Merged with default branch to prepare new release. maintenance release-20.05

Sat, 02 May 2020 13:51:07 +0200

author
Detlev Offenbach <detlev@die-offenbachs.de>
date
Sat, 02 May 2020 13:51:07 +0200
branch
maintenance
changeset 7560
343db73c4842
parent 7507
a4eb1787ea41 (current diff)
parent 7559
b198b08914cc (diff)
child 7561
fb454da949c4

Merged with default branch to prepare new release.

docs/changelog file | annotate | diff | comparison | revisions
eric6.e4p file | annotate | diff | comparison | revisions
eric6/APIs/Python3/eric6.api file | annotate | diff | comparison | revisions
eric6/Documentation/Help/source.qch file | annotate | diff | comparison | revisions
eric6/Documentation/Help/source.qhp file | annotate | diff | comparison | revisions
eric6/E5Gui/E5TextEditSearchWidget.py file | annotate | diff | comparison | revisions
eric6/Graphics/UMLGraphicsView.py file | annotate | diff | comparison | revisions
eric6/Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckerDialog.py file | annotate | diff | comparison | revisions
eric6/Plugins/UiExtensionPlugins/Translator/icons/engines/deepl.png file | annotate | diff | comparison | revisions
eric6/Plugins/UiExtensionPlugins/Translator/icons/engines/glosbe.png file | annotate | diff | comparison | revisions
eric6/Plugins/UiExtensionPlugins/Translator/icons/engines/googlev1.png file | annotate | diff | comparison | revisions
eric6/Plugins/UiExtensionPlugins/Translator/icons/engines/googlev2.png file | annotate | diff | comparison | revisions
eric6/Plugins/UiExtensionPlugins/Translator/icons/engines/ibm_watson.png file | annotate | diff | comparison | revisions
eric6/Plugins/UiExtensionPlugins/Translator/icons/engines/microsoft.png file | annotate | diff | comparison | revisions
eric6/Plugins/UiExtensionPlugins/Translator/icons/engines/mymemory.png file | annotate | diff | comparison | revisions
eric6/Plugins/UiExtensionPlugins/Translator/icons/engines/promt.png file | annotate | diff | comparison | revisions
eric6/Plugins/UiExtensionPlugins/Translator/icons/engines/yandex.png file | annotate | diff | comparison | revisions
eric6/Plugins/UiExtensionPlugins/Translator/icons/flag.png file | annotate | diff | comparison | revisions
eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/af.png file | annotate | diff | comparison | revisions
eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/ar.png file | annotate | diff | comparison | revisions
eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/be.png file | annotate | diff | comparison | revisions
eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/bg.png file | annotate | diff | comparison | revisions
eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/bs.png file | annotate | diff | comparison | revisions
eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/ca.png file | annotate | diff | comparison | revisions
eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/cs.png file | annotate | diff | comparison | revisions
eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/da.png file | annotate | diff | comparison | revisions
eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/de.png file | annotate | diff | comparison | revisions
eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/el.png file | annotate | diff | comparison | revisions
eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/en.png file | annotate | diff | comparison | revisions
eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/es.png file | annotate | diff | comparison | revisions
eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/et.png file | annotate | diff | comparison | revisions
eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/fi.png file | annotate | diff | comparison | revisions
eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/fr.png file | annotate | diff | comparison | revisions
eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/ga.png file | annotate | diff | comparison | revisions
eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/gl.png file | annotate | diff | comparison | revisions
eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/he.png file | annotate | diff | comparison | revisions
eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/hi.png file | annotate | diff | comparison | revisions
eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/hr.png file | annotate | diff | comparison | revisions
eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/hu.png file | annotate | diff | comparison | revisions
eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/id.png file | annotate | diff | comparison | revisions
eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/is.png file | annotate | diff | comparison | revisions
eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/it.png file | annotate | diff | comparison | revisions
eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/iw.png file | annotate | diff | comparison | revisions
eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/ja.png file | annotate | diff | comparison | revisions
eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/ka.png file | annotate | diff | comparison | revisions
eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/ko.png file | annotate | diff | comparison | revisions
eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/lt.png file | annotate | diff | comparison | revisions
eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/lv.png file | annotate | diff | comparison | revisions
eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/mk.png file | annotate | diff | comparison | revisions
eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/mt.png file | annotate | diff | comparison | revisions
eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/nl.png file | annotate | diff | comparison | revisions
eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/no.png file | annotate | diff | comparison | revisions
eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/pl.png file | annotate | diff | comparison | revisions
eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/pt.png file | annotate | diff | comparison | revisions
eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/ro.png file | annotate | diff | comparison | revisions
eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/ru.png file | annotate | diff | comparison | revisions
eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/sk.png file | annotate | diff | comparison | revisions
eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/sl.png file | annotate | diff | comparison | revisions
eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/sq.png file | annotate | diff | comparison | revisions
eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/sr.png file | annotate | diff | comparison | revisions
eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/sv.png file | annotate | diff | comparison | revisions
eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/th.png file | annotate | diff | comparison | revisions
eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/tl.png file | annotate | diff | comparison | revisions
eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/tr.png file | annotate | diff | comparison | revisions
eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/uk.png file | annotate | diff | comparison | revisions
eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/vi.png file | annotate | diff | comparison | revisions
eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/zh-CN.png file | annotate | diff | comparison | revisions
eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/zh-TW.png file | annotate | diff | comparison | revisions
eric6/Plugins/UiExtensionPlugins/Translator/icons/pronounce.png file | annotate | diff | comparison | revisions
eric6/Plugins/UiExtensionPlugins/Translator/icons/swap.png file | annotate | diff | comparison | revisions
eric6/Plugins/UiExtensionPlugins/Translator/icons/translate.png file | annotate | diff | comparison | revisions
eric6/Plugins/ViewManagerPlugins/Listspace/Listspace.py file | annotate | diff | comparison | revisions
eric6/Plugins/ViewManagerPlugins/Tabview/Tabview.py file | annotate | diff | comparison | revisions
eric6/Preferences/ConfigurationDialog.py file | annotate | diff | comparison | revisions
eric6/Preferences/__init__.py file | annotate | diff | comparison | revisions
eric6/QScintilla/Editor.py file | annotate | diff | comparison | revisions
eric6/QScintilla/Shell.py file | annotate | diff | comparison | revisions
eric6/ThirdParty/Pygments/pygments/styles/stata.py file | annotate | diff | comparison | revisions
eric6/UI/Previewers/PreviewerHTML.py file | annotate | diff | comparison | revisions
eric6/UI/UserInterface.py file | annotate | diff | comparison | revisions
eric6/UI/data/codeDocumentationViewer_rc.py file | annotate | diff | comparison | revisions
eric6/UI/data/documentViewerStyle.css file | annotate | diff | comparison | revisions
eric6/ViewManager/ViewManager.py file | annotate | diff | comparison | revisions
eric6/WebBrowser/Download/DownloadItem.py file | annotate | diff | comparison | revisions
eric6/WebBrowser/WebBrowserView.py file | annotate | diff | comparison | revisions
eric6/i18n/eric6_cs.ts file | annotate | diff | comparison | revisions
eric6/i18n/eric6_de.qm file | annotate | diff | comparison | revisions
eric6/i18n/eric6_de.ts file | annotate | diff | comparison | revisions
eric6/i18n/eric6_empty.ts file | annotate | diff | comparison | revisions
eric6/i18n/eric6_en.ts file | annotate | diff | comparison | revisions
eric6/i18n/eric6_es.qm file | annotate | diff | comparison | revisions
eric6/i18n/eric6_es.ts file | annotate | diff | comparison | revisions
eric6/i18n/eric6_fr.ts file | annotate | diff | comparison | revisions
eric6/i18n/eric6_it.ts file | annotate | diff | comparison | revisions
eric6/i18n/eric6_pt.ts file | annotate | diff | comparison | revisions
eric6/i18n/eric6_ru.qm file | annotate | diff | comparison | revisions
eric6/i18n/eric6_ru.ts file | annotate | diff | comparison | revisions
eric6/i18n/eric6_tr.ts file | annotate | diff | comparison | revisions
eric6/i18n/eric6_zh_CN.ts file | annotate | diff | comparison | revisions
eric6/icons/default/1downarrow.png file | annotate | diff | comparison | revisions
eric6/icons/default/1leftarrow.png file | annotate | diff | comparison | revisions
eric6/icons/default/1rightarrow.png file | annotate | diff | comparison | revisions
eric6/icons/default/1uparrow.png file | annotate | diff | comparison | revisions
eric6/icons/default/2downarrow.png file | annotate | diff | comparison | revisions
eric6/icons/default/2leftarrow.png file | annotate | diff | comparison | revisions
eric6/icons/default/2rightarrow.png file | annotate | diff | comparison | revisions
eric6/icons/default/2uparrow.png file | annotate | diff | comparison | revisions
eric6/icons/default/LICENSE.oxygen file | annotate | diff | comparison | revisions
eric6/icons/default/actionsToolButton.png file | annotate | diff | comparison | revisions
eric6/icons/default/adBlockAction.png file | annotate | diff | comparison | revisions
eric6/icons/default/adBlockPlus.png file | annotate | diff | comparison | revisions
eric6/icons/default/adBlockPlus48.png file | annotate | diff | comparison | revisions
eric6/icons/default/adBlockPlusDisabled.png file | annotate | diff | comparison | revisions
eric6/icons/default/adBlockPlusDisabled16.png file | annotate | diff | comparison | revisions
eric6/icons/default/adBlockPlusGreen.png file | annotate | diff | comparison | revisions
eric6/icons/default/adBlockPlusGreen16.png file | annotate | diff | comparison | revisions
eric6/icons/default/adBlockPlusGreen48.png file | annotate | diff | comparison | revisions
eric6/icons/default/addBookmark.png file | annotate | diff | comparison | revisions
eric6/icons/default/addUser.png file | annotate | diff | comparison | revisions
eric6/icons/default/altn.png file | annotate | diff | comparison | revisions
eric6/icons/default/anychar.png file | annotate | diff | comparison | revisions
eric6/icons/default/astTree.png file | annotate | diff | comparison | revisions
eric6/icons/default/atomicgroup.png file | annotate | diff | comparison | revisions
eric6/icons/default/attribute.png file | annotate | diff | comparison | revisions
eric6/icons/default/attribute_class.png file | annotate | diff | comparison | revisions
eric6/icons/default/attribute_private.png file | annotate | diff | comparison | revisions
eric6/icons/default/attribute_protected.png file | annotate | diff | comparison | revisions
eric6/icons/default/attributes.png file | annotate | diff | comparison | revisions
eric6/icons/default/attributes_class.png file | annotate | diff | comparison | revisions
eric6/icons/default/audio-video.png file | annotate | diff | comparison | revisions
eric6/icons/default/audioMuted.png file | annotate | diff | comparison | revisions
eric6/icons/default/audioPlaying.png file | annotate | diff | comparison | revisions
eric6/icons/default/audioVolumeHigh.png file | annotate | diff | comparison | revisions
eric6/icons/default/audioVolumeMuted.png file | annotate | diff | comparison | revisions
eric6/icons/default/audiocapture.png file | annotate | diff | comparison | revisions
eric6/icons/default/autoHideOff.png file | annotate | diff | comparison | revisions
eric6/icons/default/autoHideOn.png file | annotate | diff | comparison | revisions
eric6/icons/default/autospellchecking.png file | annotate | diff | comparison | revisions
eric6/icons/default/back.png file | annotate | diff | comparison | revisions
eric6/icons/default/begline.png file | annotate | diff | comparison | revisions
eric6/icons/default/bookmark16.png file | annotate | diff | comparison | revisions
eric6/icons/default/bookmark22.png file | annotate | diff | comparison | revisions
eric6/icons/default/bookmark32.png file | annotate | diff | comparison | revisions
eric6/icons/default/bookmarkNext.png file | annotate | diff | comparison | revisions
eric6/icons/default/bookmarkPrevious.png file | annotate | diff | comparison | revisions
eric6/icons/default/bookmarkToggle.png file | annotate | diff | comparison | revisions
eric6/icons/default/break.png file | annotate | diff | comparison | revisions
eric6/icons/default/breakDisabled.png file | annotate | diff | comparison | revisions
eric6/icons/default/breakpointNext.png file | annotate | diff | comparison | revisions
eric6/icons/default/breakpointPrevious.png file | annotate | diff | comparison | revisions
eric6/icons/default/breakpointToggle.png file | annotate | diff | comparison | revisions
eric6/icons/default/breakpoints.png file | annotate | diff | comparison | revisions
eric6/icons/default/browser.png file | annotate | diff | comparison | revisions
eric6/icons/default/cBreak.png file | annotate | diff | comparison | revisions
eric6/icons/default/cBreakpointToggle.png file | annotate | diff | comparison | revisions
eric6/icons/default/callReturn.png file | annotate | diff | comparison | revisions
eric6/icons/default/callStack.png file | annotate | diff | comparison | revisions
eric6/icons/default/callTrace.png file | annotate | diff | comparison | revisions
eric6/icons/default/callTraceStart.png file | annotate | diff | comparison | revisions
eric6/icons/default/callTraceStop.png file | annotate | diff | comparison | revisions
eric6/icons/default/camera.png file | annotate | diff | comparison | revisions
eric6/icons/default/cameraPhoto.png file | annotate | diff | comparison | revisions
eric6/icons/default/certificateDelete.png file | annotate | diff | comparison | revisions
eric6/icons/default/certificateExport.png file | annotate | diff | comparison | revisions
eric6/icons/default/certificateImport.png file | annotate | diff | comparison | revisions
eric6/icons/default/certificates.png file | annotate | diff | comparison | revisions
eric6/icons/default/changeNext.png file | annotate | diff | comparison | revisions
eric6/icons/default/changePrev.png file | annotate | diff | comparison | revisions
eric6/icons/default/changesetSign.png file | annotate | diff | comparison | revisions
eric6/icons/default/changesetSignList.png file | annotate | diff | comparison | revisions
eric6/icons/default/changesetSignVerify.png file | annotate | diff | comparison | revisions
eric6/icons/default/characters.png file | annotate | diff | comparison | revisions
eric6/icons/default/chart.svg file | annotate | diff | comparison | revisions
eric6/icons/default/chatBanKickUser.png file | annotate | diff | comparison | revisions
eric6/icons/default/chatBanUser.png file | annotate | diff | comparison | revisions
eric6/icons/default/chatKickUser.png file | annotate | diff | comparison | revisions
eric6/icons/default/chatUser.png file | annotate | diff | comparison | revisions
eric6/icons/default/chatUser1.png file | annotate | diff | comparison | revisions
eric6/icons/default/chatUser2.png file | annotate | diff | comparison | revisions
eric6/icons/default/chatUser3.png file | annotate | diff | comparison | revisions
eric6/icons/default/chatUser4.png file | annotate | diff | comparison | revisions
eric6/icons/default/chatUser5.png file | annotate | diff | comparison | revisions
eric6/icons/default/chatUser6.png file | annotate | diff | comparison | revisions
eric6/icons/default/chrome.png file | annotate | diff | comparison | revisions
eric6/icons/default/chromium.png file | annotate | diff | comparison | revisions
eric6/icons/default/circuitPythonDevice.png file | annotate | diff | comparison | revisions
eric6/icons/default/class.png file | annotate | diff | comparison | revisions
eric6/icons/default/class_private.png file | annotate | diff | comparison | revisions
eric6/icons/default/class_protected.png file | annotate | diff | comparison | revisions
eric6/icons/default/clearLeft.png file | annotate | diff | comparison | revisions
eric6/icons/default/clearPrivateData.png file | annotate | diff | comparison | revisions
eric6/icons/default/clearRight.png file | annotate | diff | comparison | revisions
eric6/icons/default/close.png file | annotate | diff | comparison | revisions
eric6/icons/default/closeEditor.png file | annotate | diff | comparison | revisions
eric6/icons/default/closehead.png file | annotate | diff | comparison | revisions
eric6/icons/default/codeDocuViewer.png file | annotate | diff | comparison | revisions
eric6/icons/default/colorPicker.png file | annotate | diff | comparison | revisions
eric6/icons/default/comment.png file | annotate | diff | comparison | revisions
eric6/icons/default/compareFiles.png file | annotate | diff | comparison | revisions
eric6/icons/default/configure.png file | annotate | diff | comparison | revisions
eric6/icons/default/configureExport.png file | annotate | diff | comparison | revisions
eric6/icons/default/configureImport.png file | annotate | diff | comparison | revisions
eric6/icons/default/configureShortcuts.png file | annotate | diff | comparison | revisions
eric6/icons/default/configureViewProfiles.png file | annotate | diff | comparison | revisions
eric6/icons/default/continue.png file | annotate | diff | comparison | revisions
eric6/icons/default/continueToCursor.png file | annotate | diff | comparison | revisions
eric6/icons/default/cookie.png file | annotate | diff | comparison | revisions
eric6/icons/default/cooperation.png file | annotate | diff | comparison | revisions
eric6/icons/default/cooperation48.png file | annotate | diff | comparison | revisions
eric6/icons/default/corba48.png file | annotate | diff | comparison | revisions
eric6/icons/default/coverageProject.png file | annotate | diff | comparison | revisions
eric6/icons/default/coverageScript.png file | annotate | diff | comparison | revisions
eric6/icons/default/currentLineMarker.png file | annotate | diff | comparison | revisions
eric6/icons/default/databaseConnection.png file | annotate | diff | comparison | revisions
eric6/icons/default/debug48.png file | annotate | diff | comparison | revisions
eric6/icons/default/debugProject.png file | annotate | diff | comparison | revisions
eric6/icons/default/debugRestart.png file | annotate | diff | comparison | revisions
eric6/icons/default/debugScript.png file | annotate | diff | comparison | revisions
eric6/icons/default/debugViewer.png file | annotate | diff | comparison | revisions
eric6/icons/default/defaultIcon.png file | annotate | diff | comparison | revisions
eric6/icons/default/deleteBookmark.png file | annotate | diff | comparison | revisions
eric6/icons/default/deleteShape.png file | annotate | diff | comparison | revisions
eric6/icons/default/designer4.png file | annotate | diff | comparison | revisions
eric6/icons/default/designer48.png file | annotate | diff | comparison | revisions
eric6/icons/default/desktopAudioVideoCapture.png file | annotate | diff | comparison | revisions
eric6/icons/default/desktopVideoCapture.png file | annotate | diff | comparison | revisions
eric6/icons/default/diffFiles.png file | annotate | diff | comparison | revisions
eric6/icons/default/dirClosed.png file | annotate | diff | comparison | revisions
eric6/icons/default/dirOpen.png file | annotate | diff | comparison | revisions
eric6/icons/default/docstringError.png file | annotate | diff | comparison | revisions
eric6/icons/default/documentFind.png file | annotate | diff | comparison | revisions
eric6/icons/default/documentNewView.png file | annotate | diff | comparison | revisions
eric6/icons/default/download.png file | annotate | diff | comparison | revisions
eric6/icons/default/downloads.png file | annotate | diff | comparison | revisions
eric6/icons/default/downloads48.png file | annotate | diff | comparison | revisions
eric6/icons/default/drawBrush.png file | annotate | diff | comparison | revisions
eric6/icons/default/drawCircle.png file | annotate | diff | comparison | revisions
eric6/icons/default/drawCircleFilled.png file | annotate | diff | comparison | revisions
eric6/icons/default/drawEllipse.png file | annotate | diff | comparison | revisions
eric6/icons/default/drawEllipseFilled.png file | annotate | diff | comparison | revisions
eric6/icons/default/drawEraser.png file | annotate | diff | comparison | revisions
eric6/icons/default/drawFill.png file | annotate | diff | comparison | revisions
eric6/icons/default/drawLine.png file | annotate | diff | comparison | revisions
eric6/icons/default/drawRectangle.png file | annotate | diff | comparison | revisions
eric6/icons/default/drawRectangleFilled.png file | annotate | diff | comparison | revisions
eric6/icons/default/edit.png file | annotate | diff | comparison | revisions
eric6/icons/default/editBookmarks.png file | annotate | diff | comparison | revisions
eric6/icons/default/editComment.png file | annotate | diff | comparison | revisions
eric6/icons/default/editCopy.png file | annotate | diff | comparison | revisions
eric6/icons/default/editCut.png file | annotate | diff | comparison | revisions
eric6/icons/default/editDelete.png file | annotate | diff | comparison | revisions
eric6/icons/default/editIndent.png file | annotate | diff | comparison | revisions
eric6/icons/default/editPaste.png file | annotate | diff | comparison | revisions
eric6/icons/default/editRedo.png file | annotate | diff | comparison | revisions
eric6/icons/default/editRename.png file | annotate | diff | comparison | revisions
eric6/icons/default/editReplace.png file | annotate | diff | comparison | revisions
eric6/icons/default/editReplaceAll.png file | annotate | diff | comparison | revisions
eric6/icons/default/editReplaceSearch.png file | annotate | diff | comparison | revisions
eric6/icons/default/editSelectAll.png file | annotate | diff | comparison | revisions
eric6/icons/default/editSmartIndent.png file | annotate | diff | comparison | revisions
eric6/icons/default/editToggleComment.png file | annotate | diff | comparison | revisions
eric6/icons/default/editUncomment.png file | annotate | diff | comparison | revisions
eric6/icons/default/editUndo.png file | annotate | diff | comparison | revisions
eric6/icons/default/editUnindent.png file | annotate | diff | comparison | revisions
eric6/icons/default/editor.png file | annotate | diff | comparison | revisions
eric6/icons/default/empty.png file | annotate | diff | comparison | revisions
eric6/icons/default/endline.png file | annotate | diff | comparison | revisions
eric6/icons/default/enum.png file | annotate | diff | comparison | revisions
eric6/icons/default/eolLinux.png file | annotate | diff | comparison | revisions
eric6/icons/default/eolMac.png file | annotate | diff | comparison | revisions
eric6/icons/default/eolWindows.png file | annotate | diff | comparison | revisions
eric6/icons/default/eric.png file | annotate | diff | comparison | revisions
eric6/icons/default/eric256.png file | annotate | diff | comparison | revisions
eric6/icons/default/ericSnap.png file | annotate | diff | comparison | revisions
eric6/icons/default/ericSnap48.png file | annotate | diff | comparison | revisions
eric6/icons/default/ericWeb.png file | annotate | diff | comparison | revisions
eric6/icons/default/ericWeb48.png file | annotate | diff | comparison | revisions
eric6/icons/default/eric_2.png file | annotate | diff | comparison | revisions
eric6/icons/default/erict-bw.png file | annotate | diff | comparison | revisions
eric6/icons/default/erict-bwi.png file | annotate | diff | comparison | revisions
eric6/icons/default/erict-hc.png file | annotate | diff | comparison | revisions
eric6/icons/default/erict.png file | annotate | diff | comparison | revisions
eric6/icons/default/errorLineMarker.png file | annotate | diff | comparison | revisions
eric6/icons/default/esp32Device.png file | annotate | diff | comparison | revisions
eric6/icons/default/exceptions.png file | annotate | diff | comparison | revisions
eric6/icons/default/exit.png file | annotate | diff | comparison | revisions
eric6/icons/default/exportShortcuts.png file | annotate | diff | comparison | revisions
eric6/icons/default/featurePermission.png file | annotate | diff | comparison | revisions
eric6/icons/default/fileD.png file | annotate | diff | comparison | revisions
eric6/icons/default/fileDelete.png file | annotate | diff | comparison | revisions
eric6/icons/default/fileDeleteList.png file | annotate | diff | comparison | revisions
eric6/icons/default/fileDesigner.png file | annotate | diff | comparison | revisions
eric6/icons/default/fileIDL.png file | annotate | diff | comparison | revisions
eric6/icons/default/fileJavascript.png file | annotate | diff | comparison | revisions
eric6/icons/default/fileLinguist.png file | annotate | diff | comparison | revisions
eric6/icons/default/fileLinguist2.png file | annotate | diff | comparison | revisions
eric6/icons/default/fileMisc.png file | annotate | diff | comparison | revisions
eric6/icons/default/fileModified.png file | annotate | diff | comparison | revisions
eric6/icons/default/fileMultiProject.png file | annotate | diff | comparison | revisions
eric6/icons/default/filePixmap.png file | annotate | diff | comparison | revisions
eric6/icons/default/fileProject.png file | annotate | diff | comparison | revisions
eric6/icons/default/filePython.png file | annotate | diff | comparison | revisions
eric6/icons/default/filePython2.png file | annotate | diff | comparison | revisions
eric6/icons/default/fileResource.png file | annotate | diff | comparison | revisions
eric6/icons/default/fileRuby.png file | annotate | diff | comparison | revisions
eric6/icons/default/fileSave.png file | annotate | diff | comparison | revisions
eric6/icons/default/fileSaveAll.png file | annotate | diff | comparison | revisions
eric6/icons/default/fileSaveAs.png file | annotate | diff | comparison | revisions
eric6/icons/default/fileSaveCopy.png file | annotate | diff | comparison | revisions
eric6/icons/default/fileSavePixmap.png file | annotate | diff | comparison | revisions
eric6/icons/default/fileSaveProject.png file | annotate | diff | comparison | revisions
eric6/icons/default/fileSaveVisiblePixmap.png file | annotate | diff | comparison | revisions
eric6/icons/default/fileShortcuts.png file | annotate | diff | comparison | revisions
eric6/icons/default/fileSvg.png file | annotate | diff | comparison | revisions
eric6/icons/default/fileText.png file | annotate | diff | comparison | revisions
eric6/icons/default/filemanager.svg file | annotate | diff | comparison | revisions
eric6/icons/default/find.png file | annotate | diff | comparison | revisions
eric6/icons/default/findClear.png file | annotate | diff | comparison | revisions
eric6/icons/default/findNext.png file | annotate | diff | comparison | revisions
eric6/icons/default/findPrev.png file | annotate | diff | comparison | revisions
eric6/icons/default/findWordNext.png file | annotate | diff | comparison | revisions
eric6/icons/default/findWordPrev.png file | annotate | diff | comparison | revisions
eric6/icons/default/firefox.png file | annotate | diff | comparison | revisions
eric6/icons/default/flag.png file | annotate | diff | comparison | revisions
eric6/icons/default/flagBlack.png file | annotate | diff | comparison | revisions
eric6/icons/default/flagGreen.png file | annotate | diff | comparison | revisions
eric6/icons/default/flagYellow.png file | annotate | diff | comparison | revisions
eric6/icons/default/flashCookie.png file | annotate | diff | comparison | revisions
eric6/icons/default/flashCookie128.png file | annotate | diff | comparison | revisions
eric6/icons/default/flashCookie16.png file | annotate | diff | comparison | revisions
eric6/icons/default/flashCookie48.png file | annotate | diff | comparison | revisions
eric6/icons/default/formatTextBold.png file | annotate | diff | comparison | revisions
eric6/icons/default/formatTextBulletedList.png file | annotate | diff | comparison | revisions
eric6/icons/default/formatTextCodeBlock.png file | annotate | diff | comparison | revisions
eric6/icons/default/formatTextHeader.png file | annotate | diff | comparison | revisions
eric6/icons/default/formatTextHeader1.png file | annotate | diff | comparison | revisions
eric6/icons/default/formatTextHeader2.png file | annotate | diff | comparison | revisions
eric6/icons/default/formatTextHeader3.png file | annotate | diff | comparison | revisions
eric6/icons/default/formatTextHorizontalLine.png file | annotate | diff | comparison | revisions
eric6/icons/default/formatTextHyperlink.png file | annotate | diff | comparison | revisions
eric6/icons/default/formatTextImage.png file | annotate | diff | comparison | revisions
eric6/icons/default/formatTextInlineCode.png file | annotate | diff | comparison | revisions
eric6/icons/default/formatTextItalic.png file | annotate | diff | comparison | revisions
eric6/icons/default/formatTextNumberedList.png file | annotate | diff | comparison | revisions
eric6/icons/default/formatTextQuote.png file | annotate | diff | comparison | revisions
eric6/icons/default/formatTextStrikethrough.png file | annotate | diff | comparison | revisions
eric6/icons/default/forward.png file | annotate | diff | comparison | revisions
eric6/icons/default/gRPC48.png file | annotate | diff | comparison | revisions
eric6/icons/default/geolocation.png file | annotate | diff | comparison | revisions
eric6/icons/default/getAs.png file | annotate | diff | comparison | revisions
eric6/icons/default/globalVariables.png file | annotate | diff | comparison | revisions
eric6/icons/default/google.png file | annotate | diff | comparison | revisions
eric6/icons/default/goto.png file | annotate | diff | comparison | revisions
eric6/icons/default/gotoBrace.png file | annotate | diff | comparison | revisions
eric6/icons/default/gotoLastEditPosition.png file | annotate | diff | comparison | revisions
eric6/icons/default/grayscale.png file | annotate | diff | comparison | revisions
eric6/icons/default/greaseMonkey.png file | annotate | diff | comparison | revisions
eric6/icons/default/greaseMonkey48.png file | annotate | diff | comparison | revisions
eric6/icons/default/greaseMonkeyScript.png file | annotate | diff | comparison | revisions
eric6/icons/default/greaseMonkeyTrash.png file | annotate | diff | comparison | revisions
eric6/icons/default/grid.png file | annotate | diff | comparison | revisions
eric6/icons/default/group.png file | annotate | diff | comparison | revisions
eric6/icons/default/help.png file | annotate | diff | comparison | revisions
eric6/icons/default/helpAbout.png file | annotate | diff | comparison | revisions
eric6/icons/default/helpAboutQt.png file | annotate | diff | comparison | revisions
eric6/icons/default/hexEditor.png file | annotate | diff | comparison | revisions
eric6/icons/default/hidePassword.png file | annotate | diff | comparison | revisions
eric6/icons/default/history.png file | annotate | diff | comparison | revisions
eric6/icons/default/historyClear.png file | annotate | diff | comparison | revisions
eric6/icons/default/home.png file | annotate | diff | comparison | revisions
eric6/icons/default/html.png file | annotate | diff | comparison | revisions
eric6/icons/default/iconEditor.png file | annotate | diff | comparison | revisions
eric6/icons/default/icons.png file | annotate | diff | comparison | revisions
eric6/icons/default/importShortcuts.png file | annotate | diff | comparison | revisions
eric6/icons/default/importedModule.png file | annotate | diff | comparison | revisions
eric6/icons/default/importedName.png file | annotate | diff | comparison | revisions
eric6/icons/default/imports.png file | annotate | diff | comparison | revisions
eric6/icons/default/incomingBookmark.png file | annotate | diff | comparison | revisions
eric6/icons/default/info.png file | annotate | diff | comparison | revisions
eric6/icons/default/internet_explorer.png file | annotate | diff | comparison | revisions
eric6/icons/default/irc.png file | annotate | diff | comparison | revisions
eric6/icons/default/irc128.png file | annotate | diff | comparison | revisions
eric6/icons/default/irc48.png file | annotate | diff | comparison | revisions
eric6/icons/default/ircAdmin.png file | annotate | diff | comparison | revisions
eric6/icons/default/ircAway.png file | annotate | diff | comparison | revisions
eric6/icons/default/ircCloseChannel.png file | annotate | diff | comparison | revisions
eric6/icons/default/ircConfigure.png file | annotate | diff | comparison | revisions
eric6/icons/default/ircConnect.png file | annotate | diff | comparison | revisions
eric6/icons/default/ircDisconnect.png file | annotate | diff | comparison | revisions
eric6/icons/default/ircEditTopic.png file | annotate | diff | comparison | revisions
eric6/icons/default/ircHalfop.png file | annotate | diff | comparison | revisions
eric6/icons/default/ircJoinChannel.png file | annotate | diff | comparison | revisions
eric6/icons/default/ircNormal.png file | annotate | diff | comparison | revisions
eric6/icons/default/ircOp.png file | annotate | diff | comparison | revisions
eric6/icons/default/ircOwner.png file | annotate | diff | comparison | revisions
eric6/icons/default/ircUserAway.png file | annotate | diff | comparison | revisions
eric6/icons/default/ircUserPresent.png file | annotate | diff | comparison | revisions
eric6/icons/default/ircVoice.png file | annotate | diff | comparison | revisions
eric6/icons/default/issueFixable.png file | annotate | diff | comparison | revisions
eric6/icons/default/issueFixed.png file | annotate | diff | comparison | revisions
eric6/icons/default/keywords.png file | annotate | diff | comparison | revisions
eric6/icons/default/konqueror.png file | annotate | diff | comparison | revisions
eric6/icons/default/languages/lexerBash.png file | annotate | diff | comparison | revisions
eric6/icons/default/languages/lexerBatch.png file | annotate | diff | comparison | revisions
eric6/icons/default/languages/lexerCMake.png file | annotate | diff | comparison | revisions
eric6/icons/default/languages/lexerCPP.png file | annotate | diff | comparison | revisions
eric6/icons/default/languages/lexerCSS.png file | annotate | diff | comparison | revisions
eric6/icons/default/languages/lexerCoffeeScript.png file | annotate | diff | comparison | revisions
eric6/icons/default/languages/lexerCsharp.png file | annotate | diff | comparison | revisions
eric6/icons/default/languages/lexerCython.png file | annotate | diff | comparison | revisions
eric6/icons/default/languages/lexerD.png file | annotate | diff | comparison | revisions
eric6/icons/default/languages/lexerDiff.png file | annotate | diff | comparison | revisions
eric6/icons/default/languages/lexerFortran.png file | annotate | diff | comparison | revisions
eric6/icons/default/languages/lexerGettext.png file | annotate | diff | comparison | revisions
eric6/icons/default/languages/lexerHTML.png file | annotate | diff | comparison | revisions
eric6/icons/default/languages/lexerIDL.png file | annotate | diff | comparison | revisions
eric6/icons/default/languages/lexerJSON.png file | annotate | diff | comparison | revisions
eric6/icons/default/languages/lexerJava.png file | annotate | diff | comparison | revisions
eric6/icons/default/languages/lexerJavaScript.png file | annotate | diff | comparison | revisions
eric6/icons/default/languages/lexerLua.png file | annotate | diff | comparison | revisions
eric6/icons/default/languages/lexerMakefile.png file | annotate | diff | comparison | revisions
eric6/icons/default/languages/lexerMarkdown.png file | annotate | diff | comparison | revisions
eric6/icons/default/languages/lexerMatlab.png file | annotate | diff | comparison | revisions
eric6/icons/default/languages/lexerOctave.png file | annotate | diff | comparison | revisions
eric6/icons/default/languages/lexerPHP.png file | annotate | diff | comparison | revisions
eric6/icons/default/languages/lexerPOV.png file | annotate | diff | comparison | revisions
eric6/icons/default/languages/lexerPascal.png file | annotate | diff | comparison | revisions
eric6/icons/default/languages/lexerPerl.png file | annotate | diff | comparison | revisions
eric6/icons/default/languages/lexerPostscript.png file | annotate | diff | comparison | revisions
eric6/icons/default/languages/lexerProperties.png file | annotate | diff | comparison | revisions
eric6/icons/default/languages/lexerPython.png file | annotate | diff | comparison | revisions
eric6/icons/default/languages/lexerPython3.png file | annotate | diff | comparison | revisions
eric6/icons/default/languages/lexerRuby.png file | annotate | diff | comparison | revisions
eric6/icons/default/languages/lexerSQL.png file | annotate | diff | comparison | revisions
eric6/icons/default/languages/lexerTCL.png file | annotate | diff | comparison | revisions
eric6/icons/default/languages/lexerTeX.png file | annotate | diff | comparison | revisions
eric6/icons/default/languages/lexerVHDL.png file | annotate | diff | comparison | revisions
eric6/icons/default/languages/lexerXML.png file | annotate | diff | comparison | revisions
eric6/icons/default/languages/lexerYAML.png file | annotate | diff | comparison | revisions
eric6/icons/default/languages/readme.txt file | annotate | diff | comparison | revisions
eric6/icons/default/linguist4.png file | annotate | diff | comparison | revisions
eric6/icons/default/linguist48.png file | annotate | diff | comparison | revisions
eric6/icons/default/linkConnect.svg file | annotate | diff | comparison | revisions
eric6/icons/default/linkDisconnect.svg file | annotate | diff | comparison | revisions
eric6/icons/default/listBookmarks.png file | annotate | diff | comparison | revisions
eric6/icons/default/listSelection.png file | annotate | diff | comparison | revisions
eric6/icons/default/loading.png file | annotate | diff | comparison | revisions
eric6/icons/default/localVariables.png file | annotate | diff | comparison | revisions
eric6/icons/default/logViewer.png file | annotate | diff | comparison | revisions
eric6/icons/default/mailSend.png file | annotate | diff | comparison | revisions
eric6/icons/default/makefile.png file | annotate | diff | comparison | revisions
eric6/icons/default/makefile48.png file | annotate | diff | comparison | revisions
eric6/icons/default/masterProject.png file | annotate | diff | comparison | revisions
eric6/icons/default/mediaPlaybackPause.png file | annotate | diff | comparison | revisions
eric6/icons/default/mediaPlaybackStart.png file | annotate | diff | comparison | revisions
eric6/icons/default/method.png file | annotate | diff | comparison | revisions
eric6/icons/default/method_class.png file | annotate | diff | comparison | revisions
eric6/icons/default/method_private.png file | annotate | diff | comparison | revisions
eric6/icons/default/method_protected.png file | annotate | diff | comparison | revisions
eric6/icons/default/method_static.png file | annotate | diff | comparison | revisions
eric6/icons/default/microbitDevice.png file | annotate | diff | comparison | revisions
eric6/icons/default/micropython.png file | annotate | diff | comparison | revisions
eric6/icons/default/micropython48.png file | annotate | diff | comparison | revisions
eric6/icons/default/miniconda.svg file | annotate | diff | comparison | revisions
eric6/icons/default/miniconda48.svg file | annotate | diff | comparison | revisions
eric6/icons/default/minus.png file | annotate | diff | comparison | revisions
eric6/icons/default/module.png file | annotate | diff | comparison | revisions
eric6/icons/default/mouse.png file | annotate | diff | comparison | revisions
eric6/icons/default/moveBookmark.png file | annotate | diff | comparison | revisions
eric6/icons/default/moveInstructionPointer.png file | annotate | diff | comparison | revisions
eric6/icons/default/multiProjectClose.png file | annotate | diff | comparison | revisions
eric6/icons/default/multiProjectNew.png file | annotate | diff | comparison | revisions
eric6/icons/default/multiProjectOpen.png file | annotate | diff | comparison | revisions
eric6/icons/default/multiProjectProps.png file | annotate | diff | comparison | revisions
eric6/icons/default/multiProjectSave.png file | annotate | diff | comparison | revisions
eric6/icons/default/multiProjectSaveAs.png file | annotate | diff | comparison | revisions
eric6/icons/default/multiProjectViewer.png file | annotate | diff | comparison | revisions
eric6/icons/default/namedgroup.png file | annotate | diff | comparison | revisions
eric6/icons/default/namedreference.png file | annotate | diff | comparison | revisions
eric6/icons/default/namingError.png file | annotate | diff | comparison | revisions
eric6/icons/default/neglookahead.png file | annotate | diff | comparison | revisions
eric6/icons/default/neglookbehind.png file | annotate | diff | comparison | revisions
eric6/icons/default/network-offline.png file | annotate | diff | comparison | revisions
eric6/icons/default/network-online.png file | annotate | diff | comparison | revisions
eric6/icons/default/network-server.png file | annotate | diff | comparison | revisions
eric6/icons/default/new.png file | annotate | diff | comparison | revisions
eric6/icons/default/newWindow.png file | annotate | diff | comparison | revisions
eric6/icons/default/nongroup.png file | annotate | diff | comparison | revisions
eric6/icons/default/nonwordboundary.png file | annotate | diff | comparison | revisions
eric6/icons/default/notcovered.png file | annotate | diff | comparison | revisions
eric6/icons/default/notcoveredNext.png file | annotate | diff | comparison | revisions
eric6/icons/default/notcoveredPrev.png file | annotate | diff | comparison | revisions
eric6/icons/default/notification.png file | annotate | diff | comparison | revisions
eric6/icons/default/notification48.png file | annotate | diff | comparison | revisions
eric6/icons/default/numbers.png file | annotate | diff | comparison | revisions
eric6/icons/default/open.png file | annotate | diff | comparison | revisions
eric6/icons/default/openNewTab.png file | annotate | diff | comparison | revisions
eric6/icons/default/openQM.png file | annotate | diff | comparison | revisions
eric6/icons/default/openUI.png file | annotate | diff | comparison | revisions
eric6/icons/default/opera.png file | annotate | diff | comparison | revisions
eric6/icons/default/outgoingBookmark.png file | annotate | diff | comparison | revisions
eric6/icons/default/passwords.png file | annotate | diff | comparison | revisions
eric6/icons/default/pause.png file | annotate | diff | comparison | revisions
eric6/icons/default/pim.png file | annotate | diff | comparison | revisions
eric6/icons/default/pim48.png file | annotate | diff | comparison | revisions
eric6/icons/default/plugin.png file | annotate | diff | comparison | revisions
eric6/icons/default/plugin48.png file | annotate | diff | comparison | revisions
eric6/icons/default/pluginArchive.png file | annotate | diff | comparison | revisions
eric6/icons/default/pluginArchive48.png file | annotate | diff | comparison | revisions
eric6/icons/default/pluginArchiveList.png file | annotate | diff | comparison | revisions
eric6/icons/default/pluginArchiveSnapshot.png file | annotate | diff | comparison | revisions
eric6/icons/default/pluginInstall.png file | annotate | diff | comparison | revisions
eric6/icons/default/pluginRepository.png file | annotate | diff | comparison | revisions
eric6/icons/default/pluginUninstall.png file | annotate | diff | comparison | revisions
eric6/icons/default/plus.png file | annotate | diff | comparison | revisions
eric6/icons/default/poslookahead.png file | annotate | diff | comparison | revisions
eric6/icons/default/poslookbehind.png file | annotate | diff | comparison | revisions
eric6/icons/default/preferences-api.png file | annotate | diff | comparison | revisions
eric6/icons/default/preferences-application.png file | annotate | diff | comparison | revisions
eric6/icons/default/preferences-autocompletion.png file | annotate | diff | comparison | revisions
eric6/icons/default/preferences-calltips.png file | annotate | diff | comparison | revisions
eric6/icons/default/preferences-colours.png file | annotate | diff | comparison | revisions
eric6/icons/default/preferences-cooperation.png file | annotate | diff | comparison | revisions
eric6/icons/default/preferences-debugger.png file | annotate | diff | comparison | revisions
eric6/icons/default/preferences-editor.png file | annotate | diff | comparison | revisions
eric6/icons/default/preferences-exporters.png file | annotate | diff | comparison | revisions
eric6/icons/default/preferences-filehandling.png file | annotate | diff | comparison | revisions
eric6/icons/default/preferences-general.png file | annotate | diff | comparison | revisions
eric6/icons/default/preferences-graphics.png file | annotate | diff | comparison | revisions
eric6/icons/default/preferences-help.png file | annotate | diff | comparison | revisions
eric6/icons/default/preferences-helpdocumentation.png file | annotate | diff | comparison | revisions
eric6/icons/default/preferences-helpviewers.png file | annotate | diff | comparison | revisions
eric6/icons/default/preferences-highlighter-association.png file | annotate | diff | comparison | revisions
eric6/icons/default/preferences-highlighting-styles.png file | annotate | diff | comparison | revisions
eric6/icons/default/preferences-html5.png file | annotate | diff | comparison | revisions
eric6/icons/default/preferences-icons.png file | annotate | diff | comparison | revisions
eric6/icons/default/preferences-interface.png file | annotate | diff | comparison | revisions
eric6/icons/default/preferences-keywords.png file | annotate | diff | comparison | revisions
eric6/icons/default/preferences-logviewer.png file | annotate | diff | comparison | revisions
eric6/icons/default/preferences-mail_generic.png file | annotate | diff | comparison | revisions
eric6/icons/default/preferences-mimetypes.png file | annotate | diff | comparison | revisions
eric6/icons/default/preferences-mouse-click-handler.png file | annotate | diff | comparison | revisions
eric6/icons/default/preferences-multiproject.png file | annotate | diff | comparison | revisions
eric6/icons/default/preferences-network.png file | annotate | diff | comparison | revisions
eric6/icons/default/preferences-notifications.png file | annotate | diff | comparison | revisions
eric6/icons/default/preferences-orbit.png file | annotate | diff | comparison | revisions
eric6/icons/default/preferences-pluginmanager.png file | annotate | diff | comparison | revisions
eric6/icons/default/preferences-printer.png file | annotate | diff | comparison | revisions
eric6/icons/default/preferences-project.png file | annotate | diff | comparison | revisions
eric6/icons/default/preferences-properties.png file | annotate | diff | comparison | revisions
eric6/icons/default/preferences-pyDebugger.png file | annotate | diff | comparison | revisions
eric6/icons/default/preferences-python.png file | annotate | diff | comparison | revisions
eric6/icons/default/preferences-qtlogo.png file | annotate | diff | comparison | revisions
eric6/icons/default/preferences-search.png file | annotate | diff | comparison | revisions
eric6/icons/default/preferences-security.png file | annotate | diff | comparison | revisions
eric6/icons/default/preferences-shell.png file | annotate | diff | comparison | revisions
eric6/icons/default/preferences-spellchecking.png file | annotate | diff | comparison | revisions
eric6/icons/default/preferences-styles.png file | annotate | diff | comparison | revisions
eric6/icons/default/preferences-template.png file | annotate | diff | comparison | revisions
eric6/icons/default/preferences-typing.png file | annotate | diff | comparison | revisions
eric6/icons/default/preferences-vcs.png file | annotate | diff | comparison | revisions
eric6/icons/default/preferences-viewmanager.png file | annotate | diff | comparison | revisions
eric6/icons/default/previewer.png file | annotate | diff | comparison | revisions
eric6/icons/default/print.png file | annotate | diff | comparison | revisions
eric6/icons/default/printPdf.png file | annotate | diff | comparison | revisions
eric6/icons/default/printPreview.png file | annotate | diff | comparison | revisions
eric6/icons/default/privateBrowsing.png file | annotate | diff | comparison | revisions
eric6/icons/default/privateMode.png file | annotate | diff | comparison | revisions
eric6/icons/default/profileProject.png file | annotate | diff | comparison | revisions
eric6/icons/default/profileScript.png file | annotate | diff | comparison | revisions
eric6/icons/default/projectClose.png file | annotate | diff | comparison | revisions
eric6/icons/default/projectFind.png file | annotate | diff | comparison | revisions
eric6/icons/default/projectForms.png file | annotate | diff | comparison | revisions
eric6/icons/default/projectInterfaces.png file | annotate | diff | comparison | revisions
eric6/icons/default/projectNew.png file | annotate | diff | comparison | revisions
eric6/icons/default/projectOpen.png file | annotate | diff | comparison | revisions
eric6/icons/default/projectOthers.png file | annotate | diff | comparison | revisions
eric6/icons/default/projectProps.png file | annotate | diff | comparison | revisions
eric6/icons/default/projectResources.png file | annotate | diff | comparison | revisions
eric6/icons/default/projectSave.png file | annotate | diff | comparison | revisions
eric6/icons/default/projectSaveAs.png file | annotate | diff | comparison | revisions
eric6/icons/default/projectSources.png file | annotate | diff | comparison | revisions
eric6/icons/default/projectSourcesJavaScript.png file | annotate | diff | comparison | revisions
eric6/icons/default/projectSourcesPy.png file | annotate | diff | comparison | revisions
eric6/icons/default/projectSourcesPyMixed.png file | annotate | diff | comparison | revisions
eric6/icons/default/projectSourcesRb.png file | annotate | diff | comparison | revisions
eric6/icons/default/projectSourcesRbMixed.png file | annotate | diff | comparison | revisions
eric6/icons/default/projectTranslations.png file | annotate | diff | comparison | revisions
eric6/icons/default/projectUserProps.png file | annotate | diff | comparison | revisions
eric6/icons/default/projectViewer.png file | annotate | diff | comparison | revisions
eric6/icons/default/protobuf.png file | annotate | diff | comparison | revisions
eric6/icons/default/protobuf48.png file | annotate | diff | comparison | revisions
eric6/icons/default/pullBookmark.png file | annotate | diff | comparison | revisions
eric6/icons/default/pushBookmark.png file | annotate | diff | comparison | revisions
eric6/icons/default/putAs.png file | annotate | diff | comparison | revisions
eric6/icons/default/pypi.svg file | annotate | diff | comparison | revisions
eric6/icons/default/qscintilla.png file | annotate | diff | comparison | revisions
eric6/icons/default/qthelp.png file | annotate | diff | comparison | revisions
eric6/icons/default/question.svg file | annotate | diff | comparison | revisions
eric6/icons/default/quickFindExtend.png file | annotate | diff | comparison | revisions
eric6/icons/default/quickFindNext.png file | annotate | diff | comparison | revisions
eric6/icons/default/quickFindPrev.png file | annotate | diff | comparison | revisions
eric6/icons/default/relayout.png file | annotate | diff | comparison | revisions
eric6/icons/default/reload.png file | annotate | diff | comparison | revisions
eric6/icons/default/remsplitHorizontal.png file | annotate | diff | comparison | revisions
eric6/icons/default/remsplitVertical.png file | annotate | diff | comparison | revisions
eric6/icons/default/renameBookmark.png file | annotate | diff | comparison | revisions
eric6/icons/default/repeat.png file | annotate | diff | comparison | revisions
eric6/icons/default/rescan.png file | annotate | diff | comparison | revisions
eric6/icons/default/resizeColumns.png file | annotate | diff | comparison | revisions
eric6/icons/default/resourcesCompiler48.png file | annotate | diff | comparison | revisions
eric6/icons/default/restart.png file | annotate | diff | comparison | revisions
eric6/icons/default/restartDelete.png file | annotate | diff | comparison | revisions
eric6/icons/default/rss16.png file | annotate | diff | comparison | revisions
eric6/icons/default/rss22.png file | annotate | diff | comparison | revisions
eric6/icons/default/rss48.png file | annotate | diff | comparison | revisions
eric6/icons/default/runProject.png file | annotate | diff | comparison | revisions
eric6/icons/default/runScript.png file | annotate | diff | comparison | revisions
eric6/icons/default/safari.png file | annotate | diff | comparison | revisions
eric6/icons/default/safeBrowsing.png file | annotate | diff | comparison | revisions
eric6/icons/default/safeBrowsing48.png file | annotate | diff | comparison | revisions
eric6/icons/default/sceneHeightDec.png file | annotate | diff | comparison | revisions
eric6/icons/default/sceneHeightInc.png file | annotate | diff | comparison | revisions
eric6/icons/default/sceneSize.png file | annotate | diff | comparison | revisions
eric6/icons/default/sceneWidthDec.png file | annotate | diff | comparison | revisions
eric6/icons/default/sceneWidthInc.png file | annotate | diff | comparison | revisions
eric6/icons/default/screenCapture.png file | annotate | diff | comparison | revisions
eric6/icons/default/scrollAll.png file | annotate | diff | comparison | revisions
eric6/icons/default/scrollHorizontal.png file | annotate | diff | comparison | revisions
eric6/icons/default/scrollVertical.png file | annotate | diff | comparison | revisions
eric6/icons/default/securityHigh.png file | annotate | diff | comparison | revisions
eric6/icons/default/securityHigh32.png file | annotate | diff | comparison | revisions
eric6/icons/default/securityLow.png file | annotate | diff | comparison | revisions
eric6/icons/default/securityLow32.png file | annotate | diff | comparison | revisions
eric6/icons/default/securityMedium.png file | annotate | diff | comparison | revisions
eric6/icons/default/securityMedium32.png file | annotate | diff | comparison | revisions
eric6/icons/default/select.png file | annotate | diff | comparison | revisions
eric6/icons/default/selectCircle.png file | annotate | diff | comparison | revisions
eric6/icons/default/selectRectangle.png file | annotate | diff | comparison | revisions
eric6/icons/default/shapesAlignBottom.png file | annotate | diff | comparison | revisions
eric6/icons/default/shapesAlignHCenter.png file | annotate | diff | comparison | revisions
eric6/icons/default/shapesAlignLeft.png file | annotate | diff | comparison | revisions
eric6/icons/default/shapesAlignRight.png file | annotate | diff | comparison | revisions
eric6/icons/default/shapesAlignTop.png file | annotate | diff | comparison | revisions
eric6/icons/default/shapesAlignVCenter.png file | annotate | diff | comparison | revisions
eric6/icons/default/sharedEditCancel.png file | annotate | diff | comparison | revisions
eric6/icons/default/sharedEditConnected.png file | annotate | diff | comparison | revisions
eric6/icons/default/sharedEditDisconnected.png file | annotate | diff | comparison | revisions
eric6/icons/default/sharedEditSend.png file | annotate | diff | comparison | revisions
eric6/icons/default/sharedEditStart.png file | annotate | diff | comparison | revisions
eric6/icons/default/shell.png file | annotate | diff | comparison | revisions
eric6/icons/default/showPassword.png file | annotate | diff | comparison | revisions
eric6/icons/default/showPrograms.png file | annotate | diff | comparison | revisions
eric6/icons/default/siteinfo-databases.png file | annotate | diff | comparison | revisions
eric6/icons/default/siteinfo-general.png file | annotate | diff | comparison | revisions
eric6/icons/default/siteinfo-media.png file | annotate | diff | comparison | revisions
eric6/icons/default/siteinfo-security.png file | annotate | diff | comparison | revisions
eric6/icons/default/spellchecking.png file | annotate | diff | comparison | revisions
eric6/icons/default/spellchecking48.png file | annotate | diff | comparison | revisions
eric6/icons/default/splitHorizontal.png file | annotate | diff | comparison | revisions
eric6/icons/default/splitVertical.png file | annotate | diff | comparison | revisions
eric6/icons/default/sqlBrowser.png file | annotate | diff | comparison | revisions
eric6/icons/default/start.svg file | annotate | diff | comparison | revisions
eric6/icons/default/step.png file | annotate | diff | comparison | revisions
eric6/icons/default/stepOut.png file | annotate | diff | comparison | revisions
eric6/icons/default/stepOver.png file | annotate | diff | comparison | revisions
eric6/icons/default/stepQuit.png file | annotate | diff | comparison | revisions
eric6/icons/default/stopLoading.png file | annotate | diff | comparison | revisions
eric6/icons/default/stopScript.png file | annotate | diff | comparison | revisions
eric6/icons/default/superMenu.png file | annotate | diff | comparison | revisions
eric6/icons/default/symbols.png file | annotate | diff | comparison | revisions
eric6/icons/default/symlink.png file | annotate | diff | comparison | revisions
eric6/icons/default/sync.png file | annotate | diff | comparison | revisions
eric6/icons/default/syncCompleted.png file | annotate | diff | comparison | revisions
eric6/icons/default/syncFailed.png file | annotate | diff | comparison | revisions
eric6/icons/default/syncNo.png file | annotate | diff | comparison | revisions
eric6/icons/default/syncToc.png file | annotate | diff | comparison | revisions
eric6/icons/default/syntaxError.png file | annotate | diff | comparison | revisions
eric6/icons/default/syntaxError22.png file | annotate | diff | comparison | revisions
eric6/icons/default/syntaxErrorGoto.png file | annotate | diff | comparison | revisions
eric6/icons/default/tBreak.png file | annotate | diff | comparison | revisions
eric6/icons/default/tCBreak.png file | annotate | diff | comparison | revisions
eric6/icons/default/tabClose.png file | annotate | diff | comparison | revisions
eric6/icons/default/tabCloseOther.png file | annotate | diff | comparison | revisions
eric6/icons/default/tabDuplicate.png file | annotate | diff | comparison | revisions
eric6/icons/default/tabManager.png file | annotate | diff | comparison | revisions
eric6/icons/default/tabNew.png file | annotate | diff | comparison | revisions
eric6/icons/default/task.png file | annotate | diff | comparison | revisions
eric6/icons/default/taskCompleted.png file | annotate | diff | comparison | revisions
eric6/icons/default/taskFixme.png file | annotate | diff | comparison | revisions
eric6/icons/default/taskNext.png file | annotate | diff | comparison | revisions
eric6/icons/default/taskNote.png file | annotate | diff | comparison | revisions
eric6/icons/default/taskPrev.png file | annotate | diff | comparison | revisions
eric6/icons/default/taskPrioHigh.png file | annotate | diff | comparison | revisions
eric6/icons/default/taskPrioLow.png file | annotate | diff | comparison | revisions
eric6/icons/default/taskPriority.png file | annotate | diff | comparison | revisions
eric6/icons/default/taskTodo.png file | annotate | diff | comparison | revisions
eric6/icons/default/taskWarning.png file | annotate | diff | comparison | revisions
eric6/icons/default/templateViewer.png file | annotate | diff | comparison | revisions
eric6/icons/default/terminal.svg file | annotate | diff | comparison | revisions
eric6/icons/default/textencoding.png file | annotate | diff | comparison | revisions
eric6/icons/default/tineye.png file | annotate | diff | comparison | revisions
eric6/icons/default/toolbarsConfigure.png file | annotate | diff | comparison | revisions
eric6/icons/default/trPreviewer.png file | annotate | diff | comparison | revisions
eric6/icons/default/transformResize.png file | annotate | diff | comparison | revisions
eric6/icons/default/translate.png file | annotate | diff | comparison | revisions
eric6/icons/default/trash.png file | annotate | diff | comparison | revisions
eric6/icons/default/uiPreviewer.png file | annotate | diff | comparison | revisions
eric6/icons/default/unhighlight.png file | annotate | diff | comparison | revisions
eric6/icons/default/unittest.png file | annotate | diff | comparison | revisions
eric6/icons/default/unittestProject.png file | annotate | diff | comparison | revisions
eric6/icons/default/unittestRerunFailed.png file | annotate | diff | comparison | revisions
eric6/icons/default/unittestRestart.png file | annotate | diff | comparison | revisions
eric6/icons/default/unittestScript.png file | annotate | diff | comparison | revisions
eric6/icons/default/updateLocal.png file | annotate | diff | comparison | revisions
eric6/icons/default/updateRemote.png file | annotate | diff | comparison | revisions
eric6/icons/default/vcsAdd.png file | annotate | diff | comparison | revisions
eric6/icons/default/vcsAddRemove.png file | annotate | diff | comparison | revisions
eric6/icons/default/vcsApplyChangegroup.png file | annotate | diff | comparison | revisions
eric6/icons/default/vcsBranch.png file | annotate | diff | comparison | revisions
eric6/icons/default/vcsChangeLists.png file | annotate | diff | comparison | revisions
eric6/icons/default/vcsCheckout.png file | annotate | diff | comparison | revisions
eric6/icons/default/vcsCommit.png file | annotate | diff | comparison | revisions
eric6/icons/default/vcsCreateChangegroup.png file | annotate | diff | comparison | revisions
eric6/icons/default/vcsDiff.png file | annotate | diff | comparison | revisions
eric6/icons/default/vcsEditHistory.png file | annotate | diff | comparison | revisions
eric6/icons/default/vcsExport.png file | annotate | diff | comparison | revisions
eric6/icons/default/vcsExportPatch.png file | annotate | diff | comparison | revisions
eric6/icons/default/vcsGraft.png file | annotate | diff | comparison | revisions
eric6/icons/default/vcsImportPatch.png file | annotate | diff | comparison | revisions
eric6/icons/default/vcsLock.png file | annotate | diff | comparison | revisions
eric6/icons/default/vcsLog.png file | annotate | diff | comparison | revisions
eric6/icons/default/vcsLogin.png file | annotate | diff | comparison | revisions
eric6/icons/default/vcsLogout.png file | annotate | diff | comparison | revisions
eric6/icons/default/vcsMerge.png file | annotate | diff | comparison | revisions
eric6/icons/default/vcsPreviewChangegroup.png file | annotate | diff | comparison | revisions
eric6/icons/default/vcsRebase.png file | annotate | diff | comparison | revisions
eric6/icons/default/vcsRemove.png file | annotate | diff | comparison | revisions
eric6/icons/default/vcsRepo.png file | annotate | diff | comparison | revisions
eric6/icons/default/vcsRepoBrowser.png file | annotate | diff | comparison | revisions
eric6/icons/default/vcsRevert.png file | annotate | diff | comparison | revisions
eric6/icons/default/vcsSbsDiff.png file | annotate | diff | comparison | revisions
eric6/icons/default/vcsStatus.png file | annotate | diff | comparison | revisions
eric6/icons/default/vcsSummary.png file | annotate | diff | comparison | revisions
eric6/icons/default/vcsSwitch.png file | annotate | diff | comparison | revisions
eric6/icons/default/vcsTag.png file | annotate | diff | comparison | revisions
eric6/icons/default/vcsTagGlobal.png file | annotate | diff | comparison | revisions
eric6/icons/default/vcsTagLocal.png file | annotate | diff | comparison | revisions
eric6/icons/default/vcsTransplant.png file | annotate | diff | comparison | revisions
eric6/icons/default/vcsUnlock.png file | annotate | diff | comparison | revisions
eric6/icons/default/vcsUpdate.png file | annotate | diff | comparison | revisions
eric6/icons/default/viewProfileDebug.png file | annotate | diff | comparison | revisions
eric6/icons/default/viewProfileEdit.png file | annotate | diff | comparison | revisions
eric6/icons/default/virtualenv.png file | annotate | diff | comparison | revisions
eric6/icons/default/virtualenvConfig.png file | annotate | diff | comparison | revisions
eric6/icons/default/virustotal.png file | annotate | diff | comparison | revisions
eric6/icons/default/w3.png file | annotate | diff | comparison | revisions
eric6/icons/default/warning.png file | annotate | diff | comparison | revisions
eric6/icons/default/warning22.png file | annotate | diff | comparison | revisions
eric6/icons/default/warningNext.png file | annotate | diff | comparison | revisions
eric6/icons/default/warningPrev.png file | annotate | diff | comparison | revisions
eric6/icons/default/watchpoints.png file | annotate | diff | comparison | revisions
eric6/icons/default/webInspector.png file | annotate | diff | comparison | revisions
eric6/icons/default/webSearch.png file | annotate | diff | comparison | revisions
eric6/icons/default/whatsThis.png file | annotate | diff | comparison | revisions
eric6/icons/default/wikipedia.png file | annotate | diff | comparison | revisions
eric6/icons/default/windowFullscreen.png file | annotate | diff | comparison | revisions
eric6/icons/default/windowRestore.png file | annotate | diff | comparison | revisions
eric6/icons/default/wordboundary.png file | annotate | diff | comparison | revisions
eric6/icons/default/xbel.png file | annotate | diff | comparison | revisions
eric6/icons/default/yahoo.png file | annotate | diff | comparison | revisions
eric6/icons/default/yandex.png file | annotate | diff | comparison | revisions
eric6/icons/default/zoomIn.png file | annotate | diff | comparison | revisions
eric6/icons/default/zoomOut.png file | annotate | diff | comparison | revisions
eric6/icons/default/zoomReset.png file | annotate | diff | comparison | revisions
eric6/icons/default/zoomTo.png file | annotate | diff | comparison | revisions
scripts/install.py file | annotate | diff | comparison | revisions
--- a/docs/THANKS	Sun Apr 05 18:17:08 2020 +0200
+++ b/docs/THANKS	Sat May 02 13:51:07 2020 +0200
@@ -38,5 +38,8 @@
 
 And all the people who reported bugs and made suggestions.
 
+Translator plug-in flag icons:
+These flag icons are based on flag icons designed by from Flaticon.
+
 Thanks,
 Detlev
--- a/docs/changelog	Sun Apr 05 18:17:08 2020 +0200
+++ b/docs/changelog	Sat May 02 13:51:07 2020 +0200
@@ -1,5 +1,12 @@
 Change Log
 ----------
+Version 20.5:
+- bug fixes
+- MicroPython
+  -- added support for Calliope mini
+- Third Party packages
+  -- updated Pygments to 2.3.1
+
 Version 20.4:
 - bug fixes
 - General
@@ -10,7 +17,7 @@
 - Debugger
   -- added debugging support for QRunable
 - Mercurial Interface
-  -- added support for the '--secure' flag of hg import as of Mercurial 5.3
+  -- added support for the '--secure' flag of "hg import" as of Mercurial 5.3
 - Syntax Checker
   -- updated pyflakes to repository as of 2020-02-03
 - Third Party packages
--- a/eric6.e4p	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6.e4p	Sat May 02 13:51:07 2020 +0200
@@ -128,6 +128,7 @@
     <Source>eric6/E5Graphics/E5GraphicsView.py</Source>
     <Source>eric6/E5Graphics/__init__.py</Source>
     <Source>eric6/E5Gui/E5Action.py</Source>
+    <Source>eric6/E5Gui/E5AnimatedLabel.py</Source>
     <Source>eric6/E5Gui/E5AnimatedWidget.py</Source>
     <Source>eric6/E5Gui/E5Application.py</Source>
     <Source>eric6/E5Gui/E5ClickableLabel.py</Source>
@@ -960,6 +961,7 @@
     <Source>eric6/ThirdParty/Jasy/jasy/script/util/__init__.py</Source>
     <Source>eric6/ThirdParty/Pygments/__init__.py</Source>
     <Source>eric6/ThirdParty/Pygments/pygments/__init__.py</Source>
+    <Source>eric6/ThirdParty/Pygments/pygments/__main__.py</Source>
     <Source>eric6/ThirdParty/Pygments/pygments/cmdline.py</Source>
     <Source>eric6/ThirdParty/Pygments/pygments/console.py</Source>
     <Source>eric6/ThirdParty/Pygments/pygments/filter.py</Source>
@@ -995,6 +997,8 @@
     <Source>eric6/ThirdParty/Pygments/pygments/lexers/_stan_builtins.py</Source>
     <Source>eric6/ThirdParty/Pygments/pygments/lexers/_stata_builtins.py</Source>
     <Source>eric6/ThirdParty/Pygments/pygments/lexers/_tsql_builtins.py</Source>
+    <Source>eric6/ThirdParty/Pygments/pygments/lexers/_usd_builtins.py</Source>
+    <Source>eric6/ThirdParty/Pygments/pygments/lexers/_vbscript_builtins.py</Source>
     <Source>eric6/ThirdParty/Pygments/pygments/lexers/_vim_builtins.py</Source>
     <Source>eric6/ThirdParty/Pygments/pygments/lexers/actionscript.py</Source>
     <Source>eric6/ThirdParty/Pygments/pygments/lexers/agile.py</Source>
@@ -1007,6 +1011,7 @@
     <Source>eric6/ThirdParty/Pygments/pygments/lexers/automation.py</Source>
     <Source>eric6/ThirdParty/Pygments/pygments/lexers/basic.py</Source>
     <Source>eric6/ThirdParty/Pygments/pygments/lexers/bibtex.py</Source>
+    <Source>eric6/ThirdParty/Pygments/pygments/lexers/boa.py</Source>
     <Source>eric6/ThirdParty/Pygments/pygments/lexers/business.py</Source>
     <Source>eric6/ThirdParty/Pygments/pygments/lexers/c_cpp.py</Source>
     <Source>eric6/ThirdParty/Pygments/pygments/lexers/c_like.py</Source>
@@ -1029,15 +1034,18 @@
     <Source>eric6/ThirdParty/Pygments/pygments/lexers/ecl.py</Source>
     <Source>eric6/ThirdParty/Pygments/pygments/lexers/eiffel.py</Source>
     <Source>eric6/ThirdParty/Pygments/pygments/lexers/elm.py</Source>
+    <Source>eric6/ThirdParty/Pygments/pygments/lexers/email.py</Source>
     <Source>eric6/ThirdParty/Pygments/pygments/lexers/erlang.py</Source>
     <Source>eric6/ThirdParty/Pygments/pygments/lexers/esoteric.py</Source>
     <Source>eric6/ThirdParty/Pygments/pygments/lexers/ezhil.py</Source>
     <Source>eric6/ThirdParty/Pygments/pygments/lexers/factor.py</Source>
     <Source>eric6/ThirdParty/Pygments/pygments/lexers/fantom.py</Source>
     <Source>eric6/ThirdParty/Pygments/pygments/lexers/felix.py</Source>
+    <Source>eric6/ThirdParty/Pygments/pygments/lexers/floscript.py</Source>
     <Source>eric6/ThirdParty/Pygments/pygments/lexers/forth.py</Source>
     <Source>eric6/ThirdParty/Pygments/pygments/lexers/fortran.py</Source>
     <Source>eric6/ThirdParty/Pygments/pygments/lexers/foxpro.py</Source>
+    <Source>eric6/ThirdParty/Pygments/pygments/lexers/freefem.py</Source>
     <Source>eric6/ThirdParty/Pygments/pygments/lexers/functional.py</Source>
     <Source>eric6/ThirdParty/Pygments/pygments/lexers/go.py</Source>
     <Source>eric6/ThirdParty/Pygments/pygments/lexers/grammar_notation.py</Source>
@@ -1063,10 +1071,12 @@
     <Source>eric6/ThirdParty/Pygments/pygments/lexers/markup.py</Source>
     <Source>eric6/ThirdParty/Pygments/pygments/lexers/math.py</Source>
     <Source>eric6/ThirdParty/Pygments/pygments/lexers/matlab.py</Source>
+    <Source>eric6/ThirdParty/Pygments/pygments/lexers/mime.py</Source>
     <Source>eric6/ThirdParty/Pygments/pygments/lexers/ml.py</Source>
     <Source>eric6/ThirdParty/Pygments/pygments/lexers/modeling.py</Source>
     <Source>eric6/ThirdParty/Pygments/pygments/lexers/modula2.py</Source>
     <Source>eric6/ThirdParty/Pygments/pygments/lexers/monte.py</Source>
+    <Source>eric6/ThirdParty/Pygments/pygments/lexers/mosel.py</Source>
     <Source>eric6/ThirdParty/Pygments/pygments/lexers/ncl.py</Source>
     <Source>eric6/ThirdParty/Pygments/pygments/lexers/nimrod.py</Source>
     <Source>eric6/ThirdParty/Pygments/pygments/lexers/nit.py</Source>
@@ -1081,6 +1091,7 @@
     <Source>eric6/ThirdParty/Pygments/pygments/lexers/pawn.py</Source>
     <Source>eric6/ThirdParty/Pygments/pygments/lexers/perl.py</Source>
     <Source>eric6/ThirdParty/Pygments/pygments/lexers/php.py</Source>
+    <Source>eric6/ThirdParty/Pygments/pygments/lexers/pony.py</Source>
     <Source>eric6/ThirdParty/Pygments/pygments/lexers/praat.py</Source>
     <Source>eric6/ThirdParty/Pygments/pygments/lexers/prolog.py</Source>
     <Source>eric6/ThirdParty/Pygments/pygments/lexers/python.py</Source>
@@ -1089,23 +1100,30 @@
     <Source>eric6/ThirdParty/Pygments/pygments/lexers/rdf.py</Source>
     <Source>eric6/ThirdParty/Pygments/pygments/lexers/rebol.py</Source>
     <Source>eric6/ThirdParty/Pygments/pygments/lexers/resource.py</Source>
+    <Source>eric6/ThirdParty/Pygments/pygments/lexers/ride.py</Source>
     <Source>eric6/ThirdParty/Pygments/pygments/lexers/rnc.py</Source>
     <Source>eric6/ThirdParty/Pygments/pygments/lexers/roboconf.py</Source>
     <Source>eric6/ThirdParty/Pygments/pygments/lexers/robotframework.py</Source>
     <Source>eric6/ThirdParty/Pygments/pygments/lexers/ruby.py</Source>
     <Source>eric6/ThirdParty/Pygments/pygments/lexers/rust.py</Source>
     <Source>eric6/ThirdParty/Pygments/pygments/lexers/sas.py</Source>
+    <Source>eric6/ThirdParty/Pygments/pygments/lexers/scdoc.py</Source>
     <Source>eric6/ThirdParty/Pygments/pygments/lexers/scripting.py</Source>
+    <Source>eric6/ThirdParty/Pygments/pygments/lexers/sgf.py</Source>
     <Source>eric6/ThirdParty/Pygments/pygments/lexers/shell.py</Source>
+    <Source>eric6/ThirdParty/Pygments/pygments/lexers/sieve.py</Source>
+    <Source>eric6/ThirdParty/Pygments/pygments/lexers/slash.py</Source>
     <Source>eric6/ThirdParty/Pygments/pygments/lexers/smalltalk.py</Source>
     <Source>eric6/ThirdParty/Pygments/pygments/lexers/smv.py</Source>
     <Source>eric6/ThirdParty/Pygments/pygments/lexers/snobol.py</Source>
+    <Source>eric6/ThirdParty/Pygments/pygments/lexers/solidity.py</Source>
     <Source>eric6/ThirdParty/Pygments/pygments/lexers/special.py</Source>
     <Source>eric6/ThirdParty/Pygments/pygments/lexers/sql.py</Source>
     <Source>eric6/ThirdParty/Pygments/pygments/lexers/stata.py</Source>
     <Source>eric6/ThirdParty/Pygments/pygments/lexers/supercollider.py</Source>
     <Source>eric6/ThirdParty/Pygments/pygments/lexers/tcl.py</Source>
     <Source>eric6/ThirdParty/Pygments/pygments/lexers/templates.py</Source>
+    <Source>eric6/ThirdParty/Pygments/pygments/lexers/teraterm.py</Source>
     <Source>eric6/ThirdParty/Pygments/pygments/lexers/testing.py</Source>
     <Source>eric6/ThirdParty/Pygments/pygments/lexers/text.py</Source>
     <Source>eric6/ThirdParty/Pygments/pygments/lexers/textedit.py</Source>
@@ -1113,14 +1131,18 @@
     <Source>eric6/ThirdParty/Pygments/pygments/lexers/theorem.py</Source>
     <Source>eric6/ThirdParty/Pygments/pygments/lexers/trafficscript.py</Source>
     <Source>eric6/ThirdParty/Pygments/pygments/lexers/typoscript.py</Source>
+    <Source>eric6/ThirdParty/Pygments/pygments/lexers/unicon.py</Source>
     <Source>eric6/ThirdParty/Pygments/pygments/lexers/urbi.py</Source>
+    <Source>eric6/ThirdParty/Pygments/pygments/lexers/usd.py</Source>
     <Source>eric6/ThirdParty/Pygments/pygments/lexers/varnish.py</Source>
     <Source>eric6/ThirdParty/Pygments/pygments/lexers/verification.py</Source>
     <Source>eric6/ThirdParty/Pygments/pygments/lexers/web.py</Source>
+    <Source>eric6/ThirdParty/Pygments/pygments/lexers/webidl.py</Source>
     <Source>eric6/ThirdParty/Pygments/pygments/lexers/webmisc.py</Source>
     <Source>eric6/ThirdParty/Pygments/pygments/lexers/whiley.py</Source>
     <Source>eric6/ThirdParty/Pygments/pygments/lexers/x10.py</Source>
     <Source>eric6/ThirdParty/Pygments/pygments/lexers/xorg.py</Source>
+    <Source>eric6/ThirdParty/Pygments/pygments/lexers/zig.py</Source>
     <Source>eric6/ThirdParty/Pygments/pygments/modeline.py</Source>
     <Source>eric6/ThirdParty/Pygments/pygments/plugin.py</Source>
     <Source>eric6/ThirdParty/Pygments/pygments/regexopt.py</Source>
@@ -1141,6 +1163,7 @@
     <Source>eric6/ThirdParty/Pygments/pygments/styles/friendly.py</Source>
     <Source>eric6/ThirdParty/Pygments/pygments/styles/fruity.py</Source>
     <Source>eric6/ThirdParty/Pygments/pygments/styles/igor.py</Source>
+    <Source>eric6/ThirdParty/Pygments/pygments/styles/inkpot.py</Source>
     <Source>eric6/ThirdParty/Pygments/pygments/styles/lovelace.py</Source>
     <Source>eric6/ThirdParty/Pygments/pygments/styles/manni.py</Source>
     <Source>eric6/ThirdParty/Pygments/pygments/styles/monokai.py</Source>
@@ -1153,7 +1176,9 @@
     <Source>eric6/ThirdParty/Pygments/pygments/styles/rainbow_dash.py</Source>
     <Source>eric6/ThirdParty/Pygments/pygments/styles/rrt.py</Source>
     <Source>eric6/ThirdParty/Pygments/pygments/styles/sas.py</Source>
-    <Source>eric6/ThirdParty/Pygments/pygments/styles/stata.py</Source>
+    <Source>eric6/ThirdParty/Pygments/pygments/styles/solarized.py</Source>
+    <Source>eric6/ThirdParty/Pygments/pygments/styles/stata_dark.py</Source>
+    <Source>eric6/ThirdParty/Pygments/pygments/styles/stata_light.py</Source>
     <Source>eric6/ThirdParty/Pygments/pygments/styles/tango.py</Source>
     <Source>eric6/ThirdParty/Pygments/pygments/styles/trac.py</Source>
     <Source>eric6/ThirdParty/Pygments/pygments/styles/vim.py</Source>
@@ -2049,6 +2074,7 @@
     <Other>docs/THANKS</Other>
     <Other>docs/changelog</Other>
     <Other>eric6.e4p</Other>
+    <Other>eric6/APIs/MicroPython/calliope.api</Other>
     <Other>eric6/APIs/MicroPython/circuitpython.api</Other>
     <Other>eric6/APIs/MicroPython/microbit.api</Other>
     <Other>eric6/APIs/MicroPython/micropython.api</Other>
@@ -2080,68 +2106,78 @@
     <Other>eric6/IconEditor/cursors/eraser-cursor.xpm</Other>
     <Other>eric6/IconEditor/cursors/fill-cursor.xpm</Other>
     <Other>eric6/IconEditor/cursors/paintbrush-cursor.xpm</Other>
-    <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/engines/deepl.png</Other>
-    <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/engines/glosbe.png</Other>
-    <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/engines/googlev1.png</Other>
-    <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/engines/googlev2.png</Other>
-    <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/engines/microsoft.png</Other>
-    <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/engines/mymemory.png</Other>
-    <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/engines/promt.png</Other>
-    <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/engines/yandex.png</Other>
-    <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/flag.png</Other>
-    <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/af.png</Other>
-    <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/ar.png</Other>
-    <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/be.png</Other>
-    <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/bg.png</Other>
-    <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/bs.png</Other>
-    <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/ca.png</Other>
-    <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/cs.png</Other>
-    <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/da.png</Other>
-    <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/de.png</Other>
-    <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/el.png</Other>
-    <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/en.png</Other>
-    <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/es.png</Other>
-    <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/et.png</Other>
-    <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/fi.png</Other>
-    <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/fr.png</Other>
-    <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/ga.png</Other>
-    <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/gl.png</Other>
-    <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/he.png</Other>
-    <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/hi.png</Other>
-    <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/hr.png</Other>
-    <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/hu.png</Other>
-    <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/id.png</Other>
-    <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/is.png</Other>
-    <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/it.png</Other>
-    <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/iw.png</Other>
-    <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/ja.png</Other>
-    <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/ka.png</Other>
-    <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/ko.png</Other>
-    <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/lt.png</Other>
-    <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/lv.png</Other>
-    <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/mk.png</Other>
-    <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/mt.png</Other>
-    <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/nl.png</Other>
-    <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/no.png</Other>
-    <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/pl.png</Other>
-    <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/pt.png</Other>
-    <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/ro.png</Other>
-    <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/ru.png</Other>
-    <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/sk.png</Other>
-    <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/sl.png</Other>
-    <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/sq.png</Other>
-    <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/sr.png</Other>
-    <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/sv.png</Other>
-    <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/th.png</Other>
-    <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/tl.png</Other>
-    <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/tr.png</Other>
-    <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/uk.png</Other>
-    <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/vi.png</Other>
-    <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/zh-CN.png</Other>
-    <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/zh-TW.png</Other>
-    <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/pronounce.png</Other>
-    <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/swap.png</Other>
-    <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/translate.png</Other>
+    <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/engines/deepl-dark.svg</Other>
+    <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/engines/deepl-light.svg</Other>
+    <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/engines/glosbe.svg</Other>
+    <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/engines/googlev1.svg</Other>
+    <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/engines/googlev2.svg</Other>
+    <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/engines/ibm_watson-dark.svg</Other>
+    <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/engines/ibm_watson-light.svg</Other>
+    <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/engines/microsoft-dark.svg</Other>
+    <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/engines/microsoft-light.svg</Other>
+    <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/engines/mymemory-dark.svg</Other>
+    <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/engines/mymemory-light.svg</Other>
+    <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/engines/promt.svg</Other>
+    <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/engines/yandex-dark.svg</Other>
+    <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/engines/yandex-light.svg</Other>
+    <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/flag-dark.svg</Other>
+    <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/flag-light.svg</Other>
+    <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/af.svg</Other>
+    <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/ar.svg</Other>
+    <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/be.svg</Other>
+    <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/bg.svg</Other>
+    <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/bs.svg</Other>
+    <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/ca.svg</Other>
+    <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/cs.svg</Other>
+    <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/da.svg</Other>
+    <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/de.svg</Other>
+    <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/el.svg</Other>
+    <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/en.svg</Other>
+    <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/es.svg</Other>
+    <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/et.svg</Other>
+    <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/fi.svg</Other>
+    <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/fr.svg</Other>
+    <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/ga.svg</Other>
+    <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/gl.svg</Other>
+    <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/he.svg</Other>
+    <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/hi.svg</Other>
+    <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/hr.svg</Other>
+    <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/hu.svg</Other>
+    <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/id.svg</Other>
+    <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/is.svg</Other>
+    <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/it.svg</Other>
+    <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/iw.svg</Other>
+    <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/ja.svg</Other>
+    <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/ka.svg</Other>
+    <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/ko.svg</Other>
+    <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/lt.svg</Other>
+    <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/lv.svg</Other>
+    <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/mk.svg</Other>
+    <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/mt.svg</Other>
+    <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/nl.svg</Other>
+    <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/no.svg</Other>
+    <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/pl.svg</Other>
+    <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/pt.svg</Other>
+    <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/ro.svg</Other>
+    <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/ru.svg</Other>
+    <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/sk.svg</Other>
+    <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/sl.svg</Other>
+    <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/sq.svg</Other>
+    <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/sr.svg</Other>
+    <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/sv.svg</Other>
+    <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/th.svg</Other>
+    <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/tl.svg</Other>
+    <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/tr.svg</Other>
+    <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/uk.svg</Other>
+    <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/vi.svg</Other>
+    <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/zh-CN.svg</Other>
+    <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/zh-TW.svg</Other>
+    <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/pronounce-dark.svg</Other>
+    <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/pronounce-light.svg</Other>
+    <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/swap-dark.svg</Other>
+    <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/swap-light.svg</Other>
+    <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/translate-dark.svg</Other>
+    <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/translate-light.svg</Other>
     <Other>eric6/Plugins/VcsPlugins/vcsGit/icons/conflict.svg</Other>
     <Other>eric6/Plugins/VcsPlugins/vcsGit/icons/git.svg</Other>
     <Other>eric6/Plugins/VcsPlugins/vcsGit/icons/git92.svg</Other>
@@ -2176,7 +2212,8 @@
     <Other>eric6/ThirdParty/Send2Trash/PKG-INFO</Other>
     <Other>eric6/ThirdParty/asttokens/asttokens/LICENSE</Other>
     <Other>eric6/ThirdParty/enum/LICENSE</Other>
-    <Other>eric6/UI/data/documentViewerStyle.css</Other>
+    <Other>eric6/UI/data/documentViewerStyle-dark.css</Other>
+    <Other>eric6/UI/data/documentViewerStyle-light.css</Other>
     <Other>eric6/WebBrowser/Bookmarks/DefaultBookmarks.xbel</Other>
     <Other>eric6/WebBrowser/OpenSearch/DefaultSearchEngines/Amazoncom.xml</Other>
     <Other>eric6/WebBrowser/OpenSearch/DefaultSearchEngines/Bing.xml</Other>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/eric6/APIs/MicroPython/calliope.api	Sat May 02 13:51:07 2020 +0200
@@ -0,0 +1,324 @@
+audio.AudioFrame?1()
+audio.is_playing?4()
+audio.play?4(source, wait=True, pin=pin0, return_pin=None)
+audio.stop?4()
+calliope_mini.Image.ANGRY?7
+calliope_mini.Image.ARROW_E?7
+calliope_mini.Image.ARROW_N?7
+calliope_mini.Image.ARROW_NE?7
+calliope_mini.Image.ARROW_NW?7
+calliope_mini.Image.ARROW_S?7
+calliope_mini.Image.ARROW_SE?7
+calliope_mini.Image.ARROW_SW?7
+calliope_mini.Image.ARROW_W?7
+calliope_mini.Image.ASLEEP?7
+calliope_mini.Image.BUTTERFLY?7
+calliope_mini.Image.CHESSBOARD?7
+calliope_mini.Image.CLOCK10?7
+calliope_mini.Image.CLOCK11?7
+calliope_mini.Image.CLOCK12?7
+calliope_mini.Image.CLOCK1?7
+calliope_mini.Image.CLOCK2?7
+calliope_mini.Image.CLOCK3?7
+calliope_mini.Image.CLOCK4?7
+calliope_mini.Image.CLOCK5?7
+calliope_mini.Image.CLOCK6?7
+calliope_mini.Image.CLOCK7?7
+calliope_mini.Image.CLOCK8?7
+calliope_mini.Image.CLOCK9?7
+calliope_mini.Image.CONFUSED?7
+calliope_mini.Image.COW?7
+calliope_mini.Image.DIAMOND?7
+calliope_mini.Image.DIAMOND_SMALL?7
+calliope_mini.Image.DUCK?7
+calliope_mini.Image.FABULOUS?7
+calliope_mini.Image.GHOST?7
+calliope_mini.Image.GIRAFFE?7
+calliope_mini.Image.HAPPY?7
+calliope_mini.Image.HEART?7
+calliope_mini.Image.HEART_SMALL?7
+calliope_mini.Image.HOUSE?7
+calliope_mini.Image.MEH?7
+calliope_mini.Image.MUSIC_CROTCHET?7
+calliope_mini.Image.MUSIC_QUAVER?7
+calliope_mini.Image.MUSIC_QUAVERS?7
+calliope_mini.Image.NO?7
+calliope_mini.Image.PACMAN?7
+calliope_mini.Image.PITCHFORK?7
+calliope_mini.Image.RABBIT?7
+calliope_mini.Image.ROLLERSKATE?7
+calliope_mini.Image.SAD?7
+calliope_mini.Image.SILLY?7
+calliope_mini.Image.SKULL?7
+calliope_mini.Image.SMILE?7
+calliope_mini.Image.SNAKE?7
+calliope_mini.Image.SQUARE?7
+calliope_mini.Image.SQUARE_SMALL?7
+calliope_mini.Image.STICKFIGURE?7
+calliope_mini.Image.SURPRISED?7
+calliope_mini.Image.SWORD?7
+calliope_mini.Image.TARGET?7
+calliope_mini.Image.TORTOISE?7
+calliope_mini.Image.TRIANGLE?7
+calliope_mini.Image.TRIANGLE_LEFT?7
+calliope_mini.Image.TSHIRT?7
+calliope_mini.Image.UMBRELLA?7
+calliope_mini.Image.XMAS?7
+calliope_mini.Image.YES?7
+calliope_mini.Image.blit?4(src, x, y, width, height, xdest=0, ydest=0)
+calliope_mini.Image.copy?4()
+calliope_mini.Image.crop?4(x, y, width, height)
+calliope_mini.Image.fill?4(value)
+calliope_mini.Image.get_pixel?4(x, y)
+calliope_mini.Image.height?4()
+calliope_mini.Image.invert?4()
+calliope_mini.Image.set_pixel?4(x, y, value)
+calliope_mini.Image.shift_down?4(n)
+calliope_mini.Image.shift_left?4(n)
+calliope_mini.Image.shift_right?4(n)
+calliope_mini.Image.shift_up?4(n)
+calliope_mini.Image.width?4()
+calliope_mini.Image?1(stringOrWidth=None, height=None, buffer=None)
+calliope_mini.MicroBitAnalogDigitalPin.NO_PULL?7
+calliope_mini.MicroBitAnalogDigitalPin.PULL_DOWN?7
+calliope_mini.MicroBitAnalogDigitalPin.PULL_UP?7
+calliope_mini.MicroBitAnalogDigitalPin.get_mode?4()
+calliope_mini.MicroBitAnalogDigitalPin.get_pull?4()
+calliope_mini.MicroBitAnalogDigitalPin.read_analog?4()
+calliope_mini.MicroBitAnalogDigitalPin.read_digital?4()
+calliope_mini.MicroBitAnalogDigitalPin.set_analog_period?4(period)
+calliope_mini.MicroBitAnalogDigitalPin.set_analog_period_microseconds?4(period)
+calliope_mini.MicroBitAnalogDigitalPin.set_pull?4(mode)
+calliope_mini.MicroBitAnalogDigitalPin.write_analog?4(value)
+calliope_mini.MicroBitAnalogDigitalPin.write_digital?4(value)
+calliope_mini.MicroBitButton.get_presses?4()
+calliope_mini.MicroBitButton.is_pressed?4()
+calliope_mini.MicroBitButton.was_pressed?4()
+calliope_mini.MicroBitDigitalPin.NO_PULL?7
+calliope_mini.MicroBitDigitalPin.PULL_DOWN?7
+calliope_mini.MicroBitDigitalPin.PULL_UP?7
+calliope_mini.MicroBitDigitalPin.get_analog_period_microseconds?4()
+calliope_mini.MicroBitDigitalPin.get_mode?4()
+calliope_mini.MicroBitDigitalPin.get_pull?4()
+calliope_mini.MicroBitDigitalPin.read_digital?4()
+calliope_mini.MicroBitDigitalPin.set_analog_period?4(period)
+calliope_mini.MicroBitDigitalPin.set_analog_period_microseconds?4(period)
+calliope_mini.MicroBitDigitalPin.set_pull?4(mode)
+calliope_mini.MicroBitDigitalPin.write_analog?4(value)
+calliope_mini.MicroBitDigitalPin.write_digital?4(value)
+calliope_mini.MicroBitTouchPin.NO_PULL?7
+calliope_mini.MicroBitTouchPin.PULL_DOWN?7
+calliope_mini.MicroBitTouchPin.PULL_UP?7
+calliope_mini.MicroBitTouchPin.get_mode?4()
+calliope_mini.MicroBitTouchPin.get_pull?4()
+calliope_mini.MicroBitTouchPin.is_touched?4()
+calliope_mini.MicroBitTouchPin.read_analog?4()
+calliope_mini.MicroBitTouchPin.read_digital?4()
+calliope_mini.MicroBitTouchPin.set_analog_period?4(period)
+calliope_mini.MicroBitTouchPin.set_analog_period_microseconds?4(period)
+calliope_mini.MicroBitTouchPin.set_pull?4(mode)
+calliope_mini.MicroBitTouchPin.write_analog?4(value)
+calliope_mini.MicroBitTouchPin.write_digital?4(value)
+calliope_mini.accelerometer.get_values?4()
+calliope_mini.accelerometer.get_x?4()
+calliope_mini.accelerometer.get_y?4()
+calliope_mini.accelerometer.get_z?4()
+calliope_mini.button_a?7
+calliope_mini.button_b?7
+calliope_mini.c0?7
+calliope_mini.c10?7
+calliope_mini.c11?7
+calliope_mini.c12?7
+calliope_mini.c16?7
+calliope_mini.c17?7
+calliope_mini.c18?7
+calliope_mini.c19?7
+calliope_mini.c1?7
+calliope_mini.c21?7
+calliope_mini.c2?7
+calliope_mini.c3?7
+calliope_mini.c4?7
+calliope_mini.c5?7
+calliope_mini.c6?7
+calliope_mini.c7?7
+calliope_mini.c8?7
+calliope_mini.c9?7
+calliope_mini.display.clear?4()
+calliope_mini.display.get_pixel?4(x, y)
+calliope_mini.display.is_on?4()
+calliope_mini.display.off?4()
+calliope_mini.display.on?4()
+calliope_mini.display.scroll?4(value, delay=150, *, wait=True, loop=False, monospace=False)
+calliope_mini.display.set_pixel?4(x, y, value)
+calliope_mini.display.show?4(image)
+calliope_mini.display.show?4(value, delay=400, *, wait=True, loop=False, clear=False)
+calliope_mini.gyrometer.get_values?4()
+calliope_mini.gyrometer.get_x?4()
+calliope_mini.gyrometer.get_y?4()
+calliope_mini.gyrometer.get_z?4()
+calliope_mini.i2c.init?4(freq=100000, sda=pin20, scl=pin19)
+calliope_mini.i2c.read?4(addr, n, repeat=False)
+calliope_mini.i2c.scan?4()
+calliope_mini.i2c.write?4(addr, buf, repeat=False)
+calliope_mini.led.clear?4()
+calliope_mini.led.get_blue?4()
+calliope_mini.led.get_colors?4()
+calliope_mini.led.get_green?4()
+calliope_mini.led.get_red?4()
+calliope_mini.led.set_blue?4(blue_value)
+calliope_mini.led.set_colors?4(red_value, green_value, blue_value)
+calliope_mini.led.set_green?4(green_value)
+calliope_mini.led.set_red?4(red_value)
+calliope_mini.magnetometer.get_values?4()
+calliope_mini.magnetometer.get_x?4()
+calliope_mini.magnetometer.get_y?4()
+calliope_mini.magnetometer.get_z?4()
+calliope_mini.p0?7
+calliope_mini.p1?7
+calliope_mini.p2?7
+calliope_mini.p3?7
+calliope_mini.panic?4(code)
+calliope_mini.pin0?7
+calliope_mini.pin10?7
+calliope_mini.pin11?7
+calliope_mini.pin12?7
+calliope_mini.pin13?7
+calliope_mini.pin14?7
+calliope_mini.pin15?7
+calliope_mini.pin16?7
+calliope_mini.pin19?7
+calliope_mini.pin1?7
+calliope_mini.pin20?7
+calliope_mini.pin21?7
+calliope_mini.pin22?7
+calliope_mini.pin23?7
+calliope_mini.pin24?7
+calliope_mini.pin25?7
+calliope_mini.pin26?7
+calliope_mini.pin27?7
+calliope_mini.pin28?7
+calliope_mini.pin29?7
+calliope_mini.pin2?7
+calliope_mini.pin30?7
+calliope_mini.pin3?7
+calliope_mini.pin4?7
+calliope_mini.pin5?7
+calliope_mini.pin6?7
+calliope_mini.pin7?7
+calliope_mini.pin8?7
+calliope_mini.pin9?7
+calliope_mini.reset?4()
+calliope_mini.running_time?4()
+calliope_mini.sensor.get_acc_values?4()
+calliope_mini.sensor.get_acc_x?4()
+calliope_mini.sensor.get_acc_y?4()
+calliope_mini.sensor.get_acc_z?4()
+calliope_mini.sensor.get_gyro_values?4()
+calliope_mini.sensor.get_gyro_x?4()
+calliope_mini.sensor.get_gyro_y?4()
+calliope_mini.sensor.get_gyro_z?4()
+calliope_mini.sensor.get_mag_values?4()
+calliope_mini.sensor.get_mag_x?4()
+calliope_mini.sensor.get_mag_y?4()
+calliope_mini.sensor.get_mag_z?4()
+calliope_mini.sensor.get_temp?4()
+calliope_mini.sleep?4(ms)
+calliope_mini.spi.init?4(baudrate=1000000, bits=8, mode=0, sclk=pin13, mosi=pin15, miso=pin14)
+calliope_mini.spi.read?4(nbytes)
+calliope_mini.spi.write?4(buffer)
+calliope_mini.spi.write_readinto?4(out_buffer, in_buffer)
+calliope_mini.temperature?4()
+calliope_mini.uart.EVEN?7
+calliope_mini.uart.ODD?7
+calliope_mini.uart.any?4()
+calliope_mini.uart.init?4(baudrate=9600, bits=8, parity=None, stop=1, *, tx=None, rx=None)
+calliope_mini.uart.read?4()
+calliope_mini.uart.read?4(nbytes)
+calliope_mini.uart.readinto?4(buf)
+calliope_mini.uart.readinto?4(buf, nbytes)
+calliope_mini.uart.readline?4()
+calliope_mini.uart.write?4(buf)
+machine.disable_irq?4()
+machine.enable_irq?4()
+machine.freq?4()
+machine.reset?4()
+machine.time_pulse_us?4(pin, pulse_level, timeout_us=1000000)
+machine.unique_id?4()
+micropython.const?4(expr)
+micropython.heap_lock?4()
+micropython.heap_unlock?4()
+micropython.kbd_intr?4(chr)
+micropython.mem_info?4()
+micropython.mem_info?4(verbose)
+micropython.opt_level?4()
+micropython.opt_level?4(level)
+micropython.qstr_info?4()
+micropython.qstr_info?4(verbose)
+micropython.stack_use?4()
+music.BADDY?7
+music.BA_DING?7
+music.BIRTHDAY?7
+music.BLUES?7
+music.CHASE?7
+music.DADADADUM?7
+music.ENTERTAINER?7
+music.FUNERAL?7
+music.FUNK?7
+music.JUMP_DOWN?7
+music.JUMP_UP?7
+music.NYAN?7
+music.ODE?7
+music.POWER_DOWN?7
+music.POWER_UP?7
+music.PRELUDE?7
+music.PUNCHLINE?7
+music.PYTHON?7
+music.RINGTONE?7
+music.WAWAWAWAA?7
+music.WEDDING?7
+music.get_tempo?4()
+music.pitch?4(frequency, duration=-1, pin=microbit.pin0, wait=True)
+music.play?4(music, pin=microbit.pin0, wait=True, loop=False)
+music.reset?4()
+music.set_tempo?4(ticks=4, bpm=120)
+music.stop?4(pin=microbit.pin0)
+neopixel.NeoPixel.clear?4()
+neopixel.NeoPixel.show?4()
+neopixel.NeoPixel?1(pin, n)
+os.listdir?4()
+os.remove?4(filename)
+os.size?4(filename)
+os.uname?4()
+radio.RATE_1MBIT?7
+radio.RATE_250KBIT?7
+radio.RATE_2MBIT?7
+radio.config?4(length=32, queue=3, channel=7, power=6, address=0x75626974, group=0, data_rate=RATE_1MBIT)
+radio.off?4()
+radio.on?4()
+radio.receive?4()
+radio.receive_bytes?4()
+radio.receive_bytes_into?4(buffer)
+radio.receive_full?4()
+radio.reset?4()
+radio.send?4(message)
+radio.send_bytes?4(message)
+random.choice?4(seq)
+random.getrandbits?4(n)
+random.randint?4(a, b)
+random.random?4()
+random.randrange?4(start, stop)
+random.randrange?4(start, stop, step)
+random.randrange?4(stop)
+random.seed?4(n)
+random.uniform?4(a, b)
+speech.pronounce?4(phonemes, *, pitch=64, speed=72, mouth=128, throat=128)
+speech.say?4(words, *, pitch=64, speed=72, mouth=128, throat=128)
+speech.sing?4(phonemes, *, pitch=64, speed=72, mouth=128, throat=128)
+speech.translate?4(words)
+utime.sleep?4(seconds)
+utime.sleep_ms?4(ms)
+utime.sleep_us?4(us)
+utime.ticks_add?4(ticks, delta)
+utime.ticks_diff?4(ticks1, ticks2)
+utime.ticks_ms?4()
+utime.ticks_us?4()
--- a/eric6/APIs/MicroPython/circuitpython.api	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/APIs/MicroPython/circuitpython.api	Sat May 02 13:51:07 2020 +0200
@@ -683,6 +683,8 @@
 ustack.max_stack_usage?4()
 ustack.stack_size?4()
 ustack.stack_usage?4()
+uzlib.DecompIO?1(stream, wbits=0)
+uzlib.decompress?4(data, wbits=0, bufsize=0)
 wiznet.WIZNET5K.connected?7
 wiznet.WIZNET5K.dhcp?7
 wiznet.WIZNET5K.ifconfig?4(params=None)
--- a/eric6/APIs/MicroPython/microbit.api	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/APIs/MicroPython/microbit.api	Sat May 02 13:51:07 2020 +0200
@@ -1,14 +1,13 @@
 audio.AudioFrame?1()
+audio.is_playing?4()
 audio.play?4(source, wait=True, pin=pin0, return_pin=None)
+audio.stop?4()
 machine.disable_irq?4()
 machine.enable_irq?4()
 machine.freq?4()
 machine.reset?4()
 machine.time_pulse_us?4(pin, pulse_level, timeout_us=1000000)
 machine.unique_id?4()
-microbit.Button.get_presses?4()
-microbit.Button.is_pressed?4()
-microbit.Button.was_pressed?4()
 microbit.Image.ANGRY?7
 microbit.Image.ARROW_E?7
 microbit.Image.ARROW_N?7
@@ -98,6 +97,9 @@
 microbit.MicroBitAnalogDigitalPin.set_pull?4(mode)
 microbit.MicroBitAnalogDigitalPin.write_analog?4(value)
 microbit.MicroBitAnalogDigitalPin.write_digital?4(value)
+microbit.MicroBitButton.get_presses?4()
+microbit.MicroBitButton.is_pressed?4()
+microbit.MicroBitButton.was_pressed?4()
 microbit.MicroBitDigitalPin.NO_PULL?7
 microbit.MicroBitDigitalPin.PULL_DOWN?7
 microbit.MicroBitDigitalPin.PULL_UP?7
--- a/eric6/APIs/Python3/eric6.api	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/APIs/Python3/eric6.api	Sat May 02 13:51:07 2020 +0200
@@ -319,7 +319,7 @@
 eric6.DebugClients.Python.DebugClientBase.DebugClientBase?1()
 eric6.DebugClients.Python.DebugClientBase.DebugClientClose?4(fd)
 eric6.DebugClients.Python.DebugClientBase.DebugClientFork?4()
-eric6.DebugClients.Python.DebugClientBase.DebugClientInput?4(prompt="", echo=True)
+eric6.DebugClients.Python.DebugClientBase.DebugClientInput?4(prompt="")
 eric6.DebugClients.Python.DebugClientBase.DebugClientInstance?7
 eric6.DebugClients.Python.DebugClientBase.DebugClientRawInput?4(prompt="", echo=True)
 eric6.DebugClients.Python.DebugClientBase.DebugClientSetRecursionLimit?4(limit)
@@ -411,6 +411,7 @@
 eric6.DebugClients.Python.eric6dbgstub.setScriptname?4(name)
 eric6.DebugClients.Python.eric6dbgstub.startDebugger?4(enableTrace=True, exceptions=True, tracePython=False, redirect=True)
 eric6.DebugClients.Python.getpass.default_getpass?7
+eric6.DebugClients.Python.getpass.fallback_getpass?7
 eric6.DebugClients.Python.getpass.getpass?4(prompt='Password: ')
 eric6.DebugClients.Python.getpass.getuser?4()
 eric6.DebugClients.Python.getpass.unix_getpass?7
@@ -923,7 +924,7 @@
 eric6.E5Graphics.E5ArrowItem.E5ArrowItem.setEndPoint?4(x, y)
 eric6.E5Graphics.E5ArrowItem.E5ArrowItem.setPoints?4(xa, ya, xb, yb)
 eric6.E5Graphics.E5ArrowItem.E5ArrowItem.setStartPoint?4(x, y)
-eric6.E5Graphics.E5ArrowItem.E5ArrowItem?1(origin=None, end=None, filled=False, arrowType=NormalArrow, parent=None)
+eric6.E5Graphics.E5ArrowItem.E5ArrowItem?1(origin=None, end=None, filled=False, arrowType=NormalArrow, colors=None, parent=None)
 eric6.E5Graphics.E5ArrowItem.NormalArrow?7
 eric6.E5Graphics.E5ArrowItem.WideArrow?7
 eric6.E5Graphics.E5GraphicsView.E5GraphicsView.ZoomLevelDefault?7
@@ -932,6 +933,9 @@
 eric6.E5Graphics.E5GraphicsView.E5GraphicsView._getDiagramSize?5(border=0)
 eric6.E5Graphics.E5GraphicsView.E5GraphicsView.autoAdjustSceneSize?4(limit=False)
 eric6.E5Graphics.E5GraphicsView.E5GraphicsView.filteredItems?4(items)
+eric6.E5Graphics.E5GraphicsView.E5GraphicsView.getBackgroundColor?4()
+eric6.E5Graphics.E5GraphicsView.E5GraphicsView.getDrawingColors?4()
+eric6.E5Graphics.E5GraphicsView.E5GraphicsView.getForegroundColor?4()
 eric6.E5Graphics.E5GraphicsView.E5GraphicsView.printDiagram?4(printer, diagramName="")
 eric6.E5Graphics.E5GraphicsView.E5GraphicsView.resizeScene?4(amount, isWidth=True)
 eric6.E5Graphics.E5GraphicsView.E5GraphicsView.saveImage?4(filename, imageFormat="PNG")
@@ -952,6 +956,17 @@
 eric6.E5Gui.E5Action.E5Action?1(*args)
 eric6.E5Gui.E5Action.addActions?4(target, actions)
 eric6.E5Gui.E5Action.createActionGroup?4(parent, name=None, exclusive=False)
+eric6.E5Gui.E5AnimatedLabel.E5AnimatedLabel.getAnimationFile?4()
+eric6.E5Gui.E5AnimatedLabel.E5AnimatedLabel.getInterval?4()
+eric6.E5Gui.E5AnimatedLabel.E5AnimatedLabel.isActive?4()
+eric6.E5Gui.E5AnimatedLabel.E5AnimatedLabel.isAnimationFileLoaded?4()
+eric6.E5Gui.E5AnimatedLabel.E5AnimatedLabel.reset?4()
+eric6.E5Gui.E5AnimatedLabel.E5AnimatedLabel.setAnimationFile?4(animationFile)
+eric6.E5Gui.E5AnimatedLabel.E5AnimatedLabel.setInterval?4(interval)
+eric6.E5Gui.E5AnimatedLabel.E5AnimatedLabel.setPixmap?4(pixmap)
+eric6.E5Gui.E5AnimatedLabel.E5AnimatedLabel.start?4()
+eric6.E5Gui.E5AnimatedLabel.E5AnimatedLabel.stop?4()
+eric6.E5Gui.E5AnimatedLabel.E5AnimatedLabel?1(parent=None, *, animationFile="", interval=100)
 eric6.E5Gui.E5AnimatedWidget.E5AnimatedWidget.DirectionDown?7
 eric6.E5Gui.E5AnimatedWidget.E5AnimatedWidget.DirectionUp?7
 eric6.E5Gui.E5AnimatedWidget.E5AnimatedWidget.hide?4()
@@ -1371,7 +1386,7 @@
 eric6.E5Gui.E5TabWidget.E5DnDTabBar.mousePressEvent?4(event)
 eric6.E5Gui.E5TabWidget.E5DnDTabBar.tabMoveRequested?7
 eric6.E5Gui.E5TabWidget.E5DnDTabBar?1(parent=None)
-eric6.E5Gui.E5TabWidget.E5TabWidget.animationLabel?4(index, animationFile, speed=100)
+eric6.E5Gui.E5TabWidget.E5TabWidget.animationLabel?4(index, animationFile, interval=100)
 eric6.E5Gui.E5TabWidget.E5TabWidget.customTabContextMenuRequested?7
 eric6.E5Gui.E5TabWidget.E5TabWidget.moveTab?4(curIndex, newIndex)
 eric6.E5Gui.E5TabWidget.E5TabWidget.nextTab?4()
@@ -1836,7 +1851,7 @@
 eric6.Graphics.AssociationItem.AssociationItem.parseAssociationItemDataString?4(data)
 eric6.Graphics.AssociationItem.AssociationItem.unassociate?4()
 eric6.Graphics.AssociationItem.AssociationItem.widgetMoved?4()
-eric6.Graphics.AssociationItem.AssociationItem?1(itemA, itemB, assocType=Normal, topToBottom=False, parent=None)
+eric6.Graphics.AssociationItem.AssociationItem?1(itemA, itemB, assocType=Normal, topToBottom=False, colors=None, parent=None)
 eric6.Graphics.AssociationItem.Center?7
 eric6.Graphics.AssociationItem.East?7
 eric6.Graphics.AssociationItem.Generalisation?7
@@ -1856,7 +1871,7 @@
 eric6.Graphics.ClassItem.ClassItem.paint?4(painter, option, widget=None)
 eric6.Graphics.ClassItem.ClassItem.parseItemDataString?4(version, data)
 eric6.Graphics.ClassItem.ClassItem.setModel?4(model)
-eric6.Graphics.ClassItem.ClassItem?1(model=None, external=False, x=0, y=0, rounded=False, noAttrs=False, parent=None, scene=None)
+eric6.Graphics.ClassItem.ClassItem?1(model=None, external=False, x=0, y=0, rounded=False, noAttrs=False, colors=None, parent=None, scene=None)
 eric6.Graphics.ClassItem.ClassModel.addAttribute?4(attribute)
 eric6.Graphics.ClassItem.ClassModel.addMethod?4(method)
 eric6.Graphics.ClassItem.ClassModel.getAttributes?4()
@@ -1874,7 +1889,7 @@
 eric6.Graphics.ModuleItem.ModuleItem.paint?4(painter, option, widget=None)
 eric6.Graphics.ModuleItem.ModuleItem.parseItemDataString?4(version, data)
 eric6.Graphics.ModuleItem.ModuleItem.setModel?4(model)
-eric6.Graphics.ModuleItem.ModuleItem?1(model=None, x=0, y=0, rounded=False, parent=None, scene=None)
+eric6.Graphics.ModuleItem.ModuleItem?1(model=None, x=0, y=0, rounded=False, colors=None, parent=None, scene=None)
 eric6.Graphics.ModuleItem.ModuleModel.addClass?4(classname)
 eric6.Graphics.ModuleItem.ModuleModel.getClasses?4()
 eric6.Graphics.ModuleItem.ModuleModel?1(name, classlist=None)
@@ -1888,7 +1903,7 @@
 eric6.Graphics.PackageItem.PackageItem.paint?4(painter, option, widget=None)
 eric6.Graphics.PackageItem.PackageItem.parseItemDataString?4(version, data)
 eric6.Graphics.PackageItem.PackageItem.setModel?4(model)
-eric6.Graphics.PackageItem.PackageItem?1(model=None, x=0, y=0, rounded=False, noModules=False, parent=None, scene=None)
+eric6.Graphics.PackageItem.PackageItem?1(model=None, x=0, y=0, rounded=False, noModules=False, colors=None, parent=None, scene=None)
 eric6.Graphics.PackageItem.PackageModel.addModule?4(modulename)
 eric6.Graphics.PackageItem.PackageModel.getModules?4()
 eric6.Graphics.PackageItem.PackageModel?1(name, moduleslist=None)
@@ -1962,7 +1977,7 @@
 eric6.Graphics.UMLItem.UMLItem.setId?4(itemId)
 eric6.Graphics.UMLItem.UMLItem.setPos?4(x, y)
 eric6.Graphics.UMLItem.UMLItem.setSize?4(width, height)
-eric6.Graphics.UMLItem.UMLItem?1(model=None, x=0, y=0, rounded=False, parent=None)
+eric6.Graphics.UMLItem.UMLItem?1(model=None, x=0, y=0, rounded=False, colors=None, parent=None)
 eric6.Graphics.UMLItem.UMLModel.getName?4()
 eric6.Graphics.UMLItem.UMLModel?1(name)
 eric6.Graphics.UMLSceneSizeDialog.UMLSceneSizeDialog.getData?4()
@@ -2365,6 +2380,7 @@
 eric6.MicroPython.MicroPythonGraphWidget.MicroPythonGraphWidget.hasData?4()
 eric6.MicroPython.MicroPythonGraphWidget.MicroPythonGraphWidget.isDirty?4()
 eric6.MicroPython.MicroPythonGraphWidget.MicroPythonGraphWidget.on_saveButton_clicked?4()
+eric6.MicroPython.MicroPythonGraphWidget.MicroPythonGraphWidget.preferencesChanged?4()
 eric6.MicroPython.MicroPythonGraphWidget.MicroPythonGraphWidget.processData?4(data)
 eric6.MicroPython.MicroPythonGraphWidget.MicroPythonGraphWidget.saveData?4()
 eric6.MicroPython.MicroPythonGraphWidget.MicroPythonGraphWidget?1(parent=None)
@@ -2414,7 +2430,7 @@
 eric6.MicroPython.MicrobitDevices.MicrobitDevice.hasTimeCommands?4()
 eric6.MicroPython.MicrobitDevices.MicrobitDevice.runScript?4(script)
 eric6.MicroPython.MicrobitDevices.MicrobitDevice.setButtons?4()
-eric6.MicroPython.MicrobitDevices.MicrobitDevice?1(microPythonWidget, parent=None)
+eric6.MicroPython.MicrobitDevices.MicrobitDevice?1(microPythonWidget, deviceType, parent=None)
 eric6.MicroPython.PyBoardDevices.PyBoardDevice.DeviceVolumeName?7
 eric6.MicroPython.PyBoardDevices.PyBoardDevice.FlashInstructionsURL?7
 eric6.MicroPython.PyBoardDevices.PyBoardDevice.addDeviceMenuEntries?4(menu)
@@ -3825,7 +3841,7 @@
 eric6.Plugins.UiExtensionPlugins.Translator.Translator.Translator.activate?4()
 eric6.Plugins.UiExtensionPlugins.Translator.Translator.Translator.deactivate?4()
 eric6.Plugins.UiExtensionPlugins.Translator.Translator.Translator.getAppIcon?4(name)
-eric6.Plugins.UiExtensionPlugins.Translator.Translator.Translator?1(plugin, parent=None)
+eric6.Plugins.UiExtensionPlugins.Translator.Translator.Translator?1(plugin, usesDarkPalette, parent=None)
 eric6.Plugins.UiExtensionPlugins.Translator.TranslatorEngines.DeepLEngine.DeepLEngine.MaxTranslationTextLen?7
 eric6.Plugins.UiExtensionPlugins.Translator.TranslatorEngines.DeepLEngine.DeepLEngine.TranslatorUrl?7
 eric6.Plugins.UiExtensionPlugins.Translator.TranslatorEngines.DeepLEngine.DeepLEngine.engineName?4()
@@ -6250,12 +6266,16 @@
 eric6.Preferences.ConfigurationPages.IconsPage.IconsPage.on_downButton_clicked?4()
 eric6.Preferences.ConfigurationPages.IconsPage.IconsPage.on_iconDirectoryList_currentRowChanged?4(row)
 eric6.Preferences.ConfigurationPages.IconsPage.IconsPage.on_iconDirectoryPicker_textChanged?4(txt)
+eric6.Preferences.ConfigurationPages.IconsPage.IconsPage.on_showDefaultIconsButton_clicked?4()
 eric6.Preferences.ConfigurationPages.IconsPage.IconsPage.on_showIconsButton_clicked?4()
 eric6.Preferences.ConfigurationPages.IconsPage.IconsPage.on_upButton_clicked?4()
 eric6.Preferences.ConfigurationPages.IconsPage.IconsPage.save?4()
 eric6.Preferences.ConfigurationPages.IconsPage.IconsPage?1()
 eric6.Preferences.ConfigurationPages.IconsPage.create?4(dlg)
-eric6.Preferences.ConfigurationPages.IconsPreviewDialog.IconsPreviewDialog?1(parent, dirName)
+eric6.Preferences.ConfigurationPages.IconsPreviewDialog.IconsPreviewDialog.on_directoryCombo_currentTextChanged?4(dirName)
+eric6.Preferences.ConfigurationPages.IconsPreviewDialog.IconsPreviewDialog.on_invertButton_toggled?4(checked)
+eric6.Preferences.ConfigurationPages.IconsPreviewDialog.IconsPreviewDialog.on_refreshButton_clicked?4()
+eric6.Preferences.ConfigurationPages.IconsPreviewDialog.IconsPreviewDialog?1(directories, parent=None)
 eric6.Preferences.ConfigurationPages.InterfacePage.InterfacePage.on_resetLayoutButton_clicked?4()
 eric6.Preferences.ConfigurationPages.InterfacePage.InterfacePage.save?4()
 eric6.Preferences.ConfigurationPages.InterfacePage.InterfacePage?1()
@@ -6875,8 +6895,10 @@
 eric6.Project.Project.Project.setTranslationPattern?4(pattern)
 eric6.Project.Project.Project.showMenu?7
 eric6.Project.Project.Project.sourceFile?7
+eric6.Project.Project.Project.startFileSystemMonitoring?4()
 eric6.Project.Project.Project.startStatusMonitor?4()
 eric6.Project.Project.Project.startswithProjectPath?4(path)
+eric6.Project.Project.Project.stopFileSystemMonitoring?4()
 eric6.Project.Project.Project.stopStatusMonitor?4()
 eric6.Project.Project.Project.unregisterProjectType?4(type_)
 eric6.Project.Project.Project.updateFileTypes?4()
@@ -6976,6 +6998,8 @@
 eric6.Project.ProjectBrowserModel.ProjectBrowserModel.removeItem?4(name)
 eric6.Project.ProjectBrowserModel.ProjectBrowserModel.renameItem?4(name, newFilename)
 eric6.Project.ProjectBrowserModel.ProjectBrowserModel.repopulateItem?4(name)
+eric6.Project.ProjectBrowserModel.ProjectBrowserModel.startFileSystemMonitoring?4()
+eric6.Project.ProjectBrowserModel.ProjectBrowserModel.stopFileSystemMonitoring?4()
 eric6.Project.ProjectBrowserModel.ProjectBrowserModel.updateVCSStatus?4(name, recursive=True)
 eric6.Project.ProjectBrowserModel.ProjectBrowserModel.vcsStateChanged?7
 eric6.Project.ProjectBrowserModel.ProjectBrowserModel?1(parent)
@@ -8430,6 +8454,7 @@
 eric6.Toolbox.SingleApplication.SingleApplicationServer.shutdown?4()
 eric6.Toolbox.SingleApplication.SingleApplicationServer?1(name)
 eric6.Toolbox.Startup.application?7
+eric6.Toolbox.Startup.getDefaultIconPaths?4(application)
 eric6.Toolbox.Startup.handleArgs?4(argv, appinfo)
 eric6.Toolbox.Startup.initializeResourceSearchPath?4(application)
 eric6.Toolbox.Startup.loadTranslatorForLocale?4(dirs, tn)
@@ -8667,6 +8692,8 @@
 eric6.UI.CodeDocumentationViewer.CodeDocumentationViewer.shutdown?4()
 eric6.UI.CodeDocumentationViewer.CodeDocumentationViewer.unregisterProvider?4(providerName)
 eric6.UI.CodeDocumentationViewer.CodeDocumentationViewer?1(parent=None)
+eric6.UI.CodeDocumentationViewer.DocumentationViewerWidget.EmpytDocument_Dark?7
+eric6.UI.CodeDocumentationViewer.DocumentationViewerWidget.EmpytDocument_Light?7
 eric6.UI.CodeDocumentationViewer.DocumentationViewerWidget.clear?4()
 eric6.UI.CodeDocumentationViewer.DocumentationViewerWidget.setHtml?4(html)
 eric6.UI.CodeDocumentationViewer.DocumentationViewerWidget?1(parent=None)
@@ -8847,8 +8874,10 @@
 eric6.UI.Previewers.PreviewerHTML.PreviewerHTML.resultCallback?4(resDict=resultDict)
 eric6.UI.Previewers.PreviewerHTML.PreviewerHTML.shutdown?4()
 eric6.UI.Previewers.PreviewerHTML.PreviewerHTML?1(parent=None)
-eric6.UI.Previewers.PreviewerHTMLStyles.css_markdown?7
-eric6.UI.Previewers.PreviewerHTMLStyles.css_pygments?7
+eric6.UI.Previewers.PreviewerHTMLStyles.css_markdown_dark?7
+eric6.UI.Previewers.PreviewerHTMLStyles.css_markdown_light?7
+eric6.UI.Previewers.PreviewerHTMLStyles.css_pygments_dark?7
+eric6.UI.Previewers.PreviewerHTMLStyles.css_pygments_light?7
 eric6.UI.Previewers.PreviewerQSS.PreviewerQSS.processEditor?4(editor=None)
 eric6.UI.Previewers.PreviewerQSS.PreviewerQSS?1(parent=None)
 eric6.UI.PythonAstViewer.PythonAstViewer.EndIndexRole?7
--- a/eric6/APIs/Python3/eric6.bas	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/APIs/Python3/eric6.bas	Sat May 02 13:51:07 2020 +0200
@@ -161,6 +161,7 @@
 DummyThreadWrapper ThreadWrapper module._DummyThread
 DuplicateParamError Exception
 E5Action QAction
+E5AnimatedLabel QLabel
 E5AnimatedWidget QWidget
 E5Application QApplication
 E5ArrowItem QAbstractGraphicsShapeItem
--- a/eric6/Cooperation/ChatWidget.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/Cooperation/ChatWidget.py	Sat May 02 13:51:07 2020 +0200
@@ -59,13 +59,13 @@
         self.setupUi(self)
         
         self.shareButton.setIcon(
-            UI.PixmapCache.getIcon("sharedEditDisconnected.png"))
+            UI.PixmapCache.getIcon("sharedEditDisconnected"))
         self.startEditButton.setIcon(
-            UI.PixmapCache.getIcon("sharedEditStart.png"))
+            UI.PixmapCache.getIcon("sharedEditStart"))
         self.sendEditButton.setIcon(
-            UI.PixmapCache.getIcon("sharedEditSend.png"))
+            UI.PixmapCache.getIcon("sharedEditSend"))
         self.cancelEditButton.setIcon(
-            UI.PixmapCache.getIcon("sharedEditCancel.png"))
+            UI.PixmapCache.getIcon("sharedEditCancel"))
         
         self.__ui = ui
         self.__client = CooperationClient(self)
@@ -177,7 +177,7 @@
         
         QListWidgetItem(
             UI.PixmapCache.getIcon(
-                "chatUser{0}.png".format(1 + self.usersList.count() % 6)),
+                "chatUser{0}".format(1 + self.usersList.count() % 6)),
             nick, self.usersList)
         
         if not self.__connected:
@@ -185,7 +185,7 @@
         
         if not self.isVisible():
             self.__ui.showNotification(
-                UI.PixmapCache.getPixmap("cooperation48.png"),
+                UI.PixmapCache.getPixmap("cooperation48"),
                 self.tr("New User"), self.tr("{0} has joined.")
                     .format(nick))
 
@@ -216,7 +216,7 @@
         
         if not self.isVisible():
             self.__ui.showNotification(
-                UI.PixmapCache.getPixmap("cooperation48.png"),
+                UI.PixmapCache.getPixmap("cooperation48"),
                 self.tr("User Left"), self.tr("{0} has left.")
                     .format(nick))
     
@@ -239,7 +239,7 @@
         
         if not self.isVisible():
             self.__ui.showNotification(
-                UI.PixmapCache.getPixmap("cooperation48.png"),
+                UI.PixmapCache.getPixmap("cooperation48"),
                 self.tr("Message from <{0}>").format(from_), message)
     
     @pyqtSlot(str)
@@ -417,10 +417,10 @@
         """
         if checked:
             self.shareButton.setIcon(
-                UI.PixmapCache.getIcon("sharedEditConnected.png"))
+                UI.PixmapCache.getIcon("sharedEditConnected"))
         else:
             self.shareButton.setIcon(
-                UI.PixmapCache.getIcon("sharedEditDisconnected.png"))
+                UI.PixmapCache.getIcon("sharedEditDisconnected"))
         self.startEditButton.setEnabled(checked)
         
         self.shareEditor.emit(checked)
@@ -477,10 +477,10 @@
         self.shareButton.setChecked(sharing)
         if sharing:
             self.shareButton.setIcon(
-                UI.PixmapCache.getIcon("sharedEditConnected.png"))
+                UI.PixmapCache.getIcon("sharedEditConnected"))
         else:
             self.shareButton.setIcon(
-                UI.PixmapCache.getIcon("sharedEditDisconnected.png"))
+                UI.PixmapCache.getIcon("sharedEditDisconnected"))
         self.startEditButton.setChecked(editing)
         
         self.shareButton.setEnabled(shareable and not editing)
@@ -495,22 +495,22 @@
         """
         self.__chatMenu = QMenu(self)
         self.__copyChatAct = self.__chatMenu.addAction(
-            UI.PixmapCache.getIcon("editCopy.png"),
+            UI.PixmapCache.getIcon("editCopy"),
             self.tr("Copy"), self.__copyChat)
         self.__chatMenu.addSeparator()
         self.__cutAllChatAct = self.__chatMenu.addAction(
-            UI.PixmapCache.getIcon("editCut.png"),
+            UI.PixmapCache.getIcon("editCut"),
             self.tr("Cut all"), self.__cutAllChat)
         self.__copyAllChatAct = self.__chatMenu.addAction(
-            UI.PixmapCache.getIcon("editCopy.png"),
+            UI.PixmapCache.getIcon("editCopy"),
             self.tr("Copy all"), self.__copyAllChat)
         self.__chatMenu.addSeparator()
         self.__clearChatAct = self.__chatMenu.addAction(
-            UI.PixmapCache.getIcon("editDelete.png"),
+            UI.PixmapCache.getIcon("editDelete"),
             self.tr("Clear"), self.__clearChat)
         self.__chatMenu.addSeparator()
         self.__saveChatAct = self.__chatMenu.addAction(
-            UI.PixmapCache.getIcon("fileSave.png"),
+            UI.PixmapCache.getIcon("fileSave"),
             self.tr("Save"), self.__saveChat)
         
         self.on_chatEdit_copyAvailable(False)
@@ -617,13 +617,13 @@
         """
         self.__usersMenu = QMenu(self)
         self.__kickUserAct = self.__usersMenu.addAction(
-            UI.PixmapCache.getIcon("chatKickUser.png"),
+            UI.PixmapCache.getIcon("chatKickUser"),
             self.tr("Kick User"), self.__kickUser)
         self.__banUserAct = self.__usersMenu.addAction(
-            UI.PixmapCache.getIcon("chatBanUser.png"),
+            UI.PixmapCache.getIcon("chatBanUser"),
             self.tr("Ban User"), self.__banUser)
         self.__banKickUserAct = self.__usersMenu.addAction(
-            UI.PixmapCache.getIcon("chatBanKickUser.png"),
+            UI.PixmapCache.getIcon("chatBanKickUser"),
             self.tr("Ban and Kick User"), self.__banKickUser)
     
     @pyqtSlot(QPoint)
--- a/eric6/DebugClients/Python/DebugClientBase.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/DebugClients/Python/DebugClientBase.py	Sat May 02 13:51:07 2020 +0200
@@ -44,13 +44,17 @@
 
 def DebugClientRawInput(prompt="", echo=True):
     """
-    Replacement for the standard raw_input builtin.
+    Replacement for the standard raw_input() builtin (Python 2) and
+    the standard input() builtin (Python 3).
     
     This function works with the split debugger.
     
-    @param prompt prompt to be shown. (string)
-    @param echo flag indicating echoing of the input (boolean)
-    @return result of the raw_input() call
+    @param prompt prompt to be shown
+    @type str
+    @param echo flag indicating echoing of the input
+    @type bool
+    @return result of the raw_input()/input() call
+    @rtype str
     """
     if DebugClientInstance is None or not DebugClientInstance.redirect:
         return DebugClientOrigRawInput(prompt)
@@ -58,20 +62,21 @@
     return DebugClientInstance.raw_input(prompt, echo)
 
 
-def DebugClientInput(prompt="", echo=True):
+def DebugClientInput(prompt=""):
     """
-    Replacement for the standard input builtin.
+    Replacement for the standard input() builtin (Python 2).
     
     This function works with the split debugger.
     
-    @param prompt prompt to be shown (string)
-    @param echo flag indicating to echo the output (boolean)
+    @param prompt prompt to be shown 
+    @type str
     @return result of the input() call
+    @rtype str
     """
     if DebugClientInstance is None or not DebugClientInstance.redirect:
         return DebugClientOrigInput(prompt)
 
-    return DebugClientInstance.input(prompt, echo)
+    return DebugClientInstance.input(prompt)
 
 # Use our own input() and on Python 2 raw_input().
 if sys.version_info[0] == 2:
@@ -93,11 +98,11 @@
 else:
     try:
         DebugClientOrigInput = __builtins__.__dict__['input']
-        __builtins__.__dict__['input'] = DebugClientInput
+        __builtins__.__dict__['input'] = DebugClientRawInput
     except (AttributeError, KeyError):
         import __main__
         DebugClientOrigInput = __main__.__builtins__.__dict__['input']
-        __main__.__builtins__.__dict__['input'] = DebugClientInput
+        __main__.__builtins__.__dict__['input'] = DebugClientRawInput
 
 ###############################################################################
 
--- a/eric6/DebugClients/Python/getpass.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/DebugClients/Python/getpass.py	Sat May 02 13:51:07 2020 +0200
@@ -23,7 +23,8 @@
     First try various environment variables, then the password
     database.  This works on Windows as long as USERNAME is set.
     
-    @return username (string)
+    @return username
+    @rtype str
     """
     # this is copied from the oroginal getpass.py
     
@@ -43,8 +44,10 @@
     """
     Function to prompt for a password, with echo turned off.
     
-    @param prompt Prompt to be shown to the user (string)
-    @return Password entered by the user (string)
+    @param prompt Prompt to be shown to the user
+    @type str
+    @return Password entered by the user
+    @rtype str
     """
     return input(prompt, False)
     
@@ -52,6 +55,7 @@
 unix_getpass = getpass
 win_getpass = getpass
 default_getpass = getpass
+fallback_getpass = getpass
 
 #
 # eflag: noqa = M702
--- a/eric6/Debugger/CallTraceViewer.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/Debugger/CallTraceViewer.py	Sat May 02 13:51:07 2020 +0200
@@ -43,16 +43,16 @@
         self.__dbs = debugServer
         
         self.startTraceButton.setIcon(
-            UI.PixmapCache.getIcon("callTraceStart.png"))
+            UI.PixmapCache.getIcon("callTraceStart"))
         self.stopTraceButton.setIcon(
-            UI.PixmapCache.getIcon("callTraceStop.png"))
-        self.resizeButton.setIcon(UI.PixmapCache.getIcon("resizeColumns.png"))
-        self.clearButton.setIcon(UI.PixmapCache.getIcon("editDelete.png"))
-        self.saveButton.setIcon(UI.PixmapCache.getIcon("fileSave.png"))
+            UI.PixmapCache.getIcon("callTraceStop"))
+        self.resizeButton.setIcon(UI.PixmapCache.getIcon("resizeColumns"))
+        self.clearButton.setIcon(UI.PixmapCache.getIcon("editDelete"))
+        self.saveButton.setIcon(UI.PixmapCache.getIcon("fileSave"))
         
         self.__headerItem = QTreeWidgetItem(
             ["", self.tr("From"), self.tr("To")])
-        self.__headerItem.setIcon(0, UI.PixmapCache.getIcon("callReturn.png"))
+        self.__headerItem.setIcon(0, UI.PixmapCache.getIcon("callReturn"))
         self.callTrace.setHeaderItem(self.__headerItem)
         
         self.__callStack = []
@@ -242,9 +242,9 @@
         @param toFunction name of the target function (string)
         """
         if isCall:
-            icon = UI.PixmapCache.getIcon("forward.png")
+            icon = UI.PixmapCache.getIcon("forward")
         else:
-            icon = UI.PixmapCache.getIcon("back.png")
+            icon = UI.PixmapCache.getIcon("back")
         parentItem = (
             self.__callStack[-1] if self.__callStack else self.callTrace)
         
--- a/eric6/Debugger/DebugUI.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/Debugger/DebugUI.py	Sat May 02 13:51:07 2020 +0200
@@ -174,7 +174,7 @@
         
         self.runAct = E5Action(
             self.tr('Run Script'),
-            UI.PixmapCache.getIcon("runScript.png"),
+            UI.PixmapCache.getIcon("runScript"),
             self.tr('&Run Script...'),
             Qt.Key_F2, 0, self, 'dbg_run_script')
         self.runAct.setStatusTip(self.tr('Run the current Script'))
@@ -189,7 +189,7 @@
 
         self.runProjectAct = E5Action(
             self.tr('Run Project'),
-            UI.PixmapCache.getIcon("runProject.png"),
+            UI.PixmapCache.getIcon("runProject"),
             self.tr('Run &Project...'), Qt.SHIFT + Qt.Key_F2, 0, self,
             'dbg_run_project')
         self.runProjectAct.setStatusTip(self.tr('Run the current Project'))
@@ -205,7 +205,7 @@
 
         self.coverageAct = E5Action(
             self.tr('Coverage run of Script'),
-            UI.PixmapCache.getIcon("coverageScript.png"),
+            UI.PixmapCache.getIcon("coverageScript"),
             self.tr('Coverage run of Script...'), 0, 0, self,
             'dbg_coverage_script')
         self.coverageAct.setStatusTip(
@@ -221,7 +221,7 @@
 
         self.coverageProjectAct = E5Action(
             self.tr('Coverage run of Project'),
-            UI.PixmapCache.getIcon("coverageProject.png"),
+            UI.PixmapCache.getIcon("coverageProject"),
             self.tr('Coverage run of Project...'), 0, 0, self,
             'dbg_coverage_project')
         self.coverageProjectAct.setStatusTip(
@@ -238,7 +238,7 @@
 
         self.profileAct = E5Action(
             self.tr('Profile Script'),
-            UI.PixmapCache.getIcon("profileScript.png"),
+            UI.PixmapCache.getIcon("profileScript"),
             self.tr('Profile Script...'), 0, 0, self, 'dbg_profile_script')
         self.profileAct.setStatusTip(self.tr('Profile the current Script'))
         self.profileAct.setWhatsThis(self.tr(
@@ -251,7 +251,7 @@
 
         self.profileProjectAct = E5Action(
             self.tr('Profile Project'),
-            UI.PixmapCache.getIcon("profileProject.png"),
+            UI.PixmapCache.getIcon("profileProject"),
             self.tr('Profile Project...'), 0, 0, self,
             'dbg_profile_project')
         self.profileProjectAct.setStatusTip(
@@ -267,7 +267,7 @@
 
         self.debugAct = E5Action(
             self.tr('Debug Script'),
-            UI.PixmapCache.getIcon("debugScript.png"),
+            UI.PixmapCache.getIcon("debugScript"),
             self.tr('&Debug Script...'), Qt.Key_F5, 0, self,
             'dbg_debug_script')
         self.debugAct.setStatusTip(self.tr('Debug the current Script'))
@@ -283,7 +283,7 @@
 
         self.debugProjectAct = E5Action(
             self.tr('Debug Project'),
-            UI.PixmapCache.getIcon("debugProject.png"),
+            UI.PixmapCache.getIcon("debugProject"),
             self.tr('Debug &Project...'), Qt.SHIFT + Qt.Key_F5, 0, self,
             'dbg_debug_project')
         self.debugProjectAct.setStatusTip(self.tr(
@@ -300,7 +300,7 @@
 
         self.restartAct = E5Action(
             self.tr('Restart'),
-            UI.PixmapCache.getIcon("debugRestart.png"),
+            UI.PixmapCache.getIcon("debugRestart"),
             self.tr('Restart'), Qt.Key_F4, 0, self, 'dbg_restart_script')
         self.restartAct.setStatusTip(self.tr(
             'Restart the last debugged script'))
@@ -316,7 +316,7 @@
 
         self.stopAct = E5Action(
             self.tr('Stop'),
-            UI.PixmapCache.getIcon("stopScript.png"),
+            UI.PixmapCache.getIcon("stopScript"),
             self.tr('Stop'), Qt.SHIFT + Qt.Key_F10, 0,
             self, 'dbg_stop_script')
         self.stopAct.setStatusTip(self.tr("""Stop the running script."""))
@@ -331,7 +331,7 @@
 
         act = E5Action(
             self.tr('Continue'),
-            UI.PixmapCache.getIcon("continue.png"),
+            UI.PixmapCache.getIcon("continue"),
             self.tr('&Continue'), Qt.Key_F6, 0,
             self.debugActGrp, 'dbg_continue')
         act.setStatusTip(
@@ -347,7 +347,7 @@
 
         act = E5Action(
             self.tr('Continue to Cursor'),
-            UI.PixmapCache.getIcon("continueToCursor.png"),
+            UI.PixmapCache.getIcon("continueToCursor"),
             self.tr('Continue &To Cursor'), Qt.SHIFT + Qt.Key_F6, 0,
             self.debugActGrp, 'dbg_continue_to_cursor')
         act.setStatusTip(self.tr(
@@ -363,7 +363,7 @@
         
         act = E5Action(
             self.tr('Move Instruction Pointer to Cursor'),
-            UI.PixmapCache.getIcon("moveInstructionPointer.png"),
+            UI.PixmapCache.getIcon("moveInstructionPointer"),
             self.tr('&Jump To Cursor'), Qt.Key_F12, 0,
             self.debugActGrp, 'dbg_jump_to_cursor')
         act.setStatusTip(self.tr(
@@ -383,7 +383,7 @@
 
         act = E5Action(
             self.tr('Single Step'),
-            UI.PixmapCache.getIcon("step.png"),
+            UI.PixmapCache.getIcon("step"),
             self.tr('Sin&gle Step'), Qt.Key_F7, 0,
             self.debugActGrp, 'dbg_single_step')
         act.setStatusTip(self.tr('Execute a single Python statement'))
@@ -399,7 +399,7 @@
 
         act = E5Action(
             self.tr('Step Over'),
-            UI.PixmapCache.getIcon("stepOver.png"),
+            UI.PixmapCache.getIcon("stepOver"),
             self.tr('Step &Over'), Qt.Key_F8, 0,
             self.debugActGrp, 'dbg_step_over')
         act.setStatusTip(self.tr(
@@ -418,7 +418,7 @@
 
         act = E5Action(
             self.tr('Step Out'),
-            UI.PixmapCache.getIcon("stepOut.png"),
+            UI.PixmapCache.getIcon("stepOut"),
             self.tr('Step Ou&t'), Qt.Key_F9, 0,
             self.debugActGrp, 'dbg_step_out')
         act.setStatusTip(self.tr(
@@ -437,7 +437,7 @@
 
         act = E5Action(
             self.tr('Stop'),
-            UI.PixmapCache.getIcon("stepQuit.png"),
+            UI.PixmapCache.getIcon("stepQuit"),
             self.tr('&Stop'), Qt.Key_F10, 0,
             self.debugActGrp, 'dbg_stop')
         act.setStatusTip(self.tr('Stop debugging'))
@@ -502,7 +502,7 @@
 
         self.dbgToggleBpAct = E5Action(
             self.tr('Toggle Breakpoint'),
-            UI.PixmapCache.getIcon("breakpointToggle.png"),
+            UI.PixmapCache.getIcon("breakpointToggle"),
             self.tr('Toggle Breakpoint'),
             QKeySequence(self.tr("Shift+F11", "Debug|Toggle Breakpoint")),
             0, self.dbgSetBpActGrp, 'dbg_toggle_breakpoint')
@@ -517,7 +517,7 @@
         
         self.dbgEditBpAct = E5Action(
             self.tr('Edit Breakpoint'),
-            UI.PixmapCache.getIcon("cBreakpointToggle.png"),
+            UI.PixmapCache.getIcon("cBreakpointToggle"),
             self.tr('Edit Breakpoint...'),
             QKeySequence(self.tr("Shift+F12", "Debug|Edit Breakpoint")), 0,
             self.dbgSetBpActGrp, 'dbg_edit_breakpoint')
@@ -532,7 +532,7 @@
 
         self.dbgNextBpAct = E5Action(
             self.tr('Next Breakpoint'),
-            UI.PixmapCache.getIcon("breakpointNext.png"),
+            UI.PixmapCache.getIcon("breakpointNext"),
             self.tr('Next Breakpoint'),
             QKeySequence(
                 self.tr("Ctrl+Shift+PgDown", "Debug|Next Breakpoint")), 0,
@@ -547,7 +547,7 @@
 
         self.dbgPrevBpAct = E5Action(
             self.tr('Previous Breakpoint'),
-            UI.PixmapCache.getIcon("breakpointPrevious.png"),
+            UI.PixmapCache.getIcon("breakpointPrevious"),
             self.tr('Previous Breakpoint'),
             QKeySequence(
                 self.tr("Ctrl+Shift+PgUp", "Debug|Previous Breakpoint")),
@@ -1069,7 +1069,7 @@
                             os.path.basename(self.ui.currentProg), status,
                             info)
                     self.ui.showNotification(
-                        UI.PixmapCache.getPixmap("debug48.png"),
+                        UI.PixmapCache.getPixmap("debug48"),
                         self.tr("Program terminated"), msg)
                 else:
                     if self.ui.currentProg is None:
--- a/eric6/Debugger/DebugViewer.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/Debugger/DebugViewer.py	Sat May 02 13:51:07 2020 +0200
@@ -62,7 +62,7 @@
         self.debugServer = debugServer
         self.debugUI = None
         
-        self.setWindowIcon(UI.PixmapCache.getIcon("eric.png"))
+        self.setWindowIcon(UI.PixmapCache.getIcon("eric"))
         
         self.__mainLayout = QVBoxLayout()
         self.__mainLayout.setContentsMargins(0, 0, 0, 0)
@@ -105,7 +105,7 @@
         
         index = self.__tabWidget.addTab(
             self.glvWidget,
-            UI.PixmapCache.getIcon("globalVariables.png"), '')
+            UI.PixmapCache.getIcon("globalVariables"), '')
         self.__tabWidget.setTabToolTip(index, self.globalsViewer.windowTitle())
         
         self.setGlobalsFilterButton.clicked.connect(
@@ -159,7 +159,7 @@
         
         index = self.__tabWidget.addTab(
             self.lvWidget,
-            UI.PixmapCache.getIcon("localVariables.png"), '')
+            UI.PixmapCache.getIcon("localVariables"), '')
         self.__tabWidget.setTabToolTip(index, self.localsViewer.windowTitle())
         
         self.sourceButton.clicked.connect(self.__showSource)
@@ -189,7 +189,7 @@
         self.callTraceViewer = CallTraceViewer(self.debugServer)
         index = self.__tabWidget.addTab(
             self.callTraceViewer,
-            UI.PixmapCache.getIcon("callTrace.png"), "")
+            UI.PixmapCache.getIcon("callTrace"), "")
         self.__tabWidget.setTabToolTip(
             index, self.callTraceViewer.windowTitle())
         self.callTraceViewer.sourceFile.connect(self.sourceFile)
@@ -200,7 +200,7 @@
         self.breakpointViewer.setModel(self.debugServer.getBreakPointModel())
         index = self.__tabWidget.addTab(
             self.breakpointViewer,
-            UI.PixmapCache.getIcon("breakpoints.png"), '')
+            UI.PixmapCache.getIcon("breakpoints"), '')
         self.__tabWidget.setTabToolTip(
             index, self.breakpointViewer.windowTitle())
         self.breakpointViewer.sourceFile.connect(self.sourceFile)
@@ -211,7 +211,7 @@
         self.watchpointViewer.setModel(self.debugServer.getWatchPointModel())
         index = self.__tabWidget.addTab(
             self.watchpointViewer,
-            UI.PixmapCache.getIcon("watchpoints.png"), '')
+            UI.PixmapCache.getIcon("watchpoints"), '')
         self.__tabWidget.setTabToolTip(
             index, self.watchpointViewer.windowTitle())
         
@@ -220,7 +220,7 @@
         self.exceptionLogger = ExceptionLogger()
         index = self.__tabWidget.addTab(
             self.exceptionLogger,
-            UI.PixmapCache.getIcon("exceptions.png"), '')
+            UI.PixmapCache.getIcon("exceptions"), '')
         self.__tabWidget.setTabToolTip(
             index, self.exceptionLogger.windowTitle())
         
--- a/eric6/Debugger/ExceptionLogger.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/Debugger/ExceptionLogger.py	Sat May 02 13:51:07 2020 +0200
@@ -103,9 +103,12 @@
             return
         
         if exceptionMessage == '':
-            itm.setText(0, "{0}".format(exceptionType))
+            text = "{0}".format(exceptionType)
         else:
-            itm.setText(0, "{0}, {1}".format(exceptionType, exceptionMessage))
+            text = "{0}, {1}".format(exceptionType, exceptionMessage)
+        
+        itm.setText(0, text)
+        itm.setToolTip(0, text)
         
         # now add the call stack, most recent call first
         for entry in stackTrace:
Binary file eric6/Documentation/Help/source.qch has changed
--- a/eric6/Documentation/Help/source.qhp	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/Documentation/Help/source.qhp	Sat May 02 13:51:07 2020 +0200
@@ -92,6 +92,7 @@
           </section>
           <section title="eric6.E5Gui" ref="index-eric6.E5Gui.html">
             <section title="eric6.E5Gui.E5Action" ref="eric6.E5Gui.E5Action.html" />
+            <section title="eric6.E5Gui.E5AnimatedLabel" ref="eric6.E5Gui.E5AnimatedLabel.html" />
             <section title="eric6.E5Gui.E5AnimatedWidget" ref="eric6.E5Gui.E5AnimatedWidget.html" />
             <section title="eric6.E5Gui.E5Application" ref="eric6.E5Gui.E5Application.html" />
             <section title="eric6.E5Gui.E5ClickableLabel" ref="eric6.E5Gui.E5ClickableLabel.html" />
@@ -3777,6 +3778,21 @@
       <keyword name="E5Action.setIconText" id="E5Action.setIconText" ref="eric6.E5Gui.E5Action.html#E5Action.setIconText" />
       <keyword name="E5Action.setShortcut" id="E5Action.setShortcut" ref="eric6.E5Gui.E5Action.html#E5Action.setShortcut" />
       <keyword name="E5Action.setShortcuts" id="E5Action.setShortcuts" ref="eric6.E5Gui.E5Action.html#E5Action.setShortcuts" />
+      <keyword name="E5AnimatedLabel" id="E5AnimatedLabel" ref="eric6.E5Gui.E5AnimatedLabel.html#E5AnimatedLabel" />
+      <keyword name="E5AnimatedLabel (Constructor)" id="E5AnimatedLabel (Constructor)" ref="eric6.E5Gui.E5AnimatedLabel.html#E5AnimatedLabel.__init__" />
+      <keyword name="E5AnimatedLabel (Module)" id="E5AnimatedLabel (Module)" ref="eric6.E5Gui.E5AnimatedLabel.html" />
+      <keyword name="E5AnimatedLabel.__animate" id="E5AnimatedLabel.__animate" ref="eric6.E5Gui.E5AnimatedLabel.html#E5AnimatedLabel.__animate" />
+      <keyword name="E5AnimatedLabel.__loadAnimationFile" id="E5AnimatedLabel.__loadAnimationFile" ref="eric6.E5Gui.E5AnimatedLabel.html#E5AnimatedLabel.__loadAnimationFile" />
+      <keyword name="E5AnimatedLabel.getAnimationFile" id="E5AnimatedLabel.getAnimationFile" ref="eric6.E5Gui.E5AnimatedLabel.html#E5AnimatedLabel.getAnimationFile" />
+      <keyword name="E5AnimatedLabel.getInterval" id="E5AnimatedLabel.getInterval" ref="eric6.E5Gui.E5AnimatedLabel.html#E5AnimatedLabel.getInterval" />
+      <keyword name="E5AnimatedLabel.isActive" id="E5AnimatedLabel.isActive" ref="eric6.E5Gui.E5AnimatedLabel.html#E5AnimatedLabel.isActive" />
+      <keyword name="E5AnimatedLabel.isAnimationFileLoaded" id="E5AnimatedLabel.isAnimationFileLoaded" ref="eric6.E5Gui.E5AnimatedLabel.html#E5AnimatedLabel.isAnimationFileLoaded" />
+      <keyword name="E5AnimatedLabel.reset" id="E5AnimatedLabel.reset" ref="eric6.E5Gui.E5AnimatedLabel.html#E5AnimatedLabel.reset" />
+      <keyword name="E5AnimatedLabel.setAnimationFile" id="E5AnimatedLabel.setAnimationFile" ref="eric6.E5Gui.E5AnimatedLabel.html#E5AnimatedLabel.setAnimationFile" />
+      <keyword name="E5AnimatedLabel.setInterval" id="E5AnimatedLabel.setInterval" ref="eric6.E5Gui.E5AnimatedLabel.html#E5AnimatedLabel.setInterval" />
+      <keyword name="E5AnimatedLabel.setPixmap" id="E5AnimatedLabel.setPixmap" ref="eric6.E5Gui.E5AnimatedLabel.html#E5AnimatedLabel.setPixmap" />
+      <keyword name="E5AnimatedLabel.start" id="E5AnimatedLabel.start" ref="eric6.E5Gui.E5AnimatedLabel.html#E5AnimatedLabel.start" />
+      <keyword name="E5AnimatedLabel.stop" id="E5AnimatedLabel.stop" ref="eric6.E5Gui.E5AnimatedLabel.html#E5AnimatedLabel.stop" />
       <keyword name="E5AnimatedWidget" id="E5AnimatedWidget" ref="eric6.E5Gui.E5AnimatedWidget.html#E5AnimatedWidget" />
       <keyword name="E5AnimatedWidget (Constructor)" id="E5AnimatedWidget (Constructor)" ref="eric6.E5Gui.E5AnimatedWidget.html#E5AnimatedWidget.__init__" />
       <keyword name="E5AnimatedWidget (Module)" id="E5AnimatedWidget (Module)" ref="eric6.E5Gui.E5AnimatedWidget.html" />
@@ -3919,6 +3935,9 @@
       <keyword name="E5GraphicsView._getDiagramSize" id="E5GraphicsView._getDiagramSize" ref="eric6.E5Graphics.E5GraphicsView.html#E5GraphicsView._getDiagramSize" />
       <keyword name="E5GraphicsView.autoAdjustSceneSize" id="E5GraphicsView.autoAdjustSceneSize" ref="eric6.E5Graphics.E5GraphicsView.html#E5GraphicsView.autoAdjustSceneSize" />
       <keyword name="E5GraphicsView.filteredItems" id="E5GraphicsView.filteredItems" ref="eric6.E5Graphics.E5GraphicsView.html#E5GraphicsView.filteredItems" />
+      <keyword name="E5GraphicsView.getBackgroundColor" id="E5GraphicsView.getBackgroundColor" ref="eric6.E5Graphics.E5GraphicsView.html#E5GraphicsView.getBackgroundColor" />
+      <keyword name="E5GraphicsView.getDrawingColors" id="E5GraphicsView.getDrawingColors" ref="eric6.E5Graphics.E5GraphicsView.html#E5GraphicsView.getDrawingColors" />
+      <keyword name="E5GraphicsView.getForegroundColor" id="E5GraphicsView.getForegroundColor" ref="eric6.E5Graphics.E5GraphicsView.html#E5GraphicsView.getForegroundColor" />
       <keyword name="E5GraphicsView.printDiagram" id="E5GraphicsView.printDiagram" ref="eric6.E5Graphics.E5GraphicsView.html#E5GraphicsView.printDiagram" />
       <keyword name="E5GraphicsView.resizeScene" id="E5GraphicsView.resizeScene" ref="eric6.E5Graphics.E5GraphicsView.html#E5GraphicsView.resizeScene" />
       <keyword name="E5GraphicsView.saveImage" id="E5GraphicsView.saveImage" ref="eric6.E5Graphics.E5GraphicsView.html#E5GraphicsView.saveImage" />
@@ -8468,17 +8487,22 @@
       <keyword name="IconsPage" id="IconsPage" ref="eric6.Preferences.ConfigurationPages.IconsPage.html#IconsPage" />
       <keyword name="IconsPage (Constructor)" id="IconsPage (Constructor)" ref="eric6.Preferences.ConfigurationPages.IconsPage.html#IconsPage.__init__" />
       <keyword name="IconsPage (Module)" id="IconsPage (Module)" ref="eric6.Preferences.ConfigurationPages.IconsPage.html" />
+      <keyword name="IconsPage.__getSelectedDefaultIconsPath" id="IconsPage.__getSelectedDefaultIconsPath" ref="eric6.Preferences.ConfigurationPages.IconsPage.html#IconsPage.__getSelectedDefaultIconsPath" />
       <keyword name="IconsPage.on_addIconDirectoryButton_clicked" id="IconsPage.on_addIconDirectoryButton_clicked" ref="eric6.Preferences.ConfigurationPages.IconsPage.html#IconsPage.on_addIconDirectoryButton_clicked" />
       <keyword name="IconsPage.on_deleteIconDirectoryButton_clicked" id="IconsPage.on_deleteIconDirectoryButton_clicked" ref="eric6.Preferences.ConfigurationPages.IconsPage.html#IconsPage.on_deleteIconDirectoryButton_clicked" />
       <keyword name="IconsPage.on_downButton_clicked" id="IconsPage.on_downButton_clicked" ref="eric6.Preferences.ConfigurationPages.IconsPage.html#IconsPage.on_downButton_clicked" />
       <keyword name="IconsPage.on_iconDirectoryList_currentRowChanged" id="IconsPage.on_iconDirectoryList_currentRowChanged" ref="eric6.Preferences.ConfigurationPages.IconsPage.html#IconsPage.on_iconDirectoryList_currentRowChanged" />
       <keyword name="IconsPage.on_iconDirectoryPicker_textChanged" id="IconsPage.on_iconDirectoryPicker_textChanged" ref="eric6.Preferences.ConfigurationPages.IconsPage.html#IconsPage.on_iconDirectoryPicker_textChanged" />
+      <keyword name="IconsPage.on_showDefaultIconsButton_clicked" id="IconsPage.on_showDefaultIconsButton_clicked" ref="eric6.Preferences.ConfigurationPages.IconsPage.html#IconsPage.on_showDefaultIconsButton_clicked" />
       <keyword name="IconsPage.on_showIconsButton_clicked" id="IconsPage.on_showIconsButton_clicked" ref="eric6.Preferences.ConfigurationPages.IconsPage.html#IconsPage.on_showIconsButton_clicked" />
       <keyword name="IconsPage.on_upButton_clicked" id="IconsPage.on_upButton_clicked" ref="eric6.Preferences.ConfigurationPages.IconsPage.html#IconsPage.on_upButton_clicked" />
       <keyword name="IconsPage.save" id="IconsPage.save" ref="eric6.Preferences.ConfigurationPages.IconsPage.html#IconsPage.save" />
       <keyword name="IconsPreviewDialog" id="IconsPreviewDialog" ref="eric6.Preferences.ConfigurationPages.IconsPreviewDialog.html#IconsPreviewDialog" />
       <keyword name="IconsPreviewDialog (Constructor)" id="IconsPreviewDialog (Constructor)" ref="eric6.Preferences.ConfigurationPages.IconsPreviewDialog.html#IconsPreviewDialog.__init__" />
       <keyword name="IconsPreviewDialog (Module)" id="IconsPreviewDialog (Module)" ref="eric6.Preferences.ConfigurationPages.IconsPreviewDialog.html" />
+      <keyword name="IconsPreviewDialog.on_directoryCombo_currentTextChanged" id="IconsPreviewDialog.on_directoryCombo_currentTextChanged" ref="eric6.Preferences.ConfigurationPages.IconsPreviewDialog.html#IconsPreviewDialog.on_directoryCombo_currentTextChanged" />
+      <keyword name="IconsPreviewDialog.on_invertButton_toggled" id="IconsPreviewDialog.on_invertButton_toggled" ref="eric6.Preferences.ConfigurationPages.IconsPreviewDialog.html#IconsPreviewDialog.on_invertButton_toggled" />
+      <keyword name="IconsPreviewDialog.on_refreshButton_clicked" id="IconsPreviewDialog.on_refreshButton_clicked" ref="eric6.Preferences.ConfigurationPages.IconsPreviewDialog.html#IconsPreviewDialog.on_refreshButton_clicked" />
       <keyword name="IdlCompilerDefineNameDialog" id="IdlCompilerDefineNameDialog" ref="eric6.Project.IdlCompilerDefineNameDialog.html#IdlCompilerDefineNameDialog" />
       <keyword name="IdlCompilerDefineNameDialog (Constructor)" id="IdlCompilerDefineNameDialog (Constructor)" ref="eric6.Project.IdlCompilerDefineNameDialog.html#IdlCompilerDefineNameDialog.__init__" />
       <keyword name="IdlCompilerDefineNameDialog (Module)" id="IdlCompilerDefineNameDialog (Module)" ref="eric6.Project.IdlCompilerDefineNameDialog.html" />
@@ -9666,6 +9690,7 @@
       <keyword name="MicroPythonGraphWidget.hasData" id="MicroPythonGraphWidget.hasData" ref="eric6.MicroPython.MicroPythonGraphWidget.html#MicroPythonGraphWidget.hasData" />
       <keyword name="MicroPythonGraphWidget.isDirty" id="MicroPythonGraphWidget.isDirty" ref="eric6.MicroPython.MicroPythonGraphWidget.html#MicroPythonGraphWidget.isDirty" />
       <keyword name="MicroPythonGraphWidget.on_saveButton_clicked" id="MicroPythonGraphWidget.on_saveButton_clicked" ref="eric6.MicroPython.MicroPythonGraphWidget.html#MicroPythonGraphWidget.on_saveButton_clicked" />
+      <keyword name="MicroPythonGraphWidget.preferencesChanged" id="MicroPythonGraphWidget.preferencesChanged" ref="eric6.MicroPython.MicroPythonGraphWidget.html#MicroPythonGraphWidget.preferencesChanged" />
       <keyword name="MicroPythonGraphWidget.processData" id="MicroPythonGraphWidget.processData" ref="eric6.MicroPython.MicroPythonGraphWidget.html#MicroPythonGraphWidget.processData" />
       <keyword name="MicroPythonGraphWidget.saveData" id="MicroPythonGraphWidget.saveData" ref="eric6.MicroPython.MicroPythonGraphWidget.html#MicroPythonGraphWidget.saveData" />
       <keyword name="MicroPythonPage" id="MicroPythonPage" ref="eric6.Preferences.ConfigurationPages.MicroPythonPage.html#MicroPythonPage" />
@@ -11062,6 +11087,7 @@
       <keyword name="Project.__initData" id="Project.__initData" ref="eric6.Project.Project.html#Project.__initData" />
       <keyword name="Project.__initDebugProperties" id="Project.__initDebugProperties" ref="eric6.Project.Project.html#Project.__initDebugProperties" />
       <keyword name="Project.__initProjectTypes" id="Project.__initProjectTypes" ref="eric6.Project.Project.html#Project.__initProjectTypes" />
+      <keyword name="Project.__isInPdata" id="Project.__isInPdata" ref="eric6.Project.Project.html#Project.__isInPdata" />
       <keyword name="Project.__loadDiagram" id="Project.__loadDiagram" ref="eric6.Project.Project.html#Project.__loadDiagram" />
       <keyword name="Project.__loadRecent" id="Project.__loadRecent" ref="eric6.Project.Project.html#Project.__loadRecent" />
       <keyword name="Project.__makeFinished" id="Project.__makeFinished" ref="eric6.Project.Project.html#Project.__makeFinished" />
@@ -11235,8 +11261,10 @@
       <keyword name="Project.setStatusMonitorAutoUpdate" id="Project.setStatusMonitorAutoUpdate" ref="eric6.Project.Project.html#Project.setStatusMonitorAutoUpdate" />
       <keyword name="Project.setStatusMonitorInterval" id="Project.setStatusMonitorInterval" ref="eric6.Project.Project.html#Project.setStatusMonitorInterval" />
       <keyword name="Project.setTranslationPattern" id="Project.setTranslationPattern" ref="eric6.Project.Project.html#Project.setTranslationPattern" />
+      <keyword name="Project.startFileSystemMonitoring" id="Project.startFileSystemMonitoring" ref="eric6.Project.Project.html#Project.startFileSystemMonitoring" />
       <keyword name="Project.startStatusMonitor" id="Project.startStatusMonitor" ref="eric6.Project.Project.html#Project.startStatusMonitor" />
       <keyword name="Project.startswithProjectPath" id="Project.startswithProjectPath" ref="eric6.Project.Project.html#Project.startswithProjectPath" />
+      <keyword name="Project.stopFileSystemMonitoring" id="Project.stopFileSystemMonitoring" ref="eric6.Project.Project.html#Project.stopFileSystemMonitoring" />
       <keyword name="Project.stopStatusMonitor" id="Project.stopStatusMonitor" ref="eric6.Project.Project.html#Project.stopStatusMonitor" />
       <keyword name="Project.unregisterProjectType" id="Project.unregisterProjectType" ref="eric6.Project.Project.html#Project.unregisterProjectType" />
       <keyword name="Project.updateFileTypes" id="Project.updateFileTypes" ref="eric6.Project.Project.html#Project.updateFileTypes" />
@@ -11351,6 +11379,8 @@
       <keyword name="ProjectBrowserModel.removeItem" id="ProjectBrowserModel.removeItem" ref="eric6.Project.ProjectBrowserModel.html#ProjectBrowserModel.removeItem" />
       <keyword name="ProjectBrowserModel.renameItem" id="ProjectBrowserModel.renameItem" ref="eric6.Project.ProjectBrowserModel.html#ProjectBrowserModel.renameItem" />
       <keyword name="ProjectBrowserModel.repopulateItem" id="ProjectBrowserModel.repopulateItem" ref="eric6.Project.ProjectBrowserModel.html#ProjectBrowserModel.repopulateItem" />
+      <keyword name="ProjectBrowserModel.startFileSystemMonitoring" id="ProjectBrowserModel.startFileSystemMonitoring" ref="eric6.Project.ProjectBrowserModel.html#ProjectBrowserModel.startFileSystemMonitoring" />
+      <keyword name="ProjectBrowserModel.stopFileSystemMonitoring" id="ProjectBrowserModel.stopFileSystemMonitoring" ref="eric6.Project.ProjectBrowserModel.html#ProjectBrowserModel.stopFileSystemMonitoring" />
       <keyword name="ProjectBrowserModel.updateVCSStatus" id="ProjectBrowserModel.updateVCSStatus" ref="eric6.Project.ProjectBrowserModel.html#ProjectBrowserModel.updateVCSStatus" />
       <keyword name="ProjectBrowserPage" id="ProjectBrowserPage" ref="eric6.Preferences.ConfigurationPages.ProjectBrowserPage.html#ProjectBrowserPage" />
       <keyword name="ProjectBrowserPage (Constructor)" id="ProjectBrowserPage (Constructor)" ref="eric6.Preferences.ConfigurationPages.ProjectBrowserPage.html#ProjectBrowserPage.__init__" />
@@ -17205,6 +17235,7 @@
       <keyword name="getCorba" id="getCorba" ref="eric6.Preferences.__init__.html#getCorba" />
       <keyword name="getDataFiles" id="getDataFiles" ref="setup.html#getDataFiles" />
       <keyword name="getDebugger" id="getDebugger" ref="eric6.Preferences.__init__.html#getDebugger" />
+      <keyword name="getDefaultIconPaths" id="getDefaultIconPaths" ref="eric6.Toolbox.Startup.html#getDefaultIconPaths" />
       <keyword name="getDefaultLexerAssociations" id="getDefaultLexerAssociations" ref="eric6.QScintilla.Lexers.__init__.html#getDefaultLexerAssociations" />
       <keyword name="getDefaults" id="getDefaults" ref="eric6.Plugins.VcsPlugins.vcsMercurial.LargefilesExtension.__init__.html#getDefaults" />
       <keyword name="getDevice" id="getDevice" ref="eric6.MicroPython.MicroPythonDevices.html#getDevice" />
@@ -17860,6 +17891,7 @@
       <file>eric6.E5Graphics.E5ArrowItem.html</file>
       <file>eric6.E5Graphics.E5GraphicsView.html</file>
       <file>eric6.E5Gui.E5Action.html</file>
+      <file>eric6.E5Gui.E5AnimatedLabel.html</file>
       <file>eric6.E5Gui.E5AnimatedWidget.html</file>
       <file>eric6.E5Gui.E5Application.html</file>
       <file>eric6.E5Gui.E5ClickableLabel.html</file>
--- a/eric6/Documentation/Source/eric6.DebugClients.Python.DebugClientBase.html	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/Documentation/Source/eric6.DebugClients.Python.DebugClientBase.html	Sat May 02 13:51:07 2020 +0200
@@ -53,11 +53,11 @@
 </tr>
 <tr>
 <td><a href="#DebugClientInput">DebugClientInput</a></td>
-<td>Replacement for the standard input builtin.</td>
+<td>Replacement for the standard input() builtin (Python 2).</td>
 </tr>
 <tr>
 <td><a href="#DebugClientRawInput">DebugClientRawInput</a></td>
-<td>Replacement for the standard raw_input builtin.</td>
+<td>Replacement for the standard raw_input() builtin (Python 2) and the standard input() builtin (Python 3).</td>
 </tr>
 <tr>
 <td><a href="#DebugClientSetRecursionLimit">DebugClientSetRecursionLimit</a></td>
@@ -1261,23 +1261,19 @@
 <hr />
 <a NAME="DebugClientInput" ID="DebugClientInput"></a>
 <h2>DebugClientInput</h2>
-<b>DebugClientInput</b>(<i>prompt="", echo=True</i>)
+<b>DebugClientInput</b>(<i>prompt=""</i>)
 
 <p>
-    Replacement for the standard input builtin.
+    Replacement for the standard input() builtin (Python 2).
 </p>
 <p>
     This function works with the split debugger.
 </p>
 <dl>
 
-<dt><i>prompt</i></dt>
+<dt><i>prompt</i> (str)</dt>
 <dd>
-prompt to be shown (string)
-</dd>
-<dt><i>echo</i></dt>
-<dd>
-flag indicating to echo the output (boolean)
+prompt to be shown
 </dd>
 </dl>
 <dl>
@@ -1286,6 +1282,12 @@
 result of the input() call
 </dd>
 </dl>
+<dl>
+<dt>Return Type:</dt>
+<dd>
+str
+</dd>
+</dl>
 <div align="right"><a href="#top">Up</a></div>
 <hr />
 <hr />
@@ -1294,26 +1296,33 @@
 <b>DebugClientRawInput</b>(<i>prompt="", echo=True</i>)
 
 <p>
-    Replacement for the standard raw_input builtin.
+    Replacement for the standard raw_input() builtin (Python 2) and
+    the standard input() builtin (Python 3).
 </p>
 <p>
     This function works with the split debugger.
 </p>
 <dl>
 
-<dt><i>prompt</i></dt>
+<dt><i>prompt</i> (str)</dt>
 <dd>
-prompt to be shown. (string)
+prompt to be shown
 </dd>
-<dt><i>echo</i></dt>
+<dt><i>echo</i> (bool)</dt>
 <dd>
-flag indicating echoing of the input (boolean)
+flag indicating echoing of the input
 </dd>
 </dl>
 <dl>
 <dt>Returns:</dt>
 <dd>
-result of the raw_input() call
+result of the raw_input()/input() call
+</dd>
+</dl>
+<dl>
+<dt>Return Type:</dt>
+<dd>
+str
 </dd>
 </dl>
 <div align="right"><a href="#top">Up</a></div>
--- a/eric6/Documentation/Source/eric6.DebugClients.Python.getpass.html	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/Documentation/Source/eric6.DebugClients.Python.getpass.html	Sat May 02 13:51:07 2020 +0200
@@ -36,7 +36,7 @@
 <h3>Global Attributes</h3>
 
 <table>
-<tr><td>__all__</td></tr><tr><td>default_getpass</td></tr><tr><td>unix_getpass</td></tr><tr><td>win_getpass</td></tr>
+<tr><td>__all__</td></tr><tr><td>default_getpass</td></tr><tr><td>fallback_getpass</td></tr><tr><td>unix_getpass</td></tr><tr><td>win_getpass</td></tr>
 </table>
 <h3>Classes</h3>
 
@@ -67,15 +67,21 @@
 </p>
 <dl>
 
-<dt><i>prompt</i></dt>
+<dt><i>prompt</i> (str)</dt>
 <dd>
-Prompt to be shown to the user (string)
+Prompt to be shown to the user
 </dd>
 </dl>
 <dl>
 <dt>Returns:</dt>
 <dd>
-Password entered by the user (string)
+Password entered by the user
+</dd>
+</dl>
+<dl>
+<dt>Return Type:</dt>
+<dd>
+str
 </dd>
 </dl>
 <div align="right"><a href="#top">Up</a></div>
@@ -95,7 +101,13 @@
 <dl>
 <dt>Returns:</dt>
 <dd>
-username (string)
+username
+</dd>
+</dl>
+<dl>
+<dt>Return Type:</dt>
+<dd>
+str
 </dd>
 </dl>
 <div align="right"><a href="#top">Up</a></div>
--- a/eric6/Documentation/Source/eric6.E5Graphics.E5ArrowItem.html	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/Documentation/Source/eric6.E5Graphics.E5ArrowItem.html	Sat May 02 13:51:07 2020 +0200
@@ -101,32 +101,36 @@
 
 <a NAME="E5ArrowItem.__init__" ID="E5ArrowItem.__init__"></a>
 <h4>E5ArrowItem (Constructor)</h4>
-<b>E5ArrowItem</b>(<i>origin=None, end=None, filled=False, arrowType=NormalArrow, parent=None</i>)
+<b>E5ArrowItem</b>(<i>origin=None, end=None, filled=False, arrowType=NormalArrow, colors=None, parent=None</i>)
 
 <p>
         Constructor
 </p>
 <dl>
 
-<dt><i>origin</i></dt>
+<dt><i>origin</i> (QPointF)</dt>
 <dd>
-origin of the arrow (QPointF)
+origin of the arrow
 </dd>
-<dt><i>end</i></dt>
+<dt><i>end</i> (QPointF)</dt>
 <dd>
-end point of the arrow (QPointF)
+end point of the arrow
 </dd>
-<dt><i>filled</i></dt>
+<dt><i>filled</i> (bool)</dt>
 <dd>
-flag indicating a filled arrow head (boolean)
+flag indicating a filled arrow head
 </dd>
-<dt><i>arrowType</i></dt>
+<dt><i>arrowType</i> (int, one of NormalArrow, WideArrow)</dt>
 <dd>
-arrow type (NormalArrow, WideArrow)
+arrow type
 </dd>
-<dt><i>parent=</i></dt>
+<dt><i>colors</i> (tuple of (QColor, QColor))</dt>
 <dd>
-reference to the parent object (QGraphicsItem)
+tuple containing the foreground and background colors
+</dd>
+<dt><i>parent</i> (QGraphicsItem)</dt>
+<dd>
+reference to the parent object
 </dd>
 </dl>
 <a NAME="E5ArrowItem.boundingRect" ID="E5ArrowItem.boundingRect"></a>
--- a/eric6/Documentation/Source/eric6.E5Graphics.E5GraphicsView.html	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/Documentation/Source/eric6.E5Graphics.E5GraphicsView.html	Sat May 02 13:51:07 2020 +0200
@@ -105,6 +105,18 @@
 <td>Public method to filter a list of items.</td>
 </tr>
 <tr>
+<td><a href="#E5GraphicsView.getBackgroundColor">getBackgroundColor</a></td>
+<td>Public method to get the configured background color.</td>
+</tr>
+<tr>
+<td><a href="#E5GraphicsView.getDrawingColors">getDrawingColors</a></td>
+<td>Public method to get the configured drawing colors.</td>
+</tr>
+<tr>
+<td><a href="#E5GraphicsView.getForegroundColor">getForegroundColor</a></td>
+<td>Public method to get the configured foreground color.</td>
+</tr>
+<tr>
 <td><a href="#E5GraphicsView.printDiagram">printDiagram</a></td>
 <td>Public method to print the diagram.</td>
 </tr>
@@ -291,6 +303,63 @@
 list of interesting collision items (QGraphicsItem)
 </dd>
 </dl>
+<a NAME="E5GraphicsView.getBackgroundColor" ID="E5GraphicsView.getBackgroundColor"></a>
+<h4>E5GraphicsView.getBackgroundColor</h4>
+<b>getBackgroundColor</b>(<i></i>)
+
+<p>
+        Public method to get the configured background color.
+</p>
+<dl>
+<dt>Returns:</dt>
+<dd>
+background color
+</dd>
+</dl>
+<dl>
+<dt>Return Type:</dt>
+<dd>
+QColor
+</dd>
+</dl>
+<a NAME="E5GraphicsView.getDrawingColors" ID="E5GraphicsView.getDrawingColors"></a>
+<h4>E5GraphicsView.getDrawingColors</h4>
+<b>getDrawingColors</b>(<i></i>)
+
+<p>
+        Public method to get the configured drawing colors.
+</p>
+<dl>
+<dt>Returns:</dt>
+<dd>
+tuple containing the foreground and background colors
+</dd>
+</dl>
+<dl>
+<dt>Return Type:</dt>
+<dd>
+tuple of (QColor, QColor)
+</dd>
+</dl>
+<a NAME="E5GraphicsView.getForegroundColor" ID="E5GraphicsView.getForegroundColor"></a>
+<h4>E5GraphicsView.getForegroundColor</h4>
+<b>getForegroundColor</b>(<i></i>)
+
+<p>
+        Public method to get the configured foreground color.
+</p>
+<dl>
+<dt>Returns:</dt>
+<dd>
+foreground color
+</dd>
+</dl>
+<dl>
+<dt>Return Type:</dt>
+<dd>
+QColor
+</dd>
+</dl>
 <a NAME="E5GraphicsView.printDiagram" ID="E5GraphicsView.printDiagram"></a>
 <h4>E5GraphicsView.printDiagram</h4>
 <b>printDiagram</b>(<i>printer, diagramName=""</i>)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/eric6/Documentation/Source/eric6.E5Gui.E5AnimatedLabel.html	Sat May 02 13:51:07 2020 +0200
@@ -0,0 +1,319 @@
+<!DOCTYPE html>
+<html><head>
+<title>eric6.E5Gui.E5AnimatedLabel</title>
+<meta charset="UTF-8">
+<style>
+body {
+    background: #EDECE6;
+    margin: 0em 1em 10em 1em;
+    color: black;
+}
+
+h1 { color: white; background: #85774A; }
+h2 { color: white; background: #85774A; }
+h3 { color: white; background: #9D936E; }
+h4 { color: white; background: #9D936E; }
+    
+a { color: #BA6D36; }
+
+</style>
+</head>
+<body>
+<a NAME="top" ID="top"></a>
+<h1>eric6.E5Gui.E5AnimatedLabel</h1>
+
+<p>
+Module implementing a label widget showing an animated pixmap.
+</p>
+<h3>Global Attributes</h3>
+
+<table>
+<tr><td>None</td></tr>
+</table>
+<h3>Classes</h3>
+
+<table>
+
+<tr>
+<td><a href="#E5AnimatedLabel">E5AnimatedLabel</a></td>
+<td>Class implementing a label widget showing an animated pixmap.</td>
+</tr>
+</table>
+<h3>Functions</h3>
+
+<table>
+<tr><td>None</td></tr>
+</table>
+<hr />
+<hr />
+<a NAME="E5AnimatedLabel" ID="E5AnimatedLabel"></a>
+<h2>E5AnimatedLabel</h2>
+
+<p>
+    Class implementing a label widget showing an animated pixmap.
+</p>
+<h3>Derived from</h3>
+QLabel
+<h3>Class Attributes</h3>
+
+<table>
+<tr><td>None</td></tr>
+</table>
+<h3>Class Methods</h3>
+
+<table>
+<tr><td>None</td></tr>
+</table>
+<h3>Methods</h3>
+
+<table>
+
+<tr>
+<td><a href="#E5AnimatedLabel.__init__">E5AnimatedLabel</a></td>
+<td>Constructor</td>
+</tr>
+<tr>
+<td><a href="#E5AnimatedLabel.__animate">__animate</a></td>
+<td>Private slot to animate the pixmap.</td>
+</tr>
+<tr>
+<td><a href="#E5AnimatedLabel.__loadAnimationFile">__loadAnimationFile</a></td>
+<td>Private method to load an animation file.</td>
+</tr>
+<tr>
+<td><a href="#E5AnimatedLabel.getAnimationFile">getAnimationFile</a></td>
+<td>Public method to get the name of the animation file.</td>
+</tr>
+<tr>
+<td><a href="#E5AnimatedLabel.getInterval">getInterval</a></td>
+<td>Public method to get the interval between the animated frames.</td>
+</tr>
+<tr>
+<td><a href="#E5AnimatedLabel.isActive">isActive</a></td>
+<td>Public method to check, if the animation is active.</td>
+</tr>
+<tr>
+<td><a href="#E5AnimatedLabel.isAnimationFileLoaded">isAnimationFileLoaded</a></td>
+<td>Public method to check, if the animation file was loaded.</td>
+</tr>
+<tr>
+<td><a href="#E5AnimatedLabel.reset">reset</a></td>
+<td>Public slot to reset the animation.</td>
+</tr>
+<tr>
+<td><a href="#E5AnimatedLabel.setAnimationFile">setAnimationFile</a></td>
+<td>Public method to set the name of the animation file.</td>
+</tr>
+<tr>
+<td><a href="#E5AnimatedLabel.setInterval">setInterval</a></td>
+<td>Public method to set the interval between the animated frames.</td>
+</tr>
+<tr>
+<td><a href="#E5AnimatedLabel.setPixmap">setPixmap</a></td>
+<td>Public slot to set the pixmap of the label.</td>
+</tr>
+<tr>
+<td><a href="#E5AnimatedLabel.start">start</a></td>
+<td>Public slot to start the animation.</td>
+</tr>
+<tr>
+<td><a href="#E5AnimatedLabel.stop">stop</a></td>
+<td>Public slot to stop the animation.</td>
+</tr>
+</table>
+<h3>Static Methods</h3>
+
+<table>
+<tr><td>None</td></tr>
+</table>
+
+<a NAME="E5AnimatedLabel.__init__" ID="E5AnimatedLabel.__init__"></a>
+<h4>E5AnimatedLabel (Constructor)</h4>
+<b>E5AnimatedLabel</b>(<i>parent=None, *, animationFile="", interval=100</i>)
+
+<p>
+        Constructor
+</p>
+<dl>
+
+<dt><i>parent</i> (QWidget)</dt>
+<dd>
+reference to the parent window
+</dd>
+<dt><i>animationFile=</i> (str)</dt>
+<dd>
+path to the file containing the animation data
+</dd>
+<dt><i>interval=</i> (int)</dt>
+<dd>
+interval in milliseconds between animation frames
+</dd>
+</dl>
+<a NAME="E5AnimatedLabel.__animate" ID="E5AnimatedLabel.__animate"></a>
+<h4>E5AnimatedLabel.__animate</h4>
+<b>__animate</b>(<i></i>)
+
+<p>
+        Private slot to animate the pixmap.
+</p>
+<a NAME="E5AnimatedLabel.__loadAnimationFile" ID="E5AnimatedLabel.__loadAnimationFile"></a>
+<h4>E5AnimatedLabel.__loadAnimationFile</h4>
+<b>__loadAnimationFile</b>(<i>animationFile</i>)
+
+<p>
+        Private method to load an animation file.
+</p>
+<dl>
+
+<dt><i>animationFile</i> (str)</dt>
+<dd>
+path to the file containing the animation data
+</dd>
+</dl>
+<a NAME="E5AnimatedLabel.getAnimationFile" ID="E5AnimatedLabel.getAnimationFile"></a>
+<h4>E5AnimatedLabel.getAnimationFile</h4>
+<b>getAnimationFile</b>(<i></i>)
+
+<p>
+        Public method to get the name of the animation file.
+</p>
+<dl>
+<dt>Returns:</dt>
+<dd>
+path to the file containing the animation data
+</dd>
+</dl>
+<dl>
+<dt>Return Type:</dt>
+<dd>
+str
+</dd>
+</dl>
+<a NAME="E5AnimatedLabel.getInterval" ID="E5AnimatedLabel.getInterval"></a>
+<h4>E5AnimatedLabel.getInterval</h4>
+<b>getInterval</b>(<i></i>)
+
+<p>
+        Public method to get the interval between the animated frames.
+</p>
+<dl>
+<dt>Returns:</dt>
+<dd>
+interval in milliseconds between animation frames
+</dd>
+</dl>
+<dl>
+<dt>Return Type:</dt>
+<dd>
+int
+</dd>
+</dl>
+<a NAME="E5AnimatedLabel.isActive" ID="E5AnimatedLabel.isActive"></a>
+<h4>E5AnimatedLabel.isActive</h4>
+<b>isActive</b>(<i></i>)
+
+<p>
+        Public method to check, if the animation is active.
+</p>
+<dl>
+<dt>Returns:</dt>
+<dd>
+flag indicating an active animation
+</dd>
+</dl>
+<dl>
+<dt>Return Type:</dt>
+<dd>
+bool
+</dd>
+</dl>
+<a NAME="E5AnimatedLabel.isAnimationFileLoaded" ID="E5AnimatedLabel.isAnimationFileLoaded"></a>
+<h4>E5AnimatedLabel.isAnimationFileLoaded</h4>
+<b>isAnimationFileLoaded</b>(<i></i>)
+
+<p>
+        Public method to check, if the animation file was loaded.
+</p>
+<dl>
+<dt>Returns:</dt>
+<dd>
+flag indicating a successfully loaded animation file
+</dd>
+</dl>
+<dl>
+<dt>Return Type:</dt>
+<dd>
+bool
+</dd>
+</dl>
+<a NAME="E5AnimatedLabel.reset" ID="E5AnimatedLabel.reset"></a>
+<h4>E5AnimatedLabel.reset</h4>
+<b>reset</b>(<i></i>)
+
+<p>
+        Public slot to reset the animation.
+</p>
+<a NAME="E5AnimatedLabel.setAnimationFile" ID="E5AnimatedLabel.setAnimationFile"></a>
+<h4>E5AnimatedLabel.setAnimationFile</h4>
+<b>setAnimationFile</b>(<i>animationFile</i>)
+
+<p>
+        Public method to set the name of the animation file.
+</p>
+<dl>
+
+<dt><i>animationFile</i> (str)</dt>
+<dd>
+path to the file containing the animation data
+</dd>
+</dl>
+<a NAME="E5AnimatedLabel.setInterval" ID="E5AnimatedLabel.setInterval"></a>
+<h4>E5AnimatedLabel.setInterval</h4>
+<b>setInterval</b>(<i>interval</i>)
+
+<p>
+        Public method to set the interval between the animated frames.
+</p>
+<dl>
+
+<dt><i>interval</i> (int)</dt>
+<dd>
+interval in milliseconds between animation frames
+</dd>
+</dl>
+<a NAME="E5AnimatedLabel.setPixmap" ID="E5AnimatedLabel.setPixmap"></a>
+<h4>E5AnimatedLabel.setPixmap</h4>
+<b>setPixmap</b>(<i>pixmap</i>)
+
+<p>
+        Public slot to set the pixmap of the label.
+</p>
+<p>
+        Setting a standard pixmap will stop the animation and set the given
+        pixmap without animating it. Thereafter the animation has to be
+        restarted with the start() method.
+</p>
+<dl>
+
+<dt><i>pixmap</i> (QPixmap)</dt>
+<dd>
+pixmap to be set
+</dd>
+</dl>
+<a NAME="E5AnimatedLabel.start" ID="E5AnimatedLabel.start"></a>
+<h4>E5AnimatedLabel.start</h4>
+<b>start</b>(<i></i>)
+
+<p>
+        Public slot to start the animation.
+</p>
+<a NAME="E5AnimatedLabel.stop" ID="E5AnimatedLabel.stop"></a>
+<h4>E5AnimatedLabel.stop</h4>
+<b>stop</b>(<i></i>)
+
+<p>
+        Public slot to stop the animation.
+</p>
+<div align="right"><a href="#top">Up</a></div>
+<hr />
+</body></html>
\ No newline at end of file
--- a/eric6/Documentation/Source/eric6.E5Gui.E5TabWidget.html	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/Documentation/Source/eric6.E5Gui.E5TabWidget.html	Sat May 02 13:51:07 2020 +0200
@@ -339,31 +339,36 @@
 </dl>
 <a NAME="E5TabWidget.animationLabel" ID="E5TabWidget.animationLabel"></a>
 <h4>E5TabWidget.animationLabel</h4>
-<b>animationLabel</b>(<i>index, animationFile, speed=100</i>)
+<b>animationLabel</b>(<i>index, animationFile, interval=100</i>)
 
 <p>
         Public slot to set an animated icon.
 </p>
 <dl>
 
-<dt><i>index</i></dt>
+<dt><i>index</i> (int)</dt>
 <dd>
-tab index (integer)
+tab index
 </dd>
-<dt><i>animationFile</i></dt>
+<dt><i>animationFile</i> (str)</dt>
 <dd>
-name of the file containing the animation (string)
+name of the file containing the animation
 </dd>
-<dt><i>speed</i></dt>
+<dt><i>interval</i> (int)</dt>
 <dd>
-animation speed of the icon in percent of the original
-            icon's speed (integer)
+interval in milliseconds between animation frames
 </dd>
 </dl>
 <dl>
 <dt>Returns:</dt>
 <dd>
-reference to the created label (QLabel)
+reference to the created label
+</dd>
+</dl>
+<dl>
+<dt>Return Type:</dt>
+<dd>
+E5AnimatedLabel
 </dd>
 </dl>
 <a NAME="E5TabWidget.moveTab" ID="E5TabWidget.moveTab"></a>
--- a/eric6/Documentation/Source/eric6.Graphics.AssociationItem.html	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/Documentation/Source/eric6.Graphics.AssociationItem.html	Sat May 02 13:51:07 2020 +0200
@@ -155,7 +155,7 @@
 </dl>
 <a NAME="AssociationItem.__init__" ID="AssociationItem.__init__"></a>
 <h4>AssociationItem (Constructor)</h4>
-<b>AssociationItem</b>(<i>itemA, itemB, assocType=Normal, topToBottom=False, parent=None</i>)
+<b>AssociationItem</b>(<i>itemA, itemB, assocType=Normal, topToBottom=False, colors=None, parent=None</i>)
 
 <p>
         Constructor
@@ -179,14 +179,18 @@
             <li>Imports</li>
             </ul>
 </dd>
-<dt><i>topToBottom=</i></dt>
+<dt><i>topToBottom</i> (bool)</dt>
 <dd>
 flag indicating to draw the association
-            from item A top to item B bottom (boolean)
+            from item A top to item B bottom
 </dd>
-<dt><i>parent=</i></dt>
+<dt><i>colors</i> (tuple of (QColor, QColor))</dt>
 <dd>
-reference to the parent object (QGraphicsItem)
+tuple containing the foreground and background colors
+</dd>
+<dt><i>parent</i> (QGraphicsItem)</dt>
+<dd>
+reference to the parent object
 </dd>
 </dl>
 <a NAME="AssociationItem.__calculateEndingPoints_center" ID="AssociationItem.__calculateEndingPoints_center"></a>
--- a/eric6/Documentation/Source/eric6.Graphics.ClassItem.html	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/Documentation/Source/eric6.Graphics.ClassItem.html	Sat May 02 13:51:07 2020 +0200
@@ -113,46 +113,48 @@
 
 <a NAME="ClassItem.__init__" ID="ClassItem.__init__"></a>
 <h4>ClassItem (Constructor)</h4>
-<b>ClassItem</b>(<i>model=None, external=False, x=0, y=0, rounded=False, noAttrs=False, parent=None, scene=None</i>)
+<b>ClassItem</b>(<i>model=None, external=False, x=0, y=0, rounded=False, noAttrs=False, colors=None, parent=None, scene=None</i>)
 
 <p>
         Constructor
 </p>
 <dl>
 
-<dt><i>model</i></dt>
+<dt><i>model</i> (ClassModel)</dt>
 <dd>
-class model containing the class data (ClassModel)
+class model containing the class data
 </dd>
-<dt><i>external</i></dt>
+<dt><i>external</i> (boolean)</dt>
 <dd>
 flag indicating a class defined outside our scope
-            (boolean)
 </dd>
-<dt><i>x</i></dt>
+<dt><i>x</i> (int)</dt>
 <dd>
-x-coordinate (integer)
+x-coordinate
 </dd>
-<dt><i>y</i></dt>
+<dt><i>y</i> (int)</dt>
 <dd>
-y-coordinate (integer)
+y-coordinate
 </dd>
-<dt><i>rounded=</i></dt>
+<dt><i>rounded</i> (bool)</dt>
 <dd>
-flag indicating a rounded corner (boolean)
+flag indicating a rounded corner
 </dd>
-<dt><i>noAttrs=</i></dt>
+<dt><i>noAttrs</i> (bool)</dt>
 <dd>
 flag indicating, that no attributes should be shown
-            (boolean)
 </dd>
-<dt><i>parent=</i></dt>
+<dt><i>colors</i> (tuple of (QColor, QColor))</dt>
 <dd>
-reference to the parent object (QGraphicsItem)
+tuple containing the foreground and background colors
 </dd>
-<dt><i>scene=</i></dt>
+<dt><i>parent</i> (QGraphicsItem)</dt>
 <dd>
-reference to the scene object (QGraphicsScene)
+reference to the parent object
+</dd>
+<dt><i>scene</i> (QGraphicsScene)</dt>
+<dd>
+reference to the scene object
 </dd>
 </dl>
 <a NAME="ClassItem.__calculateSize" ID="ClassItem.__calculateSize"></a>
--- a/eric6/Documentation/Source/eric6.Graphics.ModuleItem.html	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/Documentation/Source/eric6.Graphics.ModuleItem.html	Sat May 02 13:51:07 2020 +0200
@@ -109,36 +109,40 @@
 
 <a NAME="ModuleItem.__init__" ID="ModuleItem.__init__"></a>
 <h4>ModuleItem (Constructor)</h4>
-<b>ModuleItem</b>(<i>model=None, x=0, y=0, rounded=False, parent=None, scene=None</i>)
+<b>ModuleItem</b>(<i>model=None, x=0, y=0, rounded=False, colors=None, parent=None, scene=None</i>)
 
 <p>
         Constructor
 </p>
 <dl>
 
-<dt><i>model</i></dt>
+<dt><i>model</i> (ModuleModel)</dt>
 <dd>
-module model containing the module data (ModuleModel)
+module model containing the module data
 </dd>
-<dt><i>x</i></dt>
+<dt><i>x</i> (int)</dt>
 <dd>
-x-coordinate (integer)
+x-coordinate
 </dd>
-<dt><i>y</i></dt>
+<dt><i>y</i> (int)</dt>
 <dd>
-y-coordinate (integer)
+y-coordinate
 </dd>
-<dt><i>rounded=</i></dt>
+<dt><i>rounded</i> (bool)</dt>
 <dd>
-flag indicating a rounded corner (boolean)
+flag indicating a rounded corner
 </dd>
-<dt><i>parent=</i></dt>
+<dt><i>colors</i> (tuple of (QColor, QColor))</dt>
 <dd>
-reference to the parent object (QGraphicsItem)
+tuple containing the foreground and background colors
 </dd>
-<dt><i>scene=</i></dt>
+<dt><i>parent</i> (QGraphicsItem)</dt>
 <dd>
-reference to the scene object (QGraphicsScene)
+reference to the parent object
+</dd>
+<dt><i>scene</i> (QGraphicsScene)</dt>
+<dd>
+reference to the scene object
 </dd>
 </dl>
 <a NAME="ModuleItem.__calculateSize" ID="ModuleItem.__calculateSize"></a>
--- a/eric6/Documentation/Source/eric6.Graphics.PackageItem.html	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/Documentation/Source/eric6.Graphics.PackageItem.html	Sat May 02 13:51:07 2020 +0200
@@ -109,41 +109,45 @@
 
 <a NAME="PackageItem.__init__" ID="PackageItem.__init__"></a>
 <h4>PackageItem (Constructor)</h4>
-<b>PackageItem</b>(<i>model=None, x=0, y=0, rounded=False, noModules=False, parent=None, scene=None</i>)
+<b>PackageItem</b>(<i>model=None, x=0, y=0, rounded=False, noModules=False, colors=None, parent=None, scene=None</i>)
 
 <p>
         Constructor
 </p>
 <dl>
 
-<dt><i>model</i></dt>
+<dt><i>model</i> (PackageModel)</dt>
 <dd>
-package model containing the package data (PackageModel)
+package model containing the package data
 </dd>
-<dt><i>x</i></dt>
+<dt><i>x</i> (int)</dt>
 <dd>
-x-coordinate (integer)
+x-coordinate
 </dd>
-<dt><i>y</i></dt>
+<dt><i>y</i> (int)</dt>
 <dd>
-y-coordinate (integer)
+y-coordinate
 </dd>
-<dt><i>rounded</i></dt>
+<dt><i>rounded</i> (bool)</dt>
 <dd>
-flag indicating a rounded corner (boolean)
+flag indicating a rounded corner
 </dd>
-<dt><i>noModules=</i></dt>
+<dt><i>noModules</i> (bool)</dt>
 <dd>
 flag indicating, that no module names should be
-            shown (boolean)
+            shown
 </dd>
-<dt><i>parent=</i></dt>
+<dt><i>colors</i> (tuple of (QColor, QColor))</dt>
 <dd>
-reference to the parent object (QGraphicsItem)
+tuple containing the foreground and background colors
 </dd>
-<dt><i>scene=</i></dt>
+<dt><i>parent</i> (QGraphicsItem)</dt>
 <dd>
-reference to the scene object (QGraphicsScene)
+reference to the parent object
+</dd>
+<dt><i>scene</i> (QGraphicsScene)</dt>
+<dd>
+reference to the scene object
 </dd>
 </dl>
 <a NAME="PackageItem.__calculateSize" ID="PackageItem.__calculateSize"></a>
--- a/eric6/Documentation/Source/eric6.Graphics.UMLItem.html	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/Documentation/Source/eric6.Graphics.UMLItem.html	Sat May 02 13:51:07 2020 +0200
@@ -145,32 +145,36 @@
 
 <a NAME="UMLItem.__init__" ID="UMLItem.__init__"></a>
 <h4>UMLItem (Constructor)</h4>
-<b>UMLItem</b>(<i>model=None, x=0, y=0, rounded=False, parent=None</i>)
+<b>UMLItem</b>(<i>model=None, x=0, y=0, rounded=False, colors=None, parent=None</i>)
 
 <p>
         Constructor
 </p>
 <dl>
 
-<dt><i>model</i></dt>
+<dt><i>model</i> (UMLModel)</dt>
 <dd>
-UML model containing the item data (UMLModel)
+UML model containing the item data
 </dd>
-<dt><i>x</i></dt>
+<dt><i>x</i> (int)</dt>
 <dd>
-x-coordinate (integer)
+x-coordinate
 </dd>
-<dt><i>y</i></dt>
+<dt><i>y</i> (int)</dt>
 <dd>
-y-coordinate (integer)
+y-coordinate
 </dd>
-<dt><i>rounded</i></dt>
+<dt><i>rounded</i> (bool)</dt>
 <dd>
-flag indicating a rounded corner (boolean)
+flag indicating a rounded corner
 </dd>
-<dt><i>parent=</i></dt>
+<dt><i>colors</i> (tuple of (QColor, QColor))</dt>
 <dd>
-reference to the parent object (QGraphicsItem)
+tuple containing the foreground and background colors
+</dd>
+<dt><i>parent</i> (QGraphicsItem)</dt>
+<dd>
+reference to the parent object
 </dd>
 </dl>
 <a NAME="UMLItem.addAssociation" ID="UMLItem.addAssociation"></a>
--- a/eric6/Documentation/Source/eric6.MicroPython.MicroPythonGraphWidget.html	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/Documentation/Source/eric6.MicroPython.MicroPythonGraphWidget.html	Sat May 02 13:51:07 2020 +0200
@@ -101,6 +101,10 @@
 <td>Private slot to save the raw data to a CSV file.</td>
 </tr>
 <tr>
+<td><a href="#MicroPythonGraphWidget.preferencesChanged">preferencesChanged</a></td>
+<td>Public slot to apply changed preferences.</td>
+</tr>
+<tr>
 <td><a href="#MicroPythonGraphWidget.processData">processData</a></td>
 <td>Public slot to process the raw data.</td>
 </tr>
@@ -207,6 +211,13 @@
 <p>
         Private slot to save the raw data to a CSV file.
 </p>
+<a NAME="MicroPythonGraphWidget.preferencesChanged" ID="MicroPythonGraphWidget.preferencesChanged"></a>
+<h4>MicroPythonGraphWidget.preferencesChanged</h4>
+<b>preferencesChanged</b>(<i></i>)
+
+<p>
+        Public slot to apply changed preferences.
+</p>
 <a NAME="MicroPythonGraphWidget.processData" ID="MicroPythonGraphWidget.processData"></a>
 <h4>MicroPythonGraphWidget.processData</h4>
 <b>processData</b>(<i>data</i>)
--- a/eric6/Documentation/Source/eric6.MicroPython.MicrobitDevices.html	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/Documentation/Source/eric6.MicroPython.MicrobitDevices.html	Sat May 02 13:51:07 2020 +0200
@@ -23,7 +23,8 @@
 <h1>eric6.MicroPython.MicrobitDevices</h1>
 
 <p>
-Module implementing the device interface class for BBC micro:bit boards.
+Module implementing the device interface class for BBC micro:bit and
+Calliope mini boards.
 </p>
 <h3>Global Attributes</h3>
 
@@ -36,7 +37,7 @@
 
 <tr>
 <td><a href="#MicrobitDevice">MicrobitDevice</a></td>
-<td>Class implementing the device for BBC micro:bit boards.</td>
+<td>Class implementing the device for BBC micro:bit and Calliope mini boards.</td>
 </tr>
 </table>
 <h3>Functions</h3>
@@ -50,7 +51,7 @@
 <h2>MicrobitDevice</h2>
 
 <p>
-    Class implementing the device for BBC micro:bit boards.
+    Class implementing the device for BBC micro:bit and Calliope mini boards.
 </p>
 <h3>Derived from</h3>
 MicroPythonDevice
@@ -149,7 +150,7 @@
 
 <a NAME="MicrobitDevice.__init__" ID="MicrobitDevice.__init__"></a>
 <h4>MicrobitDevice (Constructor)</h4>
-<b>MicrobitDevice</b>(<i>microPythonWidget, parent=None</i>)
+<b>MicrobitDevice</b>(<i>microPythonWidget, deviceType, parent=None</i>)
 
 <p>
         Constructor
@@ -160,6 +161,10 @@
 <dd>
 reference to the main MicroPython widget
 </dd>
+<dt><i>deviceType</i> (str)</dt>
+<dd>
+type of the device
+</dd>
 <dt><i>parent</i> (QObject)</dt>
 <dd>
 reference to the parent object
--- a/eric6/Documentation/Source/eric6.Plugins.UiExtensionPlugins.Translator.Translator.html	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/Documentation/Source/eric6.Plugins.UiExtensionPlugins.Translator.Translator.html	Sat May 02 13:51:07 2020 +0200
@@ -97,20 +97,25 @@
 
 <a NAME="Translator.__init__" ID="Translator.__init__"></a>
 <h4>Translator (Constructor)</h4>
-<b>Translator</b>(<i>plugin, parent=None</i>)
+<b>Translator</b>(<i>plugin, usesDarkPalette, parent=None</i>)
 
 <p>
         Constructor
 </p>
 <dl>
 
-<dt><i>plugin</i></dt>
+<dt><i>plugin</i> (TranslatorPlugin)</dt>
 <dd>
-reference to the plugin object (TranslatorPlugin)
+reference to the plugin object
 </dd>
-<dt><i>parent</i></dt>
+<dt><i>usesDarkPalette</i> (bool)</dt>
 <dd>
-parent (QObject)
+flag indicating that the platform uses a palette
+            with a dark background
+</dd>
+<dt><i>parent</i> (QObject)</dt>
+<dd>
+parent
 </dd>
 </dl>
 <a NAME="Translator.__activateWidget" ID="Translator.__activateWidget"></a>
--- a/eric6/Documentation/Source/eric6.Preferences.ConfigurationPages.IconsPage.html	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/Documentation/Source/eric6.Preferences.ConfigurationPages.IconsPage.html	Sat May 02 13:51:07 2020 +0200
@@ -77,6 +77,10 @@
 <td>Constructor</td>
 </tr>
 <tr>
+<td><a href="#IconsPage.__getSelectedDefaultIconsPath">__getSelectedDefaultIconsPath</a></td>
+<td>Private method to determine the selected default icons path.</td>
+</tr>
+<tr>
 <td><a href="#IconsPage.on_addIconDirectoryButton_clicked">on_addIconDirectoryButton_clicked</a></td>
 <td>Private slot to add the icon directory displayed to the listbox.</td>
 </tr>
@@ -97,6 +101,10 @@
 <td>Private slot to handle the textChanged signal of the directory picker.</td>
 </tr>
 <tr>
+<td><a href="#IconsPage.on_showDefaultIconsButton_clicked">on_showDefaultIconsButton_clicked</a></td>
+<td>Private slot to display a preview of the selected default icons.</td>
+</tr>
+<tr>
 <td><a href="#IconsPage.on_showIconsButton_clicked">on_showIconsButton_clicked</a></td>
 <td>Private slot to display a preview of an icons directory.</td>
 </tr>
@@ -122,6 +130,25 @@
 <p>
         Constructor
 </p>
+<a NAME="IconsPage.__getSelectedDefaultIconsPath" ID="IconsPage.__getSelectedDefaultIconsPath"></a>
+<h4>IconsPage.__getSelectedDefaultIconsPath</h4>
+<b>__getSelectedDefaultIconsPath</b>(<i></i>)
+
+<p>
+        Private method to determine the selected default icons path.
+</p>
+<dl>
+<dt>Returns:</dt>
+<dd>
+selected default icons path
+</dd>
+</dl>
+<dl>
+<dt>Return Type:</dt>
+<dd>
+str
+</dd>
+</dl>
 <a NAME="IconsPage.on_addIconDirectoryButton_clicked" ID="IconsPage.on_addIconDirectoryButton_clicked"></a>
 <h4>IconsPage.on_addIconDirectoryButton_clicked</h4>
 <b>on_addIconDirectoryButton_clicked</b>(<i></i>)
@@ -172,6 +199,13 @@
 the text of the directory picker (string)
 </dd>
 </dl>
+<a NAME="IconsPage.on_showDefaultIconsButton_clicked" ID="IconsPage.on_showDefaultIconsButton_clicked"></a>
+<h4>IconsPage.on_showDefaultIconsButton_clicked</h4>
+<b>on_showDefaultIconsButton_clicked</b>(<i></i>)
+
+<p>
+        Private slot to display a preview of the selected default icons.
+</p>
 <a NAME="IconsPage.on_showIconsButton_clicked" ID="IconsPage.on_showIconsButton_clicked"></a>
 <h4>IconsPage.on_showIconsButton_clicked</h4>
 <b>on_showIconsButton_clicked</b>(<i></i>)
--- a/eric6/Documentation/Source/eric6.Preferences.ConfigurationPages.IconsPreviewDialog.html	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/Documentation/Source/eric6.Preferences.ConfigurationPages.IconsPreviewDialog.html	Sat May 02 13:51:07 2020 +0200
@@ -72,6 +72,18 @@
 <td><a href="#IconsPreviewDialog.__init__">IconsPreviewDialog</a></td>
 <td>Constructor</td>
 </tr>
+<tr>
+<td><a href="#IconsPreviewDialog.on_directoryCombo_currentTextChanged">on_directoryCombo_currentTextChanged</a></td>
+<td>Private slot to show the icons of the selected icon directory.</td>
+</tr>
+<tr>
+<td><a href="#IconsPreviewDialog.on_invertButton_toggled">on_invertButton_toggled</a></td>
+<td>Private slot to show the icons on an inverted background.</td>
+</tr>
+<tr>
+<td><a href="#IconsPreviewDialog.on_refreshButton_clicked">on_refreshButton_clicked</a></td>
+<td>Private slot to refresh the view.</td>
+</tr>
 </table>
 <h3>Static Methods</h3>
 
@@ -81,22 +93,57 @@
 
 <a NAME="IconsPreviewDialog.__init__" ID="IconsPreviewDialog.__init__"></a>
 <h4>IconsPreviewDialog (Constructor)</h4>
-<b>IconsPreviewDialog</b>(<i>parent, dirName</i>)
+<b>IconsPreviewDialog</b>(<i>directories, parent=None</i>)
 
 <p>
         Constructor
 </p>
 <dl>
 
-<dt><i>parent</i></dt>
+<dt><i>directories</i> (list of str)</dt>
 <dd>
-parent widget (QWidget)
+list of directories to be shown
 </dd>
-<dt><i>dirName</i></dt>
+<dt><i>parent</i> (QWidget)</dt>
 <dd>
-name of directory to show (string)
+parent widget
 </dd>
 </dl>
+<a NAME="IconsPreviewDialog.on_directoryCombo_currentTextChanged" ID="IconsPreviewDialog.on_directoryCombo_currentTextChanged"></a>
+<h4>IconsPreviewDialog.on_directoryCombo_currentTextChanged</h4>
+<b>on_directoryCombo_currentTextChanged</b>(<i>dirName</i>)
+
+<p>
+        Private slot to show the icons of the selected icon directory.
+</p>
+<dl>
+
+<dt><i>dirName</i> (str)</dt>
+<dd>
+selected icon directory
+</dd>
+</dl>
+<a NAME="IconsPreviewDialog.on_invertButton_toggled" ID="IconsPreviewDialog.on_invertButton_toggled"></a>
+<h4>IconsPreviewDialog.on_invertButton_toggled</h4>
+<b>on_invertButton_toggled</b>(<i>checked</i>)
+
+<p>
+        Private slot to show the icons on an inverted background.
+</p>
+<dl>
+
+<dt><i>checked</i> (bool)</dt>
+<dd>
+state of the button
+</dd>
+</dl>
+<a NAME="IconsPreviewDialog.on_refreshButton_clicked" ID="IconsPreviewDialog.on_refreshButton_clicked"></a>
+<h4>IconsPreviewDialog.on_refreshButton_clicked</h4>
+<b>on_refreshButton_clicked</b>(<i></i>)
+
+<p>
+        Private slot to refresh the view.
+</p>
 <div align="right"><a href="#top">Up</a></div>
 <hr />
 </body></html>
\ No newline at end of file
--- a/eric6/Documentation/Source/eric6.Project.Project.html	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/Documentation/Source/eric6.Project.Project.html	Sat May 02 13:51:07 2020 +0200
@@ -321,6 +321,10 @@
 <td>Private method to initialize the list of supported project types.</td>
 </tr>
 <tr>
+<td><a href="#Project.__isInPdata">__isInPdata</a></td>
+<td>Private method used to check, if the passed in filename is project controlled..</td>
+</tr>
+<tr>
 <td><a href="#Project.__loadDiagram">__loadDiagram</a></td>
 <td>Private slot to load a diagram from file.</td>
 </tr>
@@ -1013,6 +1017,10 @@
 <td>Public method to set the translation pattern.</td>
 </tr>
 <tr>
+<td><a href="#Project.startFileSystemMonitoring">startFileSystemMonitoring</a></td>
+<td>Public method to (re)start monitoring the project file system.</td>
+</tr>
+<tr>
 <td><a href="#Project.startStatusMonitor">startStatusMonitor</a></td>
 <td>Public method to start the VCS status monitor thread.</td>
 </tr>
@@ -1021,6 +1029,10 @@
 <td>Public method to check, if a path starts with the project path.</td>
 </tr>
 <tr>
+<td><a href="#Project.stopFileSystemMonitoring">stopFileSystemMonitoring</a></td>
+<td>Public method to stop monitoring the project file system.</td>
+</tr>
+<tr>
 <td><a href="#Project.stopStatusMonitor">stopStatusMonitor</a></td>
 <td>Public method to stop the VCS status monitor thread.</td>
 </tr>
@@ -1324,6 +1336,33 @@
 <p>
         Private method to initialize the list of supported project types.
 </p>
+<a NAME="Project.__isInPdata" ID="Project.__isInPdata"></a>
+<h4>Project.__isInPdata</h4>
+<b>__isInPdata</b>(<i>fn</i>)
+
+<p>
+        Private method used to check, if the passed in filename is project
+        controlled..
+</p>
+<dl>
+
+<dt><i>fn</i> (str)</dt>
+<dd>
+filename to be checked
+</dd>
+</dl>
+<dl>
+<dt>Returns:</dt>
+<dd>
+flag indicating membership
+</dd>
+</dl>
+<dl>
+<dt>Return Type:</dt>
+<dd>
+bool
+</dd>
+</dl>
 <a NAME="Project.__loadDiagram" ID="Project.__loadDiagram"></a>
 <h4>Project.__loadDiagram</h4>
 <b>__loadDiagram</b>(<i></i>)
@@ -3878,6 +3917,13 @@
 translation pattern
 </dd>
 </dl>
+<a NAME="Project.startFileSystemMonitoring" ID="Project.startFileSystemMonitoring"></a>
+<h4>Project.startFileSystemMonitoring</h4>
+<b>startFileSystemMonitoring</b>(<i></i>)
+
+<p>
+        Public method to (re)start monitoring the project file system.
+</p>
 <a NAME="Project.startStatusMonitor" ID="Project.startStatusMonitor"></a>
 <h4>Project.startStatusMonitor</h4>
 <b>startStatusMonitor</b>(<i></i>)
@@ -3906,6 +3952,13 @@
             (boolean)
 </dd>
 </dl>
+<a NAME="Project.stopFileSystemMonitoring" ID="Project.stopFileSystemMonitoring"></a>
+<h4>Project.stopFileSystemMonitoring</h4>
+<b>stopFileSystemMonitoring</b>(<i></i>)
+
+<p>
+        Public method to stop monitoring the project file system.
+</p>
 <a NAME="Project.stopStatusMonitor" ID="Project.stopStatusMonitor"></a>
 <h4>Project.stopStatusMonitor</h4>
 <b>stopStatusMonitor</b>(<i></i>)
--- a/eric6/Documentation/Source/eric6.Project.ProjectBrowserModel.html	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/Documentation/Source/eric6.Project.ProjectBrowserModel.html	Sat May 02 13:51:07 2020 +0200
@@ -480,6 +480,14 @@
 <td>Public method to repopulate an item.</td>
 </tr>
 <tr>
+<td><a href="#ProjectBrowserModel.startFileSystemMonitoring">startFileSystemMonitoring</a></td>
+<td>Public method to (re)start monitoring the project file system.</td>
+</tr>
+<tr>
+<td><a href="#ProjectBrowserModel.stopFileSystemMonitoring">stopFileSystemMonitoring</a></td>
+<td>Public method to stop monitoring the project file system.</td>
+</tr>
+<tr>
 <td><a href="#ProjectBrowserModel.updateVCSStatus">updateVCSStatus</a></td>
 <td>Public method used to update the vcs status of a node.</td>
 </tr>
@@ -884,6 +892,20 @@
 name of the file relative to the project root (string)
 </dd>
 </dl>
+<a NAME="ProjectBrowserModel.startFileSystemMonitoring" ID="ProjectBrowserModel.startFileSystemMonitoring"></a>
+<h4>ProjectBrowserModel.startFileSystemMonitoring</h4>
+<b>startFileSystemMonitoring</b>(<i></i>)
+
+<p>
+        Public method to (re)start monitoring the project file system.
+</p>
+<a NAME="ProjectBrowserModel.stopFileSystemMonitoring" ID="ProjectBrowserModel.stopFileSystemMonitoring"></a>
+<h4>ProjectBrowserModel.stopFileSystemMonitoring</h4>
+<b>stopFileSystemMonitoring</b>(<i></i>)
+
+<p>
+        Public method to stop monitoring the project file system.
+</p>
 <a NAME="ProjectBrowserModel.updateVCSStatus" ID="ProjectBrowserModel.updateVCSStatus"></a>
 <h4>ProjectBrowserModel.updateVCSStatus</h4>
 <b>updateVCSStatus</b>(<i>name, recursive=True</i>)
--- a/eric6/Documentation/Source/eric6.QScintilla.Exporters.ExporterHTML.html	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/Documentation/Source/eric6.QScintilla.Exporters.ExporterHTML.html	Sat May 02 13:51:07 2020 +0200
@@ -115,12 +115,20 @@
 </dl>
 <a NAME="ExporterHTML.__generateFromMarkdown" ID="ExporterHTML.__generateFromMarkdown"></a>
 <h4>ExporterHTML.__generateFromMarkdown</h4>
-<b>__generateFromMarkdown</b>(<i></i>)
+<b>__generateFromMarkdown</b>(<i>useDarkScheme</i>)
 
 <p>
         Private method to convert Markdown text into HTML.
 </p>
 <dl>
+
+<dt><i>useDarkScheme</i> (bool)</dt>
+<dd>
+flag indicating to export using a dark color
+            scheme
+</dd>
+</dl>
+<dl>
 <dt>Returns:</dt>
 <dd>
 processed HTML
--- a/eric6/Documentation/Source/eric6.Toolbox.Startup.html	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/Documentation/Source/eric6.Toolbox.Startup.html	Sat May 02 13:51:07 2020 +0200
@@ -40,6 +40,10 @@
 <table>
 
 <tr>
+<td><a href="#getDefaultIconPaths">getDefaultIconPaths</a></td>
+<td>Module function to determine the default icon paths.</td>
+</tr>
+<tr>
 <td><a href="#handleArgs">handleArgs</a></td>
 <td>Module function to handle the always present commandline options.</td>
 </tr>
@@ -74,6 +78,35 @@
 </table>
 <hr />
 <hr />
+<a NAME="getDefaultIconPaths" ID="getDefaultIconPaths"></a>
+<h2>getDefaultIconPaths</h2>
+<b>getDefaultIconPaths</b>(<i>application</i>)
+
+<p>
+    Module function to determine the default icon paths.
+</p>
+<dl>
+
+<dt><i>application</i> (E5Application)</dt>
+<dd>
+reference to the application object
+</dd>
+</dl>
+<dl>
+<dt>Returns:</dt>
+<dd>
+list of default icon paths
+</dd>
+</dl>
+<dl>
+<dt>Return Type:</dt>
+<dd>
+list of str
+</dd>
+</dl>
+<div align="right"><a href="#top">Up</a></div>
+<hr />
+<hr />
 <a NAME="handleArgs" ID="handleArgs"></a>
 <h2>handleArgs</h2>
 <b>handleArgs</b>(<i>argv, appinfo</i>)
--- a/eric6/Documentation/Source/eric6.UI.CodeDocumentationViewer.html	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/Documentation/Source/eric6.UI.CodeDocumentationViewer.html	Sat May 02 13:51:07 2020 +0200
@@ -395,7 +395,7 @@
 <h3>Class Attributes</h3>
 
 <table>
-<tr><td>None</td></tr>
+<tr><td>EmpytDocument_Dark</td></tr><tr><td>EmpytDocument_Light</td></tr>
 </table>
 <h3>Class Methods</h3>
 
--- a/eric6/Documentation/Source/eric6.UI.Previewers.PreviewerHTMLStyles.html	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/Documentation/Source/eric6.UI.Previewers.PreviewerHTMLStyles.html	Sat May 02 13:51:07 2020 +0200
@@ -28,7 +28,7 @@
 <h3>Global Attributes</h3>
 
 <table>
-<tr><td>css_markdown</td></tr><tr><td>css_pygments</td></tr>
+<tr><td>css_markdown_dark</td></tr><tr><td>css_markdown_light</td></tr><tr><td>css_pygments_dark</td></tr><tr><td>css_pygments_light</td></tr>
 </table>
 <h3>Classes</h3>
 
--- a/eric6/Documentation/Source/eric6.WebBrowser.Sync.SyncCheckPage.html	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/Documentation/Source/eric6.WebBrowser.Sync.SyncCheckPage.html	Sat May 02 13:51:07 2020 +0200
@@ -122,13 +122,13 @@
 </p>
 <dl>
 
-<dt><i>fileName</i></dt>
+<dt><i>fileName</i> (str)</dt>
 <dd>
-name of the file containing the animation (string)
+name of the file containing the animation
 </dd>
-<dt><i>label</i></dt>
+<dt><i>label</i> (E5AnimatedLabel)</dt>
 <dd>
-reference to the label to be animated (QLabel)
+reference to the label to be animated
 </dd>
 </dl>
 <a NAME="SyncCheckPage.__syncError" ID="SyncCheckPage.__syncError"></a>
--- a/eric6/Documentation/Source/index-eric6.E5Gui.html	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/Documentation/Source/index-eric6.E5Gui.html	Sat May 02 13:51:07 2020 +0200
@@ -37,6 +37,10 @@
 <td>Module implementing an Action class extending QAction.</td>
 </tr>
 <tr>
+<td><a href="eric6.E5Gui.E5AnimatedLabel.html">E5AnimatedLabel</a></td>
+<td>Module implementing a label widget showing an animated pixmap.</td>
+</tr>
+<tr>
 <td><a href="eric6.E5Gui.E5AnimatedWidget.html">E5AnimatedWidget</a></td>
 <td>Module implementing an animated widget.</td>
 </tr>
--- a/eric6/Documentation/Source/index-eric6.MicroPython.html	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/Documentation/Source/index-eric6.MicroPython.html	Sat May 02 13:51:07 2020 +0200
@@ -87,7 +87,7 @@
 </tr>
 <tr>
 <td><a href="eric6.MicroPython.MicrobitDevices.html">MicrobitDevices</a></td>
-<td>Module implementing the device interface class for BBC micro:bit boards.</td>
+<td>Module implementing the device interface class for BBC micro:bit and Calliope mini boards.</td>
 </tr>
 <tr>
 <td><a href="eric6.MicroPython.PyBoardDevices.html">PyBoardDevices</a></td>
--- a/eric6/E5Graphics/E5ArrowItem.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/E5Graphics/E5ArrowItem.py	Sat May 02 13:51:07 2020 +0200
@@ -11,7 +11,7 @@
 import math
 
 from PyQt5.QtCore import QPointF, QRectF, QSizeF, QLineF, Qt
-from PyQt5.QtGui import QPen, QPolygonF
+from PyQt5.QtGui import QPen, QPolygonF, QColor
 from PyQt5.QtWidgets import QAbstractGraphicsShapeItem, QGraphicsItem, QStyle
 
 NormalArrow = 1
@@ -26,15 +26,23 @@
     Class implementing an arrow graphics item subclass.
     """
     def __init__(self, origin=None, end=None,
-                 filled=False, arrowType=NormalArrow, parent=None):
+                 filled=False, arrowType=NormalArrow, colors=None,
+                 parent=None):
         """
         Constructor
         
-        @param origin origin of the arrow (QPointF)
-        @param end end point of the arrow (QPointF)
-        @param filled flag indicating a filled arrow head (boolean)
-        @param arrowType arrow type (NormalArrow, WideArrow)
-        @keyparam parent reference to the parent object (QGraphicsItem)
+        @param origin origin of the arrow
+        @type QPointF
+        @param end end point of the arrow
+        @type QPointF
+        @param filled flag indicating a filled arrow head
+        @type bool
+        @param arrowType arrow type
+        @type int, one of NormalArrow, WideArrow
+        @param colors tuple containing the foreground and background colors
+        @type tuple of (QColor, QColor)
+        @param parent reference to the parent object
+        @type QGraphicsItem
         """
         super(E5ArrowItem, self).__init__(parent)
         
@@ -43,6 +51,11 @@
         self._filled = filled
         self._type = arrowType
         
+        if colors is None:
+            self._colors = (QColor(Qt.black), QColor(Qt.white))
+        else:
+            self._colors = colors
+        
         self._halfLength = 13.0
         
         self.setFlag(QGraphicsItem.ItemIsMovable, True)
@@ -114,7 +127,8 @@
         # draw the line first
         line = QLineF(self._origin, self._end)
         painter.setPen(
-            QPen(Qt.black, width, Qt.SolidLine, Qt.FlatCap, Qt.MiterJoin))
+            QPen(self._colors[0], width, Qt.SolidLine, Qt.FlatCap,
+                 Qt.MiterJoin))
         painter.drawLine(line)
         
         # draw the arrow head
@@ -132,9 +146,9 @@
                      self._end.y() - self._halfLength * math.sin(arrowSlope))
         
         if self._filled:
-            painter.setBrush(Qt.black)
+            painter.setBrush(self._colors[0])
         else:
-            painter.setBrush(Qt.white)
+            painter.setBrush(self._colors[1])
         polygon = QPolygonF()
         polygon.append(line.p2())
         polygon.append(a1)
--- a/eric6/E5Graphics/E5GraphicsView.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/E5Graphics/E5GraphicsView.py	Sat May 02 13:51:07 2020 +0200
@@ -14,6 +14,8 @@
 from PyQt5.QtGui import QBrush, QPainter, QPixmap, QFont, QColor
 from PyQt5.QtWidgets import QGraphicsView
 
+from E5Gui.E5Application import e5App
+
 import Preferences
 
 
@@ -45,7 +47,7 @@
         self.setObjectName("E5GraphicsView")
         
         self.__initialSceneSize = self.scene().sceneRect().size()
-        self.setBackgroundBrush(QBrush(Qt.white))
+        self.setBackgroundBrush(QBrush(self.getBackgroundColor()))
         self.setRenderHint(QPainter.Antialiasing, True)
         self.setDragMode(QGraphicsView.RubberBandDrag)
         self.setAlignment(Qt.Alignment(Qt.AlignLeft | Qt.AlignTop))
@@ -70,7 +72,44 @@
             "whole selection.</li>\n"
             "</ul>\n"
         ))
+    
+    def getDrawingColors(self):
+        """
+        Public method to get the configured drawing colors.
         
+        @return tuple containing the foreground and background colors
+        @rtype tuple of (QColor, QColor)
+        """
+        drawingMode = Preferences.getGraphics("DrawingMode")
+        if drawingMode == "automatic":
+            if e5App().usesDarkPalette():
+                drawingMode = "white_black"
+            else:
+                drawingMode = "black_white"
+        
+        if drawingMode == "white_black":
+            return (QColor("#ffffff"), QColor("#262626"))
+        else:
+            return (QColor("#000000"), QColor("#ffffff"))
+    
+    def getForegroundColor(self):
+        """
+        Public method to get the configured foreground color.
+        
+        @return foreground color
+        @rtype QColor
+        """
+        return self.getDrawingColors()[0]
+    
+    def getBackgroundColor(self):
+        """
+        Public method to get the configured background color.
+        
+        @return background color
+        @rtype QColor
+        """
+        return self.getDrawingColors()[1]
+    
     def __levelForZoom(self, zoom):
         """
         Private method determining the zoom level index given a zoom factor.
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/eric6/E5Gui/E5AnimatedLabel.py	Sat May 02 13:51:07 2020 +0200
@@ -0,0 +1,180 @@
+# -*- coding: utf-8 -*-
+
+# Copyright (c) 2020 Detlev Offenbach <detlev@die-offenbachs.de>
+#
+
+"""
+Module implementing a label widget showing an animated pixmap.
+"""
+
+from PyQt5.QtCore import pyqtSlot, QTimer
+from PyQt5.QtGui import QPixmap
+from PyQt5.QtWidgets import QLabel
+
+import UI.PixmapCache
+
+
+class E5AnimatedLabel(QLabel):
+    """
+    Class implementing a label widget showing an animated pixmap.
+    """
+    def __init__(self, parent=None, *, animationFile="", interval=100):
+        """
+        Constructor
+        
+        @param parent reference to the parent window
+        @type QWidget
+        @keyparam animationFile path to the file containing the animation data
+        @type str
+        @keyparam interval interval in milliseconds between animation frames
+        @type int
+        """
+        super(E5AnimatedLabel, self).__init__(parent)
+        
+        self.__timer = QTimer(self)
+        self.__timer.setInterval(interval)
+        self.__timer.timeout.connect(self.__animate)
+        
+        self.__currentFrame = 0
+        self.__frames = 0
+        self.__pixmap = None
+        self.__pixmapHeight = 0
+        self.__animationFile = ""
+        self.__animationFileLoaded = False
+        
+        self.__loadAnimationFile(animationFile)
+    
+    def __loadAnimationFile(self, animationFile):
+        """
+        Private method to load an animation file.
+        
+        @param animationFile path to the file containing the animation data
+        @type str
+        """
+        self.__animationFile = animationFile
+        
+        pixmap = UI.PixmapCache.getPixmap(animationFile)
+        if not pixmap.isNull():
+            self.__pixmap = pixmap
+            self.__pixmapHeight = pixmap.height()
+            self.__frames = pixmap.width() // pixmap.height()
+            # assume quadratic animation frames
+            self.__animationFileLoaded = True
+        else:
+            self.__pixmap = QPixmap()
+            self.__pixmapHeight = 0
+            self.__frames = 0
+            self.__animationFileLoaded = False
+        
+        self.reset()
+    
+    @pyqtSlot()
+    def __animate(self):
+        """
+        Private slot to animate the pixmap.
+        """
+        if self.__animationFileLoaded:
+            self.__currentFrame = (self.__currentFrame + 1) % self.__frames
+            super(E5AnimatedLabel, self).setPixmap(self.__pixmap.copy(
+                self.__currentFrame * self.__pixmapHeight,
+                0,
+                self.__pixmapHeight,
+                self.__pixmapHeight
+            ))
+        else:
+            self.clear()
+    
+    @pyqtSlot()
+    def reset(self):
+        """
+        Public slot to reset the animation.
+        """
+        self.__currentFrame = -1
+        self.__animate()
+    
+    @pyqtSlot()
+    def start(self):
+        """
+        Public slot to start the animation.
+        """
+        if self.__animationFileLoaded:
+            self.__timer.start()
+    
+    @pyqtSlot()
+    def stop(self):
+        """
+        Public slot to stop the animation.
+        """
+        self.__timer.stop()
+    
+    def isActive(self):
+        """
+        Public method to check, if the animation is active.
+        
+        @return flag indicating an active animation
+        @rtype bool
+        """
+        return self.__timer.isActive() and self.__animationFileLoaded
+    
+    def setAnimationFile(self, animationFile):
+        """
+        Public method to set the name of the animation file.
+        
+        @param animationFile path to the file containing the animation data
+        @type str
+        """
+        active = self.__timer.isActive()
+        self.__timer.stop()
+        self.__loadAnimationFile(animationFile)
+        if active and self.__animationFileLoaded:
+            self.__timer.start()
+    
+    def getAnimationFile(self):
+        """
+        Public method to get the name of the animation file.
+        
+        @return path to the file containing the animation data
+        @rtype str
+        """
+        return self.__animationFile
+    
+    def isAnimationFileLoaded(self):
+        """
+        Public method to check, if the animation file was loaded.
+        
+        @return flag indicating a successfully loaded animation file
+        @rtype bool
+        """
+        return self.__animationFileLoaded
+    
+    def setInterval(self, interval):
+        """
+        Public method to set the interval between the animated frames.
+        
+        @param interval interval in milliseconds between animation frames
+        @type int
+        """
+        self.__timer.setInterval(interval)
+    
+    def getInterval(self):
+        """
+        Public method to get the interval between the animated frames.
+        
+        @return interval in milliseconds between animation frames
+        @rtype int
+        """
+        return self.__timer.interval()
+    
+    def setPixmap(self, pixmap):
+        """
+        Public slot to set the pixmap of the label.
+        
+        Setting a standard pixmap will stop the animation and set the given
+        pixmap without animating it. Thereafter the animation has to be
+        restarted with the start() method.
+        
+        @param pixmap pixmap to be set
+        @type QPixmap
+        """
+        self.stop()
+        super(E5AnimatedLabel, self).setPixmap(pixmap)
--- a/eric6/E5Gui/E5LineEdit.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/E5Gui/E5LineEdit.py	Sat May 02 13:51:07 2020 +0200
@@ -260,7 +260,7 @@
         
         from E5Gui.E5LineEditButton import E5LineEditButton
         self.__clearButton = E5LineEditButton(self)
-        self.__clearButton.setIcon(UI.PixmapCache.getIcon("clearLeft.png"))
+        self.__clearButton.setIcon(UI.PixmapCache.getIcon("clearLeft"))
         self.addWidget(self.__clearButton, side)
         self.__clearButton.setVisible(False)
         
--- a/eric6/E5Gui/E5ModelMenu.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/E5Gui/E5ModelMenu.py	Sat May 02 13:51:07 2020 +0200
@@ -206,7 +206,7 @@
             
             icon = parent.data(Qt.DecorationRole)
             if icon == NotImplemented or icon is None:
-                icon = UI.PixmapCache.getIcon("defaultIcon.png")
+                icon = UI.PixmapCache.getIcon("defaultIcon")
             modelMenu.setIcon(icon)
             if parentMenu is not None:
                 parentMenu.addMenu(modelMenu).setData(v)
@@ -246,7 +246,7 @@
         """
         icon = idx.data(Qt.DecorationRole)
         if icon == NotImplemented or icon is None:
-            icon = UI.PixmapCache.getIcon("defaultIcon.png")
+            icon = UI.PixmapCache.getIcon("defaultIcon")
         action = self.makeAction(icon, idx.data(), self)
         action.setStatusTip(idx.data(self.__statusBarTextRole))
         
--- a/eric6/E5Gui/E5PathPicker.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/E5Gui/E5PathPicker.py	Sat May 02 13:51:07 2020 +0200
@@ -101,7 +101,7 @@
         
         self.__button = QToolButton(self)
         self.__button.setToolButtonStyle(Qt.ToolButtonIconOnly)
-        self.__button.setIcon(UI.PixmapCache.getIcon("open.png"))
+        self.__button.setIcon(UI.PixmapCache.getIcon("open"))
         
         self.__layout.addWidget(self._editor)
         self.__layout.addWidget(self.__button)
--- a/eric6/E5Gui/E5SideBar.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/E5Gui/E5SideBar.py	Sat May 02 13:51:07 2020 +0200
@@ -54,7 +54,7 @@
         self.__autoHideButton = QToolButton()
         self.__autoHideButton.setCheckable(True)
         self.__autoHideButton.setIcon(
-            UI.PixmapCache.getIcon("autoHideOff.png"))
+            UI.PixmapCache.getIcon("autoHideOff"))
         self.__autoHideButton.setChecked(True)
         self.__autoHideButton.setToolTip(
             self.tr("Deselect to activate automatic collapsing"))
@@ -647,10 +647,10 @@
         self.__autoHide = not checked
         if self.__autoHide:
             self.__autoHideButton.setIcon(
-                UI.PixmapCache.getIcon("autoHideOn.png"))
+                UI.PixmapCache.getIcon("autoHideOn"))
         else:
             self.__autoHideButton.setIcon(
-                UI.PixmapCache.getIcon("autoHideOff.png"))
+                UI.PixmapCache.getIcon("autoHideOff"))
     
     def __appFocusChanged(self, old, now):
         """
--- a/eric6/E5Gui/E5TabWidget.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/E5Gui/E5TabWidget.py	Sat May 02 13:51:07 2020 +0200
@@ -8,9 +8,11 @@
 """
 
 
-from PyQt5.QtCore import Qt, QPoint, QMimeData, QByteArray, pyqtSignal
-from PyQt5.QtGui import QDrag, QMovie
-from PyQt5.QtWidgets import QTabWidget, QTabBar, QApplication, QStyle, QLabel
+from PyQt5.QtCore import pyqtSignal, Qt, QPoint, QMimeData
+from PyQt5.QtGui import QDrag
+from PyQt5.QtWidgets import QTabWidget, QTabBar, QApplication, QStyle
+
+from E5Gui.E5AnimatedLabel import E5AnimatedLabel
 
 
 class E5WheelTabBar(QTabBar):
@@ -311,29 +313,29 @@
             side = QTabBar.LeftSide
         return side
     
-    def animationLabel(self, index, animationFile, speed=100):
+    def animationLabel(self, index, animationFile, interval=100):
         """
         Public slot to set an animated icon.
         
-        @param index tab index (integer)
-        @param animationFile name of the file containing the animation (string)
-        @param speed animation speed of the icon in percent of the original
-            icon's speed (integer)
-        @return reference to the created label (QLabel)
+        @param index tab index
+        @type int
+        @param animationFile name of the file containing the animation
+        @type str
+        @param interval interval in milliseconds between animation frames
+        @type int
+        @return reference to the created label
+        @rtype E5AnimatedLabel
         """
         if index == -1:
             return None
         
         if hasattr(self.__tabBar, 'setTabButton'):
             side = self.__freeSide()
-            animation = QLabel(self)
-            if animationFile and not animation.movie():
-                movie = QMovie(animationFile, QByteArray(), animation)
-                movie.setSpeed(speed)
-                animation.setMovie(movie)
-                movie.start()
+            animation = E5AnimatedLabel(
+                self, animationFile=animationFile, interval=interval)
             self.__tabBar.setTabButton(index, side, None)
             self.__tabBar.setTabButton(index, side, animation)
+            animation.start()
             return animation
         else:
             return None
@@ -351,6 +353,6 @@
             side = self.__freeSide()
             animation = self.__tabBar.tabButton(index, side)
             if animation is not None:
-                animation.movie().stop()
+                animation.stop()
                 self.__tabBar.setTabButton(index, side, None)
                 del animation
--- a/eric6/E5Gui/E5TextEditSearchWidget.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/E5Gui/E5TextEditSearchWidget.py	Sat May 02 13:51:07 2020 +0200
@@ -119,14 +119,14 @@
         self.findPrevButton.setObjectName("findPrevButton")
         self.findPrevButton.setToolTip(self.tr(
             "Press to find the previous occurrence"))
-        self.findPrevButton.setIcon(UI.PixmapCache.getIcon("1leftarrow.png"))
+        self.findPrevButton.setIcon(UI.PixmapCache.getIcon("1leftarrow"))
         self.horizontalLayout3.addWidget(self.findPrevButton)
         
         self.findNextButton = QToolButton(self)
         self.findNextButton.setObjectName("findNextButton")
         self.findNextButton.setToolTip(self.tr(
             "Press to find the next occurrence"))
-        self.findNextButton.setIcon(UI.PixmapCache.getIcon("1rightarrow.png"))
+        self.findNextButton.setIcon(UI.PixmapCache.getIcon("1rightarrow"))
         self.horizontalLayout3.addWidget(self.findNextButton)
         
         self.horizontalLayout2.addLayout(self.horizontalLayout3)
--- a/eric6/E5Gui/E5ToolBarDialog.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/E5Gui/E5ToolBarDialog.py	Sat May 02 13:51:07 2020 +0200
@@ -72,10 +72,10 @@
         self.__toolBarItemToWidgetActionID = {}
         # maps toolbar item IDs to widget action IDs
         
-        self.upButton.setIcon(UI.PixmapCache.getIcon("1uparrow.png"))
-        self.downButton.setIcon(UI.PixmapCache.getIcon("1downarrow.png"))
-        self.leftButton.setIcon(UI.PixmapCache.getIcon("1leftarrow.png"))
-        self.rightButton.setIcon(UI.PixmapCache.getIcon("1rightarrow.png"))
+        self.upButton.setIcon(UI.PixmapCache.getIcon("1uparrow"))
+        self.downButton.setIcon(UI.PixmapCache.getIcon("1downarrow"))
+        self.leftButton.setIcon(UI.PixmapCache.getIcon("1leftarrow"))
+        self.rightButton.setIcon(UI.PixmapCache.getIcon("1rightarrow"))
         
         self.__restoreDefaultsButton = self.buttonBox.button(
             QDialogButtonBox.RestoreDefaults)
--- a/eric6/E5Network/E5NetworkIcon.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/E5Network/E5NetworkIcon.py	Sat May 02 13:51:07 2020 +0200
@@ -54,9 +54,9 @@
         @type bool
         """
         if online:
-            self.setPixmap(UI.PixmapCache.getPixmap("network-online.png"))
+            self.setPixmap(UI.PixmapCache.getPixmap("network-online"))
         else:
-            self.setPixmap(UI.PixmapCache.getPixmap("network-offline.png"))
+            self.setPixmap(UI.PixmapCache.getPixmap("network-offline"))
         
         tooltip = self.tr("<p>Shows the network status<br/><br/>"
                           "<b>Network:</b> {0}</p>")
--- a/eric6/E5Network/E5SslCertificateSelectionDialog.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/E5Network/E5SslCertificateSelectionDialog.py	Sat May 02 13:51:07 2020 +0200
@@ -43,7 +43,7 @@
         self.setupUi(self)
         
         self.viewButton.setIcon(
-            UI.PixmapCache.getIcon("certificates.png"))
+            UI.PixmapCache.getIcon("certificates"))
         
         self.buttonBox.button(QDialogButtonBox.OK).setEnabled(False)
         self.viewButton.setEnabled(False)
--- a/eric6/E5Network/E5SslCertificatesDialog.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/E5Network/E5SslCertificatesDialog.py	Sat May 02 13:51:07 2020 +0200
@@ -45,22 +45,22 @@
         self.setupUi(self)
         
         self.serversViewButton.setIcon(
-            UI.PixmapCache.getIcon("certificates.png"))
+            UI.PixmapCache.getIcon("certificates"))
         self.serversDeleteButton.setIcon(
-            UI.PixmapCache.getIcon("certificateDelete.png"))
+            UI.PixmapCache.getIcon("certificateDelete"))
         self.serversExportButton.setIcon(
-            UI.PixmapCache.getIcon("certificateExport.png"))
+            UI.PixmapCache.getIcon("certificateExport"))
         self.serversImportButton.setIcon(
-            UI.PixmapCache.getIcon("certificateImport.png"))
+            UI.PixmapCache.getIcon("certificateImport"))
         
         self.caViewButton.setIcon(
-            UI.PixmapCache.getIcon("certificates.png"))
+            UI.PixmapCache.getIcon("certificates"))
         self.caDeleteButton.setIcon(
-            UI.PixmapCache.getIcon("certificateDelete.png"))
+            UI.PixmapCache.getIcon("certificateDelete"))
         self.caExportButton.setIcon(
-            UI.PixmapCache.getIcon("certificateExport.png"))
+            UI.PixmapCache.getIcon("certificateExport"))
         self.caImportButton.setIcon(
-            UI.PixmapCache.getIcon("certificateImport.png"))
+            UI.PixmapCache.getIcon("certificateImport"))
         
         self.__populateServerCertificatesTree()
         self.__populateCaCertificatesTree()
--- a/eric6/E5Network/E5SslInfoWidget.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/E5Network/E5SslInfoWidget.py	Sat May 02 13:51:07 2020 +0200
@@ -65,7 +65,7 @@
         if cert.isNull():
             label.setText(self.tr(
                 "Warning: this site is NOT carrying a certificate."))
-            imageLabel.setPixmap(UI.PixmapCache.getPixmap("securityLow32.png"))
+            imageLabel.setPixmap(UI.PixmapCache.getPixmap("securityLow32"))
         else:
             valid = not cert.isBlacklisted()
             if valid:
@@ -76,12 +76,12 @@
                     " and has been verified by:\n{0}").format(
                     Utilities.decodeString(txt)))
                 imageLabel.setPixmap(
-                    UI.PixmapCache.getPixmap("securityHigh32.png"))
+                    UI.PixmapCache.getPixmap("securityHigh32"))
             else:
                 label.setText(self.tr(
                     "The certificate for this site is NOT valid."))
                 imageLabel.setPixmap(
-                    UI.PixmapCache.getPixmap("securityLow32.png"))
+                    UI.PixmapCache.getPixmap("securityLow32"))
             layout.addWidget(label, rows, 1)
             rows += 1
             
@@ -117,7 +117,7 @@
                 'Your connection to "{0}" is NOT encrypted.\n').format(
                 self.__url.host()))
             layout.addWidget(label, rows, 1)
-            imageLabel.setPixmap(UI.PixmapCache.getPixmap("securityLow32.png"))
+            imageLabel.setPixmap(UI.PixmapCache.getPixmap("securityLow32"))
             rows += 1
         else:
             label = QLabel(self)
@@ -131,37 +131,37 @@
             if proto == QSsl.SslV3:
                 sslVersion = "SSL 3.0"
                 imageLabel.setPixmap(
-                    UI.PixmapCache.getPixmap("securityLow32.png"))
+                    UI.PixmapCache.getPixmap("securityLow32"))
             elif proto == QSsl.TlsV1SslV3:
                 sslVersion = "TLS 1.0/SSL 3.0"
                 imageLabel.setPixmap(
-                    UI.PixmapCache.getPixmap("securityLow32.png"))
+                    UI.PixmapCache.getPixmap("securityLow32"))
             elif proto == QSsl.SslV2:
                 sslVersion = "SSL 2.0"
                 imageLabel.setPixmap(
-                    UI.PixmapCache.getPixmap("securityLow32.png"))
+                    UI.PixmapCache.getPixmap("securityLow32"))
             else:
                 sslVersion = self.tr("unknown")
                 imageLabel.setPixmap(
-                    UI.PixmapCache.getPixmap("securityLow32.png"))
+                    UI.PixmapCache.getPixmap("securityLow32"))
             if proto == QSsl.TlsV1_0:
                 sslVersion = "TLS 1.0"
                 imageLabel.setPixmap(
-                    UI.PixmapCache.getPixmap("securityHigh32.png"))
+                    UI.PixmapCache.getPixmap("securityHigh32"))
             elif proto == QSsl.TlsV1_1:
                 sslVersion = "TLS 1.1"
                 imageLabel.setPixmap(
-                    UI.PixmapCache.getPixmap("securityHigh32.png"))
+                    UI.PixmapCache.getPixmap("securityHigh32"))
             elif proto == QSsl.TlsV1_2:
                 sslVersion = "TLS 1.2"
                 imageLabel.setPixmap(
-                    UI.PixmapCache.getPixmap("securityHigh32.png"))
+                    UI.PixmapCache.getPixmap("securityHigh32"))
             try:
                 # Qt 5.12 and newer
                 if proto == QSsl.TlsV1_2:
                     sslVersion = "TLS 1.2"
                     imageLabel.setPixmap(
-                        UI.PixmapCache.getPixmap("securityHigh32.png"))
+                        UI.PixmapCache.getPixmap("securityHigh32"))
             except AttributeError:
                 pass
             rows += 1
--- a/eric6/Graphics/ApplicationDiagramBuilder.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/Graphics/ApplicationDiagramBuilder.py	Sat May 02 13:51:07 2020 +0200
@@ -244,7 +244,8 @@
         from .PackageItem import PackageItem, PackageModel
         modules.sort()
         pm = PackageModel(name, modules)
-        pw = PackageItem(pm, x, y, noModules=self.noModules, scene=self.scene)
+        pw = PackageItem(pm, x, y, noModules=self.noModules, scene=self.scene,
+                         colors=self.umlView.getDrawingColors())
         pw.setId(self.umlView.getItemId())
         return pw
         
@@ -259,7 +260,8 @@
             for rel in shapes[package][1]:
                 assoc = AssociationItem(
                     shapes[package][0], shapes[rel][0],
-                    Imports)
+                    Imports,
+                    colors=self.umlView.getDrawingColors())
                 self.scene.addItem(assoc)
     
     def getPersistenceData(self):
--- a/eric6/Graphics/AssociationItem.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/Graphics/AssociationItem.py	Sat May 02 13:51:07 2020 +0200
@@ -41,7 +41,7 @@
     ending at the second.
     """
     def __init__(self, itemA, itemB, assocType=Normal, topToBottom=False,
-                 parent=None):
+                 colors=None, parent=None):
         """
         Constructor
         
@@ -53,9 +53,13 @@
             <li>Generalisation</li>
             <li>Imports</li>
             </ul>
-        @keyparam topToBottom flag indicating to draw the association
-            from item A top to item B bottom (boolean)
-        @keyparam parent reference to the parent object (QGraphicsItem)
+        @param topToBottom flag indicating to draw the association
+            from item A top to item B bottom
+        @type bool
+        @param colors tuple containing the foreground and background colors
+        @type tuple of (QColor, QColor)
+        @param parent reference to the parent object
+        @type QGraphicsItem
         """
         if assocType == Normal:
             arrowType = NormalArrow
@@ -68,7 +72,7 @@
             arrowFilled = False
         
         E5ArrowItem.__init__(self, QPointF(0, 0), QPointF(100, 100),
-                             arrowFilled, arrowType, parent)
+                             arrowFilled, arrowType, colors, parent)
         
         self.setFlag(QGraphicsItem.ItemIsMovable, False)
         self.setFlag(QGraphicsItem.ItemIsSelectable, False)
--- a/eric6/Graphics/ClassItem.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/Graphics/ClassItem.py	Sat May 02 13:51:07 2020 +0200
@@ -75,22 +75,31 @@
     ItemType = "class"
     
     def __init__(self, model=None, external=False, x=0, y=0,
-                 rounded=False, noAttrs=False, parent=None, scene=None):
+                 rounded=False, noAttrs=False, colors=None, parent=None,
+                 scene=None):
         """
         Constructor
         
-        @param model class model containing the class data (ClassModel)
+        @param model class model containing the class data
+        @type ClassModel
         @param external flag indicating a class defined outside our scope
-            (boolean)
-        @param x x-coordinate (integer)
-        @param y y-coordinate (integer)
-        @keyparam rounded flag indicating a rounded corner (boolean)
-        @keyparam noAttrs flag indicating, that no attributes should be shown
-            (boolean)
-        @keyparam parent reference to the parent object (QGraphicsItem)
-        @keyparam scene reference to the scene object (QGraphicsScene)
+        @type boolean
+        @param x x-coordinate
+        @type int
+        @param y y-coordinate
+        @type int
+        @param rounded flag indicating a rounded corner
+        @type bool
+        @param noAttrs flag indicating, that no attributes should be shown
+        @type bool
+        @param colors tuple containing the foreground and background colors
+        @type tuple of (QColor, QColor)
+        @param parent reference to the parent object
+        @type QGraphicsItem
+        @param scene reference to the scene object
+        @type QGraphicsScene
         """
-        UMLItem.__init__(self, model, x, y, rounded, parent)
+        UMLItem.__init__(self, model, x, y, rounded, colors, parent)
         
         self.external = external
         self.noAttrs = noAttrs
@@ -117,6 +126,7 @@
         x = self.margin + self.rect().x()
         y = self.margin + self.rect().y()
         self.header = QGraphicsSimpleTextItem(self)
+        self.header.setBrush(self._colors[0])
         self.header.setFont(boldFont)
         self.header.setText(self.model.getName())
         self.header.setPos(x, y)
@@ -127,6 +137,7 @@
             else:
                 txt = " "
             self.attrs = QGraphicsSimpleTextItem(self)
+            self.attrs.setBrush(self._colors[0])
             self.attrs.setFont(self.font)
             self.attrs.setText(txt)
             self.attrs.setPos(x, y)
@@ -138,6 +149,7 @@
         else:
             txt = " "
         self.meths = QGraphicsSimpleTextItem(self)
+        self.meths.setBrush(self._colors[0])
         self.meths.setFont(self.font)
         self.meths.setText(txt)
         self.meths.setPos(x, y)
--- a/eric6/Graphics/ImportsDiagramBuilder.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/Graphics/ImportsDiagramBuilder.py	Sat May 02 13:51:07 2020 +0200
@@ -241,7 +241,8 @@
         from .ModuleItem import ModuleItem, ModuleModel
         classes.sort()
         impM = ModuleModel(name, classes)
-        impW = ModuleItem(impM, x, y, scene=self.scene)
+        impW = ModuleItem(impM, x, y, scene=self.scene,
+                          colors=self.umlView.getDrawingColors())
         impW.setId(self.umlView.getItemId())
         return impW
     
@@ -256,7 +257,8 @@
             for rel in shapes[module][1]:
                 assoc = AssociationItem(
                     shapes[module][0], shapes[rel][0],
-                    Imports)
+                    Imports,
+                    colors=self.umlView.getDrawingColors())
                 self.scene.addItem(assoc)
     
     def getPersistenceData(self):
--- a/eric6/Graphics/ModuleItem.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/Graphics/ModuleItem.py	Sat May 02 13:51:07 2020 +0200
@@ -52,19 +52,27 @@
     """
     ItemType = "module"
     
-    def __init__(self, model=None, x=0, y=0, rounded=False,
+    def __init__(self, model=None, x=0, y=0, rounded=False, colors=None,
                  parent=None, scene=None):
         """
         Constructor
         
-        @param model module model containing the module data (ModuleModel)
-        @param x x-coordinate (integer)
-        @param y y-coordinate (integer)
-        @keyparam rounded flag indicating a rounded corner (boolean)
-        @keyparam parent reference to the parent object (QGraphicsItem)
-        @keyparam scene reference to the scene object (QGraphicsScene)
+        @param model module model containing the module data
+        @type ModuleModel
+        @param x x-coordinate
+        @type int
+        @param y y-coordinate
+        @type int
+        @param rounded flag indicating a rounded corner
+        @type bool
+        @param colors tuple containing the foreground and background colors
+        @type tuple of (QColor, QColor)
+        @param parent reference to the parent object
+        @type QGraphicsItem
+        @param scene reference to the scene object
+        @type QGraphicsScene
         """
-        UMLItem.__init__(self, model, x, y, rounded, parent)
+        UMLItem.__init__(self, model, x, y, rounded, colors, parent)
         
         scene.addItem(self)
         
@@ -87,6 +95,7 @@
         x = self.margin + self.rect().x()
         y = self.margin + self.rect().y()
         self.header = QGraphicsSimpleTextItem(self)
+        self.header.setBrush(self._colors[0])
         self.header.setFont(boldFont)
         self.header.setText(self.model.getName())
         self.header.setPos(x, y)
@@ -96,6 +105,7 @@
         else:
             txt = " "
         self.classes = QGraphicsSimpleTextItem(self)
+        self.classes.setBrush(self._colors[0])
         self.classes.setFont(self.font)
         self.classes.setText(txt)
         self.classes.setPos(x, y)
--- a/eric6/Graphics/PackageDiagramBuilder.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/Graphics/PackageDiagramBuilder.py	Sat May 02 13:51:07 2020 +0200
@@ -394,7 +394,8 @@
         if isRbModule:
             name = "{0} (Module)".format(name)
         cl = ClassModel(name, meths[:], attrs[:])
-        cw = ClassItem(cl, False, x, y, noAttrs=self.noAttrs, scene=self.scene)
+        cw = ClassItem(cl, False, x, y, noAttrs=self.noAttrs, scene=self.scene,
+                       colors=self.umlView.getDrawingColors())
         cw.setId(self.umlView.getItemId())
         self.allClasses[className] = cw
     
@@ -411,7 +412,8 @@
         """
         from .ClassItem import ClassItem, ClassModel
         cl = ClassModel(_class)
-        cw = ClassItem(cl, True, x, y, noAttrs=self.noAttrs, scene=self.scene)
+        cw = ClassItem(cl, True, x, y, noAttrs=self.noAttrs, scene=self.scene,
+                       colors=self.umlView.getDrawingColors())
         cw.setId(self.umlView.getItemId())
         self.allClasses[_class] = cw
     
@@ -427,7 +429,8 @@
         """
         from .PackageItem import PackageItem, PackageModel
         pm = PackageModel(name, modules)
-        pw = PackageItem(pm, x, y, scene=self.scene)
+        pw = PackageItem(pm, x, y, scene=self.scene,
+                         colors=self.umlView.getDrawingColors())
         pw.setId(self.umlView.getItemId())
         self.allClasses[name] = pw
     
@@ -444,7 +447,8 @@
                     self.__getCurrentShape(route[1]),
                     self.__getCurrentShape(route[0]),
                     Generalisation,
-                    topToBottom=True)
+                    topToBottom=True,
+                    colors=self.umlView.getDrawingColors())
                 self.scene.addItem(assoc)
     
     def getPersistenceData(self):
--- a/eric6/Graphics/PackageItem.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/Graphics/PackageItem.py	Sat May 02 13:51:07 2020 +0200
@@ -55,20 +55,29 @@
     ItemType = "package"
     
     def __init__(self, model=None, x=0, y=0, rounded=False,
-                 noModules=False, parent=None, scene=None):
+                 noModules=False, colors=None, parent=None, scene=None):
         """
         Constructor
         
-        @param model package model containing the package data (PackageModel)
-        @param x x-coordinate (integer)
-        @param y y-coordinate (integer)
-        @param rounded flag indicating a rounded corner (boolean)
-        @keyparam noModules flag indicating, that no module names should be
-            shown (boolean)
-        @keyparam parent reference to the parent object (QGraphicsItem)
-        @keyparam scene reference to the scene object (QGraphicsScene)
+        @param model package model containing the package data
+        @type PackageModel
+        @param x x-coordinate
+        @type int
+        @param y y-coordinate
+        @type int
+        @param rounded flag indicating a rounded corner
+        @type bool
+        @param noModules flag indicating, that no module names should be
+            shown
+        @type bool
+        @param colors tuple containing the foreground and background colors
+        @type tuple of (QColor, QColor)
+        @param parent reference to the parent object
+        @type QGraphicsItem
+        @param scene reference to the scene object
+        @type QGraphicsScene
         """
-        UMLItem.__init__(self, model, x, y, rounded, parent)
+        UMLItem.__init__(self, model, x, y, rounded, colors, parent)
         self.noModules = noModules
         
         scene.addItem(self)
@@ -92,6 +101,7 @@
         x = self.margin + self.rect().x()
         y = self.margin + self.rect().y()
         self.header = QGraphicsSimpleTextItem(self)
+        self.header.setBrush(self._colors[0])
         self.header.setFont(boldFont)
         self.header.setText(self.model.getName())
         self.header.setPos(x, y)
@@ -103,6 +113,7 @@
             else:
                 txt = " "
             self.modules = QGraphicsSimpleTextItem(self)
+            self.modules.setBrush(self._colors[0])
             self.modules.setFont(self.font)
             self.modules.setText(txt)
             self.modules.setPos(x, y)
--- a/eric6/Graphics/PixmapDiagram.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/Graphics/PixmapDiagram.py	Sat May 02 13:51:07 2020 +0200
@@ -67,9 +67,9 @@
         self.setCentralWidget(self.pixmapView)
         
         self.__zoomWidget = E5ZoomWidget(
-            UI.PixmapCache.getPixmap("zoomOut.png"),
-            UI.PixmapCache.getPixmap("zoomIn.png"),
-            UI.PixmapCache.getPixmap("zoomReset.png"), self)
+            UI.PixmapCache.getPixmap("zoomOut"),
+            UI.PixmapCache.getPixmap("zoomIn"),
+            UI.PixmapCache.getPixmap("zoomReset"), self)
         self.statusBar().addPermanentWidget(self.__zoomWidget)
         self.__zoomWidget.setMapping(
             PixmapDiagram.ZoomLevels, PixmapDiagram.ZoomLevelDefault)
@@ -92,17 +92,17 @@
         Private method to initialize the view actions.
         """
         self.closeAct = QAction(
-            UI.PixmapCache.getIcon("close.png"),
+            UI.PixmapCache.getIcon("close"),
             self.tr("Close"), self)
         self.closeAct.triggered.connect(self.close)
         
         self.printAct = QAction(
-            UI.PixmapCache.getIcon("print.png"),
+            UI.PixmapCache.getIcon("print"),
             self.tr("Print"), self)
         self.printAct.triggered.connect(self.__printDiagram)
         
         self.printPreviewAct = QAction(
-            UI.PixmapCache.getIcon("printPreview.png"),
+            UI.PixmapCache.getIcon("printPreview"),
             self.tr("Print Preview"), self)
         self.printPreviewAct.triggered.connect(self.__printPreviewDiagram)
         
--- a/eric6/Graphics/SvgDiagram.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/Graphics/SvgDiagram.py	Sat May 02 13:51:07 2020 +0200
@@ -63,9 +63,9 @@
         self.setCentralWidget(self.svgView)
         
         self.__zoomWidget = E5ZoomWidget(
-            UI.PixmapCache.getPixmap("zoomOut.png"),
-            UI.PixmapCache.getPixmap("zoomIn.png"),
-            UI.PixmapCache.getPixmap("zoomReset.png"), self)
+            UI.PixmapCache.getPixmap("zoomOut"),
+            UI.PixmapCache.getPixmap("zoomIn"),
+            UI.PixmapCache.getPixmap("zoomReset"), self)
         self.statusBar().addPermanentWidget(self.__zoomWidget)
         self.__zoomWidget.setMapping(
             SvgDiagram.ZoomLevels, SvgDiagram.ZoomLevelDefault)
@@ -90,17 +90,17 @@
         Private method to initialize the view actions.
         """
         self.closeAct = QAction(
-            UI.PixmapCache.getIcon("close.png"),
+            UI.PixmapCache.getIcon("close"),
             self.tr("Close"), self)
         self.closeAct.triggered.connect(self.close)
         
         self.printAct = QAction(
-            UI.PixmapCache.getIcon("print.png"),
+            UI.PixmapCache.getIcon("print"),
             self.tr("Print"), self)
         self.printAct.triggered.connect(self.__printDiagram)
         
         self.printPreviewAct = QAction(
-            UI.PixmapCache.getIcon("printPreview.png"),
+            UI.PixmapCache.getIcon("printPreview"),
             self.tr("Print Preview"), self)
         self.printPreviewAct.triggered.connect(self.__printPreviewDiagram)
         
--- a/eric6/Graphics/UMLClassDiagramBuilder.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/Graphics/UMLClassDiagramBuilder.py	Sat May 02 13:51:07 2020 +0200
@@ -241,7 +241,8 @@
         if isRbModule:
             name = "{0} (Module)".format(name)
         cl = ClassModel(name, meths[:], attrs[:])
-        cw = ClassItem(cl, False, x, y, noAttrs=self.noAttrs, scene=self.scene)
+        cw = ClassItem(cl, False, x, y, noAttrs=self.noAttrs, scene=self.scene,
+                       colors=self.umlView.getDrawingColors())
         cw.setId(self.umlView.getItemId())
         self.allClasses[className] = cw
         if _class.name not in self.allModules[self.file]:
@@ -260,7 +261,8 @@
         """
         from .ClassItem import ClassItem, ClassModel
         cl = ClassModel(_class)
-        cw = ClassItem(cl, True, x, y, noAttrs=self.noAttrs, scene=self.scene)
+        cw = ClassItem(cl, True, x, y, noAttrs=self.noAttrs, scene=self.scene,
+                       colors=self.umlView.getDrawingColors())
         cw.setId(self.umlView.getItemId())
         self.allClasses[_class] = cw
         if _class not in self.allModules[self.file]:
@@ -279,7 +281,8 @@
                     self.__getCurrentShape(route[1]),
                     self.__getCurrentShape(route[0]),
                     Generalisation,
-                    topToBottom=True)
+                    topToBottom=True,
+                    colors=self.umlView.getDrawingColors())
                 self.scene.addItem(assoc)
     
     def getPersistenceData(self):
--- a/eric6/Graphics/UMLDialog.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/Graphics/UMLDialog.py	Sat May 02 13:51:07 2020 +0200
@@ -74,37 +74,37 @@
         Private slot to initialize the actions.
         """
         self.closeAct = QAction(
-            UI.PixmapCache.getIcon("close.png"),
+            UI.PixmapCache.getIcon("close"),
             self.tr("Close"), self)
         self.closeAct.triggered.connect(self.close)
         
         self.openAct = QAction(
-            UI.PixmapCache.getIcon("open.png"),
+            UI.PixmapCache.getIcon("open"),
             self.tr("Load"), self)
         self.openAct.triggered.connect(self.load)
         
         self.saveAct = QAction(
-            UI.PixmapCache.getIcon("fileSave.png"),
+            UI.PixmapCache.getIcon("fileSave"),
             self.tr("Save"), self)
         self.saveAct.triggered.connect(self.__save)
         
         self.saveAsAct = QAction(
-            UI.PixmapCache.getIcon("fileSaveAs.png"),
+            UI.PixmapCache.getIcon("fileSaveAs"),
             self.tr("Save As..."), self)
         self.saveAsAct.triggered.connect(self.__saveAs)
         
         self.saveImageAct = QAction(
-            UI.PixmapCache.getIcon("fileSavePixmap.png"),
+            UI.PixmapCache.getIcon("fileSavePixmap"),
             self.tr("Save as Image"), self)
         self.saveImageAct.triggered.connect(self.umlView.saveImage)
         
         self.printAct = QAction(
-            UI.PixmapCache.getIcon("print.png"),
+            UI.PixmapCache.getIcon("print"),
             self.tr("Print"), self)
         self.printAct.triggered.connect(self.umlView.printDiagram)
         
         self.printPreviewAct = QAction(
-            UI.PixmapCache.getIcon("printPreview.png"),
+            UI.PixmapCache.getIcon("printPreview"),
             self.tr("Print Preview"), self)
         self.printPreviewAct.triggered.connect(
             self.umlView.printPreviewDiagram)
--- a/eric6/Graphics/UMLGraphicsView.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/Graphics/UMLGraphicsView.py	Sat May 02 13:51:07 2020 +0200
@@ -54,9 +54,9 @@
         self.deltaSize = 100.0
         
         self.__zoomWidget = E5ZoomWidget(
-            UI.PixmapCache.getPixmap("zoomOut.png"),
-            UI.PixmapCache.getPixmap("zoomIn.png"),
-            UI.PixmapCache.getPixmap("zoomReset.png"), self)
+            UI.PixmapCache.getPixmap("zoomOut"),
+            UI.PixmapCache.getPixmap("zoomIn"),
+            UI.PixmapCache.getPixmap("zoomReset"), self)
         parent.statusBar().addPermanentWidget(self.__zoomWidget)
         self.__zoomWidget.setMapping(
             E5GraphicsView.ZoomLevels, E5GraphicsView.ZoomLevelDefault)
@@ -77,85 +77,85 @@
         self.alignMapper.mapped[int].connect(self.__alignShapes)
         
         self.deleteShapeAct = QAction(
-            UI.PixmapCache.getIcon("deleteShape.png"),
+            UI.PixmapCache.getIcon("deleteShape"),
             self.tr("Delete shapes"), self)
         self.deleteShapeAct.triggered.connect(self.__deleteShape)
         
         self.incWidthAct = QAction(
-            UI.PixmapCache.getIcon("sceneWidthInc.png"),
+            UI.PixmapCache.getIcon("sceneWidthInc"),
             self.tr("Increase width by {0} points").format(
                 self.deltaSize),
             self)
         self.incWidthAct.triggered.connect(self.__incWidth)
         
         self.incHeightAct = QAction(
-            UI.PixmapCache.getIcon("sceneHeightInc.png"),
+            UI.PixmapCache.getIcon("sceneHeightInc"),
             self.tr("Increase height by {0} points").format(
                 self.deltaSize),
             self)
         self.incHeightAct.triggered.connect(self.__incHeight)
         
         self.decWidthAct = QAction(
-            UI.PixmapCache.getIcon("sceneWidthDec.png"),
+            UI.PixmapCache.getIcon("sceneWidthDec"),
             self.tr("Decrease width by {0} points").format(
                 self.deltaSize),
             self)
         self.decWidthAct.triggered.connect(self.__decWidth)
         
         self.decHeightAct = QAction(
-            UI.PixmapCache.getIcon("sceneHeightDec.png"),
+            UI.PixmapCache.getIcon("sceneHeightDec"),
             self.tr("Decrease height by {0} points").format(
                 self.deltaSize),
             self)
         self.decHeightAct.triggered.connect(self.__decHeight)
         
         self.setSizeAct = QAction(
-            UI.PixmapCache.getIcon("sceneSize.png"),
+            UI.PixmapCache.getIcon("sceneSize"),
             self.tr("Set size"), self)
         self.setSizeAct.triggered.connect(self.__setSize)
         
         self.rescanAct = QAction(
-            UI.PixmapCache.getIcon("rescan.png"),
+            UI.PixmapCache.getIcon("rescan"),
             self.tr("Re-Scan"), self)
         self.rescanAct.triggered.connect(self.__rescan)
         
         self.relayoutAct = QAction(
-            UI.PixmapCache.getIcon("relayout.png"),
+            UI.PixmapCache.getIcon("relayout"),
             self.tr("Re-Layout"), self)
         self.relayoutAct.triggered.connect(self.__relayout)
         
         self.alignLeftAct = QAction(
-            UI.PixmapCache.getIcon("shapesAlignLeft.png"),
+            UI.PixmapCache.getIcon("shapesAlignLeft"),
             self.tr("Align Left"), self)
         self.alignMapper.setMapping(self.alignLeftAct, Qt.AlignLeft)
         self.alignLeftAct.triggered.connect(self.alignMapper.map)
         
         self.alignHCenterAct = QAction(
-            UI.PixmapCache.getIcon("shapesAlignHCenter.png"),
+            UI.PixmapCache.getIcon("shapesAlignHCenter"),
             self.tr("Align Center Horizontal"), self)
         self.alignMapper.setMapping(self.alignHCenterAct, Qt.AlignHCenter)
         self.alignHCenterAct.triggered.connect(self.alignMapper.map)
         
         self.alignRightAct = QAction(
-            UI.PixmapCache.getIcon("shapesAlignRight.png"),
+            UI.PixmapCache.getIcon("shapesAlignRight"),
             self.tr("Align Right"), self)
         self.alignMapper.setMapping(self.alignRightAct, Qt.AlignRight)
         self.alignRightAct.triggered.connect(self.alignMapper.map)
         
         self.alignTopAct = QAction(
-            UI.PixmapCache.getIcon("shapesAlignTop.png"),
+            UI.PixmapCache.getIcon("shapesAlignTop"),
             self.tr("Align Top"), self)
         self.alignMapper.setMapping(self.alignTopAct, Qt.AlignTop)
         self.alignTopAct.triggered.connect(self.alignMapper.map)
         
         self.alignVCenterAct = QAction(
-            UI.PixmapCache.getIcon("shapesAlignVCenter.png"),
+            UI.PixmapCache.getIcon("shapesAlignVCenter"),
             self.tr("Align Center Vertical"), self)
         self.alignMapper.setMapping(self.alignVCenterAct, Qt.AlignVCenter)
         self.alignVCenterAct.triggered.connect(self.alignMapper.map)
         
         self.alignBottomAct = QAction(
-            UI.PixmapCache.getIcon("shapesAlignBottom.png"),
+            UI.PixmapCache.getIcon("shapesAlignBottom"),
             self.tr("Align Bottom"), self)
         self.alignMapper.setMapping(self.alignBottomAct, Qt.AlignBottom)
         self.alignBottomAct.triggered.connect(self.alignMapper.map)
@@ -744,11 +744,14 @@
                     y = float(y.split("=", 1)[1].strip())
                     itemType = itemType.split("=", 1)[1].strip()
                     if itemType == ClassItem.ItemType:
-                        itm = ClassItem(x=x, y=y, scene=self.scene())
+                        itm = ClassItem(x=x, y=y, scene=self.scene(),
+                                        colors=self.getDrawingColors())
                     elif itemType == ModuleItem.ItemType:
-                        itm = ModuleItem(x=x, y=y, scene=self.scene())
+                        itm = ModuleItem(x=x, y=y, scene=self.scene(),
+                                         colors=self.getDrawingColors())
                     elif itemType == PackageItem.ItemType:
-                        itm = PackageItem(x=x, y=y, scene=self.scene())
+                        itm = PackageItem(x=x, y=y, scene=self.scene(),
+                                          colors=self.getDrawingColors())
                     itm.setId(itemId)
                     umlItems[itemId] = itm
                     if not itm.parseItemDataString(version, itemData):
--- a/eric6/Graphics/UMLItem.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/Graphics/UMLItem.py	Sat May 02 13:51:07 2020 +0200
@@ -9,6 +9,7 @@
 
 
 from PyQt5.QtCore import Qt, QSizeF
+from PyQt5.QtGui import QColor, QPen
 from PyQt5.QtWidgets import QGraphicsItem, QGraphicsRectItem, QStyle
 
 import Preferences
@@ -41,19 +42,33 @@
     """
     ItemType = "UMLItem"
     
-    def __init__(self, model=None, x=0, y=0, rounded=False, parent=None):
+    def __init__(self, model=None, x=0, y=0, rounded=False, colors=None,
+                 parent=None):
         """
         Constructor
         
-        @param model UML model containing the item data (UMLModel)
-        @param x x-coordinate (integer)
-        @param y y-coordinate (integer)
-        @param rounded flag indicating a rounded corner (boolean)
-        @keyparam parent reference to the parent object (QGraphicsItem)
+        @param model UML model containing the item data
+        @type UMLModel
+        @param x x-coordinate
+        @type int
+        @param y y-coordinate
+        @type int
+        @param rounded flag indicating a rounded corner
+        @type bool
+        @param colors tuple containing the foreground and background colors
+        @type tuple of (QColor, QColor)
+        @param parent reference to the parent object
+        @type QGraphicsItem
         """
         super(UMLItem, self).__init__(parent)
         self.model = model
         
+        if colors is None:
+            self._colors = (QColor(Qt.black), QColor(Qt.white))
+        else:
+            self._colors = colors
+        self.setPen(QPen(self._colors[0]))
+        
         self.font = Preferences.getGraphics("Font")
         self.margin = 5
         self.associations = []
--- a/eric6/HexEdit/HexEditGotoWidget.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/HexEdit/HexEditGotoWidget.py	Sat May 02 13:51:07 2020 +0200
@@ -45,7 +45,7 @@
         
         self.__currentFormat = ""
         
-        self.closeButton.setIcon(UI.PixmapCache.getIcon("close.png"))
+        self.closeButton.setIcon(UI.PixmapCache.getIcon("close"))
         
         for dataFormat in formatOrder:
             formatStr, validator = self.__formatAndValidators[dataFormat]
--- a/eric6/HexEdit/HexEditMainWindow.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/HexEdit/HexEditMainWindow.py	Sat May 02 13:51:07 2020 +0200
@@ -71,7 +71,7 @@
         }
         
         self.__fromEric = fromEric
-        self.setWindowIcon(UI.PixmapCache.getIcon("hexEditor.png"))
+        self.setWindowIcon(UI.PixmapCache.getIcon("hexEditor"))
         
         if not self.__fromEric:
             self.setStyle(Preferences.getUI("Style"),
@@ -158,7 +158,7 @@
         """
         self.newWindowAct = E5Action(
             self.tr('New Window'),
-            UI.PixmapCache.getIcon("newWindow.png"),
+            UI.PixmapCache.getIcon("newWindow"),
             self.tr('New &Window'),
             0, 0, self, 'hexEditor_file_new_window')
         self.newWindowAct.setStatusTip(self.tr(
@@ -174,7 +174,7 @@
         # correct texts will be set later
         self.openAct = E5Action(
             self.tr('Open'),
-            UI.PixmapCache.getIcon("open.png"),
+            UI.PixmapCache.getIcon("open"),
             self.tr('&Open...'),
             QKeySequence(self.tr("Ctrl+O", "File|Open")),
             0, self, 'hexEditor_file_open')
@@ -190,7 +190,7 @@
         
         self.saveAct = E5Action(
             self.tr('Save'),
-            UI.PixmapCache.getIcon("fileSave.png"),
+            UI.PixmapCache.getIcon("fileSave"),
             self.tr('&Save'),
             QKeySequence(self.tr("Ctrl+S", "File|Save")),
             0, self, 'hexEditor_file_save')
@@ -204,7 +204,7 @@
         
         self.saveAsAct = E5Action(
             self.tr('Save As'),
-            UI.PixmapCache.getIcon("fileSaveAs.png"),
+            UI.PixmapCache.getIcon("fileSaveAs"),
             self.tr('Save &As...'),
             QKeySequence(self.tr("Shift+Ctrl+S", "File|Save As")),
             0, self, 'hexEditor_file_save_as')
@@ -234,7 +234,7 @@
         
         self.closeAct = E5Action(
             self.tr('Close'),
-            UI.PixmapCache.getIcon("close.png"),
+            UI.PixmapCache.getIcon("close"),
             self.tr('&Close'),
             QKeySequence(self.tr("Ctrl+W", "File|Close")),
             0, self, 'hexEditor_file_close')
@@ -275,7 +275,7 @@
         
         self.exitAct = E5Action(
             self.tr('Quit'),
-            UI.PixmapCache.getIcon("exit.png"),
+            UI.PixmapCache.getIcon("exit"),
             self.tr('&Quit'),
             QKeySequence(self.tr("Ctrl+Q", "File|Quit")),
             0, self, 'hexEditor_file_quit')
@@ -294,7 +294,7 @@
         """
         self.undoAct = E5Action(
             self.tr('Undo'),
-            UI.PixmapCache.getIcon("editUndo.png"),
+            UI.PixmapCache.getIcon("editUndo"),
             self.tr('&Undo'),
             QKeySequence(self.tr("Ctrl+Z", "Edit|Undo")),
             QKeySequence(self.tr("Alt+Backspace", "Edit|Undo")),
@@ -309,7 +309,7 @@
         
         self.redoAct = E5Action(
             self.tr('Redo'),
-            UI.PixmapCache.getIcon("editRedo.png"),
+            UI.PixmapCache.getIcon("editRedo"),
             self.tr('&Redo'),
             QKeySequence(self.tr("Ctrl+Shift+Z", "Edit|Redo")),
             0, self, 'hexEditor_edit_redo')
@@ -338,7 +338,7 @@
         
         self.cutAct = E5Action(
             self.tr('Cut'),
-            UI.PixmapCache.getIcon("editCut.png"),
+            UI.PixmapCache.getIcon("editCut"),
             self.tr('Cu&t'),
             QKeySequence(self.tr("Ctrl+X", "Edit|Cut")),
             QKeySequence(self.tr("Shift+Del", "Edit|Cut")),
@@ -353,7 +353,7 @@
         
         self.copyAct = E5Action(
             self.tr('Copy'),
-            UI.PixmapCache.getIcon("editCopy.png"),
+            UI.PixmapCache.getIcon("editCopy"),
             self.tr('&Copy'),
             QKeySequence(self.tr("Ctrl+C", "Edit|Copy")),
             QKeySequence(self.tr("Ctrl+Ins", "Edit|Copy")),
@@ -368,7 +368,7 @@
         
         self.pasteAct = E5Action(
             self.tr('Paste'),
-            UI.PixmapCache.getIcon("editPaste.png"),
+            UI.PixmapCache.getIcon("editPaste"),
             self.tr('&Paste'),
             QKeySequence(self.tr("Ctrl+V", "Edit|Paste")),
             QKeySequence(self.tr("Shift+Ins", "Edit|Paste")),
@@ -383,7 +383,7 @@
         
         self.selectAllAct = E5Action(
             self.tr('Select All'),
-            UI.PixmapCache.getIcon("editSelectAll.png"),
+            UI.PixmapCache.getIcon("editSelectAll"),
             self.tr('&Select All'),
             QKeySequence(self.tr("Ctrl+A", "Edit|Select All")),
             0,
@@ -445,7 +445,7 @@
         
         self.searchAct = E5Action(
             self.tr('Search'),
-            UI.PixmapCache.getIcon("find.png"),
+            UI.PixmapCache.getIcon("find"),
             self.tr('&Search...'),
             QKeySequence(self.tr("Ctrl+F", "Search|Search")),
             0,
@@ -461,7 +461,7 @@
         
         self.searchNextAct = E5Action(
             self.tr('Search next'),
-            UI.PixmapCache.getIcon("findNext.png"),
+            UI.PixmapCache.getIcon("findNext"),
             self.tr('Search &next'),
             QKeySequence(self.tr("F3", "Search|Search next")),
             0,
@@ -478,7 +478,7 @@
         
         self.searchPrevAct = E5Action(
             self.tr('Search previous'),
-            UI.PixmapCache.getIcon("findPrev.png"),
+            UI.PixmapCache.getIcon("findPrev"),
             self.tr('Search &previous'),
             QKeySequence(self.tr("Shift+F3", "Search|Search previous")),
             0,
@@ -512,7 +512,7 @@
         
         self.gotoAct = E5Action(
             self.tr('Goto Offset'),
-            UI.PixmapCache.getIcon("goto.png"),
+            UI.PixmapCache.getIcon("goto"),
             self.tr('&Goto Offset...'),
             QKeySequence(QCoreApplication.translate(
                 'ViewManager', "Ctrl+G", "Search|Goto Offset")),
@@ -575,7 +575,7 @@
         
         self.whatsThisAct = E5Action(
             self.tr('What\'s This?'),
-            UI.PixmapCache.getIcon("whatsThis.png"),
+            UI.PixmapCache.getIcon("whatsThis"),
             self.tr('&What\'s This?'),
             QKeySequence(self.tr("Shift+F1", "Help|What's This?'")),
             0, self, 'hexEditor_help_whats_this')
@@ -597,7 +597,7 @@
         """
         self.prefAct = E5Action(
             self.tr('Preferences'),
-            UI.PixmapCache.getIcon("configure.png"),
+            UI.PixmapCache.getIcon("configure"),
             self.tr('&Preferences...'),
             0, 0, self, 'hexEditor_settings_preferences')
         self.prefAct.setStatusTip(self.tr(
--- a/eric6/HexEdit/HexEditSearchReplaceWidget.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/HexEdit/HexEditSearchReplaceWidget.py	Sat May 02 13:51:07 2020 +0200
@@ -66,19 +66,19 @@
             self.__ui = Ui_HexEditSearchWidget()
         self.__ui.setupUi(self)
         
-        self.__ui.closeButton.setIcon(UI.PixmapCache.getIcon("close.png"))
+        self.__ui.closeButton.setIcon(UI.PixmapCache.getIcon("close"))
         self.__ui.findPrevButton.setIcon(
-            UI.PixmapCache.getIcon("1leftarrow.png"))
+            UI.PixmapCache.getIcon("1leftarrow"))
         self.__ui.findNextButton.setIcon(
-            UI.PixmapCache.getIcon("1rightarrow.png"))
+            UI.PixmapCache.getIcon("1rightarrow"))
         
         if replace:
             self.__ui.replaceButton.setIcon(
-                UI.PixmapCache.getIcon("editReplace.png"))
+                UI.PixmapCache.getIcon("editReplace"))
             self.__ui.replaceSearchButton.setIcon(
-                UI.PixmapCache.getIcon("editReplaceSearch.png"))
+                UI.PixmapCache.getIcon("editReplaceSearch"))
             self.__ui.replaceAllButton.setIcon(
-                UI.PixmapCache.getIcon("editReplaceAll.png"))
+                UI.PixmapCache.getIcon("editReplaceAll"))
         
         for dataFormat in formatOrder:
             formatStr, validator = self.__formatAndValidators[dataFormat]
--- a/eric6/IconEditor/IconEditorWindow.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/IconEditor/IconEditorWindow.py	Sat May 02 13:51:07 2020 +0200
@@ -59,7 +59,7 @@
         
         self.fromEric = fromEric
         self.initShortcutsOnly = initShortcutsOnly
-        self.setWindowIcon(UI.PixmapCache.getIcon("iconEditor.png"))
+        self.setWindowIcon(UI.PixmapCache.getIcon("iconEditor"))
         
         if self.initShortcutsOnly:
             self.__initActions()
@@ -193,7 +193,7 @@
         """
         self.newAct = E5Action(
             self.tr('New'),
-            UI.PixmapCache.getIcon("new.png"),
+            UI.PixmapCache.getIcon("new"),
             self.tr('&New'),
             QKeySequence(self.tr("Ctrl+N", "File|New")),
             0, self, 'iconEditor_file_new')
@@ -207,7 +207,7 @@
         
         self.newWindowAct = E5Action(
             self.tr('New Window'),
-            UI.PixmapCache.getIcon("newWindow.png"),
+            UI.PixmapCache.getIcon("newWindow"),
             self.tr('New &Window'),
             0, 0, self, 'iconEditor_file_new_window')
         self.newWindowAct.setStatusTip(self.tr(
@@ -221,7 +221,7 @@
         
         self.openAct = E5Action(
             self.tr('Open'),
-            UI.PixmapCache.getIcon("open.png"),
+            UI.PixmapCache.getIcon("open"),
             self.tr('&Open...'),
             QKeySequence(self.tr("Ctrl+O", "File|Open")),
             0, self, 'iconEditor_file_open')
@@ -236,7 +236,7 @@
         
         self.saveAct = E5Action(
             self.tr('Save'),
-            UI.PixmapCache.getIcon("fileSave.png"),
+            UI.PixmapCache.getIcon("fileSave"),
             self.tr('&Save'),
             QKeySequence(self.tr("Ctrl+S", "File|Save")),
             0, self, 'iconEditor_file_save')
@@ -250,7 +250,7 @@
         
         self.saveAsAct = E5Action(
             self.tr('Save As'),
-            UI.PixmapCache.getIcon("fileSaveAs.png"),
+            UI.PixmapCache.getIcon("fileSaveAs"),
             self.tr('Save &As...'),
             QKeySequence(self.tr("Shift+Ctrl+S", "File|Save As")),
             0, self, 'iconEditor_file_save_as')
@@ -265,7 +265,7 @@
         
         self.closeAct = E5Action(
             self.tr('Close'),
-            UI.PixmapCache.getIcon("close.png"),
+            UI.PixmapCache.getIcon("close"),
             self.tr('&Close'),
             QKeySequence(self.tr("Ctrl+W", "File|Close")),
             0, self, 'iconEditor_file_close')
@@ -306,7 +306,7 @@
         
         self.exitAct = E5Action(
             self.tr('Quit'),
-            UI.PixmapCache.getIcon("exit.png"),
+            UI.PixmapCache.getIcon("exit"),
             self.tr('&Quit'),
             QKeySequence(self.tr("Ctrl+Q", "File|Quit")),
             0, self, 'iconEditor_file_quit')
@@ -325,7 +325,7 @@
         """
         self.undoAct = E5Action(
             self.tr('Undo'),
-            UI.PixmapCache.getIcon("editUndo.png"),
+            UI.PixmapCache.getIcon("editUndo"),
             self.tr('&Undo'),
             QKeySequence(self.tr("Ctrl+Z", "Edit|Undo")),
             QKeySequence(self.tr("Alt+Backspace", "Edit|Undo")),
@@ -340,7 +340,7 @@
         
         self.redoAct = E5Action(
             self.tr('Redo'),
-            UI.PixmapCache.getIcon("editRedo.png"),
+            UI.PixmapCache.getIcon("editRedo"),
             self.tr('&Redo'),
             QKeySequence(self.tr("Ctrl+Shift+Z", "Edit|Redo")),
             0, self, 'iconEditor_edit_redo')
@@ -354,7 +354,7 @@
         
         self.cutAct = E5Action(
             self.tr('Cut'),
-            UI.PixmapCache.getIcon("editCut.png"),
+            UI.PixmapCache.getIcon("editCut"),
             self.tr('Cu&t'),
             QKeySequence(self.tr("Ctrl+X", "Edit|Cut")),
             QKeySequence(self.tr("Shift+Del", "Edit|Cut")),
@@ -369,7 +369,7 @@
         
         self.copyAct = E5Action(
             self.tr('Copy'),
-            UI.PixmapCache.getIcon("editCopy.png"),
+            UI.PixmapCache.getIcon("editCopy"),
             self.tr('&Copy'),
             QKeySequence(self.tr("Ctrl+C", "Edit|Copy")),
             QKeySequence(self.tr("Ctrl+Ins", "Edit|Copy")),
@@ -384,7 +384,7 @@
         
         self.pasteAct = E5Action(
             self.tr('Paste'),
-            UI.PixmapCache.getIcon("editPaste.png"),
+            UI.PixmapCache.getIcon("editPaste"),
             self.tr('&Paste'),
             QKeySequence(self.tr("Ctrl+V", "Edit|Paste")),
             QKeySequence(self.tr("Shift+Ins", "Edit|Paste")),
@@ -412,7 +412,7 @@
         
         self.deleteAct = E5Action(
             self.tr('Clear'),
-            UI.PixmapCache.getIcon("editDelete.png"),
+            UI.PixmapCache.getIcon("editDelete"),
             self.tr('Cl&ear'),
             QKeySequence(self.tr("Alt+Shift+C", "Edit|Clear")),
             0,
@@ -443,7 +443,7 @@
         
         self.resizeAct = E5Action(
             self.tr('Change Size'),
-            UI.PixmapCache.getIcon("transformResize.png"),
+            UI.PixmapCache.getIcon("transformResize"),
             self.tr('Change Si&ze...'),
             0, 0,
             self, 'iconEditor_edit_change_size')
@@ -457,7 +457,7 @@
         
         self.grayscaleAct = E5Action(
             self.tr('Grayscale'),
-            UI.PixmapCache.getIcon("grayscale.png"),
+            UI.PixmapCache.getIcon("grayscale"),
             self.tr('&Grayscale'),
             0, 0,
             self, 'iconEditor_edit_grayscale')
@@ -494,7 +494,7 @@
         """
         self.zoomInAct = E5Action(
             self.tr('Zoom in'),
-            UI.PixmapCache.getIcon("zoomIn.png"),
+            UI.PixmapCache.getIcon("zoomIn"),
             self.tr('Zoom &in'),
             QKeySequence(self.tr("Ctrl++", "View|Zoom in")),
             0, self, 'iconEditor_view_zoom_in')
@@ -508,7 +508,7 @@
         
         self.zoomOutAct = E5Action(
             self.tr('Zoom out'),
-            UI.PixmapCache.getIcon("zoomOut.png"),
+            UI.PixmapCache.getIcon("zoomOut"),
             self.tr('Zoom &out'),
             QKeySequence(self.tr("Ctrl+-", "View|Zoom out")),
             0, self, 'iconEditor_view_zoom_out')
@@ -522,7 +522,7 @@
         
         self.zoomResetAct = E5Action(
             self.tr('Zoom reset'),
-            UI.PixmapCache.getIcon("zoomReset.png"),
+            UI.PixmapCache.getIcon("zoomReset"),
             self.tr('Zoom &reset'),
             QKeySequence(self.tr("Ctrl+0", "View|Zoom reset")),
             0, self, 'iconEditor_view_zoom_reset')
@@ -538,7 +538,7 @@
         
         self.showGridAct = E5Action(
             self.tr('Show Grid'),
-            UI.PixmapCache.getIcon("grid.png"),
+            UI.PixmapCache.getIcon("grid"),
             self.tr('Show &Grid'),
             0, 0,
             self, 'iconEditor_view_show_grid')
@@ -565,7 +565,7 @@
         
         self.drawPencilAct = E5Action(
             self.tr('Freehand'),
-            UI.PixmapCache.getIcon("drawBrush.png"),
+            UI.PixmapCache.getIcon("drawBrush"),
             self.tr('&Freehand'),
             0, 0,
             self.drawingActGrp, 'iconEditor_tools_pencil')
@@ -580,7 +580,7 @@
         
         self.drawColorPickerAct = E5Action(
             self.tr('Color Picker'),
-            UI.PixmapCache.getIcon("colorPicker.png"),
+            UI.PixmapCache.getIcon("colorPicker"),
             self.tr('&Color Picker'),
             0, 0,
             self.drawingActGrp, 'iconEditor_tools_color_picker')
@@ -597,7 +597,7 @@
         
         self.drawRectangleAct = E5Action(
             self.tr('Rectangle'),
-            UI.PixmapCache.getIcon("drawRectangle.png"),
+            UI.PixmapCache.getIcon("drawRectangle"),
             self.tr('&Rectangle'),
             0, 0,
             self.drawingActGrp, 'iconEditor_tools_rectangle')
@@ -612,7 +612,7 @@
         
         self.drawFilledRectangleAct = E5Action(
             self.tr('Filled Rectangle'),
-            UI.PixmapCache.getIcon("drawRectangleFilled.png"),
+            UI.PixmapCache.getIcon("drawRectangleFilled"),
             self.tr('F&illed Rectangle'),
             0, 0,
             self.drawingActGrp, 'iconEditor_tools_filled_rectangle')
@@ -628,7 +628,7 @@
         
         self.drawCircleAct = E5Action(
             self.tr('Circle'),
-            UI.PixmapCache.getIcon("drawCircle.png"),
+            UI.PixmapCache.getIcon("drawCircle"),
             self.tr('Circle'),
             0, 0,
             self.drawingActGrp, 'iconEditor_tools_circle')
@@ -643,7 +643,7 @@
         
         self.drawFilledCircleAct = E5Action(
             self.tr('Filled Circle'),
-            UI.PixmapCache.getIcon("drawCircleFilled.png"),
+            UI.PixmapCache.getIcon("drawCircleFilled"),
             self.tr('Fille&d Circle'),
             0, 0,
             self.drawingActGrp, 'iconEditor_tools_filled_circle')
@@ -659,7 +659,7 @@
         
         self.drawEllipseAct = E5Action(
             self.tr('Ellipse'),
-            UI.PixmapCache.getIcon("drawEllipse.png"),
+            UI.PixmapCache.getIcon("drawEllipse"),
             self.tr('&Ellipse'),
             0, 0,
             self.drawingActGrp, 'iconEditor_tools_ellipse')
@@ -674,7 +674,7 @@
         
         self.drawFilledEllipseAct = E5Action(
             self.tr('Filled Ellipse'),
-            UI.PixmapCache.getIcon("drawEllipseFilled.png"),
+            UI.PixmapCache.getIcon("drawEllipseFilled"),
             self.tr('Fille&d Elli&pse'),
             0, 0,
             self.drawingActGrp, 'iconEditor_tools_filled_ellipse')
@@ -690,7 +690,7 @@
         
         self.drawFloodFillAct = E5Action(
             self.tr('Flood Fill'),
-            UI.PixmapCache.getIcon("drawFill.png"),
+            UI.PixmapCache.getIcon("drawFill"),
             self.tr('Fl&ood Fill'),
             0, 0,
             self.drawingActGrp, 'iconEditor_tools_flood_fill')
@@ -706,7 +706,7 @@
         
         self.drawLineAct = E5Action(
             self.tr('Line'),
-            UI.PixmapCache.getIcon("drawLine.png"),
+            UI.PixmapCache.getIcon("drawLine"),
             self.tr('&Line'),
             0, 0,
             self.drawingActGrp, 'iconEditor_tools_line')
@@ -721,7 +721,7 @@
         
         self.drawEraserAct = E5Action(
             self.tr('Eraser (Transparent)'),
-            UI.PixmapCache.getIcon("drawEraser.png"),
+            UI.PixmapCache.getIcon("drawEraser"),
             self.tr('Eraser (&Transparent)'),
             0, 0,
             self.drawingActGrp, 'iconEditor_tools_eraser')
@@ -736,7 +736,7 @@
         
         self.drawRectangleSelectionAct = E5Action(
             self.tr('Rectangular Selection'),
-            UI.PixmapCache.getIcon("selectRectangle.png"),
+            UI.PixmapCache.getIcon("selectRectangle"),
             self.tr('Rect&angular Selection'),
             0, 0,
             self.drawingActGrp, 'iconEditor_tools_selection_rectangle')
@@ -753,7 +753,7 @@
         
         self.drawCircleSelectionAct = E5Action(
             self.tr('Circular Selection'),
-            UI.PixmapCache.getIcon("selectCircle.png"),
+            UI.PixmapCache.getIcon("selectCircle"),
             self.tr('Rect&angular Selection'),
             0, 0,
             self.drawingActGrp, 'iconEditor_tools_selection_circle')
@@ -801,7 +801,7 @@
         
         self.whatsThisAct = E5Action(
             self.tr('What\'s This?'),
-            UI.PixmapCache.getIcon("whatsThis.png"),
+            UI.PixmapCache.getIcon("whatsThis"),
             self.tr('&What\'s This?'),
             QKeySequence(self.tr("Shift+F1", "Help|What's This?'")),
             0, self, 'iconEditor_help_whats_this')
@@ -971,9 +971,9 @@
         self.__updatePosition(0, 0)
         
         self.__zoomWidget = E5ZoomWidget(
-            UI.PixmapCache.getPixmap("zoomOut.png"),
-            UI.PixmapCache.getPixmap("zoomIn.png"),
-            UI.PixmapCache.getPixmap("zoomReset.png"), self)
+            UI.PixmapCache.getPixmap("zoomOut"),
+            UI.PixmapCache.getPixmap("zoomIn"),
+            UI.PixmapCache.getPixmap("zoomReset"), self)
         self.__zoomWidget.setMinimum(IconEditorGrid.ZoomMinimum)
         self.__zoomWidget.setMaximum(IconEditorGrid.ZoomMaximum)
         self.__zoomWidget.setDefault(IconEditorGrid.ZoomDefault)
--- a/eric6/MicroPython/MicroPythonDevices.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/MicroPython/MicroPythonDevices.py	Sat May 02 13:51:07 2020 +0200
@@ -55,6 +55,14 @@
         "icon": "microbitDevice",
     },
     
+    "calliope": {
+        "ids": [
+            (0x0D28, 0x0204),       # Calliope mini
+        ],
+        "description": "Calliope mini",
+        "icon": "calliope_mini",
+    },
+    
     "pyboard": {
         "ids": [
             (0xF055, 0x9800),       # Pyboard in CDC mode
@@ -63,7 +71,7 @@
         ],
         "description": "PyBoard",
         "icon": "micropython48",
-    }
+    },
 }
 
 
@@ -103,7 +111,6 @@
                 foundDevices.append(
                     (board, SupportedBoards[board]["description"],
                      port.portName()))
-                break
         else:
             logging.debug("Unknown device: (0x%04x:0x%04x)", vid, pid)
     
@@ -151,9 +158,9 @@
     elif deviceType == "circuitpython":
         from .CircuitPythonDevices import CircuitPythonDevice
         return CircuitPythonDevice(microPythonWidget)
-    elif deviceType == "bbc_microbit":
+    elif deviceType in ("bbc_microbit", "calliope"):
         from .MicrobitDevices import MicrobitDevice
-        return MicrobitDevice(microPythonWidget)
+        return MicrobitDevice(microPythonWidget, deviceType)
     elif deviceType == "pyboard":
         from .PyBoardDevices import PyBoardDevice
         return PyBoardDevice(microPythonWidget)
--- a/eric6/MicroPython/MicroPythonGraphWidget.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/MicroPython/MicroPythonGraphWidget.py	Sat May 02 13:51:07 2020 +0200
@@ -23,6 +23,7 @@
 from PyQt5.QtChart import QChartView, QChart, QLineSeries, QValueAxis
 
 from E5Gui import E5MessageBox
+from E5Gui.E5Application import e5App
 
 import UI.PixmapCache
 import Preferences
@@ -113,9 +114,26 @@
         self.__chart.setAxisY(self.__axisY, self.__series[0])
         self.__chartView.setChart(self.__chart)
         self.__chartView.setRenderHint(QPainter.Antialiasing)
+        self.preferencesChanged()
         
         self.__maxXSpinBox.valueChanged.connect(self.__handleMaxXChanged)
     
+    @pyqtSlot()
+    def preferencesChanged(self):
+        """
+        Public slot to apply changed preferences.
+        """
+        chartColorTheme = Preferences.getMicroPython("ChartColorTheme")
+        if chartColorTheme == -1:
+            # automatic selection of light or dark depending on desktop
+            # color scheme
+            if e5App().usesDarkPalette():
+                self.__chart.setTheme(QChart.ChartThemeDark)
+            else:
+                self.__chart.setTheme(QChart.ChartThemeLight)
+        else:
+            self.__chart.setTheme(chartColorTheme)
+    
     @pyqtSlot(bytes)
     def processData(self, data):
         """
--- a/eric6/MicroPython/MicroPythonWidget.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/MicroPython/MicroPythonWidget.py	Sat May 02 13:51:07 2020 +0200
@@ -136,6 +136,42 @@
         16: QBrush(QColor(0, 255, 255)),
         17: QBrush(QColor(255, 255, 255)),
     },
+    "Ubuntu (dark)": {
+        0: QBrush(QColor(96, 96, 96)),
+        1: QBrush(QColor(235, 58, 45)),
+        2: QBrush(QColor(57, 181, 74)),
+        3: QBrush(QColor(255, 199, 29)),
+        4: QBrush(QColor(25, 56, 230)),
+        5: QBrush(QColor(200, 64, 193)),
+        6: QBrush(QColor(48, 200, 255)),
+        7: QBrush(QColor(204, 204, 204)),
+        10: QBrush(QColor(128, 128, 128)),
+        11: QBrush(QColor(255, 0, 0)),
+        12: QBrush(QColor(0, 255, 0)),
+        13: QBrush(QColor(255, 255, 0)),
+        14: QBrush(QColor(0, 0, 255)),
+        15: QBrush(QColor(255, 0, 255)),
+        16: QBrush(QColor(0, 255, 255)),
+        17: QBrush(QColor(255, 255, 255)),
+    },
+    "Breeze (dark)": {
+        0: QBrush(QColor(35, 38, 39)),
+        1: QBrush(QColor(237, 21, 21)),
+        2: QBrush(QColor(17, 209, 22)),
+        3: QBrush(QColor(246, 116, 0)),
+        4: QBrush(QColor(29, 153, 243)),
+        5: QBrush(QColor(155, 89, 182)),
+        6: QBrush(QColor(26, 188, 156)),
+        7: QBrush(QColor(252, 252, 252)),
+        10: QBrush(QColor(127, 140, 141)),
+        11: QBrush(QColor(192, 57, 43)),
+        12: QBrush(QColor(28, 220, 154)),
+        13: QBrush(QColor(253, 188, 75)),
+        14: QBrush(QColor(61, 174, 233)),
+        15: QBrush(QColor(142, 68, 173)),
+        16: QBrush(QColor(22, 160, 133)),
+        17: QBrush(QColor(255, 255, 255)),
+    },
 }
 
 
@@ -213,6 +249,7 @@
         self.__currentZoom = 0
         
         self.__fileManagerWidget = None
+        self.__chartWidget = None
         
         if HAS_QTSERIALPORT:
             self.__interface = MicroPythonCommandsInterface(self)
@@ -303,6 +340,9 @@
             self.replEdit.setLineWrapMode(QTextEdit.WidgetWidth)
         else:
             self.replEdit.setLineWrapMode(QTextEdit.NoWrap)
+        
+        if self.__chartWidget is not None:
+            self.__chartWidget.preferencesChanged()
     
     def commandsInterface(self):
         """
@@ -370,7 +410,7 @@
         if "files" in kwargs:
             self.filesButton.setEnabled(kwargs["files"])
         if "chart" in kwargs:
-            self.chartButton.setEnabled(kwargs["chart"])
+            self.chartButton.setEnabled(kwargs["chart"] and HAS_QTCHART)
     
     @pyqtSlot(QPoint)
     def __showContextMenu(self, pos):
--- a/eric6/MicroPython/MicrobitDevices.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/MicroPython/MicrobitDevices.py	Sat May 02 13:51:07 2020 +0200
@@ -4,7 +4,8 @@
 #
 
 """
-Module implementing the device interface class for BBC micro:bit boards.
+Module implementing the device interface class for BBC micro:bit and
+Calliope mini boards.
 """
 
 
@@ -26,18 +27,22 @@
 
 class MicrobitDevice(MicroPythonDevice):
     """
-    Class implementing the device for BBC micro:bit boards.
+    Class implementing the device for BBC micro:bit and Calliope mini boards.
     """
-    def __init__(self, microPythonWidget, parent=None):
+    def __init__(self, microPythonWidget, deviceType, parent=None):
         """
         Constructor
         
         @param microPythonWidget reference to the main MicroPython widget
         @type MicroPythonWidget
+        @param deviceType type of the device
+        @type str
         @param parent reference to the parent object
         @type QObject
         """
         super(MicrobitDevice, self).__init__(microPythonWidget, parent)
+        
+        self.__deviceType = deviceType
     
     def setButtons(self):
         """
@@ -64,7 +69,12 @@
         @return name of the device
         @rtype str
         """
-        return self.tr("BBC micro:bit")
+        if self.__deviceType == "bbc_microbit":
+            # BBC micro:bit
+            return self.tr("BBC micro:bit")
+        else:
+            # Calliope mini
+            return self.tr("Calliope mini")
     
     def canStartRepl(self):
         """
@@ -124,8 +134,13 @@
         @rtype str
         """
         # Attempts to find the path on the filesystem that represents the
-        # plugged in MICROBIT board.
-        deviceDirectory = Utilities.findVolume("MICROBIT")
+        # plugged in MICROBIT or MINI board.
+        if self.__deviceType == "bbc_microbit":
+            # BBC micro:bit
+            deviceDirectory = Utilities.findVolume("MICROBIT")
+        else:
+            # Calliope mini
+            deviceDirectory = Utilities.findVolume("MINI")
         
         if deviceDirectory:
             return deviceDirectory
@@ -134,9 +149,9 @@
             E5MessageBox.warning(
                 self.microPython,
                 self.tr("Workspace Directory"),
-                self.tr("Could not find an attached BBC micro:bit.\n\n"
+                self.tr("Could not find an attached {0}.\n\n"
                         "Please make sure the device is plugged "
-                        "into this computer."))
+                        "into this computer.").format(self.deviceName()))
             
             return super(MicrobitDevice, self).getWorkspace()
     
@@ -174,7 +189,8 @@
             "Save the current script as 'main.py' on the connected device"))
         act.setEnabled(connected)
         menu.addSeparator()
-        act = menu.addAction(self.tr("Reset micro:bit"), self.__resetDevice)
+        act = menu.addAction(self.tr("Reset {0}").format(self.deviceName()),
+                             self.__resetDevice)
         act.setEnabled(connected)
     
     @pyqtSlot()
@@ -183,18 +199,42 @@
         Private slot to flash the default MicroPython firmware to the device.
         """
         # Attempts to find the path on the filesystem that represents the
-        # plugged in micro:bit board in maintenance mode.
-        deviceDirectory = Utilities.findVolume("MAINTENANCE")
+        # plugged in micro:bit board in maintenance mode or Calliope mini
+        # board in standard mode.
+        if self.__deviceType == "bbc_microbit":
+            # BBC micro:bit
+            deviceDirectory = Utilities.findVolume("MAINTENANCE")
+        else:
+            # Calliope mini
+            deviceDirectory = Utilities.findVolume("MINI")
         if not deviceDirectory:
-            # BBC micro:bit is not ready or not mounted
-            E5MessageBox.critical(
-                self.microPython,
-                self.tr("Flash MicroPython Firmware"),
-                self.tr(
-                    'The BBC micro:bit is not ready for flashing. See the'
-                    ' <a href="https://microbit.org/guide/firmware/">'
-                    'micro:bit web site</a> for details.'
-                ))
+            if self.__deviceType == "bbc_microbit":
+                # BBC micro:bit is not ready or not mounted
+                E5MessageBox.critical(
+                    self.microPython,
+                    self.tr("Flash MicroPython Firmware"),
+                    self.tr(
+                        '<p>The BBC micro:bit is not ready for flashing.'
+                        ' Follow these instructions.</p>'
+                        '<ul>'
+                        '<li>unplug USB cable and any batteries</li>'
+                        '<li>keep RESET button pressed an plug USB cable back'
+                        ' in</li>'
+                        '<li>a drive called MAINTENANCE should be available'
+                        '</li>'
+                        '</ul>'
+                        '<p>See the '
+                        '<a href="https://microbit.org/guide/firmware/">'
+                        'micro:bit web site</a> for details.</p>'
+                    ))
+            else:
+                # Calliope mini is not ready or not mounted
+                E5MessageBox.warning(
+                    self.microPython,
+                    self.tr("Flash MicroPython Firmware"),
+                    self.tr("Could not find an attached {0}.\n\n"
+                            "Please make sure the device is plugged "
+                            "into this computer.").format(self.deviceName()))
         else:
             downloadsPath = QStandardPaths.standardLocations(
                 QStandardPaths.DownloadLocation)[0]
@@ -286,10 +326,18 @@
         """
         Private slot to reset the connected device.
         """
-        self.microPython.commandsInterface().execute([
-            "import microbit",
-            "microbit.reset()",
-        ])
+        if self.__deviceType == "bbc_microbit":
+            # BBC micro:bit
+            self.microPython.commandsInterface().execute([
+                "import microbit",
+                "microbit.reset()",
+            ])
+        else:
+            # Calliope mini
+            self.microPython.commandsInterface().execute([
+                "import calliope_mini",
+                "calliope_mini.reset()",
+            ])
     
     def getDocumentationUrl(self):
         """
@@ -298,7 +346,12 @@
         @return documentation URL of the device
         @rtype str
         """
-        return Preferences.getMicroPython("MicrobitDocuUrl")
+        if self.__deviceType == "bbc_microbit":
+            # BBC micro:bit
+            return Preferences.getMicroPython("MicrobitDocuUrl")
+        else:
+            # Calliope mini
+            return Preferences.getMicroPython("CalliopeDocuUrl")
     
     def getFirmwareUrl(self):
         """
@@ -307,4 +360,9 @@
         @return firmware download URL of the device
         @rtype str
         """
-        return Preferences.getMicroPython("MicrobitFirmwareUrl")
+        if self.__deviceType == "bbc_microbit":
+            # BBC micro:bit
+            return Preferences.getMicroPython("MicrobitFirmwareUrl")
+        else:
+            # Calliope mini
+            return Preferences.getMicroPython("CalliopeFirmwareUrl")
--- a/eric6/MultiProject/MultiProject.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/MultiProject/MultiProject.py	Sat May 02 13:51:07 2020 +0200
@@ -702,7 +702,7 @@
         
         act = E5Action(
             self.tr('New multiproject'),
-            UI.PixmapCache.getIcon("multiProjectNew.png"),
+            UI.PixmapCache.getIcon("multiProjectNew"),
             self.tr('&New...'), 0, 0,
             self.actGrp1, 'multi_project_new')
         act.setStatusTip(self.tr('Generate a new multiproject'))
@@ -716,7 +716,7 @@
 
         act = E5Action(
             self.tr('Open multiproject'),
-            UI.PixmapCache.getIcon("multiProjectOpen.png"),
+            UI.PixmapCache.getIcon("multiProjectOpen"),
             self.tr('&Open...'), 0, 0,
             self.actGrp1, 'multi_project_open')
         act.setStatusTip(self.tr('Open an existing multiproject'))
@@ -729,7 +729,7 @@
 
         self.closeAct = E5Action(
             self.tr('Close multiproject'),
-            UI.PixmapCache.getIcon("multiProjectClose.png"),
+            UI.PixmapCache.getIcon("multiProjectClose"),
             self.tr('&Close'), 0, 0, self, 'multi_project_close')
         self.closeAct.setStatusTip(self.tr(
             'Close the current multiproject'))
@@ -742,7 +742,7 @@
 
         self.saveAct = E5Action(
             self.tr('Save multiproject'),
-            UI.PixmapCache.getIcon("multiProjectSave.png"),
+            UI.PixmapCache.getIcon("multiProjectSave"),
             self.tr('&Save'), 0, 0, self, 'multi_project_save')
         self.saveAct.setStatusTip(self.tr('Save the current multiproject'))
         self.saveAct.setWhatsThis(self.tr(
@@ -754,7 +754,7 @@
 
         self.saveasAct = E5Action(
             self.tr('Save multiproject as'),
-            UI.PixmapCache.getIcon("multiProjectSaveAs.png"),
+            UI.PixmapCache.getIcon("multiProjectSaveAs"),
             self.tr('Save &as...'), 0, 0, self,
             'multi_project_save_as')
         self.saveasAct.setStatusTip(self.tr(
@@ -768,7 +768,7 @@
 
         self.addProjectAct = E5Action(
             self.tr('Add project to multiproject'),
-            UI.PixmapCache.getIcon("fileProject.png"),
+            UI.PixmapCache.getIcon("fileProject"),
             self.tr('Add &project...'), 0, 0,
             self, 'multi_project_add_project')
         self.addProjectAct.setStatusTip(self.tr(
@@ -783,7 +783,7 @@
 
         self.propsAct = E5Action(
             self.tr('Multiproject properties'),
-            UI.PixmapCache.getIcon("multiProjectProps.png"),
+            UI.PixmapCache.getIcon("multiProjectProps"),
             self.tr('&Properties...'), 0, 0, self,
             'multi_project_properties')
         self.propsAct.setStatusTip(self.tr(
--- a/eric6/MultiProject/MultiProjectBrowser.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/MultiProject/MultiProjectBrowser.py	Sat May 02 13:51:07 2020 +0200
@@ -42,7 +42,7 @@
         self.multiProject = multiProject
         self.project = project
         
-        self.setWindowIcon(UI.PixmapCache.getIcon("eric.png"))
+        self.setWindowIcon(UI.PixmapCache.getIcon("eric"))
         self.setAlternatingRowColors(True)
         self.setHeaderHidden(True)
         self.setItemsExpandable(False)
@@ -252,9 +252,9 @@
         """
         itm.setText(0, project['name'])
         if project['master']:
-            itm.setIcon(0, UI.PixmapCache.getIcon("masterProject.png"))
+            itm.setIcon(0, UI.PixmapCache.getIcon("masterProject"))
         else:
-            itm.setIcon(0, UI.PixmapCache.getIcon("empty.png"))
+            itm.setIcon(0, UI.PixmapCache.getIcon("empty"))
         itm.setToolTip(0, project['file'])
         itm.setData(0, MultiProjectBrowser.ProjectFileNameRole,
                     project['file'])
--- a/eric6/Network/IRC/IrcChannelWidget.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/Network/IRC/IrcChannelWidget.py	Sat May 02 13:51:07 2020 +0200
@@ -129,17 +129,17 @@
         """
         # step 1: determine the icon
         if self.__privilege & IrcUserItem.Voice:
-            icon = UI.PixmapCache.getIcon("ircVoice.png")
+            icon = UI.PixmapCache.getIcon("ircVoice")
         elif self.__privilege & IrcUserItem.Owner:
-            icon = UI.PixmapCache.getIcon("ircOwner.png")
+            icon = UI.PixmapCache.getIcon("ircOwner")
         elif self.__privilege & IrcUserItem.Operator:
-            icon = UI.PixmapCache.getIcon("ircOp.png")
+            icon = UI.PixmapCache.getIcon("ircOp")
         elif self.__privilege & IrcUserItem.Halfop:
-            icon = UI.PixmapCache.getIcon("ircHalfop.png")
+            icon = UI.PixmapCache.getIcon("ircHalfop")
         elif self.__privilege & IrcUserItem.Admin:
-            icon = UI.PixmapCache.getIcon("ircAdmin.png")
+            icon = UI.PixmapCache.getIcon("ircAdmin")
         else:
-            icon = UI.PixmapCache.getIcon("ircNormal.png")
+            icon = UI.PixmapCache.getIcon("ircNormal")
         if self.__privilege & IrcUserItem.Away:
             icon = self.__awayIcon(icon)
         
@@ -154,7 +154,7 @@
         @return away icon (QIcon)
         """
         pix1 = icon.pixmap(16, 16)
-        pix2 = UI.PixmapCache.getPixmap("ircAway.png")
+        pix2 = UI.PixmapCache.getPixmap("ircAway")
         painter = QPainter(pix1)
         painter.drawPixmap(0, 0, pix2)
         painter.end()
@@ -259,7 +259,7 @@
         self.__ircWidget = parent
         
         self.editTopicButton.setIcon(
-            UI.PixmapCache.getIcon("ircEditTopic.png"))
+            UI.PixmapCache.getIcon("ircEditTopic"))
         self.editTopicButton.hide()
         
         height = self.usersList.height() + self.messages.height()
@@ -686,14 +686,14 @@
         if Preferences.getIrc("ShowNotifications"):
             if Preferences.getIrc("NotifyMessage"):
                 self.__ui.showNotification(
-                    UI.PixmapCache.getPixmap("irc48.png"),
+                    UI.PixmapCache.getPixmap("irc48"),
                     self.tr("Channel Message"), msg)
             elif (
                 Preferences.getIrc("NotifyNick") and
                 self.__userName.lower() in msg.lower()
             ):
                 self.__ui.showNotification(
-                    UI.PixmapCache.getPixmap("irc48.png"),
+                    UI.PixmapCache.getPixmap("irc48"),
                     self.tr("Nick mentioned"), msg)
     
     def addUsers(self, users):
@@ -733,7 +733,7 @@
                 Preferences.getIrc("NotifyJoinPart")
             ):
                 self.__ui.showNotification(
-                    UI.PixmapCache.getPixmap("irc48.png"),
+                    UI.PixmapCache.getPixmap("irc48"),
                     self.tr("Join Channel"), msg)
             return True
         
@@ -768,7 +768,7 @@
                 Preferences.getIrc("NotifyJoinPart")
             ):
                 self.__ui.showNotification(
-                    UI.PixmapCache.getPixmap("irc48.png"),
+                    UI.PixmapCache.getPixmap("irc48"),
                     self.tr("Leave Channel"), nmsg)
             return True
         
@@ -800,7 +800,7 @@
                 Preferences.getIrc("NotifyJoinPart")
             ):
                 self.__ui.showNotification(
-                    UI.PixmapCache.getPixmap("irc48.png"),
+                    UI.PixmapCache.getPixmap("irc48"),
                     self.tr("Quit"), msg)
         
         # always return False for other channels and server to process
@@ -1417,22 +1417,22 @@
         """
         self.__messagesMenu = QMenu(self)
         self.__copyMessagesAct = self.__messagesMenu.addAction(
-            UI.PixmapCache.getIcon("editCopy.png"),
+            UI.PixmapCache.getIcon("editCopy"),
             self.tr("Copy"), self.__copyMessages)
         self.__messagesMenu.addSeparator()
         self.__cutAllMessagesAct = self.__messagesMenu.addAction(
-            UI.PixmapCache.getIcon("editCut.png"),
+            UI.PixmapCache.getIcon("editCut"),
             self.tr("Cut all"), self.__cutAllMessages)
         self.__copyAllMessagesAct = self.__messagesMenu.addAction(
-            UI.PixmapCache.getIcon("editCopy.png"),
+            UI.PixmapCache.getIcon("editCopy"),
             self.tr("Copy all"), self.__copyAllMessages)
         self.__messagesMenu.addSeparator()
         self.__clearMessagesAct = self.__messagesMenu.addAction(
-            UI.PixmapCache.getIcon("editDelete.png"),
+            UI.PixmapCache.getIcon("editDelete"),
             self.tr("Clear"), self.__clearMessages)
         self.__messagesMenu.addSeparator()
         self.__saveMessagesAct = self.__messagesMenu.addAction(
-            UI.PixmapCache.getIcon("fileSave.png"),
+            UI.PixmapCache.getIcon("fileSave"),
             self.tr("Save"), self.__saveMessages)
         self.__messagesMenu.addSeparator()
         self.__setMarkerMessagesAct = self.__messagesMenu.addAction(
--- a/eric6/Network/IRC/IrcIdentitiesEditDialog.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/Network/IRC/IrcIdentitiesEditDialog.py	Sat May 02 13:51:07 2020 +0200
@@ -39,17 +39,17 @@
         super(IrcIdentitiesEditDialog, self).__init__(parent)
         self.setupUi(self)
         
-        self.addButton.setIcon(UI.PixmapCache.getIcon("plus.png"))
-        self.copyButton.setIcon(UI.PixmapCache.getIcon("editCopy.png"))
-        self.renameButton.setIcon(UI.PixmapCache.getIcon("editRename.png"))
-        self.deleteButton.setIcon(UI.PixmapCache.getIcon("minus.png"))
-        self.nicknameAddButton.setIcon(UI.PixmapCache.getIcon("plus.png"))
-        self.nicknameDeleteButton.setIcon(UI.PixmapCache.getIcon("minus.png"))
-        self.nicknameUpButton.setIcon(UI.PixmapCache.getIcon("1uparrow.png"))
+        self.addButton.setIcon(UI.PixmapCache.getIcon("plus"))
+        self.copyButton.setIcon(UI.PixmapCache.getIcon("editCopy"))
+        self.renameButton.setIcon(UI.PixmapCache.getIcon("editRename"))
+        self.deleteButton.setIcon(UI.PixmapCache.getIcon("minus"))
+        self.nicknameAddButton.setIcon(UI.PixmapCache.getIcon("plus"))
+        self.nicknameDeleteButton.setIcon(UI.PixmapCache.getIcon("minus"))
+        self.nicknameUpButton.setIcon(UI.PixmapCache.getIcon("1uparrow"))
         self.nicknameDownButton.setIcon(
-            UI.PixmapCache.getIcon("1downarrow.png"))
+            UI.PixmapCache.getIcon("1downarrow"))
         self.showPasswordButton.setIcon(
-            UI.PixmapCache.getIcon("showPassword.png"))
+            UI.PixmapCache.getIcon("showPassword"))
         
         self.__manager = manager
         
@@ -468,13 +468,13 @@
         if checked:
             self.passwordEdit.setEchoMode(QLineEdit.Normal)
             self.showPasswordButton.setIcon(
-                UI.PixmapCache.getIcon("hidePassword.png"))
+                UI.PixmapCache.getIcon("hidePassword"))
             self.showPasswordButton.setToolTip(
                 self.tr("Press to hide the password"))
         else:
             self.passwordEdit.setEchoMode(QLineEdit.Password)
             self.showPasswordButton.setIcon(
-                UI.PixmapCache.getIcon("showPassword.png"))
+                UI.PixmapCache.getIcon("showPassword"))
             self.showPasswordButton.setToolTip(
                 self.tr("Press to show the password"))
     
--- a/eric6/Network/IRC/IrcNetworkEditDialog.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/Network/IRC/IrcNetworkEditDialog.py	Sat May 02 13:51:07 2020 +0200
@@ -39,13 +39,13 @@
         self.__manager = manager
         
         self.editIdentitiesButton.setIcon(
-            UI.PixmapCache.getIcon("ircConfigure.png"))
+            UI.PixmapCache.getIcon("ircConfigure"))
         self.editServerButton.setIcon(
-            UI.PixmapCache.getIcon("ircConfigure.png"))
+            UI.PixmapCache.getIcon("ircConfigure"))
         self.editChannelButton.setIcon(
-            UI.PixmapCache.getIcon("ircConfigure.png"))
-        self.addChannelButton.setIcon(UI.PixmapCache.getIcon("plus.png"))
-        self.deleteChannelButton.setIcon(UI.PixmapCache.getIcon("minus.png"))
+            UI.PixmapCache.getIcon("ircConfigure"))
+        self.addChannelButton.setIcon(UI.PixmapCache.getIcon("plus"))
+        self.deleteChannelButton.setIcon(UI.PixmapCache.getIcon("minus"))
         
         self.__okButton = self.buttonBox.button(QDialogButtonBox.Ok)
         
--- a/eric6/Network/IRC/IrcNetworkWidget.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/Network/IRC/IrcNetworkWidget.py	Sat May 02 13:51:07 2020 +0200
@@ -54,10 +54,10 @@
         super(IrcNetworkWidget, self).__init__(parent)
         self.setupUi(self)
         
-        self.connectButton.setIcon(UI.PixmapCache.getIcon("ircConnect.png"))
-        self.editButton.setIcon(UI.PixmapCache.getIcon("ircConfigure.png"))
-        self.joinButton.setIcon(UI.PixmapCache.getIcon("ircJoinChannel.png"))
-        self.awayButton.setIcon(UI.PixmapCache.getIcon("ircUserPresent.png"))
+        self.connectButton.setIcon(UI.PixmapCache.getIcon("ircConnect"))
+        self.editButton.setIcon(UI.PixmapCache.getIcon("ircConfigure"))
+        self.joinButton.setIcon(UI.PixmapCache.getIcon("ircJoinChannel"))
+        self.awayButton.setIcon(UI.PixmapCache.getIcon("ircUserPresent"))
         
         self.joinButton.setEnabled(False)
         self.nickCombo.setEnabled(False)
@@ -191,14 +191,14 @@
             # set being away
             # don't send away, if the status is already set
             self.sendData.emit("AWAY :" + awayMessage)
-            self.awayButton.setIcon(UI.PixmapCache.getIcon("ircUserAway.png"))
+            self.awayButton.setIcon(UI.PixmapCache.getIcon("ircUserAway"))
             self.__away = True
             self.away.emit(self.__away)
         elif not awayMessage and self.__away:
             # cancel being away
             self.sendData.emit("AWAY")
             self.awayButton.setIcon(
-                UI.PixmapCache.getIcon("ircUserPresent.png"))
+                UI.PixmapCache.getIcon("ircUserPresent"))
             self.__away = False
             self.away.emit(self.__away)
     
@@ -344,12 +344,12 @@
         self.__connected = connected
         if self.__connected:
             self.connectButton.setIcon(
-                UI.PixmapCache.getIcon("ircDisconnect.png"))
+                UI.PixmapCache.getIcon("ircDisconnect"))
             self.connectButton.setToolTip(
                 self.tr("Press to disconnect from the network"))
         else:
             self.connectButton.setIcon(
-                UI.PixmapCache.getIcon("ircConnect.png"))
+                UI.PixmapCache.getIcon("ircConnect"))
             self.connectButton.setToolTip(
                 self.tr("Press to connect to the selected network"))
     
@@ -374,7 +374,7 @@
         self.awayButton.setEnabled(registered)
         if registered:
             self.awayButton.setIcon(
-                UI.PixmapCache.getIcon("ircUserPresent.png"))
+                UI.PixmapCache.getIcon("ircUserPresent"))
             self.__away = False
     
     def __clearMessages(self):
@@ -471,22 +471,22 @@
         """
         self.__messagesMenu = QMenu(self)
         self.__copyMessagesAct = self.__messagesMenu.addAction(
-            UI.PixmapCache.getIcon("editCopy.png"),
+            UI.PixmapCache.getIcon("editCopy"),
             self.tr("Copy"), self.__copyMessages)
         self.__messagesMenu.addSeparator()
         self.__cutAllMessagesAct = self.__messagesMenu.addAction(
-            UI.PixmapCache.getIcon("editCut.png"),
+            UI.PixmapCache.getIcon("editCut"),
             self.tr("Cut all"), self.__cutAllMessages)
         self.__copyAllMessagesAct = self.__messagesMenu.addAction(
-            UI.PixmapCache.getIcon("editCopy.png"),
+            UI.PixmapCache.getIcon("editCopy"),
             self.tr("Copy all"), self.__copyAllMessages)
         self.__messagesMenu.addSeparator()
         self.__clearMessagesAct = self.__messagesMenu.addAction(
-            UI.PixmapCache.getIcon("editDelete.png"),
+            UI.PixmapCache.getIcon("editDelete"),
             self.tr("Clear"), self.__clearMessages)
         self.__messagesMenu.addSeparator()
         self.__saveMessagesAct = self.__messagesMenu.addAction(
-            UI.PixmapCache.getIcon("fileSave.png"),
+            UI.PixmapCache.getIcon("fileSave"),
             self.tr("Save"), self.__saveMessages)
         
         self.on_messages_copyAvailable(False)
--- a/eric6/Network/IRC/IrcWidget.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/Network/IRC/IrcWidget.py	Sat May 02 13:51:07 2020 +0200
@@ -61,7 +61,7 @@
         
         self.__leaveButton = QToolButton(self)
         self.__leaveButton.setIcon(
-            UI.PixmapCache.getIcon("ircCloseChannel.png"))
+            UI.PixmapCache.getIcon("ircCloseChannel"))
         self.__leaveButton.setToolTip(
             self.tr("Press to leave the current channel"))
         self.__leaveButton.clicked.connect(self.__leaveChannel)
@@ -113,7 +113,7 @@
         self.__prefixRe = re.compile(r""".*\sPREFIX=\((.*)\)([^ ]+).*""")
         self.__chanTypesRe = re.compile(r""".*\sCHANTYPES=([^ ]+).*""")
         
-        ircPic = UI.PixmapCache.getPixmap("irc128.png")
+        ircPic = UI.PixmapCache.getPixmap("irc128")
         self.__emptyLabel = QLabel()
         self.__emptyLabel.setPixmap(ircPic)
         self.__emptyLabel.setAlignment(Qt.AlignVCenter | Qt.AlignHCenter)
--- a/eric6/PluginManager/PluginRepositoryDialog.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/PluginManager/PluginRepositoryDialog.py	Sat May 02 13:51:07 2020 +0200
@@ -394,7 +394,7 @@
             ui = None
         if ui and ui.notificationsEnabled():
             ui.showNotification(
-                UI.PixmapCache.getPixmap("plugin48.png"),
+                UI.PixmapCache.getPixmap("plugin48"),
                 self.tr("Download Plugin Files"),
                 self.tr("""The requested plugins were downloaded."""))
         
@@ -651,22 +651,22 @@
         
         updateStatus = self.__updateStatus(filename, version)
         if updateStatus == PluginRepositoryWidget.PluginStatusUpToDate:
-            itm.setIcon(1, UI.PixmapCache.getIcon("empty.png"))
+            itm.setIcon(1, UI.PixmapCache.getIcon("empty"))
             itm.setToolTip(1, self.tr("up-to-date"))
         elif updateStatus == PluginRepositoryWidget.PluginStatusNew:
-            itm.setIcon(1, UI.PixmapCache.getIcon("download.png"))
+            itm.setIcon(1, UI.PixmapCache.getIcon("download"))
             itm.setToolTip(1, self.tr("new download available"))
             self.__newItems += 1
         elif updateStatus == PluginRepositoryWidget.PluginStatusLocalUpdate:
-            itm.setIcon(1, UI.PixmapCache.getIcon("updateLocal.png"))
+            itm.setIcon(1, UI.PixmapCache.getIcon("updateLocal"))
             itm.setToolTip(1, self.tr("update installable"))
             self.__updateLocalItems += 1
         elif updateStatus == PluginRepositoryWidget.PluginStatusRemoteUpdate:
-            itm.setIcon(1, UI.PixmapCache.getIcon("updateRemote.png"))
+            itm.setIcon(1, UI.PixmapCache.getIcon("updateRemote"))
             itm.setToolTip(1, self.tr("updated download available"))
             self.__updateRemoteItems += 1
         elif updateStatus == PluginRepositoryWidget.PluginStatusError:
-            itm.setIcon(1, UI.PixmapCache.getIcon("warning.png"))
+            itm.setIcon(1, UI.PixmapCache.getIcon("warning"))
             itm.setToolTip(1, self.tr("error determining status"))
     
     def __updateStatus(self, filename, version):
--- a/eric6/PluginManager/PluginUninstallDialog.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/PluginManager/PluginUninstallDialog.py	Sat May 02 13:51:07 2020 +0200
@@ -189,7 +189,7 @@
             ui = e5App().getObject("UserInterface")
             if ui.notificationsEnabled():
                 ui.showNotification(
-                    UI.PixmapCache.getPixmap("plugin48.png"),
+                    UI.PixmapCache.getPixmap("plugin48"),
                     self.tr("Plugin Uninstallation"),
                     self.tr(
                         """<p>The plugin <b>{0}</b> was uninstalled"""
--- a/eric6/Plugins/AboutPlugin/AboutDialog.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/Plugins/AboutPlugin/AboutDialog.py	Sat May 02 13:51:07 2020 +0200
@@ -753,7 +753,7 @@
         
         self.ericLabel.setText(titleText)
         self.ericPixmap.setPixmap(
-            UI.PixmapCache.getPixmap("eric.png").scaled(48, 48))
+            UI.PixmapCache.getPixmap("eric").scaled(48, 48))
         
         ####################################################################
         ## ABOUT
--- a/eric6/Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py	Sat May 02 13:51:07 2020 +0200
@@ -69,13 +69,13 @@
         self.optionsTabWidget.setCurrentIndex(0)
         
         self.excludeMessagesSelectButton.setIcon(
-            UI.PixmapCache.getIcon("select.png"))
+            UI.PixmapCache.getIcon("select"))
         self.includeMessagesSelectButton.setIcon(
-            UI.PixmapCache.getIcon("select.png"))
+            UI.PixmapCache.getIcon("select"))
         self.fixIssuesSelectButton.setIcon(
-            UI.PixmapCache.getIcon("select.png"))
+            UI.PixmapCache.getIcon("select"))
         self.noFixIssuesSelectButton.setIcon(
-            UI.PixmapCache.getIcon("select.png"))
+            UI.PixmapCache.getIcon("select"))
         
         self.docTypeComboBox.addItem(self.tr("PEP-257"), "pep257")
         self.docTypeComboBox.addItem(self.tr("Eric"), "eric")
@@ -101,8 +101,8 @@
         self.resultList.headerItem().setText(self.resultList.columnCount(), "")
         self.resultList.header().setSortIndicator(0, Qt.AscendingOrder)
         
-        self.addBuiltinButton.setIcon(UI.PixmapCache.getIcon("plus.png"))
-        self.deleteBuiltinButton.setIcon(UI.PixmapCache.getIcon("minus.png"))
+        self.addBuiltinButton.setIcon(UI.PixmapCache.getIcon("plus"))
+        self.deleteBuiltinButton.setIcon(UI.PixmapCache.getIcon("minus"))
         
         self.checkProgress.setVisible(False)
         self.checkProgressLabel.setVisible(False)
@@ -192,20 +192,20 @@
             self.__lastFileItem,
             ["{0:6}".format(line), code, message])
         if code.startswith(("W", "-", "C", "M")):
-            itm.setIcon(1, UI.PixmapCache.getIcon("warning.png"))
+            itm.setIcon(1, UI.PixmapCache.getIcon("warning"))
         elif code.startswith("N"):
-            itm.setIcon(1, UI.PixmapCache.getIcon("namingError.png"))
+            itm.setIcon(1, UI.PixmapCache.getIcon("namingError"))
         elif code.startswith("D"):
-            itm.setIcon(1, UI.PixmapCache.getIcon("docstringError.png"))
+            itm.setIcon(1, UI.PixmapCache.getIcon("docstringError"))
         else:
-            itm.setIcon(1, UI.PixmapCache.getIcon("syntaxError.png"))
+            itm.setIcon(1, UI.PixmapCache.getIcon("syntaxError"))
         if fixed:
-            itm.setIcon(0, UI.PixmapCache.getIcon("issueFixed.png"))
+            itm.setIcon(0, UI.PixmapCache.getIcon("issueFixed"))
         elif (
             code in FixableCodeStyleIssues and not autofixing and
             code not in self.__noFixCodesList
         ):
-            itm.setIcon(0, UI.PixmapCache.getIcon("issueFixable.png"))
+            itm.setIcon(0, UI.PixmapCache.getIcon("issueFixable"))
             fixable = True
         
         itm.setTextAlignment(0, Qt.AlignRight)
@@ -243,7 +243,7 @@
         if fixed:
             code, message = text.split(None, 1)
             itm.setText(2, message)
-            itm.setIcon(0, UI.PixmapCache.getIcon("issueFixed.png"))
+            itm.setIcon(0, UI.PixmapCache.getIcon("issueFixed"))
             
             itm.setData(0, self.messageRole, message)
         else:
--- a/eric6/Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCodeSelectionDialog.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCodeSelectionDialog.py	Sat May 02 13:51:07 2020 +0200
@@ -52,16 +52,16 @@
                 continue
             itm = QTreeWidgetItem(self.codeTable, [code, message])
             if code.startswith(("W", "C", "M")):
-                itm.setIcon(0, UI.PixmapCache.getIcon("warning.png"))
+                itm.setIcon(0, UI.PixmapCache.getIcon("warning"))
             elif code.startswith("E"):
-                itm.setIcon(0, UI.PixmapCache.getIcon("syntaxError.png"))
+                itm.setIcon(0, UI.PixmapCache.getIcon("syntaxError"))
             elif code.startswith("N"):
-                itm.setIcon(0, UI.PixmapCache.getIcon("namingError.png"))
+                itm.setIcon(0, UI.PixmapCache.getIcon("namingError"))
             elif code.startswith("D"):
-                itm.setIcon(0, UI.PixmapCache.getIcon("docstringError.png"))
+                itm.setIcon(0, UI.PixmapCache.getIcon("docstringError"))
             else:
                 # unknown category prefix => warning
-                itm.setIcon(0, UI.PixmapCache.getIcon("warning.png"))
+                itm.setIcon(0, UI.PixmapCache.getIcon("warning"))
             itm.setFlags(itm.flags() | Qt.ItemIsUserCheckable)
             if code in codeList:
                 itm.setCheckState(0, Qt.Checked)
--- a/eric6/Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleStatisticsDialog.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleStatisticsDialog.py	Sat May 02 13:51:07 2020 +0200
@@ -84,13 +84,13 @@
         itm.setData(1, Qt.DisplayRole, code)
         itm.setData(2, Qt.DisplayRole, message)
         if code.startswith(("W", "C", "M")):
-            itm.setIcon(1, UI.PixmapCache.getIcon("warning.png"))
+            itm.setIcon(1, UI.PixmapCache.getIcon("warning"))
         elif code.startswith("E"):
-            itm.setIcon(1, UI.PixmapCache.getIcon("syntaxError.png"))
+            itm.setIcon(1, UI.PixmapCache.getIcon("syntaxError"))
         elif code.startswith("N"):
-            itm.setIcon(1, UI.PixmapCache.getIcon("namingError.png"))
+            itm.setIcon(1, UI.PixmapCache.getIcon("namingError"))
         elif code.startswith("D"):
-            itm.setIcon(1, UI.PixmapCache.getIcon("docstringError.png"))
+            itm.setIcon(1, UI.PixmapCache.getIcon("docstringError"))
         
         itm.setTextAlignment(0, Qt.AlignRight)
         itm.setTextAlignment(1, Qt.AlignHCenter)
--- a/eric6/Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckerDialog.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckerDialog.py	Sat May 02 13:51:07 2020 +0200
@@ -133,9 +133,9 @@
         
         itm = QTreeWidgetItem(self.__lastFileItem)
         if isWarning:
-            itm.setIcon(0, UI.PixmapCache.getIcon("warning.png"))
+            itm.setIcon(0, UI.PixmapCache.getIcon("warning"))
         else:
-            itm.setIcon(0, UI.PixmapCache.getIcon("syntaxError.png"))
+            itm.setIcon(0, UI.PixmapCache.getIcon("syntaxError"))
         itm.setData(0, Qt.DisplayRole, line)
         itm.setData(1, Qt.DisplayRole, error)
         itm.setData(2, Qt.DisplayRole, sourcecode)
--- a/eric6/Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui	Sat May 02 13:51:07 2020 +0200
@@ -249,7 +249,7 @@
              <enum>Qt::StrongFocus</enum>
             </property>
             <property name="toolTip">
-             <string>Enter the filename of a CSS style sheet. Leave empty to use the colours defined below.</string>
+             <string>Enter the filename of a CSS style sheet. Leave empty to use the colors defined below.</string>
             </property>
            </widget>
           </item>
@@ -259,13 +259,13 @@
        <item>
         <widget class="QGroupBox" name="groupBox_2">
          <property name="title">
-          <string>Colours</string>
+          <string>Colors</string>
          </property>
          <layout class="QGridLayout">
           <item row="3" column="1">
            <widget class="QPushButton" name="cfBgButton">
             <property name="toolTip">
-             <string>Press to select the class and function header background colour.</string>
+             <string>Press to select the class and function header background color.</string>
             </property>
             <property name="text">
              <string>Class/Function Header Background</string>
@@ -275,7 +275,7 @@
           <item row="3" column="0">
            <widget class="QPushButton" name="cfFgButton">
             <property name="toolTip">
-             <string>Press to select the class and function header foreground colour.</string>
+             <string>Press to select the class and function header foreground color.</string>
             </property>
             <property name="text">
              <string>Class/Function Header Foreground</string>
@@ -285,7 +285,7 @@
           <item row="2" column="1">
            <widget class="QPushButton" name="l2BgButton">
             <property name="toolTip">
-             <string>Press to select the level 2 header background colour.</string>
+             <string>Press to select the level 2 header background color.</string>
             </property>
             <property name="text">
              <string>Level 2 Header Background</string>
@@ -295,7 +295,7 @@
           <item row="2" column="0">
            <widget class="QPushButton" name="l2FgButton">
             <property name="toolTip">
-             <string>Press to select the level 2 header foreground colour.</string>
+             <string>Press to select the level 2 header foreground color.</string>
             </property>
             <property name="text">
              <string>Level 2 Header Foreground</string>
@@ -305,7 +305,7 @@
           <item row="1" column="1">
            <widget class="QPushButton" name="l1BgButton">
             <property name="toolTip">
-             <string>Press to select the level 1 header background colour.</string>
+             <string>Press to select the level 1 header background color.</string>
             </property>
             <property name="text">
              <string>Level 1 Header Background</string>
@@ -315,7 +315,7 @@
           <item row="1" column="0">
            <widget class="QPushButton" name="l1FgButton">
             <property name="toolTip">
-             <string>Press to select the level 1 header foreground colour.</string>
+             <string>Press to select the level 1 header foreground color.</string>
             </property>
             <property name="text">
              <string>Level 1 Header Foreground</string>
@@ -325,7 +325,7 @@
           <item row="0" column="1">
            <widget class="QPushButton" name="bodyBgButton">
             <property name="toolTip">
-             <string>Press to select the body background colour.</string>
+             <string>Press to select the body background color.</string>
             </property>
             <property name="text">
              <string>Body Background</string>
@@ -335,7 +335,7 @@
           <item row="0" column="0">
            <widget class="QPushButton" name="bodyFgButton">
             <property name="toolTip">
-             <string>Press to select the body foreground colour.</string>
+             <string>Press to select the body foreground color.</string>
             </property>
             <property name="text">
              <string>Body Foreground</string>
@@ -345,7 +345,7 @@
           <item row="4" column="0">
            <widget class="QPushButton" name="linkFgButton">
             <property name="toolTip">
-             <string>Press to select the foreground colour of links.</string>
+             <string>Press to select the foreground color of links.</string>
             </property>
             <property name="text">
              <string>Links</string>
@@ -355,7 +355,7 @@
           <item row="5" column="0" colspan="2">
            <widget class="QTextEdit" name="sample">
             <property name="toolTip">
-             <string>This shows an example of the selected colours.</string>
+             <string>This shows an example of the selected colors.</string>
             </property>
             <property name="readOnly">
              <bool>true</bool>
--- a/eric6/Plugins/PluginAbout.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/Plugins/PluginAbout.py	Sat May 02 13:51:07 2020 +0200
@@ -78,7 +78,7 @@
         
         self.aboutAct = E5Action(
             self.tr('About {0}').format(UI.Info.Program),
-            UI.PixmapCache.getIcon("helpAbout.png"),
+            UI.PixmapCache.getIcon("helpAbout"),
             self.tr('&About {0}').format(UI.Info.Program),
             0, 0, self, 'about_eric')
         self.aboutAct.setStatusTip(self.tr(
@@ -93,7 +93,7 @@
         
         self.aboutQtAct = E5Action(
             self.tr('About Qt'),
-            UI.PixmapCache.getIcon("helpAboutQt.png"),
+            UI.PixmapCache.getIcon("helpAboutQt"),
             self.tr('About &Qt'), 0, 0, self, 'about_qt')
         self.aboutQtAct.setStatusTip(
             self.tr('Display information about the Qt toolkit'))
--- a/eric6/Plugins/PluginTranslator.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/Plugins/PluginTranslator.py	Sat May 02 13:51:07 2020 +0200
@@ -60,13 +60,17 @@
     
     @return dictionary containing the relevant data
     """
+    if e5App().usesDarkPalette():
+        icon = os.path.join("UiExtensionPlugins", "Translator", "icons",
+                            "flag-dark")
+    else:
+        icon = os.path.join("UiExtensionPlugins", "Translator", "icons",
+                            "flag-light")
     return {
         "translatorPage": [
             QCoreApplication.translate("TranslatorPlugin",
                                        "Translator"),
-            os.path.join("UiExtensionPlugins", "Translator", "icons",
-                         "flag.png"),
-            createTranslatorPage, None, None],
+            icon, createTranslatorPage, None, None],
     }
 
 
@@ -141,7 +145,7 @@
         global translatorPluginObject
         translatorPluginObject = self
         
-        self.__object = Translator(self, self.__ui)
+        self.__object = Translator(self, e5App().usesDarkPalette(), self.__ui)
         self.__object.activate()
         e5App().registerPluginObject("Translator", self.__object)
         
--- a/eric6/Plugins/UiExtensionPlugins/Translator/Translator.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/Plugins/UiExtensionPlugins/Translator/Translator.py	Sat May 02 13:51:07 2020 +0200
@@ -22,12 +22,17 @@
     """
     Class implementing the translator object.
     """
-    def __init__(self, plugin, parent=None):
+    def __init__(self, plugin, usesDarkPalette, parent=None):
         """
         Constructor
         
-        @param plugin reference to the plugin object (TranslatorPlugin)
-        @param parent parent (QObject)
+        @param plugin reference to the plugin object
+        @type TranslatorPlugin
+        @param usesDarkPalette flag indicating that the platform uses a palette
+            with a dark background
+        @type bool
+        @param parent parent
+        @type QObject
         """
         QObject.__init__(self, parent)
         
@@ -35,6 +40,11 @@
         self.__ui = parent
         
         self.__widget = None
+        
+        if usesDarkPalette:
+            self.__iconSuffix = "dark"
+        else:
+            self.__iconSuffix = "light"
     
     def activate(self):
         """
@@ -46,7 +56,8 @@
         self.__ui.addSideWidget(
             self.__ui.BottomSide, self.__widget,
             UI.PixmapCache.getIcon(
-                os.path.join(os.path.dirname(__file__), "icons", "flag.png")),
+                os.path.join(os.path.dirname(__file__), "icons",
+                             "flag-{0}".format(self.__iconSuffix))),
             self.tr("Translator"))
         
         self.__activateAct = E5Action(
@@ -85,7 +96,9 @@
         @return icon (QIcon)
         """
         return UI.PixmapCache.getIcon(os.path.join(
-            os.path.dirname(__file__), "icons", name))
+            os.path.dirname(__file__), "icons",
+            "{0}-{1}".format(name, self.__iconSuffix)
+        ))
     
     def __activateWidget(self):
         """
--- a/eric6/Plugins/UiExtensionPlugins/Translator/TranslatorEngines/__init__.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/Plugins/UiExtensionPlugins/Translator/TranslatorEngines/__init__.py	Sat May 02 13:51:07 2020 +0200
@@ -13,6 +13,8 @@
 from PyQt5.QtCore import QCoreApplication
 from PyQt5.QtGui import QIcon
 
+from E5Gui.E5Application import e5App
+
 import UI.PixmapCache
 
 
@@ -107,10 +109,20 @@
     @return engine icon
     @rtype QIcon
     """
+    if e5App().usesDarkPalette():
+        iconSuffix = "dark"
+    else:
+        iconSuffix = "light"
     if name in supportedEngineNames():
-        return UI.PixmapCache.getIcon(os.path.join(
+        icon = UI.PixmapCache.getIcon(os.path.join(
             os.path.dirname(__file__), "..", "icons", "engines",
-            "{0}.png".format(name)))
+            "{0}-{1}".format(name, iconSuffix)))
+        if icon.isNull():
+            # try variant without suffix
+            icon = UI.PixmapCache.getIcon(os.path.join(
+                os.path.dirname(__file__), "..", "icons", "engines",
+                "{0}".format(name)))
+        return icon
     else:
         return QIcon()
 
--- a/eric6/Plugins/UiExtensionPlugins/Translator/TranslatorLanguagesDb.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/Plugins/UiExtensionPlugins/Translator/TranslatorLanguagesDb.py	Sat May 02 13:51:07 2020 +0200
@@ -76,8 +76,8 @@
             "tr": self.tr("Turkish"),
             "uk": self.tr("Ukrainian"),
             "vi": self.tr("Vietnamese"),
-            "zh-CN": self.tr("Chinese S"),
-            "zh-TW": self.tr("Chinese T"),
+            "zh-CN": self.tr("Chinese (China)"),
+            "zh-TW": self.tr("Chinese (Taiwan)"),
         }
         
         self.__toThreeCharacterCode = {
@@ -142,7 +142,7 @@
         """
         return UI.PixmapCache.getIcon(os.path.join(
             os.path.dirname(__file__), "icons", "flags",
-            "{0}.png".format(code)))
+            "{0}".format(code)))
     
     def getLanguage(self, code):
         """
--- a/eric6/Plugins/UiExtensionPlugins/Translator/TranslatorWidget.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/Plugins/UiExtensionPlugins/Translator/TranslatorWidget.py	Sat May 02 13:51:07 2020 +0200
@@ -59,15 +59,15 @@
         self.pronounceTransButton.setVisible(audioAvailable)
         
         self.pronounceOrigButton.setIcon(
-            self.__translator.getAppIcon("pronounce.png"))
+            self.__translator.getAppIcon("pronounce"))
         self.pronounceTransButton.setIcon(
-            self.__translator.getAppIcon("pronounce.png"))
+            self.__translator.getAppIcon("pronounce"))
         self.swapButton.setIcon(
-            self.__translator.getAppIcon("swap.png"))
+            self.__translator.getAppIcon("swap"))
         self.translateButton.setIcon(
-            self.__translator.getAppIcon("translate.png"))
-        self.clearButton.setIcon(UI.PixmapCache.getIcon("editDelete.png"))
-        self.preferencesButton.setIcon(UI.PixmapCache.getIcon("configure.png"))
+            self.__translator.getAppIcon("translate"))
+        self.clearButton.setIcon(UI.PixmapCache.getIcon("editDelete"))
+        self.preferencesButton.setIcon(UI.PixmapCache.getIcon("configure"))
         
         self.translateButton.setEnabled(False)
         self.clearButton.setEnabled(False)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/eric6/Plugins/UiExtensionPlugins/Translator/icons/engines/deepl-dark.svg	Sat May 02 13:51:07 2020 +0200
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="48" height="48" version="1.1" viewBox="0 0 12.7 12.7" xmlns="http://www.w3.org/2000/svg">
+ <g transform="translate(0 -284.3)">
+  <path d="m7.6799 296.37c-1.0956-0.62413-3.3561-1.9093-5.0554-2.8741-0.498-0.28275-0.93515-0.53712-0.97146-0.56527-0.10781-0.0836-0.23751-0.26711-0.28556-0.40413l-0.0446-0.127v-5.0691l0.04257-0.10991c0.05791-0.14977 0.14214-0.27412 0.24933-0.36827 0.05516-0.0484 0.91852-0.54468 2.2359-1.2852 2.254-1.267 2.2575-1.2688 2.4862-1.2715 0.25016-3e-3 0.19984-0.0284 2.4985 1.2642 1.1801 0.66359 2.1834 1.2379 2.2295 1.2763 0.11123 0.0925 0.21208 0.23978 0.26726 0.39029l0.0449 0.12257v5.0505l-0.0449 0.12257c-0.05527 0.15085-0.1563 0.29815-0.26726 0.38983-0.04612 0.0381-0.5508 0.33407-1.1214 0.65764-0.57062 0.32356-1.0481 0.59685-1.0611 0.60731-0.018489 0.0149-0.023569 0.32146-0.023569 1.4186v1.3996l-0.042465-9.3e-4c-0.023366-4.9e-4 -0.53478-0.2814-1.1365-0.62418zm-2.559-3.6121c0.2289-0.0719 0.44031-0.27568 0.53343-0.51426 0.03007-0.0771 0.04114-0.1485 0.04277-0.27562l2e-3 -0.17157 0.74934-0.42261c0.41214-0.23243 0.74955-0.42767 0.74982-0.43386 2.844e-4 -6e-3 -0.028039-0.048-0.062884-0.093-0.069996-0.0902-0.16529-0.25867-0.19696-0.34813l-0.02042-0.0577-0.75665 0.42785-0.75666 0.42784-0.08655-0.0564c-0.44368-0.28929-1.0248-0.13011-1.264 0.34623-0.06217 0.12383-0.07081 0.15857-0.07761 0.31099-0.0126 0.28245 0.06735 0.48595 0.263 0.66962 0.24013 0.22546 0.55407 0.29336 0.88128 0.19062zm3.4774-1.9826c0.27656-0.0841 0.50559-0.31809 0.58095-0.59358 0.012292-0.045 0.022045-0.14935 0.02174-0.23179-0.00203-0.39533-0.2598-0.71667-0.65698-0.8185-0.24186-0.062-0.50725-0.01-0.72764 0.14329l-0.052217 0.0362-1.0257-0.58175-1.0257-0.58175-0.0071-0.19496c-0.0061-0.17242-0.01412-0.20954-0.06735-0.321-0.08412-0.176-0.2386-0.33061-0.4171-0.41745-0.12899-0.0627-0.15699-0.0691-0.33126-0.0754-0.15817-6e-3 -0.2109-2e-5 -0.31194 0.0336-0.4054 0.13474-0.6542 0.52633-0.59075 0.92981 0.09661 0.61458 0.81418 0.94113 1.3248 0.6029l0.09661-0.064 1.032 0.58533 1.0319 0.58534 0.00203 0.16132c0.00305 0.24518 0.076294 0.41437 0.25704 0.5945 0.096307 0.096 0.30321 0.21257 0.41053 0.23128 0.12831 0.0224 0.3417 0.0114 0.45625-0.0234z" fill="#eff0f1" stroke-width=".018715"/>
+ </g>
+</svg>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/eric6/Plugins/UiExtensionPlugins/Translator/icons/engines/deepl-light.svg	Sat May 02 13:51:07 2020 +0200
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="48" height="48" version="1.1" viewBox="0 0 12.7 12.7" xmlns="http://www.w3.org/2000/svg">
+ <g transform="translate(0 -284.3)">
+  <path d="m7.6799 296.37c-1.0956-0.62413-3.3561-1.9093-5.0554-2.8741-0.498-0.28275-0.93515-0.53712-0.97146-0.56527-0.10781-0.0836-0.23751-0.26711-0.28556-0.40413l-0.0446-0.127v-5.0691l0.04257-0.10991c0.05791-0.14977 0.14214-0.27412 0.24933-0.36827 0.05516-0.0484 0.91852-0.54468 2.2359-1.2852 2.254-1.267 2.2575-1.2688 2.4862-1.2715 0.25016-3e-3 0.19984-0.0284 2.4985 1.2642 1.1801 0.66359 2.1834 1.2379 2.2295 1.2763 0.11123 0.0925 0.21208 0.23978 0.26726 0.39029l0.0449 0.12257v5.0505l-0.0449 0.12257c-0.05527 0.15085-0.1563 0.29815-0.26726 0.38983-0.04612 0.0381-0.5508 0.33407-1.1214 0.65764-0.57062 0.32356-1.0481 0.59685-1.0611 0.60731-0.018489 0.0149-0.023569 0.32146-0.023569 1.4186v1.3996l-0.042465-9.3e-4c-0.023366-4.9e-4 -0.53478-0.2814-1.1365-0.62418zm-2.559-3.6121c0.2289-0.0719 0.44031-0.27568 0.53343-0.51426 0.03007-0.0771 0.04114-0.1485 0.04277-0.27562l2e-3 -0.17157 0.74934-0.42261c0.41214-0.23243 0.74955-0.42767 0.74982-0.43386 2.844e-4 -6e-3 -0.028039-0.048-0.062884-0.093-0.069996-0.0902-0.16529-0.25867-0.19696-0.34813l-0.02042-0.0577-0.75665 0.42785-0.75666 0.42784-0.08655-0.0564c-0.44368-0.28929-1.0248-0.13011-1.264 0.34623-0.06217 0.12383-0.07081 0.15857-0.07761 0.31099-0.0126 0.28245 0.06735 0.48595 0.263 0.66962 0.24013 0.22546 0.55407 0.29336 0.88128 0.19062zm3.4774-1.9826c0.27656-0.0841 0.50559-0.31809 0.58095-0.59358 0.012292-0.045 0.022045-0.14935 0.02174-0.23179-0.00203-0.39533-0.2598-0.71667-0.65698-0.8185-0.24186-0.062-0.50725-0.01-0.72764 0.14329l-0.052217 0.0362-1.0257-0.58175-1.0257-0.58175-0.0071-0.19496c-0.0061-0.17242-0.01412-0.20954-0.06735-0.321-0.08412-0.176-0.2386-0.33061-0.4171-0.41745-0.12899-0.0627-0.15699-0.0691-0.33126-0.0754-0.15817-6e-3 -0.2109-2e-5 -0.31194 0.0336-0.4054 0.13474-0.6542 0.52633-0.59075 0.92981 0.09661 0.61458 0.81418 0.94113 1.3248 0.6029l0.09661-0.064 1.032 0.58533 1.0319 0.58534 0.00203 0.16132c0.00305 0.24518 0.076294 0.41437 0.25704 0.5945 0.096307 0.096 0.30321 0.21257 0.41053 0.23128 0.12831 0.0224 0.3417 0.0114 0.45625-0.0234z" fill="#232629" stroke-width=".018715"/>
+ </g>
+</svg>
Binary file eric6/Plugins/UiExtensionPlugins/Translator/icons/engines/deepl.png has changed
Binary file eric6/Plugins/UiExtensionPlugins/Translator/icons/engines/glosbe.png has changed
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/eric6/Plugins/UiExtensionPlugins/Translator/icons/engines/glosbe.svg	Sat May 02 13:51:07 2020 +0200
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="48" height="48" version="1.1" viewBox="0 0 12.7 12.7" xmlns="http://www.w3.org/2000/svg">
+ <g transform="translate(0 -284.3)">
+  <g transform="matrix(.13599 0 0 .13437 -17.402 257.84)" stroke="#232629" stroke-width="1.0102">
+   <path transform="matrix(.26458 0 0 .26458 0 191.17)" d="m695.31 204.03c-21.035-21.821-27.856-39.687-25.07-65.672 2.2764-21.236 7.8317-35.343 18.712-47.518 10.959-12.263 22.952-18.884 38.841-21.441 6.347-1.0216 8.9576-0.97132 15.657 0.30139 17.292 3.2848 25.48 8.542 33.695 21.635 2.4268 3.8676 5.3216 7.5998 6.433 8.2939 1.1113 0.69404 9.9928 3.0405 19.737 5.2143 9.7438 2.1738 17.874 4.1104 18.067 4.3035s-2.9664 0.63158-7.0213 0.97434c-8.9917 0.76008-22.765 4.6483-32.66 9.2198-24.296 11.225-38.436 27.24-66.049 74.804-5.1606 8.8894-9.9234 16.747-10.584 17.462-0.95777 1.0363-2.935-0.49908-9.7591-7.578zm53.93-84.948c7.6619-7.6619 2.5452-21.368-8.598-23.031-10.024-1.4961-18.547 11.823-13.276 20.746 4.415 7.474 15.525 8.6348 21.874 2.2855z" fill="#ff6e00"/>
+   <path transform="matrix(.26458 0 0 .26458 0 191.17)" d="m555.26 377.49c0.29382-0.83338 3.5257-8.8356 7.1819-17.783s9.3498-23.721 12.652-32.83 6.3206-17.358 6.7066-18.33c0.55133-1.3886 1.9246-1.7715 6.4022-1.7853 13.901-0.0428 28.333-5.4423 37.888-14.175 3.0092-2.7502 5.9067-5.0004 6.4389-5.0004 0.5322 0 1.7975 1.8403 2.8118 4.0896 2.1552 4.7794 3.6325 2.8308-12.649 16.685-15.333 13.047-45.622 43.587-56.036 56.502-10.433 12.938-12.195 14.89-11.397 12.627z" fill="#ff6e00"/>
+   <path transform="matrix(.26458 0 0 .26458 0 191.17)" d="m688.86 312.76c-11.807-4.1528-25.978-15.816-34.805-28.646-4.6453-6.7516-10.701-20.014-13.869-30.37-2.668-8.7243-2.7816-9.9887-2.8122-31.315-0.0293-20.416 0.15679-22.824 2.2883-29.607 2.5149-8.0034 10.205-25.446 11.219-25.446 0.34365 0 2.5446 4.432 4.891 9.849 12.529 28.925 27.833 47.246 56.321 67.426 17.002 12.044 24.141 18.568 27.441 25.08 7.375 14.554 0.76067 32.945-14.967 41.616-5.0162 2.7657-6.2697 2.999-17.524 3.2623-10.229 0.23925-13.068-0.0493-18.183-1.8483z" fill="#0cf"/>
+   <path transform="matrix(.26458 0 0 .26458 0 191.17)" d="m583.18 286.19c-8.7118-3.1132-16.94-10.624-21.503-19.628-1.4052-2.7731-3.3294-8.9836-4.276-13.801-1.4695-7.4792-1.5495-10.047-0.54718-17.576 1.3397-10.062 4.7102-20.719 9.2248-29.166 9.4933-17.763 28.103-35.519 45.83-43.728 7.2044-3.3362 21.564-7.7076 22.44-6.8313 0.32735 0.32735-1.2676 4.3002-3.5444 8.8285-4.6161 9.181-9.2031 22.169-11.823 33.478-1.3889 5.9946-1.6708 11.222-1.4117 26.178 0.77303 44.62 0.77417 44.586-1.6208 49.061-6.115 11.427-20.965 17.402-32.769 13.184z" fill="#6c0"/>
+   <path transform="matrix(.26458 0 0 .26458 0 191.17)" d="m517.46 210.47c-13.32-3.743-20.716-17.39-18.08-33.357 3.4129-20.666 21.13-38.102 46.665-45.926 21.935-6.7208 47.585-4.5524 67.056 5.6689l4.0406 2.1211-4.5457 1.7742c-6.5257 2.547-20.525 9.8926-25.895 13.587-10.987 7.5592-21.426 18.539-32.881 34.583-8.7048 12.192-13.026 17.112-17.406 19.819-4.2457 2.624-12.945 3.4176-18.954 1.7292z" fill="#fc0"/>
+   <path transform="matrix(.26458 0 0 .26458 0 191.17)" d="m618.88 119.28c-18.625-9.2704-28.21-10.912-58.37-9.995-20.376 0.61944-23.788 0.50051-27.26-0.95041-8.2354-3.441-12.908-10.971-12.916-20.814-0.0156-20.521 26.82-33.593 52.355-25.504 24.003 7.6043 45.37 28.482 52.668 51.462 1.3577 4.2755 2.3363 8.2657 2.1746 8.8672-0.16813 0.6253-3.8728-0.68778-8.6519-3.0666z" fill="#c09"/>
+   <path transform="matrix(.26458 0 0 .26458 0 191.17)" d="m646.56 118.89c-0.30018-0.83338-1.2809-4.4699-2.1794-8.0812-2.1021-8.4489-9.5471-24.225-14.516-30.761-2.1326-2.8048-8.5373-10.1-14.233-16.211-15.152-16.258-16.807-21.6-10.015-32.311 6.0999-9.6186 19.627-12.288 30.974-6.1121 8.4861 4.6187 17.088 14.201 20.91 23.293 4.7437 11.285 6.1856 32.184 3.1297 45.36-2.6376 11.373-12.589 28.931-14.069 24.823z" fill="#069"/>
+  </g>
+ </g>
+</svg>
Binary file eric6/Plugins/UiExtensionPlugins/Translator/icons/engines/googlev1.png has changed
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/eric6/Plugins/UiExtensionPlugins/Translator/icons/engines/googlev1.svg	Sat May 02 13:51:07 2020 +0200
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="48" height="48" version="1.1" viewBox="0 0 48 48" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
+<style type="text/css">
+	.st0{fill:#4285F4;}
+	.st1{fill:#34A853;}
+	.st2{fill:#FBBC04;}
+	.st3{fill:#EA4335;}
+</style>
+
+<g transform="matrix(.089963 0 0 .088184 .0044982 .0016273)">
+	<path class="st0" d="m533.5 278.4c0-18.5-1.5-37.1-4.7-55.3h-256.7v104.8h147c-6.1 33.8-25.7 63.7-54.4 82.7v68h87.7c51.5-47.4 81.1-117.4 81.1-200.2z" fill="#4285f4"/>
+	<path class="st1" d="m272.1 544.3c73.4 0 135.3-24.1 180.4-65.7l-87.7-68c-24.4 16.6-55.9 26-92.6 26-71 0-131.2-47.9-152.8-112.3h-90.5v70.1c46.2 91.9 140.3 149.9 243.2 149.9z" fill="#34a853"/>
+	<path class="st2" d="m119.3 324.3c-11.4-33.8-11.4-70.4 0-104.2v-70.1h-90.4c-38.6 76.9-38.6 167.5 0 244.4z" fill="#fbbc04"/>
+	<path class="st3" d="m272.1 107.7c38.8-0.6 76.3 14 104.4 40.8l77.7-77.7c-49.2-46.2-114.5-71.6-182.1-70.8-102.9 0-197 58-243.2 150l90.4 70.1c21.5-64.5 81.8-112.4 152.8-112.4z" fill="#ea4335"/>
+</g>
+</svg>
Binary file eric6/Plugins/UiExtensionPlugins/Translator/icons/engines/googlev2.png has changed
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/eric6/Plugins/UiExtensionPlugins/Translator/icons/engines/googlev2.svg	Sat May 02 13:51:07 2020 +0200
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="48" height="48" enable-background="new 0 0 998.1 998.3" version="1.1" viewBox="0 0 48 48" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
+
+<g transform="matrix(.048091 0 0 .048082 0 1e-5)">
+	<path d="m931.7 998.3c36.5 0 66.4-29.4 66.4-65.4v-667.1c0-36-29.9-65.4-66.4-65.4h-648.1l260.1 797.9z" fill="#dbdbdb"/>
+	
+		
+			<path d="m931.7 230.4c9.7 0 18.9 3.8 25.8 10.6 6.8 6.7 10.6 15.5 10.6 24.8v667.1c0 9.3-3.7 18.1-10.6 24.8-6.9 6.8-16.1 10.6-25.8 10.6h-366.2l-240.6-737.9h606.8m0-30h-648.1l260.1 797.9h388c36.5 0 66.4-29.4 66.4-65.4v-667.1c0-36-29.9-65.4-66.4-65.4z" fill="#dcdcdc"/>
+		
+	
+	
+		<polygon points="482.3 809.8 543.7 998.3 714.4 809.8" fill="#4352b8"/>
+	
+	<path d="m936.1 476.1v-39.1h-188.5v-63.2h-61.2v63.2h-120.3v39.1h239.4c-12.8 45.1-41.1 87.7-68.7 120.8-48.9-57.9-49.1-76.7-49.1-76.7h-50.8s2.1 28.2 70.7 108.6c-22.3 22.8-39.2 36.3-39.2 36.3l15.6 48.8s23.6-20.3 53.1-51.6c29.6 32.1 67.8 70.7 117.2 116.7l32.1-32.1c-52.9-48-91.7-86.1-120.2-116.7 38.2-45.2 77-102.1 85.2-154.2h84.6v0.1z" fill="#607988"/>
+	<path d="m66.4 0c-36.5 0-66.4 29.9-66.4 66.5v677c0 36.5 29.9 66.4 66.4 66.4h648.1l-260.1-809.9z" fill="#4285f4"/>
+	<linearGradient id="SVGID_1_" x1="534.3" x2="998.1" y1="433.2" y2="433.2" gradientUnits="userSpaceOnUse">
+		<stop stop-color="#fff" stop-opacity=".2" offset="0"/>
+		<stop stop-color="#fff" stop-opacity=".02" offset="1"/>
+	</linearGradient>
+	<path d="m534.3 200.4h397.4c36.5 0 66.4 29.4 66.4 65.4v400.2z" enable-background="new    " fill="url(#SVGID_1_)"/>
+	<path d="m371.4 430.6c-2.5 30.3-28.4 75.2-91.1 75.2-54.3 0-98.3-44.9-98.3-100.2s44-100.2 98.3-100.2c30.9 0 51.5 13.4 63.3 24.3l41.2-39.6c-27.1-25-62.4-40.6-104.5-40.6-86.1 0-156 69.9-156 156s69.9 156 156 156c90.2 0 149.8-63.3 149.8-152.6 0-12.8-1.6-22.2-3.7-31.8h-146v53.4z" fill="#eee"/>
+</g>
+<radialGradient id="SVGID_2_" cx="65.208" cy="19.365" r="1398.3" gradientTransform="matrix(.048091 0 0 .048082 0 1.0959e-5)" gradientUnits="userSpaceOnUse">
+	<stop stop-color="#fff" stop-opacity=".1" offset="0"/>
+	<stop stop-color="#fff" stop-opacity="0" offset="1"/>
+</radialGradient>
+<path d="m44.807 9.6356h-19.857l-3.0971-9.6356h-18.659c-1.7553 0-3.1933 1.4376-3.1933 3.1974v32.551c0 1.755 1.4379 3.1926 3.1933 3.1926h20.001l2.9528 9.0586h18.659c1.7553 0 3.1933-1.4136 3.1933-3.1445v-32.075c0-1.7309-1.4379-3.1445-3.1933-3.1445z" fill="url(#SVGID_2_)" stroke-width=".048087"/>
+</svg>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/eric6/Plugins/UiExtensionPlugins/Translator/icons/engines/ibm_watson-dark.svg	Sat May 02 13:51:07 2020 +0200
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="48" height="48" version="1.1" viewBox="0 0 14.746 14.747" xmlns="http://www.w3.org/2000/svg">
+ <g transform="matrix(.019202 0 0 .019037 -.0024016 13.862)" fill="#eff0f1">
+  <path d="m305.67-467.18c1.437 0.05 2.874 0.1 4.388 0.01 3.202 0.096 6.279 0.124 9.403 0.362 14.293 0.645 28.547 2.554 42.618 5.097 17.167 3.132 34.14 7.81 50.574 13.477 21.535 7.351 42.317 16.677 62.174 27.7 21.486 11.912 41.97 25.662 60.793 41.259 8.95 7.454 17.542 15.263 25.825 23.639 7.01 7.13 13.742 14.474 20.116 22.174 10.906 13.11 20.694 27.077 29.16 41.974 6.634 11.695 12.429 24.033 17.085 36.668 3.722 10.472 6.836 21.163 8.812 32.15 1.33 7.7 2.332 15.403 2.601 23.257 0.366 8.274 0.075 16.556-0.996 24.78-0.666 5.691-1.786 11.319-3.156 16.81-1.524 5.774-3.3 11.41-5.528 16.984-3.55 8.888-8.103 17.23-13.408 25.16-4.254 6.302-9.058 12.121-14.363 17.666-4.08 4.196-8.536 8.186-13.166 11.897-3.23 2.64-6.51 5.07-9.963 7.223a140.33 140.33 0 0 1-7.87 4.879c-1.93 1.149-3.984 2.23-6.038 3.31-14.863 7.851-30.912 13.404-47.27 17.136a119.07 119.07 0 0 1-8.593 1.732c-3.587 0.61-7.175 1.221-10.686 1.69a165.05 165.05 0 0 1-14.466 1.462c-5.932 0.432-11.786 0.723-17.688 0.804a301.42 301.42 0 0 1-45.666-3.091c-18.584-2.621-37.024-6.998-54.971-12.575-24.458-7.662-48.182-17.86-70.623-30.109-22.691-12.387-44.351-26.962-64.197-43.668-16.298-13.667-31.495-28.752-45.063-45.334-10.357-12.626-19.672-25.968-27.868-40.167-6.76-11.764-12.631-23.96-17.211-36.737-3.924-10.4-6.835-21.163-8.811-32.15-1.33-7.7-2.332-15.403-2.679-23.116-0.365-8.273-0.075-16.556 0.794-24.706 0.666-5.692 1.66-11.388 3.03-16.88a129.05 129.05 0 0 1 5.634-17.476c3.55-8.888 8.103-17.23 13.409-25.16 4.254-6.302 9.057-12.12 14.362-17.666 4.235-4.478 8.893-8.541 13.726-12.326 3.23-2.64 6.635-5.002 9.963-7.222a140.33 140.33 0 0 1 7.87-4.88c1.93-1.148 3.984-2.229 6.038-3.31 14.863-7.85 31.037-13.335 47.394-17.067a119.07 119.07 0 0 1 8.594-1.732 211.84 211.84 0 0 1 11.544-1.772c4.9-0.629 9.722-1.116 14.467-1.462l12.036-0.586c1.968-0.027 3.81-0.122 5.7-8e-3 0.733-0.15 1.514-0.091 2.17-0.1zm-1.382 27.871c-2.093-0.041-4.263 0.059-6.433 0.159l-12.036 0.586c-5.073 0.35-10.175 1.052-15.277 1.753-3.916 0.615-7.832 1.23-11.7 2.055-2.806 0.67-5.738 1.272-8.419 2.01-2.401 0.524-4.755 1.258-7.108 1.992-14.043 4.262-27.651 10.412-39.872 18.789-1.6 1.144-3.202 2.289-4.88 3.575-2.315 1.855-4.63 3.711-6.82 5.636-2.903 2.635-5.68 5.34-8.285 8.322-4.109 4.546-7.716 9.367-11.025 14.533-4.003 6.44-7.254 13.29-9.801 20.34a127.47 127.47 0 0 0-4.014 14.508 115.81 115.81 0 0 0-1.892 14.197c-1.004 13.765 0.412 27.566 3.622 41.063 2.169 9.441 5.196 18.8 8.908 27.8 4.57 11.302 10.23 22.099 16.652 32.394 7.86 12.73 16.885 24.814 26.702 36.045a337.6 337.6 0 0 0 39.566 38.113c17.927 14.556 37.311 27.34 57.698 38.284 20.889 11.22 42.983 20.527 65.656 27.582 16.289 5.038 32.944 8.808 49.792 11.032a254.67 254.67 0 0 0 40.072 2.607c6.105-0.154 12.21-0.308 18.344-0.813a209.38 209.38 0 0 0 14.621-1.745c3.713-0.542 7.378-1.294 11.043-2.046l8.42-2.01c2.276-0.592 4.427-1.253 6.578-1.914 13.917-4.33 27.371-10.198 39.39-18.501 1.803-1.218 3.607-2.435 5.362-3.862 2.315-1.856 4.63-3.712 6.82-5.636a84.345 84.345 0 0 0 8.641-8.678 116.31 116.31 0 0 0 10.514-13.895c3.926-6.298 7.303-13.08 9.85-20.13 1.688-4.584 2.923-9.231 3.907-14.015a123.1 123.1 0 0 0 2.123-14.622c1.005-13.765-0.334-27.708-3.293-41.067-2.17-9.441-5.196-18.8-8.909-27.8-4.57-11.303-10.23-22.1-16.652-32.394-7.907-12.94-17.058-25.093-27.048-36.601-12.68-14.63-26.914-27.904-41.968-39.975-16.905-13.448-34.987-25.337-53.917-35.67a360.51 360.51 0 0 0-59.32-25.775 361.74 361.74 0 0 0-41.093-10.871c-12.837-2.42-25.856-4.205-38.963-4.937-3.327-0.165-6.655-0.33-9.857-0.426-1.437-0.05-3.076-0.028-4.513-0.078-0.328 4e-3 -0.733 0.15-1.186 0.086z"/>
+  <path d="m384.83-529.93c2.458-0.032 5.042 5e-3 7.385 0.185 5.292 0.142 10.47 0.495 15.646 0.849 14.799 1.21 29.28 3.895 43.665 7.352a288.92 288.92 0 0 1 33.96 11.12c9.73 3.937 19.229 8.298 28.38 13.294 8.902 4.859 17.572 10.14 25.896 16.058a322.45 322.45 0 0 1 24.152 18.953c9.26 8.077 17.932 16.932 25.882 26.216 7.95 9.285 15.293 18.787 21.922 29 7.412 11.463 14.1 23.356 19.826 35.822 5.455 11.768 10.071 24.178 13.705 36.601 4.183 14.097 7.153 28.63 9.014 43.107a265.73 265.73 0 0 1 1.92 44.18 282.21 282.21 0 0 1-6.07 47.785c-3.402 15.176-8.038 30.228-13.928 44.595a262.32 262.32 0 0 1-12.822 27.066 275.5 275.5 0 0 1-18.286 29.029c-7.272 10.042-15.17 19.741-23.83 28.75-11.743 12.271-24.509 23.435-38.307 33.21-14.992 10.772-30.902 19.945-47.613 27.306-17.193 7.648-35.061 13.553-53.49 17.504-19.037 4.17-38.393 6.24-57.702 6.14-10.7-0.072-21.421-0.704-32.161-1.896-10.865-1.261-21.51-3.225-32.048-5.681a247.32 247.32 0 0 1-36.438-11.649c-9.98-4.074-19.98-8.708-29.508-13.91a277.66 277.66 0 0 1-24.13-14.82c-7.687-5.294-15.268-11.081-22.368-17.154-8.613-7.174-16.64-15.127-24.184-23.366-8.306-8.93-15.774-18.5-22.77-28.638-7.643-11.04-14.447-22.721-20.403-34.764-6.478-12.876-11.75-26.469-16.04-40.074-4.435-14.234-7.78-28.972-9.776-43.798-2.122-14.894-2.778-30.087-2.441-45.013a259.3 259.3 0 0 1 5.914-48.694 276.54 276.54 0 0 1 13.562-44.52c4.07-10.14 8.884-20.15 14.199-29.887 5.545-10.16 11.843-19.908 18.643-29.383a256.58 256.58 0 0 1 21.585-26.13c11.974-12.694 25.212-24.424 39.491-34.486 14.396-10.274 29.939-19.371 46.158-26.726 11.623-5.194 23.757-9.835 35.93-13.355a271.31 271.31 0 0 1 35.875-7.889 216.89 216.89 0 0 1 26.836-2.658c3.066-0.25 6.015-0.288 8.965-0.326 1.35-0.088 2.825-0.107 4.059 0.017 0.636 0.623 1.128 0.616 1.745 0.678zm-1.485 27.761-4.424 0.057c-2.7 0.175-5.409 0.07-8.108 0.245-7.856 0.382-15.693 1.324-23.404 2.334-11.866 1.765-23.577 4.438-35.008 8.088-9.975 3.071-19.931 6.703-29.491 11.1-14.523 6.632-28.505 14.659-41.455 24.073a245.25 245.25 0 0 0-35.435 30.932c-6.994 7.446-13.486 15.166-19.467 23.44-6.096 8.485-11.691 17.244-16.66 26.345a258.13 258.13 0 0 0-12.706 26.855c-5.206 12.817-9.285 26.25-12.244 40.019-3.066 14.26-4.762 28.994-5.234 43.571a247.7 247.7 0 0 0 2.159 40.464 242.53 242.53 0 0 0 8.76 39.398c3.875 12.28 8.607 24.477 14.428 36.171 5.425 10.929 11.824 21.565 18.82 31.702a220.06 220.06 0 0 0 20.06 24.96c6.897 7.337 14.036 14.53 21.762 20.946a252.24 252.24 0 0 0 41.829 28.602c9.026 4.927 18.4 9.22 27.878 13.02 9.97 3.794 20.172 7.165 30.47 9.764 9.179 2.264 18.589 4.104 27.97 5.103 10.007 1.342 20.11 1.912 30.435 1.779 17.458-0.086 34.857-1.852 51.821-5.503 16.473-3.646 32.645-8.829 48.017-15.823 15.014-6.639 29.479-14.952 42.795-24.441a252.17 252.17 0 0 0 34.366-29.867c7.35-7.8 14.198-15.876 20.41-24.573 6.337-8.628 12.163-17.81 17.237-27.403 4.275-7.832 8.164-16.148 11.561-24.459 5.322-13.028 9.526-26.393 12.495-39.882 3.075-13.98 4.907-28.365 5.504-42.874 0.521-13.177-0.076-26.69-1.763-39.698-1.686-13.009-4.356-26.004-8.124-38.776a243.84 243.84 0 0 0-13.009-34.298c-5.184-11.072-11.217-21.782-17.972-32.063-5.713-8.613-12.033-17.008-18.825-24.836-7.429-8.451-15.34-16.615-23.837-24.001a258.41 258.41 0 0 0-21.74-16.813 245.17 245.17 0 0 0-22.626-13.999 223.73 223.73 0 0 0-28.37-13.013c-8.978-3.527-18.302-6.42-27.606-8.75-12.535-3.272-25.396-5.347-38.353-6.65-4.936-0.498-9.863-0.714-14.789-0.93-2.217-0.112-4.434-0.224-6.642-0.055-0.501-0.274-0.993-0.267-1.485-0.261z"/>
+  <path d="m479.4-504.04c0.925 0.04 2.022 0.013 2.947 0.052 2.124 0.072 4.35 0.203 6.504 0.457a78.452 78.452 0 0 1 16.376 3.517 81.74 81.74 0 0 1 16.997 7.834c3.786 2.35 7.357 5.072 10.685 7.983 2.383 2.2 4.695 4.525 6.936 6.974 1.602 1.914 3.204 3.828 4.632 5.807 1.064 1.44 2.057 3.002 3.05 4.565 5.794 8.952 9.919 18.92 12.874 29.038 0.444 1.576 0.888 3.152 1.23 4.669 0.474 1.758 0.846 3.457 1.249 5.339 0.492 2.428 0.955 4.674 1.346 7.044 0.512 3.1 0.952 6.322 1.392 9.545 0.52 4.258 0.764 8.523 0.938 12.91 0.21 5.73 0.32 11.401 0.155 17.078-0.27 7.266-0.814 14.538-1.562 21.694-1.149 9.726-2.603 19.277-4.504 28.9a426.41 426.41 0 0 1-7.978 32.338c-3.39 11.732-7.359 23.294-11.703 34.805-5.07 13.235-10.72 26.302-16.846 39.257-6.228 12.898-12.862 25.56-20.105 37.871-7.285 12.617-15.178 24.882-23.406 36.79-7.942 11.412-16.29 22.59-25.177 33.293-7.582 9.147-15.468 18.118-23.79 26.672-7.691 7.93-15.615 15.559-23.975 22.772-5.774 5.078-11.853 9.98-18.063 14.64-6.21 4.662-12.551 9.082-19.126 13.203-5.74 3.613-11.51 7.043-17.544 9.992-5.169 2.623-10.439 5.188-15.871 7.33-8.616 3.436-17.495 6.391-26.585 8.07-7.647 1.523-15.586 2.382-23.432 2.14-4.32-0.02-8.628-0.528-12.865-1.16-4.165-0.756-8.36-1.694-12.443-3.061-5.922-1.934-11.516-4.67-16.651-7.964-3.888-2.41-7.388-5.255-10.817-8.224-2.383-2.201-4.696-4.526-6.865-7.098a52.06 52.06 0 0 1-4.297-5.45c-0.963-1.38-1.926-2.76-2.787-4.082-5.59-8.835-9.757-18.498-12.713-28.615-0.443-1.576-0.887-3.152-1.23-4.669-0.503-1.94-1.007-3.88-1.338-5.885-0.625-2.67-1.076-5.404-1.527-8.139-0.44-3.223-0.88-6.446-1.22-9.61-0.519-4.258-0.692-8.646-0.937-12.91-0.21-5.73-0.147-11.466 0.018-17.143 0.27-7.266 0.814-14.538 1.633-21.817 1.15-9.727 2.675-19.402 4.677-28.966 2.199-10.605 4.773-21.159 7.824-31.602 3.42-11.55 7.246-22.864 11.448-34.128 4.814-12.558 10.035-24.882 15.763-36.914a544.79 544.79 0 0 1 20.33-38.73 559.99 559.99 0 0 1 23.734-37.59c7.555-10.976 15.689-21.783 24.086-32.108a477.59 477.59 0 0 1 23.2-26.353c7.834-8.177 15.901-16.054 24.475-23.638 5.703-4.954 11.435-9.726 17.472-14.322 5.865-4.531 11.86-8.821 18.09-12.811 5.394-3.483 10.818-6.784 16.475-9.784 5.312-2.871 10.827-5.625 16.402-8.014a175.51 175.51 0 0 1 22.57-7.914c6.692-1.745 13.646-3.007 20.62-3.599 1.82-0.104 3.71-0.332 5.631-0.377l2.47-0.058c0.58 0.169 0.853 0.162 1.128 0.156zm-0.813 27.898c-1.748-0.02-3.466 0.143-5.113 0.182-5.357 0.37-10.624 1.288-15.729 2.629-7.139 1.816-13.984 4.296-20.74 7.322-4.71 2.064-9.288 4.368-13.664 6.79a188.02 188.02 0 0 0-15.021 9.14c-5.466 3.606-10.729 7.33-15.931 11.418-5.447 4.277-10.864 8.736-16.078 13.312-7.21 6.393-14.186 13.085-20.757 20.012-7.447 7.74-14.558 15.84-21.467 24.055a450.23 450.23 0 0 0-21.527 28.144 554.5 554.5 0 0 0-21.61 33.209c-6.63 11.015-12.753 22.323-18.47 33.866s-11.058 23.138-15.891 35.026c-4.108 10.163-7.911 20.502-11.238 30.95-3.1 9.59-5.795 19.415-8.215 29.233-2.205 9.447-4.065 18.763-5.418 28.373-1.063 7.468-1.852 14.929-2.265 22.442a188.02 188.02 0 0 0-0.404 17.579c0.102 4.512 0.275 8.9 0.723 13.282 0.297 3.47 0.798 7.057 1.37 10.521 0.45 2.735 0.974 5.345 1.598 8.015 0.534 2.122 1.068 4.245 1.674 6.244 0.443 1.575 0.989 3.21 1.504 4.661 0.455 1.088 0.838 2.299 1.293 3.386 0.354 1.029 0.779 1.934 1.204 2.839 2.8 6.4 6.568 12.534 11.283 17.73 0.8 0.957 1.572 1.731 2.444 2.565 1.207 1.191 2.485 2.26 3.763 3.327 1.99 1.478 3.978 2.956 6.181 4.063 2.944 1.7 6.102 3.028 9.301 4.05 5.038 1.59 10.402 2.378 15.748 2.496 6.098 0.222 12.218-0.533 18.176-1.71 3.55-0.756 6.895-1.628 10.312-2.624 4.109-1.256 8.188-2.694 12.135-4.374a147.56 147.56 0 0 0 14.04-6.737c5.312-2.87 10.42-5.858 15.398-9.087a310.02 310.02 0 0 0 15.4-10.735 280.97 280.97 0 0 0 17.401-14.198c7.383-6.458 14.431-13.274 21.348-20.33 7.304-7.494 14.273-15.345 20.937-23.372 7.51-9.023 14.686-18.404 21.629-28.085 7.9-11.107 15.467-22.571 22.425-34.387 6.63-11.016 12.753-22.324 18.571-33.809 5.819-11.484 11.058-23.137 15.892-35.026 4.25-10.41 8.024-20.93 11.493-31.627 3.213-10.02 6.122-20.215 8.38-30.456 2.134-9.323 3.964-18.822 5.347-28.25 1.022-7.161 1.739-14.499 2.182-21.83 0.41-5.866 0.442-11.784 0.303-17.637a304.78 304.78 0 0 0-0.825-13.34c-0.297-3.47-0.869-6.934-1.44-10.398a122.15 122.15 0 0 0-1.6-8.015c-0.533-2.122-1.067-4.245-1.673-6.244a75.495 75.495 0 0 0-1.504-4.662c-0.455-1.087-0.838-2.298-1.293-3.385-2.952-7.312-6.972-14.416-12.254-20.27-0.8-0.956-1.775-1.848-2.748-2.74-1.207-1.192-2.486-2.26-3.764-3.328a66.038 66.038 0 0 0-6.282-4.121c-3.045-1.759-6.275-2.963-9.576-4.044-3.372-0.958-6.785-1.61-10.342-2.013-1.3-0.092-2.601-0.183-3.8-0.215-0.65-0.046-1.474-0.027-2.124-0.072 0.03 0.182-0.245 0.189-0.692 0.26z"/>
+  <path d="m499.42-448.8c3.135 2e-3 6.46 0.047 9.66 0.162 8.597 0.323 17.209 1.241 25.77 2.643 7.869 1.347 15.687 3.176 23.207 5.631 10.487 3.31 20.69 7.841 29.924 13.837a1.5749e16 1.5749e16 0 0 1 14.753 11.269c3.271 3.095 6.55 6.489 9.268 10.055 4.332 5.503 8.111 11.478 11.083 17.767a94.313 94.313 0 0 1 5.49 14.652c0.959 3.374 1.794 6.82 2.315 10.294 0.5 2.58 0.754 5.304 1.065 7.843 0.174 2.014 0.282 3.916 0.39 5.817 0.501 13.152-1.317 26.285-4.838 39.041-0.582 1.847-0.976 3.736-1.56 5.583-0.757 2.401-1.515 4.802-2.396 7.275-1.115 3.21-2.419 6.38-3.723 9.55a163.67 163.67 0 0 1-5.724 12.367c-2.454 4.89-5.032 9.852-7.864 14.66-3.735 6.385-7.666 12.43-11.91 18.506-4.732 6.659-9.595 13.09-14.712 19.368a375.8 375.8 0 0 1-16.362 18.509c-6.237 6.622-12.671 12.904-19.294 19.144a421.01 421.01 0 0 1-24.517 20.952c-9.17 7.257-18.658 14.246-28.41 20.782-10.798 7.292-21.858 14.13-33.114 20.629a541.06 541.06 0 0 1-36.606 18.869c-11.226 5.122-22.772 9.976-34.333 14.234-11.19 4.043-22.451 7.676-33.851 10.783a397.56 397.56 0 0 1-32.992 7.418c-9.617 1.625-19.364 3.024-29.003 3.756-8.51 0.684-17.217 1.03-25.75 0.82-10.161-0.175-20.337-0.946-30.345-2.568-8.873-1.372-17.637-3.41-26.168-6.189-10.428-3.494-20.507-8.096-29.742-14.093l-4.014-2.667c-3.7-2.696-7.22-5.649-10.68-8.786-3.206-2.982-6.106-6.292-8.949-9.786-4.266-5.39-7.98-11.252-10.951-17.541a91.238 91.238 0 0 1-5.36-14.426c-0.959-3.374-1.793-6.819-2.315-10.293-0.377-2.653-0.754-5.305-1.065-7.844-0.173-2.014-0.281-3.915-0.39-5.816-0.501-13.153 1.317-26.286 4.838-39.042 0.583-1.847 0.977-3.736 1.56-5.583 0.757-2.4 1.515-4.802 2.397-7.274 1.114-3.211 2.418-6.38 3.722-9.55 1.66-3.98 3.51-7.917 5.36-11.855 2.389-5.004 5.032-9.853 7.864-14.66 3.612-6.314 7.667-12.43 11.787-18.435 4.244-6.075 8.743-11.995 13.307-17.802 5.48-6.79 11.158-13.239 17.148-19.718 6.296-6.806 12.911-13.344 19.782-19.728 7.546-6.924 15.224-13.623 23.222-20.052a476.37 476.37 0 0 1 26.735-19.967 500.91 500.91 0 0 1 33.603-21.213c10.761-6.213 21.785-11.973 32.88-17.322 11.78-5.593 23.756-10.846 35.935-15.46 10.687-4.056 21.571-7.773 32.469-10.893 10.272-3.06 20.683-5.597 31.042-7.651 8.111-1.663 16.419-2.985 24.544-4.051 7.377-0.936 14.884-1.645 22.463-1.944 3.695-0.17 7.456-0.226 11.217-0.283 0.821 0.28 1.512 0.335 2.138 0.276zm-1.092 27.817c-2.946 0.04-5.892 0.08-8.773 0.232-7.077 0.31-14.337 0.877-21.4 1.783-7.69 0.965-15.495 2.3-23.235 3.748-9.734 1.995-19.271 4.33-28.86 7.147-10.709 3.162-21.345 6.735-31.72 10.761-9.443 3.64-18.814 7.691-28.055 11.969-10.23 4.849-20.452 9.996-30.29 15.524a459.61 459.61 0 0 0-50.382 32.713c-14.474 10.924-28.301 22.683-41.292 35.319a336.6 336.6 0 0 0-16.085 16.99c-4.884 5.538-9.637 11.303-14.2 17.11a233.2 233.2 0 0 0-13.825 19.762c-3.262 5.206-6.458 10.525-9.276 15.928-2.22 4.152-4.187 8.459-6.153 12.766-1.428 3.24-2.725 6.708-3.898 10.104a137.17 137.17 0 0 0-2.681 8.496l-1.728 6.434c-0.459 1.776-0.73 3.593-1.188 5.369l-0.657 4.004c-1.286 9.2-1.502 18.538 0.035 27.77 0.225 1.532 0.573 2.993 0.921 4.453 0.552 2.098 1.169 4.31 1.91 6.45 1.075 3.004 2.208 5.823 3.777 8.542a67.136 67.136 0 0 0 7.283 10.9c2.13 2.546 4.507 4.949 7.008 7.281 2.37 2.106 4.987 4.068 7.54 5.918 3.758 2.511 7.7 4.767 11.757 6.653 4.822 2.352 9.818 4.15 14.872 5.763 6.378 1.906 12.997 3.37 19.543 4.425 8.182 1.317 16.474 1.967 24.817 2.135 8.03 0.197 16.112-0.09 24.186-0.673 8.634-0.756 17.262-1.81 25.817-3.275 10.49-1.828 20.842-4.18 31.121-6.943a348.82 348.82 0 0 0 31.61-10.094c10.194-3.77 20.256-7.767 30.18-12.288 10.731-4.837 21.325-10.198 31.723-15.899 17.142-9.444 33.696-19.908 49.596-31.504a380.56 380.56 0 0 0 23.694-18.664 416.52 416.52 0 0 0 19.272-17.47 360.62 360.62 0 0 0 16.826-17.418 328.7 328.7 0 0 0 14.878-17.652 273.53 273.53 0 0 0 14.014-19.72 205.89 205.89 0 0 0 9.763-16.512c2.28-4.336 4.493-8.786 6.394-13.207 1.486-3.425 2.906-6.964 4.137-10.544a137.17 137.17 0 0 0 2.682-8.496l1.728-6.435c0.459-1.776 0.729-3.593 1.188-5.368l0.657-4.005c1.41-9.271 1.495-18.836-0.108-28.181-0.224-1.532-0.573-2.992-0.921-4.453-0.552-2.098-1.169-4.31-1.91-6.45-1.14-3.117-2.462-5.978-3.973-8.882-2.1-3.922-4.76-7.673-7.726-11.096-2.32-2.588-4.762-5.105-7.386-7.365-2.494-2.034-5.112-3.997-7.787-5.775-3.949-2.554-8.079-4.851-12.326-6.78-4.945-2.28-10.065-4.006-15.243-5.548-5.869-1.595-11.796-3.006-17.775-3.935a194.57 194.57 0 0 0-20.926-1.965c-2.51-0.061-4.895-0.194-7.339-0.142a5.01 5.01 0 0 1-1.811 0.29zm-116.06-274.89c0.604 0 0.755 0 1.359 0.157 1.057 0.157 2.265 0.472 3.322 0.944 1.962 0.787 3.623 2.046 4.982 3.462 1.36 1.573 2.416 3.304 3.02 5.35 0.302 0.944 0.453 1.73 0.604 2.674v88.115c0 0.472 0 0.944-0.151 1.416-0.302 1.573-0.755 3.147-1.51 4.563-0.604 1.259-1.51 2.36-2.416 3.304-1.51 1.416-3.17 2.518-5.133 3.305-1.963 0.629-4.077 0.944-6.04 0.786-1.359-0.157-2.718-0.472-3.926-0.944-1.51-0.63-2.869-1.416-4.076-2.517-1.36-1.26-2.416-2.675-3.171-4.406-0.604-1.259-1.057-2.518-1.208-3.934 0-0.472-0.151-0.944-0.151-1.416v-88.114c0.15-1.102 0.302-2.203 0.755-3.304 0.755-1.889 1.812-3.777 3.322-5.193s3.17-2.517 5.133-3.304c1.057-0.315 2.265-0.63 3.322-0.787h1.359c0.15-0.157 0.302-0.157 0.604-0.157zm214.45 57.634c0.21-0.061 0.47 0.09 0.68 0.029 0.471 0.09 0.811 0.105 1.282 0.195 1.282 0.195 2.538 0.739 3.584 1.342 1.91 0.921 3.504 2.387 4.81 4.05 1.228 1.799 2.168 3.795 2.558 5.837 0.182 1.195 0.285 2.526 0.048 3.843-0.159 1.18-0.396 2.497-0.973 3.799-0.236 0.409-0.263 0.757-0.499 1.165l-0.314 0.545-43.035 74.538-0.314 0.545c-0.236 0.409-0.394 0.681-0.76 1.015-0.84 1.15-2.018 2.287-3.302 3a13.484 13.484 0 0 1-4.66 2.032c-1.597 0.35-3.377 0.413-5.13 0.128-1.884-0.361-3.74-1.07-5.44-2.052-1.622-1.117-2.955-2.432-4.13-4.02-0.732-1.148-1.333-2.222-1.645-3.492-0.444-1.347-0.73-2.965-0.623-4.357 2e-3 -1.816 0.396-3.405 1-5.055 0.236-0.409 0.263-0.757 0.499-1.166l0.315-0.545 43.034-74.537 0.63-1.09c0.523-0.606 1.126-1.348 1.65-1.954 0.891-0.94 1.965-1.591 3.039-2.243s2.33-1.016 3.587-1.381c0.628-0.182 1.178-0.228 1.937-0.335 0.55-0.046 0.68 0.03 1.23-0.017 0.602 0.166 0.811 0.105 0.942 0.18zm-429.08-0.065c0.55 0.046 0.68-0.029 1.309 0.153 0.55 0.046 1.308 0.153 1.937 0.335 1.256 0.365 2.382 0.805 3.535 1.593 1.073 0.652 2.095 1.516 2.986 2.455 0.445 0.47 0.89 0.94 1.206 1.484l0.629 1.09 43.034 74.538c0.08 0.136 0.236 0.409 0.315 0.545 0.236 0.409 0.393 0.681 0.499 1.166 0.604 1.65 0.998 3.239 1 5.054-0.024 1.468-0.18 3.01-0.623 4.357a14.709 14.709 0 0 1-2.82 5.08c-1.254 1.451-2.876 2.57-4.654 3.414-1.125 0.468-2.46 0.875-3.741 1.07-1.753 0.285-3.402 0.147-5.13-0.127a13.484 13.484 0 0 1-4.66-2.033 23.105 23.105 0 0 1-3.302-3c-0.236-0.409-0.524-0.606-0.76-1.015l-0.314-0.545-43.035-74.537-0.314-0.545c-0.236-0.409-0.394-0.682-0.5-1.166-0.576-1.302-0.97-2.89-0.946-4.358a22.52 22.52 0 0 1 0.257-3.783c0.52-2.117 1.46-4.113 2.767-5.776s3.11-3.068 5.02-3.989c1.125-0.467 2.459-0.874 3.74-1.07 0.472-0.09 0.812-0.104 1.283-0.194 0.21 0.06 0.47-0.09 0.68-0.03 0.052-0.212 0.262-0.15 0.602-0.166zm-152.84 155.82c0.56-0.025 0.696 0.054 1.18 0.159 0.696 0.053 1.317 0.237 1.937 0.42 0.62 0.185 1.241 0.369 1.787 0.683l1.09 0.63 74.537 43.034 0.545 0.315c0.409 0.236 0.682 0.393 1.015 0.76 1.348 1.127 2.484 2.306 3.394 3.877 1.046 1.65 1.593 3.535 1.928 5.472 0.199 1.859 0.11 3.9-0.387 5.705-0.331 1.203-0.874 2.459-1.615 3.426a10.457 10.457 0 0 1-3.007 3.32c-1.375 1.124-2.872 1.829-4.505 2.455a13.484 13.484 0 0 1-5.053 0.57 23.105 23.105 0 0 1-4.359-0.948c-0.409-0.236-0.757-0.262-1.166-0.498l-0.545-0.315-74.537-43.034c-0.136-0.08-0.409-0.236-0.545-0.315-0.409-0.236-0.682-0.393-1.015-0.76-1.15-0.84-2.287-2.018-3-3.301-0.924-1.231-1.425-2.567-1.85-4.033-0.365-1.256-0.518-2.565-0.534-3.795 0.073-1.701 0.359-3.454 1.053-4.971 0.558-1.596 1.6-3.086 2.703-4.367a17.261 17.261 0 0 1 3.038-2.43c1.648-0.967 3.493-1.645 5.46-1.904 0.423-0.105 0.771-0.078 1.331-0.104 0.212-0.052 0.348 0.027 0.696 0.054-0.06-0.21 0.151-0.262 0.424-0.105zm739.74-0.085c0.212 0.052 0.424 0.104 0.56 0.025 0.424 0.105 0.772 0.078 1.331 0.103 1.407 0.234 2.965 0.73 4.25 1.382 1.573 0.836 2.873 1.829 4.051 3.24 1.028 1.15 1.783 2.459 2.401 3.845 0.468 1.125 0.875 2.459 0.858 3.689 0.196 1.282 0.043 2.59-0.11 3.9-0.214 1.517-0.715 2.853-1.427 4.136-0.834 1.702-2.168 3.17-3.652 4.375-0.409 0.236-0.606 0.524-1.015 0.76l-0.545 0.315-74.537 43.034-0.545 0.315c-0.409 0.236-0.681 0.393-1.166 0.498-1.302 0.578-2.89 0.972-4.358 0.948a13.484 13.484 0 0 1-5.053-0.57 13.849 13.849 0 0 1-4.506-2.455 14.821 14.821 0 0 1-2.705-2.797c-1.118-1.62-1.963-3.4-2.324-5.283-0.36-1.884-0.374-3.795 0.098-5.81 0.289-1.388 0.85-2.932 1.639-4.085 0.91-1.571 2.046-2.75 3.394-3.877 0.408-0.236 0.605-0.524 1.014-0.76l0.545-0.315 74.538-43.034 1.09-0.63c1.03-0.42 1.922-0.76 3.027-1.05a5.935 5.935 0 0 1 1.877-0.212c0.211 0.052 0.348-0.026 0.696-0.053 0.15 0.262 0.362 0.314 0.574 0.366z"/>
+ </g>
+</svg>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/eric6/Plugins/UiExtensionPlugins/Translator/icons/engines/ibm_watson-light.svg	Sat May 02 13:51:07 2020 +0200
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="48" height="48" version="1.1" viewBox="0 0 14.746 14.747" xmlns="http://www.w3.org/2000/svg">
+ <g transform="matrix(.019202 0 0 .019037 -.0024016 13.862)" fill="#232629">
+  <path d="m305.67-467.18c1.437 0.05 2.874 0.1 4.388 0.01 3.202 0.096 6.279 0.124 9.403 0.362 14.293 0.645 28.547 2.554 42.618 5.097 17.167 3.132 34.14 7.81 50.574 13.477 21.535 7.351 42.317 16.677 62.174 27.7 21.486 11.912 41.97 25.662 60.793 41.259 8.95 7.454 17.542 15.263 25.825 23.639 7.01 7.13 13.742 14.474 20.116 22.174 10.906 13.11 20.694 27.077 29.16 41.974 6.634 11.695 12.429 24.033 17.085 36.668 3.722 10.472 6.836 21.163 8.812 32.15 1.33 7.7 2.332 15.403 2.601 23.257 0.366 8.274 0.075 16.556-0.996 24.78-0.666 5.691-1.786 11.319-3.156 16.81-1.524 5.774-3.3 11.41-5.528 16.984-3.55 8.888-8.103 17.23-13.408 25.16-4.254 6.302-9.058 12.121-14.363 17.666-4.08 4.196-8.536 8.186-13.166 11.897-3.23 2.64-6.51 5.07-9.963 7.223a140.33 140.33 0 0 1-7.87 4.879c-1.93 1.149-3.984 2.23-6.038 3.31-14.863 7.851-30.912 13.404-47.27 17.136a119.07 119.07 0 0 1-8.593 1.732c-3.587 0.61-7.175 1.221-10.686 1.69a165.05 165.05 0 0 1-14.466 1.462c-5.932 0.432-11.786 0.723-17.688 0.804a301.42 301.42 0 0 1-45.666-3.091c-18.584-2.621-37.024-6.998-54.971-12.575-24.458-7.662-48.182-17.86-70.623-30.109-22.691-12.387-44.351-26.962-64.197-43.668-16.298-13.667-31.495-28.752-45.063-45.334-10.357-12.626-19.672-25.968-27.868-40.167-6.76-11.764-12.631-23.96-17.211-36.737-3.924-10.4-6.835-21.163-8.811-32.15-1.33-7.7-2.332-15.403-2.679-23.116-0.365-8.273-0.075-16.556 0.794-24.706 0.666-5.692 1.66-11.388 3.03-16.88a129.05 129.05 0 0 1 5.634-17.476c3.55-8.888 8.103-17.23 13.409-25.16 4.254-6.302 9.057-12.12 14.362-17.666 4.235-4.478 8.893-8.541 13.726-12.326 3.23-2.64 6.635-5.002 9.963-7.222a140.33 140.33 0 0 1 7.87-4.88c1.93-1.148 3.984-2.229 6.038-3.31 14.863-7.85 31.037-13.335 47.394-17.067a119.07 119.07 0 0 1 8.594-1.732 211.84 211.84 0 0 1 11.544-1.772c4.9-0.629 9.722-1.116 14.467-1.462l12.036-0.586c1.968-0.027 3.81-0.122 5.7-8e-3 0.733-0.15 1.514-0.091 2.17-0.1zm-1.382 27.871c-2.093-0.041-4.263 0.059-6.433 0.159l-12.036 0.586c-5.073 0.35-10.175 1.052-15.277 1.753-3.916 0.615-7.832 1.23-11.7 2.055-2.806 0.67-5.738 1.272-8.419 2.01-2.401 0.524-4.755 1.258-7.108 1.992-14.043 4.262-27.651 10.412-39.872 18.789-1.6 1.144-3.202 2.289-4.88 3.575-2.315 1.855-4.63 3.711-6.82 5.636-2.903 2.635-5.68 5.34-8.285 8.322-4.109 4.546-7.716 9.367-11.025 14.533-4.003 6.44-7.254 13.29-9.801 20.34a127.47 127.47 0 0 0-4.014 14.508 115.81 115.81 0 0 0-1.892 14.197c-1.004 13.765 0.412 27.566 3.622 41.063 2.169 9.441 5.196 18.8 8.908 27.8 4.57 11.302 10.23 22.099 16.652 32.394 7.86 12.73 16.885 24.814 26.702 36.045a337.6 337.6 0 0 0 39.566 38.113c17.927 14.556 37.311 27.34 57.698 38.284 20.889 11.22 42.983 20.527 65.656 27.582 16.289 5.038 32.944 8.808 49.792 11.032a254.67 254.67 0 0 0 40.072 2.607c6.105-0.154 12.21-0.308 18.344-0.813a209.38 209.38 0 0 0 14.621-1.745c3.713-0.542 7.378-1.294 11.043-2.046l8.42-2.01c2.276-0.592 4.427-1.253 6.578-1.914 13.917-4.33 27.371-10.198 39.39-18.501 1.803-1.218 3.607-2.435 5.362-3.862 2.315-1.856 4.63-3.712 6.82-5.636a84.345 84.345 0 0 0 8.641-8.678 116.31 116.31 0 0 0 10.514-13.895c3.926-6.298 7.303-13.08 9.85-20.13 1.688-4.584 2.923-9.231 3.907-14.015a123.1 123.1 0 0 0 2.123-14.622c1.005-13.765-0.334-27.708-3.293-41.067-2.17-9.441-5.196-18.8-8.909-27.8-4.57-11.303-10.23-22.1-16.652-32.394-7.907-12.94-17.058-25.093-27.048-36.601-12.68-14.63-26.914-27.904-41.968-39.975-16.905-13.448-34.987-25.337-53.917-35.67a360.51 360.51 0 0 0-59.32-25.775 361.74 361.74 0 0 0-41.093-10.871c-12.837-2.42-25.856-4.205-38.963-4.937-3.327-0.165-6.655-0.33-9.857-0.426-1.437-0.05-3.076-0.028-4.513-0.078-0.328 4e-3 -0.733 0.15-1.186 0.086z"/>
+  <path d="m384.83-529.93c2.458-0.032 5.042 5e-3 7.385 0.185 5.292 0.142 10.47 0.495 15.646 0.849 14.799 1.21 29.28 3.895 43.665 7.352a288.92 288.92 0 0 1 33.96 11.12c9.73 3.937 19.229 8.298 28.38 13.294 8.902 4.859 17.572 10.14 25.896 16.058a322.45 322.45 0 0 1 24.152 18.953c9.26 8.077 17.932 16.932 25.882 26.216 7.95 9.285 15.293 18.787 21.922 29 7.412 11.463 14.1 23.356 19.826 35.822 5.455 11.768 10.071 24.178 13.705 36.601 4.183 14.097 7.153 28.63 9.014 43.107a265.73 265.73 0 0 1 1.92 44.18 282.21 282.21 0 0 1-6.07 47.785c-3.402 15.176-8.038 30.228-13.928 44.595a262.32 262.32 0 0 1-12.822 27.066 275.5 275.5 0 0 1-18.286 29.029c-7.272 10.042-15.17 19.741-23.83 28.75-11.743 12.271-24.509 23.435-38.307 33.21-14.992 10.772-30.902 19.945-47.613 27.306-17.193 7.648-35.061 13.553-53.49 17.504-19.037 4.17-38.393 6.24-57.702 6.14-10.7-0.072-21.421-0.704-32.161-1.896-10.865-1.261-21.51-3.225-32.048-5.681a247.32 247.32 0 0 1-36.438-11.649c-9.98-4.074-19.98-8.708-29.508-13.91a277.66 277.66 0 0 1-24.13-14.82c-7.687-5.294-15.268-11.081-22.368-17.154-8.613-7.174-16.64-15.127-24.184-23.366-8.306-8.93-15.774-18.5-22.77-28.638-7.643-11.04-14.447-22.721-20.403-34.764-6.478-12.876-11.75-26.469-16.04-40.074-4.435-14.234-7.78-28.972-9.776-43.798-2.122-14.894-2.778-30.087-2.441-45.013a259.3 259.3 0 0 1 5.914-48.694 276.54 276.54 0 0 1 13.562-44.52c4.07-10.14 8.884-20.15 14.199-29.887 5.545-10.16 11.843-19.908 18.643-29.383a256.58 256.58 0 0 1 21.585-26.13c11.974-12.694 25.212-24.424 39.491-34.486 14.396-10.274 29.939-19.371 46.158-26.726 11.623-5.194 23.757-9.835 35.93-13.355a271.31 271.31 0 0 1 35.875-7.889 216.89 216.89 0 0 1 26.836-2.658c3.066-0.25 6.015-0.288 8.965-0.326 1.35-0.088 2.825-0.107 4.059 0.017 0.636 0.623 1.128 0.616 1.745 0.678zm-1.485 27.761-4.424 0.057c-2.7 0.175-5.409 0.07-8.108 0.245-7.856 0.382-15.693 1.324-23.404 2.334-11.866 1.765-23.577 4.438-35.008 8.088-9.975 3.071-19.931 6.703-29.491 11.1-14.523 6.632-28.505 14.659-41.455 24.073a245.25 245.25 0 0 0-35.435 30.932c-6.994 7.446-13.486 15.166-19.467 23.44-6.096 8.485-11.691 17.244-16.66 26.345a258.13 258.13 0 0 0-12.706 26.855c-5.206 12.817-9.285 26.25-12.244 40.019-3.066 14.26-4.762 28.994-5.234 43.571a247.7 247.7 0 0 0 2.159 40.464 242.53 242.53 0 0 0 8.76 39.398c3.875 12.28 8.607 24.477 14.428 36.171 5.425 10.929 11.824 21.565 18.82 31.702a220.06 220.06 0 0 0 20.06 24.96c6.897 7.337 14.036 14.53 21.762 20.946a252.24 252.24 0 0 0 41.829 28.602c9.026 4.927 18.4 9.22 27.878 13.02 9.97 3.794 20.172 7.165 30.47 9.764 9.179 2.264 18.589 4.104 27.97 5.103 10.007 1.342 20.11 1.912 30.435 1.779 17.458-0.086 34.857-1.852 51.821-5.503 16.473-3.646 32.645-8.829 48.017-15.823 15.014-6.639 29.479-14.952 42.795-24.441a252.17 252.17 0 0 0 34.366-29.867c7.35-7.8 14.198-15.876 20.41-24.573 6.337-8.628 12.163-17.81 17.237-27.403 4.275-7.832 8.164-16.148 11.561-24.459 5.322-13.028 9.526-26.393 12.495-39.882 3.075-13.98 4.907-28.365 5.504-42.874 0.521-13.177-0.076-26.69-1.763-39.698-1.686-13.009-4.356-26.004-8.124-38.776a243.84 243.84 0 0 0-13.009-34.298c-5.184-11.072-11.217-21.782-17.972-32.063-5.713-8.613-12.033-17.008-18.825-24.836-7.429-8.451-15.34-16.615-23.837-24.001a258.41 258.41 0 0 0-21.74-16.813 245.17 245.17 0 0 0-22.626-13.999 223.73 223.73 0 0 0-28.37-13.013c-8.978-3.527-18.302-6.42-27.606-8.75-12.535-3.272-25.396-5.347-38.353-6.65-4.936-0.498-9.863-0.714-14.789-0.93-2.217-0.112-4.434-0.224-6.642-0.055-0.501-0.274-0.993-0.267-1.485-0.261z"/>
+  <path d="m479.4-504.04c0.925 0.04 2.022 0.013 2.947 0.052 2.124 0.072 4.35 0.203 6.504 0.457a78.452 78.452 0 0 1 16.376 3.517 81.74 81.74 0 0 1 16.997 7.834c3.786 2.35 7.357 5.072 10.685 7.983 2.383 2.2 4.695 4.525 6.936 6.974 1.602 1.914 3.204 3.828 4.632 5.807 1.064 1.44 2.057 3.002 3.05 4.565 5.794 8.952 9.919 18.92 12.874 29.038 0.444 1.576 0.888 3.152 1.23 4.669 0.474 1.758 0.846 3.457 1.249 5.339 0.492 2.428 0.955 4.674 1.346 7.044 0.512 3.1 0.952 6.322 1.392 9.545 0.52 4.258 0.764 8.523 0.938 12.91 0.21 5.73 0.32 11.401 0.155 17.078-0.27 7.266-0.814 14.538-1.562 21.694-1.149 9.726-2.603 19.277-4.504 28.9a426.41 426.41 0 0 1-7.978 32.338c-3.39 11.732-7.359 23.294-11.703 34.805-5.07 13.235-10.72 26.302-16.846 39.257-6.228 12.898-12.862 25.56-20.105 37.871-7.285 12.617-15.178 24.882-23.406 36.79-7.942 11.412-16.29 22.59-25.177 33.293-7.582 9.147-15.468 18.118-23.79 26.672-7.691 7.93-15.615 15.559-23.975 22.772-5.774 5.078-11.853 9.98-18.063 14.64-6.21 4.662-12.551 9.082-19.126 13.203-5.74 3.613-11.51 7.043-17.544 9.992-5.169 2.623-10.439 5.188-15.871 7.33-8.616 3.436-17.495 6.391-26.585 8.07-7.647 1.523-15.586 2.382-23.432 2.14-4.32-0.02-8.628-0.528-12.865-1.16-4.165-0.756-8.36-1.694-12.443-3.061-5.922-1.934-11.516-4.67-16.651-7.964-3.888-2.41-7.388-5.255-10.817-8.224-2.383-2.201-4.696-4.526-6.865-7.098a52.06 52.06 0 0 1-4.297-5.45c-0.963-1.38-1.926-2.76-2.787-4.082-5.59-8.835-9.757-18.498-12.713-28.615-0.443-1.576-0.887-3.152-1.23-4.669-0.503-1.94-1.007-3.88-1.338-5.885-0.625-2.67-1.076-5.404-1.527-8.139-0.44-3.223-0.88-6.446-1.22-9.61-0.519-4.258-0.692-8.646-0.937-12.91-0.21-5.73-0.147-11.466 0.018-17.143 0.27-7.266 0.814-14.538 1.633-21.817 1.15-9.727 2.675-19.402 4.677-28.966 2.199-10.605 4.773-21.159 7.824-31.602 3.42-11.55 7.246-22.864 11.448-34.128 4.814-12.558 10.035-24.882 15.763-36.914a544.79 544.79 0 0 1 20.33-38.73 559.99 559.99 0 0 1 23.734-37.59c7.555-10.976 15.689-21.783 24.086-32.108a477.59 477.59 0 0 1 23.2-26.353c7.834-8.177 15.901-16.054 24.475-23.638 5.703-4.954 11.435-9.726 17.472-14.322 5.865-4.531 11.86-8.821 18.09-12.811 5.394-3.483 10.818-6.784 16.475-9.784 5.312-2.871 10.827-5.625 16.402-8.014a175.51 175.51 0 0 1 22.57-7.914c6.692-1.745 13.646-3.007 20.62-3.599 1.82-0.104 3.71-0.332 5.631-0.377l2.47-0.058c0.58 0.169 0.853 0.162 1.128 0.156zm-0.813 27.898c-1.748-0.02-3.466 0.143-5.113 0.182-5.357 0.37-10.624 1.288-15.729 2.629-7.139 1.816-13.984 4.296-20.74 7.322-4.71 2.064-9.288 4.368-13.664 6.79a188.02 188.02 0 0 0-15.021 9.14c-5.466 3.606-10.729 7.33-15.931 11.418-5.447 4.277-10.864 8.736-16.078 13.312-7.21 6.393-14.186 13.085-20.757 20.012-7.447 7.74-14.558 15.84-21.467 24.055a450.23 450.23 0 0 0-21.527 28.144 554.5 554.5 0 0 0-21.61 33.209c-6.63 11.015-12.753 22.323-18.47 33.866s-11.058 23.138-15.891 35.026c-4.108 10.163-7.911 20.502-11.238 30.95-3.1 9.59-5.795 19.415-8.215 29.233-2.205 9.447-4.065 18.763-5.418 28.373-1.063 7.468-1.852 14.929-2.265 22.442a188.02 188.02 0 0 0-0.404 17.579c0.102 4.512 0.275 8.9 0.723 13.282 0.297 3.47 0.798 7.057 1.37 10.521 0.45 2.735 0.974 5.345 1.598 8.015 0.534 2.122 1.068 4.245 1.674 6.244 0.443 1.575 0.989 3.21 1.504 4.661 0.455 1.088 0.838 2.299 1.293 3.386 0.354 1.029 0.779 1.934 1.204 2.839 2.8 6.4 6.568 12.534 11.283 17.73 0.8 0.957 1.572 1.731 2.444 2.565 1.207 1.191 2.485 2.26 3.763 3.327 1.99 1.478 3.978 2.956 6.181 4.063 2.944 1.7 6.102 3.028 9.301 4.05 5.038 1.59 10.402 2.378 15.748 2.496 6.098 0.222 12.218-0.533 18.176-1.71 3.55-0.756 6.895-1.628 10.312-2.624 4.109-1.256 8.188-2.694 12.135-4.374a147.56 147.56 0 0 0 14.04-6.737c5.312-2.87 10.42-5.858 15.398-9.087a310.02 310.02 0 0 0 15.4-10.735 280.97 280.97 0 0 0 17.401-14.198c7.383-6.458 14.431-13.274 21.348-20.33 7.304-7.494 14.273-15.345 20.937-23.372 7.51-9.023 14.686-18.404 21.629-28.085 7.9-11.107 15.467-22.571 22.425-34.387 6.63-11.016 12.753-22.324 18.571-33.809 5.819-11.484 11.058-23.137 15.892-35.026 4.25-10.41 8.024-20.93 11.493-31.627 3.213-10.02 6.122-20.215 8.38-30.456 2.134-9.323 3.964-18.822 5.347-28.25 1.022-7.161 1.739-14.499 2.182-21.83 0.41-5.866 0.442-11.784 0.303-17.637a304.78 304.78 0 0 0-0.825-13.34c-0.297-3.47-0.869-6.934-1.44-10.398a122.15 122.15 0 0 0-1.6-8.015c-0.533-2.122-1.067-4.245-1.673-6.244a75.495 75.495 0 0 0-1.504-4.662c-0.455-1.087-0.838-2.298-1.293-3.385-2.952-7.312-6.972-14.416-12.254-20.27-0.8-0.956-1.775-1.848-2.748-2.74-1.207-1.192-2.486-2.26-3.764-3.328a66.038 66.038 0 0 0-6.282-4.121c-3.045-1.759-6.275-2.963-9.576-4.044-3.372-0.958-6.785-1.61-10.342-2.013-1.3-0.092-2.601-0.183-3.8-0.215-0.65-0.046-1.474-0.027-2.124-0.072 0.03 0.182-0.245 0.189-0.692 0.26z"/>
+  <path d="m499.42-448.8c3.135 2e-3 6.46 0.047 9.66 0.162 8.597 0.323 17.209 1.241 25.77 2.643 7.869 1.347 15.687 3.176 23.207 5.631 10.487 3.31 20.69 7.841 29.924 13.837a1.5749e16 1.5749e16 0 0 1 14.753 11.269c3.271 3.095 6.55 6.489 9.268 10.055 4.332 5.503 8.111 11.478 11.083 17.767a94.313 94.313 0 0 1 5.49 14.652c0.959 3.374 1.794 6.82 2.315 10.294 0.5 2.58 0.754 5.304 1.065 7.843 0.174 2.014 0.282 3.916 0.39 5.817 0.501 13.152-1.317 26.285-4.838 39.041-0.582 1.847-0.976 3.736-1.56 5.583-0.757 2.401-1.515 4.802-2.396 7.275-1.115 3.21-2.419 6.38-3.723 9.55a163.67 163.67 0 0 1-5.724 12.367c-2.454 4.89-5.032 9.852-7.864 14.66-3.735 6.385-7.666 12.43-11.91 18.506-4.732 6.659-9.595 13.09-14.712 19.368a375.8 375.8 0 0 1-16.362 18.509c-6.237 6.622-12.671 12.904-19.294 19.144a421.01 421.01 0 0 1-24.517 20.952c-9.17 7.257-18.658 14.246-28.41 20.782-10.798 7.292-21.858 14.13-33.114 20.629a541.06 541.06 0 0 1-36.606 18.869c-11.226 5.122-22.772 9.976-34.333 14.234-11.19 4.043-22.451 7.676-33.851 10.783a397.56 397.56 0 0 1-32.992 7.418c-9.617 1.625-19.364 3.024-29.003 3.756-8.51 0.684-17.217 1.03-25.75 0.82-10.161-0.175-20.337-0.946-30.345-2.568-8.873-1.372-17.637-3.41-26.168-6.189-10.428-3.494-20.507-8.096-29.742-14.093l-4.014-2.667c-3.7-2.696-7.22-5.649-10.68-8.786-3.206-2.982-6.106-6.292-8.949-9.786-4.266-5.39-7.98-11.252-10.951-17.541a91.238 91.238 0 0 1-5.36-14.426c-0.959-3.374-1.793-6.819-2.315-10.293-0.377-2.653-0.754-5.305-1.065-7.844-0.173-2.014-0.281-3.915-0.39-5.816-0.501-13.153 1.317-26.286 4.838-39.042 0.583-1.847 0.977-3.736 1.56-5.583 0.757-2.4 1.515-4.802 2.397-7.274 1.114-3.211 2.418-6.38 3.722-9.55 1.66-3.98 3.51-7.917 5.36-11.855 2.389-5.004 5.032-9.853 7.864-14.66 3.612-6.314 7.667-12.43 11.787-18.435 4.244-6.075 8.743-11.995 13.307-17.802 5.48-6.79 11.158-13.239 17.148-19.718 6.296-6.806 12.911-13.344 19.782-19.728 7.546-6.924 15.224-13.623 23.222-20.052a476.37 476.37 0 0 1 26.735-19.967 500.91 500.91 0 0 1 33.603-21.213c10.761-6.213 21.785-11.973 32.88-17.322 11.78-5.593 23.756-10.846 35.935-15.46 10.687-4.056 21.571-7.773 32.469-10.893 10.272-3.06 20.683-5.597 31.042-7.651 8.111-1.663 16.419-2.985 24.544-4.051 7.377-0.936 14.884-1.645 22.463-1.944 3.695-0.17 7.456-0.226 11.217-0.283 0.821 0.28 1.512 0.335 2.138 0.276zm-1.092 27.817c-2.946 0.04-5.892 0.08-8.773 0.232-7.077 0.31-14.337 0.877-21.4 1.783-7.69 0.965-15.495 2.3-23.235 3.748-9.734 1.995-19.271 4.33-28.86 7.147-10.709 3.162-21.345 6.735-31.72 10.761-9.443 3.64-18.814 7.691-28.055 11.969-10.23 4.849-20.452 9.996-30.29 15.524a459.61 459.61 0 0 0-50.382 32.713c-14.474 10.924-28.301 22.683-41.292 35.319a336.6 336.6 0 0 0-16.085 16.99c-4.884 5.538-9.637 11.303-14.2 17.11a233.2 233.2 0 0 0-13.825 19.762c-3.262 5.206-6.458 10.525-9.276 15.928-2.22 4.152-4.187 8.459-6.153 12.766-1.428 3.24-2.725 6.708-3.898 10.104a137.17 137.17 0 0 0-2.681 8.496l-1.728 6.434c-0.459 1.776-0.73 3.593-1.188 5.369l-0.657 4.004c-1.286 9.2-1.502 18.538 0.035 27.77 0.225 1.532 0.573 2.993 0.921 4.453 0.552 2.098 1.169 4.31 1.91 6.45 1.075 3.004 2.208 5.823 3.777 8.542a67.136 67.136 0 0 0 7.283 10.9c2.13 2.546 4.507 4.949 7.008 7.281 2.37 2.106 4.987 4.068 7.54 5.918 3.758 2.511 7.7 4.767 11.757 6.653 4.822 2.352 9.818 4.15 14.872 5.763 6.378 1.906 12.997 3.37 19.543 4.425 8.182 1.317 16.474 1.967 24.817 2.135 8.03 0.197 16.112-0.09 24.186-0.673 8.634-0.756 17.262-1.81 25.817-3.275 10.49-1.828 20.842-4.18 31.121-6.943a348.82 348.82 0 0 0 31.61-10.094c10.194-3.77 20.256-7.767 30.18-12.288 10.731-4.837 21.325-10.198 31.723-15.899 17.142-9.444 33.696-19.908 49.596-31.504a380.56 380.56 0 0 0 23.694-18.664 416.52 416.52 0 0 0 19.272-17.47 360.62 360.62 0 0 0 16.826-17.418 328.7 328.7 0 0 0 14.878-17.652 273.53 273.53 0 0 0 14.014-19.72 205.89 205.89 0 0 0 9.763-16.512c2.28-4.336 4.493-8.786 6.394-13.207 1.486-3.425 2.906-6.964 4.137-10.544a137.17 137.17 0 0 0 2.682-8.496l1.728-6.435c0.459-1.776 0.729-3.593 1.188-5.368l0.657-4.005c1.41-9.271 1.495-18.836-0.108-28.181-0.224-1.532-0.573-2.992-0.921-4.453-0.552-2.098-1.169-4.31-1.91-6.45-1.14-3.117-2.462-5.978-3.973-8.882-2.1-3.922-4.76-7.673-7.726-11.096-2.32-2.588-4.762-5.105-7.386-7.365-2.494-2.034-5.112-3.997-7.787-5.775-3.949-2.554-8.079-4.851-12.326-6.78-4.945-2.28-10.065-4.006-15.243-5.548-5.869-1.595-11.796-3.006-17.775-3.935a194.57 194.57 0 0 0-20.926-1.965c-2.51-0.061-4.895-0.194-7.339-0.142a5.01 5.01 0 0 1-1.811 0.29zm-116.06-274.89c0.604 0 0.755 0 1.359 0.157 1.057 0.157 2.265 0.472 3.322 0.944 1.962 0.787 3.623 2.046 4.982 3.462 1.36 1.573 2.416 3.304 3.02 5.35 0.302 0.944 0.453 1.73 0.604 2.674v88.115c0 0.472 0 0.944-0.151 1.416-0.302 1.573-0.755 3.147-1.51 4.563-0.604 1.259-1.51 2.36-2.416 3.304-1.51 1.416-3.17 2.518-5.133 3.305-1.963 0.629-4.077 0.944-6.04 0.786-1.359-0.157-2.718-0.472-3.926-0.944-1.51-0.63-2.869-1.416-4.076-2.517-1.36-1.26-2.416-2.675-3.171-4.406-0.604-1.259-1.057-2.518-1.208-3.934 0-0.472-0.151-0.944-0.151-1.416v-88.114c0.15-1.102 0.302-2.203 0.755-3.304 0.755-1.889 1.812-3.777 3.322-5.193s3.17-2.517 5.133-3.304c1.057-0.315 2.265-0.63 3.322-0.787h1.359c0.15-0.157 0.302-0.157 0.604-0.157zm214.45 57.634c0.21-0.061 0.47 0.09 0.68 0.029 0.471 0.09 0.811 0.105 1.282 0.195 1.282 0.195 2.538 0.739 3.584 1.342 1.91 0.921 3.504 2.387 4.81 4.05 1.228 1.799 2.168 3.795 2.558 5.837 0.182 1.195 0.285 2.526 0.048 3.843-0.159 1.18-0.396 2.497-0.973 3.799-0.236 0.409-0.263 0.757-0.499 1.165l-0.314 0.545-43.035 74.538-0.314 0.545c-0.236 0.409-0.394 0.681-0.76 1.015-0.84 1.15-2.018 2.287-3.302 3a13.484 13.484 0 0 1-4.66 2.032c-1.597 0.35-3.377 0.413-5.13 0.128-1.884-0.361-3.74-1.07-5.44-2.052-1.622-1.117-2.955-2.432-4.13-4.02-0.732-1.148-1.333-2.222-1.645-3.492-0.444-1.347-0.73-2.965-0.623-4.357 2e-3 -1.816 0.396-3.405 1-5.055 0.236-0.409 0.263-0.757 0.499-1.166l0.315-0.545 43.034-74.537 0.63-1.09c0.523-0.606 1.126-1.348 1.65-1.954 0.891-0.94 1.965-1.591 3.039-2.243s2.33-1.016 3.587-1.381c0.628-0.182 1.178-0.228 1.937-0.335 0.55-0.046 0.68 0.03 1.23-0.017 0.602 0.166 0.811 0.105 0.942 0.18zm-429.08-0.065c0.55 0.046 0.68-0.029 1.309 0.153 0.55 0.046 1.308 0.153 1.937 0.335 1.256 0.365 2.382 0.805 3.535 1.593 1.073 0.652 2.095 1.516 2.986 2.455 0.445 0.47 0.89 0.94 1.206 1.484l0.629 1.09 43.034 74.538c0.08 0.136 0.236 0.409 0.315 0.545 0.236 0.409 0.393 0.681 0.499 1.166 0.604 1.65 0.998 3.239 1 5.054-0.024 1.468-0.18 3.01-0.623 4.357a14.709 14.709 0 0 1-2.82 5.08c-1.254 1.451-2.876 2.57-4.654 3.414-1.125 0.468-2.46 0.875-3.741 1.07-1.753 0.285-3.402 0.147-5.13-0.127a13.484 13.484 0 0 1-4.66-2.033 23.105 23.105 0 0 1-3.302-3c-0.236-0.409-0.524-0.606-0.76-1.015l-0.314-0.545-43.035-74.537-0.314-0.545c-0.236-0.409-0.394-0.682-0.5-1.166-0.576-1.302-0.97-2.89-0.946-4.358a22.52 22.52 0 0 1 0.257-3.783c0.52-2.117 1.46-4.113 2.767-5.776s3.11-3.068 5.02-3.989c1.125-0.467 2.459-0.874 3.74-1.07 0.472-0.09 0.812-0.104 1.283-0.194 0.21 0.06 0.47-0.09 0.68-0.03 0.052-0.212 0.262-0.15 0.602-0.166zm-152.84 155.82c0.56-0.025 0.696 0.054 1.18 0.159 0.696 0.053 1.317 0.237 1.937 0.42 0.62 0.185 1.241 0.369 1.787 0.683l1.09 0.63 74.537 43.034 0.545 0.315c0.409 0.236 0.682 0.393 1.015 0.76 1.348 1.127 2.484 2.306 3.394 3.877 1.046 1.65 1.593 3.535 1.928 5.472 0.199 1.859 0.11 3.9-0.387 5.705-0.331 1.203-0.874 2.459-1.615 3.426a10.457 10.457 0 0 1-3.007 3.32c-1.375 1.124-2.872 1.829-4.505 2.455a13.484 13.484 0 0 1-5.053 0.57 23.105 23.105 0 0 1-4.359-0.948c-0.409-0.236-0.757-0.262-1.166-0.498l-0.545-0.315-74.537-43.034c-0.136-0.08-0.409-0.236-0.545-0.315-0.409-0.236-0.682-0.393-1.015-0.76-1.15-0.84-2.287-2.018-3-3.301-0.924-1.231-1.425-2.567-1.85-4.033-0.365-1.256-0.518-2.565-0.534-3.795 0.073-1.701 0.359-3.454 1.053-4.971 0.558-1.596 1.6-3.086 2.703-4.367a17.261 17.261 0 0 1 3.038-2.43c1.648-0.967 3.493-1.645 5.46-1.904 0.423-0.105 0.771-0.078 1.331-0.104 0.212-0.052 0.348 0.027 0.696 0.054-0.06-0.21 0.151-0.262 0.424-0.105zm739.74-0.085c0.212 0.052 0.424 0.104 0.56 0.025 0.424 0.105 0.772 0.078 1.331 0.103 1.407 0.234 2.965 0.73 4.25 1.382 1.573 0.836 2.873 1.829 4.051 3.24 1.028 1.15 1.783 2.459 2.401 3.845 0.468 1.125 0.875 2.459 0.858 3.689 0.196 1.282 0.043 2.59-0.11 3.9-0.214 1.517-0.715 2.853-1.427 4.136-0.834 1.702-2.168 3.17-3.652 4.375-0.409 0.236-0.606 0.524-1.015 0.76l-0.545 0.315-74.537 43.034-0.545 0.315c-0.409 0.236-0.681 0.393-1.166 0.498-1.302 0.578-2.89 0.972-4.358 0.948a13.484 13.484 0 0 1-5.053-0.57 13.849 13.849 0 0 1-4.506-2.455 14.821 14.821 0 0 1-2.705-2.797c-1.118-1.62-1.963-3.4-2.324-5.283-0.36-1.884-0.374-3.795 0.098-5.81 0.289-1.388 0.85-2.932 1.639-4.085 0.91-1.571 2.046-2.75 3.394-3.877 0.408-0.236 0.605-0.524 1.014-0.76l0.545-0.315 74.538-43.034 1.09-0.63c1.03-0.42 1.922-0.76 3.027-1.05a5.935 5.935 0 0 1 1.877-0.212c0.211 0.052 0.348-0.026 0.696-0.053 0.15 0.262 0.362 0.314 0.574 0.366z"/>
+ </g>
+</svg>
Binary file eric6/Plugins/UiExtensionPlugins/Translator/icons/engines/ibm_watson.png has changed
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/eric6/Plugins/UiExtensionPlugins/Translator/icons/engines/microsoft-dark.svg	Sat May 02 13:51:07 2020 +0200
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="48" height="48" fill="#000000" version="1.1" viewBox="0 0 48 48" xmlns="http://www.w3.org/2000/svg">
+ <path d="m48 0-48 6.5283v34.943l48 6.5283zm-4.3637 4.9943v16.823h-21.818v-13.853zm-26.182 3.5625v13.261h-13.091v-11.48zm-13.091 17.625h13.091v13.261l-13.091-1.7812zm17.454 0h21.818v16.823l-21.818-2.9702z" fill="#eff0f1" stroke-width="2.1818"/>
+</svg>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/eric6/Plugins/UiExtensionPlugins/Translator/icons/engines/microsoft-light.svg	Sat May 02 13:51:07 2020 +0200
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="48" height="48" fill="#000000" version="1.1" viewBox="0 0 48 48" xmlns="http://www.w3.org/2000/svg">
+ <path d="m48 0-48 6.5283v34.943l48 6.5283zm-4.3637 4.9943v16.823h-21.818v-13.853zm-26.182 3.5625v13.261h-13.091v-11.48zm-13.091 17.625h13.091v13.261l-13.091-1.7812zm17.454 0h21.818v16.823l-21.818-2.9702z" fill="#232629" stroke-width="2.1818"/>
+</svg>
Binary file eric6/Plugins/UiExtensionPlugins/Translator/icons/engines/microsoft.png has changed
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/eric6/Plugins/UiExtensionPlugins/Translator/icons/engines/mymemory-dark.svg	Sat May 02 13:51:07 2020 +0200
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="48" height="48" version="1.1" viewBox="0 0 48 48" xmlns="http://www.w3.org/2000/svg">
+ <defs>
+  <style type="text/css">.ColorScheme-Text {
+        color:#eff0f1;
+      }</style>
+ </defs>
+ <g transform="matrix(3 0 0 3 -1274.1 -1586.4)" fill="#eff0f1">
+  <rect class="ColorScheme-Text" x="383.46" y="518.13" width="0" height="11" color="#eff0f1"/>
+  <path class="ColorScheme-Text" d="m432.72 528.79c-0.31896 0-0.62792 0.026-0.93788 0.063-0.30396 0.036-0.61392 0.087-0.90589 0.1559-0.094 0.022-0.18497 0.067-0.28096 0.094-0.084 0.023-0.16698 0.037-0.24997 0.063-0.10499 0.033-0.21397 0.059-0.31296 0.094-0.10699 0.038-0.20697 0.083-0.31296 0.1249-0.20597 0.083-0.39695 0.182-0.59393 0.2809-0.071 0.036-0.14898 0.056-0.21897 0.094-0.22997 0.1209-0.44094 0.2629-0.65592 0.4058-0.082 0.055-0.16997 0.098-0.24996 0.1559-0.033 0.024-0.061 0.038-0.094 0.063-0.094 0.071-0.19098 0.1418-0.28097 0.2188-0.10698 0.089-0.20997 0.1869-0.31296 0.2809-0.032 0.03-0.062 0.064-0.094 0.094l-0.031 0.031c-0.016 0.016-0.015 0.047-0.031 0.063-0.20997 0.2039-0.43894 0.3988-0.62492 0.6247-5e-3 0.01 5e-3 0.025 0 0.031-0.18098 0.2199-0.34296 0.4478-0.49994 0.6877-0.021 0.032-0.042 0.061-0.063 0.094-0.015 0.024-0.047 0.037-0.063 0.063-0.06 0.098-0.10099 0.209-0.15598 0.3129-0.018 0.033-0.045 0.061-0.063 0.094-0.075 0.1459-0.14998 0.2898-0.21897 0.4378-4e-3 0.01 4e-3 0.023 0 0.031-0.11699 0.2528-0.22198 0.5136-0.31296 0.7805-0.019 0.053-0.045 0.103-0.063 0.156-3e-3 0.01 3e-3 0.022 0 0.031-0.02 0.062-0.044 0.125-0.063 0.188-0.073 0.2568-0.13998 0.5137-0.18798 0.7806-0.034 0.1919-0.074 0.3968-0.094 0.5938-0.027 0.2648-0.031 0.5417-0.031 0.8125 0 0.4038 0.036 0.7996 0.094 1.1875 6e-3 0.041-7e-3 0.085 0 0.1249 0.044 0.2659 0.11798 0.5248 0.18798 0.7807 0.026 0.096 0.064 0.1859 0.094 0.2809 0.04 0.1289 0.079 0.2489 0.12499 0.3748 0.077 0.2119 0.15598 0.4218 0.24997 0.6246 0.05 0.106 0.10198 0.2099 0.15598 0.3129 0.15198 0.2919 0.31496 0.5747 0.49993 0.8436 0.016 0.024 0.046 0.039 0.063 0.063 0.19797 0.2809 0.39395 0.5597 0.62492 0.8126 0.04 0.044 0.084 0.082 0.12498 0.125 0.04 0.042 0.084 0.084 0.12499 0.1249 0.21397 0.2139 0.45094 0.4048 0.68791 0.5938 0.30596 0.2438 0.62892 0.4587 0.96888 0.6556 0.012 0.01 0.019 0.024 0.031 0.031 0.053 0.03 0.10299 0.065 0.15598 0.094 0.31596 0.156 0.69192 0.3249 0.93788 0.4378 0.10999 0.042 0.23098 0.057 0.34396 0.094 0.053 0.018 0.10299 0.046 0.15598 0.063 0.13598 0.041 0.26797 0.09 0.40595 0.1249 0.042 0.011 0.083 0.021 0.12499 0.031 0.29196 0.069 0.60192 0.1209 0.90588 0.1559 0.30896 0.036 0.61792 0.063 0.93788 0.063 0.33996 0 0.67092-0.021 0.99988-0.063 0.36495-0.048 0.68091-0.1239 0.99987-0.1879 1.6978-0.4358 3.1616-1.4213 4.2185-2.7487 0.028-0.035 0.067-0.058 0.094-0.094 9e-3 -0.012 0.022-0.02 0.031-0.031 0.014-0.018 0.018-0.044 0.031-0.063 0.62292-0.8246 1.0769-1.7801 1.3438-2.8117 0.056-0.2169 0.11799-0.4318 0.15598-0.6557 5e-3 -0.03-5e-3 -0.063 0-0.094 6e-3 -0.04 0.025-0.079 0.031-0.125 6e-3 -0.043 0.026-0.082 0.031-0.1249h-0.031c0.044-0.3289 0.094-0.6587 0.094-0.9996 0-0.5517-0.05-1.1034-0.15598-1.6242-9e-3 -0.043-0.022-0.082-0.031-0.1249-0.046-0.2079-0.12398-0.4229-0.18798-0.6248-3e-3 -0.01 3e-3 -0.022 0-0.031-0.012-0.038-0.018-0.056-0.031-0.094-0.039-0.119-0.081-0.2579-0.12498-0.3748-0.012-0.032-0.018-0.064-0.031-0.094-0.043-0.109-0.10799-0.2059-0.15598-0.3128-2e-3 0 2e-3 -0.026 0-0.031-0.025-0.054-0.068-0.1029-0.094-0.1559-0.098-0.2029-0.19797-0.3998-0.31296-0.5937-0.058-0.098-0.094-0.2169-0.15598-0.3129-0.024-0.036-0.069-0.058-0.094-0.094-0.067-0.099-0.14698-0.185-0.21897-0.2809-0.08-0.1-0.13999-0.2159-0.21898-0.3129-5e-3 -0.01 5e-3 -0.025 0-0.031-0.17197-0.2089-0.36995-0.4028-0.56292-0.5937-0.093-0.092-0.18398-0.1939-0.28097-0.2809-0.028-0.025-0.065-0.038-0.094-0.063-0.20897-0.1819-0.42994-0.3398-0.65592-0.4996-0.055-0.038-0.10098-0.088-0.15598-0.125-0.07-0.046-0.14798-0.081-0.21897-0.1249-0.13498-0.084-0.26597-0.174-0.40595-0.2499-0.12298-0.067-0.24797-0.127-0.37495-0.1879-0.21397-0.102-0.43195-0.198-0.65592-0.2809-0.26596-0.099-0.53393-0.1799-0.8129-0.2499-0.24496-0.062-0.49693-0.118-0.7499-0.1559-0.39695-0.061-0.8049-0.094-1.2188-0.094m0 0.9996c0.29896 0 0.58493 0.027 0.87489 0.063 0.17998 0.023 0.35496 0.058 0.53093 0.094h0.031c0.16598 0.035 0.33796 0.079 0.49994 0.1249 0.096 0.027 0.18698 0.063 0.28097 0.094 0.17197 0.057 0.33395 0.1169 0.49993 0.1879 0.19398 0.08 0.37896 0.1528 0.56293 0.2498-0.031 0.01-0.063 0.021-0.094 0.031-0.047 0.017-0.11298 0.096-0.12498 0.1249-0.02 0.048 5e-3 0.115 0 0.188 0.038 0.017 0.06 0.089 0.12498 0.1249 0.025 0.014 0.041-0.01 0.063 0 0.038 0.021 0.07 0.087 0.063 0.1249-0.011 0.055-0.088 0.022-0.12498 0.063 6e-3 0.078-0.043 0.105-0.063 0.1559 0.012 0.033 0.057 0.024 0.063 0.063-7e-3 0.043-0.079 0.049-0.063 0.094 0.072 0.056 0.15098-0.022 0.21897-0.031 0.14898-0.019 0.28297 0.041 0.37495-0.031-0.012-0.071 0.10099-0.092 0.094-0.1559-6e-3 -0.048-0.09-0.061-0.12498-0.094-0.019-0.018-0.04-0.059-0.063-0.094-0.026-0.04-0.064-0.087-0.094-0.125-0.039-0.052-0.12498-0.1169-0.12498-0.1559 1e-3 -0.045 0.052-0.063 0.063-0.125-0.012-0.057-0.11699 0-0.12499-0.063 2e-3 -0.019 0.021-0.051 0.031-0.063 0.14998 0.082 0.29796 0.1789 0.43795 0.2809 0.032 0.021 0.062 0.041 0.094 0.063 0.10798 0.081 0.20697 0.17 0.31296 0.2499-0.067 0.012-0.10099 0.09-0.15598 0.156-0.038 0.046-0.099 0.1009-0.15598 0.1249-0.028 0.012-0.068-0.016-0.094 0-0.037 0.025-0.051 0.096-0.094 0.125-0.031 0.021-0.12399 0.094-0.15598 0.094-0.038 1e-3 -0.098-0.04-0.12499-0.031-0.04 0.013-0.017 0.077-0.063 0.094-0.088 0.031-0.24997-0.069-0.28096 0.063 0.038 0.076 0.15298 0.051 0.21897 0.094 0.042 0.026 0.11399 0.143 0.12498 0.1879 0.01 0.038 0.015 0.179 0 0.2189-0.041 0.106-0.15898 0.097-0.28096 0.094-0.034-1e-3 -0.063 0-0.094 0-0.20697-0.014-0.40695-0.085-0.49994 0.063 7e-3 0.1129 0.025 0.1829 0 0.2808-0.018 0.072-0.097 0.125-0.094 0.188 2e-3 0.032 0.055 0.082 0.063 0.1249 5e-3 0.023-0.011 0.073 0 0.094 0.034 0.066 0.12699-0.01 0.18798 0 0.059 0.01 0.12598 0.1209 0.12498 0.1879-1e-3 0.046-0.033 0.1119-0.063 0.1559-0.058 0.089-0.16698 0.077-0.24997 0.1249-0.07 0.039-0.084 0.1189-0.12498 0.1879-0.044 0.074-0.081 0.1109-0.063 0.2189-0.06 0.1179-0.12598 0.1939-0.24997 0.2499-0.037 0.017-0.092 0.039-0.12498 0.063-0.027 0.019-0.056 0.051-0.094 0.094-0.047 0.052-0.1 0.085-0.12499 0.125-0.019 0.031-0.01 0.084-0.031 0.1249-0.029 0.056-0.088 0.1-0.12498 0.1559-0.017 0.026-0.043 0.059-0.063 0.094-0.042 0.077-0.10099 0.1509-0.094 0.2189 7e-3 0.066 0.089 0.068 0.094 0.1249 4e-3 0.032-0.033 0.059-0.031 0.094 1e-3 0.051 0.027 0.086 0.031 0.1249 0.01 0.099-0.044 0.12-0.063 0.188-9e-3 0.032 8e-3 0.068 0 0.094-0.016 0.05-0.093 0.098-0.094 0.156-1e-3 0.042 0.059 0.097 0.063 0.1559 2e-3 0.04-0.038 0.057-0.031 0.094 0.014 0.073 0.16198 0.162 0.21897 0.2189 0.075 0.075 0.15498 0.139 0.18798 0.219 0.027 0.067 0.041 0.1678 0.094 0.2188 0.039 0.037 0.10598 0.054 0.15598 0.094 0.047 0.036 0.10698 0.055 0.15598 0.094 0.081 0.064 0.18297 0.1969 0.31296 0.1879 0.068-0.01 0.14198-0.05 0.21897-0.063 0.079-0.014 0.16998-0.039 0.24997-0.031 0.061 0.01 0.12398 0.066 0.18797 0.063 0.067 0 0.14299-0.061 0.21898-0.094 0.13198-0.057 0.33896-0.1529 0.53093-0.1249 0.14598 0.021 0.14898 0.2169 0.24997 0.2809 0.11798 0.01 0.21897-0.054 0.31296-0.031 0.07 0.017 0.14898 0.1319 0.15598 0.1879 7e-3 0.058-0.054 0.121-0.063 0.1559-0.018 0.078-0.017 0.169-0.031 0.2189-0.011 0.038-0.032 0.086-0.031 0.125 0 0.035 0.058 0.1419 0.094 0.1879 0.044 0.056 0.10299 0.096 0.15598 0.1559 0.087 0.109 0.15498 0.2359 0.21897 0.3749 0.017 0.037-0.016 0.077 0 0.1249-0.029 0.2239-0.10298 0.3769-0.24997 0.6247-0.069 0.08-0.15798 0.15-0.15598 0.2499-5e-3 0.2399 0.13599 0.3928 0.12499 0.6247-0.024 0.3118 0.024 0.3328 0 0.4997 0.10499 0.053 0.031 0.2329 0 0.3439-0.045 0.1319-0.1 0.1619-0.12499 0.2499 0.071 0.031 0.17098 0.019 0.24997 0 0 0 0.096 0.4008 0.094 0.4058-0.8069 0.7967-1.8188 1.3874-2.9376 1.7182-0.54993 0.1329-0.71291 0.1329-0.96888 0.1879-0.33395 0.055-0.68291 0.094-1.0309 0.094-0.24296 0-0.48293-0.01-0.71891-0.031-0.18197-0.018-0.35395-0.062-0.53093-0.094-0.053-0.01-0.10398-0.02-0.15598-0.031-0.16298-0.055-0.35095-0.088-0.49994-0.1249-0.16997-0.048-0.33495-0.096-0.49993-0.156 0.014-0.013 0.027-0.011 0.031-0.031 9e-3 -0.04 2e-3 -0.062 0-0.1249 0.015-0.065 0.08-0.058 0.094-0.1249-0.028-0.048-0.083-0.038-0.12498-0.063-0.041-0.024-0.068-0.074-0.063-0.125 0.07-0.029 0.19997 0.066 0.24996-0.031 0.025-0.046-0.034-0.1409 0-0.1879 0.023-0.031 0.16898-0.055 0.21898-0.063 0.071-0.012 0.14798-0.01 0.18797-0.031 0.044-0.029 0.10099-0.105 0.094-0.188-4e-3 -0.039-0.033-0.059-0.063-0.094-0.025-0.029-0.013-0.066-0.031-0.094-0.031-0.047-0.08-0.058-0.094-0.1249 0.096-0.019 0.23597 0.1019 0.37496 0.063 0.066-0.019 0.15698-0.188 0.18797-0.2499 0.01-0.019-0.01-0.04 0-0.063 0.012-0.026 0.059-0.049 0.063-0.063 0.01-0.036-8e-3 -0.071 0-0.094 0.024-0.068 0.085-0.075 0.12498-0.125 0.03-0.038 0.065-0.087 0.094-0.1249 0.031-0.041 0.042-0.089 0.063-0.125 0.02-0.1219-0.06-0.2059-0.031-0.3128 0.032-0.12 0.19598-0.165 0.31296-0.2189 0.04-0.019 0.092-0.05 0.12499-0.063 0.08-0.028 0.17598-0.036 0.24997-0.063 0.12498-0.046 0.15698-0.1669 0.21897-0.2809 0.029-0.054 0.057-0.1179 0.063-0.1559 5e-3 -0.035-7e-3 -0.053 0-0.094 6e-3 -0.04 0.02-0.081 0.031-0.1248 0.014-0.058 0.031-0.1539 0.031-0.2189 0-0.053-0.029-0.078-0.031-0.1249-9e-3 -0.173 0.061-0.218 0.12498-0.3129 0.032-0.047 0.04-0.091 0.063-0.125 0.10799-0.1609 0.29497-0.2259 0.28097-0.4688-5e-3 -0.08-0.035-0.2558-0.094-0.2808-0.034-0.015-0.10699-0.011-0.15598-0.031-0.15798-0.059-0.27397-0.2689-0.43795-0.2809-0.035 0-0.055 0.031-0.094 0.031-0.065 0-0.14698-0.053-0.21897-0.063-0.046-0.01-0.12898 0.013-0.15598 0-0.042-0.02-0.029-0.1019-0.063-0.1249-0.027-0.018-0.084-0.015-0.12498-0.031-0.066-0.025-0.11199-0.056-0.18798-0.063-0.023-1e-3 -0.067 0-0.094 0-0.042-0.01-0.086-0.04-0.12498-0.063-0.048-0.029-0.074-0.052-0.094-0.094 0.044-0.1439-0.096-0.1669-0.12498-0.2499-0.014-0.039 0.013-0.09 0-0.1249-0.017-0.05-0.071-0.084-0.12499-0.125-0.097-0.074-0.17398-0.1389-0.31296-0.1559-0.061-0.01-0.14498 0-0.21897 0-0.078-0.01-0.16098-0.058-0.21897-0.125-0.056-0.065-0.076-0.1249-0.12499-0.1559-0.047-0.03-0.12398-0.031-0.15598-0.063-0.014-0.014-0.017-0.031-0.031-0.063-0.023-0.048-0.061-0.098-0.031-0.156-0.053-0.027-0.035 0.072-0.094 0.063-0.052-0.074-0.10099-0.115-0.21897-0.094-0.054 0.01-0.093 0.06-0.15598 0.063-0.052 0-0.088-0.053-0.15598-0.063-0.052-0.01-0.11999 0.036-0.15598 0.031-0.057-0.011-0.073-0.059-0.12499-0.094-0.038-0.025-0.10398-0.095-0.12498-0.094-0.067 0-0.12598 0.1429-0.21897 0.094-0.045-0.057 0.085-0.071 0.031-0.125-0.04-0.041-0.061 0.01-0.094 0.031-0.037 0.025-0.084 0.047-0.12499 0.063-0.092 0.034-0.14698 0.025-0.21897 0.063-0.066 0.034-0.087 0.088-0.12499 0.156-0.031 0.056-0.079 0.1529-0.12498 0.1559-0.056 0-0.10599-0.072-0.15598-0.094-0.15298-0.066-0.24797 0.03-0.37495 0.031-0.11799 0-0.28697-0.1709-0.28097-0.2808 4e-3 -0.067 0.054-0.166 0.063-0.2499 6e-3 -0.066 0.062-0.127 0.063-0.1879 1e-3 -0.081-0.13499-0.147-0.18798-0.156-0.12498-0.023-0.29496 0.061-0.43794 0-0.027-0.045 0.047-0.081 0.063-0.1249 9e-3 -0.025-9e-3 -0.034 0-0.063 0.016-0.042 0.074-0.08 0.094-0.1249 0.015-0.034 0.016-0.082 0.031-0.125 0.017-0.049 0.059-0.091 0.063-0.1249 5e-3 -0.045-0.027-0.095-0.063-0.125-0.11098 0.01-0.18697 0-0.24997 0.031-0.14398 0.066-0.10598 0.2659-0.24997 0.3129-0.05 0.016-0.13298 0.021-0.18797 0.031-0.047 0.01-0.10699 0.032-0.15598 0.031-0.058-1e-3 -0.15298-0.057-0.18798-0.094-9e-3 -0.01-0.024-0.036-0.031-0.063 2e-3 -0.01-2e-3 -0.021 0-0.031 0.046-0.2229 0.093-0.4438 0.15598-0.6557 3e-3 -0.01-3e-3 -0.022 0-0.031 0.042-0.1389 0.10298-0.2699 0.15598-0.4058 0.013-0.01 0.019-0.023 0.031-0.031 0.077-0.053 0.15598-0.1189 0.24997-0.1249 0.057 0 0.16398 0.02 0.21897 0.031 0.05 0.01 0.082 0.059 0.12499 0.063 0.12298 0.01 0.14898-0.1029 0.24997-0.1559 0.10398 0.015 0.15598-0.01 0.24996 0 0.064 0.01 0.13799 0.09 0.18798 0.094 0.042 0 0.053-0.069 0.094-0.063 0.04 0.01 0.11898 0.1079 0.12498 0.1559 7e-3 0.06-0.048 0.122-0.031 0.1879 0.063 0.064 0.19097 0.056 0.28096 0.094 0.059-0.048 9e-3 -0.118 0-0.1879-2e-3 -0.031 4e-3 -0.066 0-0.094-6e-3 -0.048-0.031-0.084-0.031-0.1249-1e-3 -0.1899 0.15398-0.2999 0.28096-0.3749 0.055-0.033 0.10799-0.069 0.15598-0.094 0.067-0.034 0.1-0.063 0.15598-0.094 0.10099-0.057 0.20198-0.092 0.28097-0.1559 0.037-0.086-4e-3 -0.1959 0-0.2809 0.037-0.022 0.055 0 0.094 0 0.061-0.013 0.09-0.091 0.12499-0.1249 0.02-0.02 0.069-0.043 0.094-0.063 0.061-0.048 0.072-0.104 0.12498-0.125 0.019-0.01 0.064-0.017 0.094-0.031 0.04-0.011 0.092-0.04 0.15598-0.063 0.042-0.014 0.13998-0.015 0.15598-0.031 0.02-0.02-6e-3 -0.095 0-0.1249 0.032-0.151 0.27196-0.168 0.40595-0.2189 0.094-0.036 0.17798-0.114 0.28096-0.094-0.02 0.072-0.10998 0.038-0.094 0.1249 0.023 0.121 0.17598-0.013 0.21898-0.031 0.081-0.034 0.23697-0.055 0.34395-0.094 0.094-0.034 0.24497-0.08 0.15598-0.1879-0.074 0-0.092 0.066-0.15598 0.094-0.044 0.01-0.056-0.027-0.094-0.031-0.036 0-0.057 0.038-0.094 0.031-0.037-0.01-0.088-0.082-0.094-0.1249-0.015-0.111 0.10999-0.136 0.15598-0.2189-0.03-0.101-0.16598-0.024-0.24997-0.063 9e-3 -0.06 0.055-0.1139 0.12499-0.1249 0.057-0.01 0.18497 0.01 0.21897 0.031 0.02 0.017 0 0.066 0.031 0.094 0.034 0.031 0.081 0.01 0.12499 0 0.016-0.076-0.10599-0.043-0.094-0.094 0.09-0.059 0.26497-0.016 0.37495-0.031 0.063-0.01 0.13099-0.062 0.18798-0.094 0.054-0.03 0.099-0.081 0.15598-0.031 0.016 0.054-0.032 0.066-0.063 0.094-0.10199 0.091-0.20198 0.2069-0.28097 0.3128 0.049 0.048 0.13599 0.022 0.21898 0.031 0.032 0 0.06 0.025 0.094 0.031 0.04 0.01 0.094-0.012 0.12499 0 0.056 0.014 0.07 0.094 0.12498 0.094 0.091 0 0.083-0.125 0.031-0.1879 0.016-0.063 0.053-0.08 0.031-0.125-0.041-0.082-0.21097 0.014-0.21897-0.094-5e-3 -0.067 0.07-0.075 0.094-0.125-0.011-0.1289 0.10598-0.1349 0.094-0.2499-6e-3 -0.048-0.06-0.049-0.094-0.094-0.017-0.023-0.01-0.076-0.031-0.094-0.07-0.059-0.20997-0.044-0.21897-0.1559-4e-3 -0.066 0.01-0.115 0-0.1879-9e-3 -0.067-0.066-0.2679-0.12498-0.2809-0.075-0.016-0.12899 0.1139-0.21898 0.1559-0.049 0.023-0.13898 0.04-0.18797 0.031-0.032-0.01-0.089-0.032-0.094-0.094-6e-3 -0.07 0.05-0.082 0.063-0.1558-0.011-0.044-0.051-0.029-0.094-0.063-0.049-0.037-0.091-0.1159-0.15598-0.1249-0.033 0-0.093 0.029-0.12498 0.031-0.06 0-0.10599-0.015-0.15598-0.031 0.021-0.01 0.041-0.024 0.063-0.031 0.12198-0.042 0.24997-0.059 0.37495-0.094 0.022-0.01 0.041-0.025 0.063-0.031 0.031 0.033 0.056 0.1029 0.094 0.1249 0.025 0.014 0.063-0.01 0.094 0 0.098 0.03 0.17398 0.085 0.28097 0.063 0.037-0.065-0.074-0.074-0.031-0.125 0.072 0.01 0.13198 0.04 0.18798 0.063 0.077-0.056 0.12798-0.066 0.12498-0.1559-1e-3 -0.046-0.062-0.063-0.094-0.094 0.063-0.011 0.12399-0.022 0.18798-0.031 5e-3 0.017 0.021 0.03 0.031 0.031 0.038 0.01 0.16498-0.051 0.18797-0.063 4e-3 0-6e-3 -0.027 0-0.031 0.25297-0.027 0.52094-0.031 0.7809-0.031m-2.4997 0.4688c-0.023 0.043-0.047 0.079-0.094 0.094 0.012 0.065-0.084 0.1049-0.094 0.1558-6e-3 0.035-2e-3 0.094 0 0.125 0.02 0.3189-0.25096 0.4768-0.56293 0.4688-0.061 0.058-0.029 0.1699-0.063 0.2499-0.028 0.067-0.11998 0.1309-0.18797 0.1249-0.05 0-0.12499-0.079-0.12499-0.1249 0-0.057 0.081-0.091 0.031-0.156 7e-3 -0.044 0.10598-0.086 0.094-0.1559-0.012-0.074-0.096-0.019-0.18798-0.031-0.052-0.01-0.13298-0.037-0.18798-0.063 0.10099-0.067 0.20498-0.126 0.31296-0.188 0.094-0.056 0.18498-0.1049 0.28097-0.1559 0.25197-0.1269 0.52193-0.2438 0.7809-0.3437m5.3743 0.7495c-0.027 0-0.04 0.018-0.063 0.031-0.051 0.031-0.054 0.079-0.094 0.094-0.054 0.021-0.11698 0.01-0.12498 0.063-6e-3 0.041 0.033 0.055 0.031 0.094-0.02 0.049-0.053 0.066-0.063 0.1249 0.068 0.11 0.22897-0.01 0.31296-0.031 0.038-0.011 0.073 0 0.094-0.031 0.023-0.035 0.013-0.105 0.031-0.156 0.019-0.056 0.069-0.043 0.063-0.094-6e-3 -0.05-0.10599-0.102-0.18797-0.094m-7.3121 0.7807c0.061 0.016 0.19597 0.1929 0.063 0.2499-0.013 0.01-0.18698 0.036-0.21897 0.031-0.046-0.01-0.078-0.086-0.12499-0.094-0.092-0.016-0.21797 0.101-0.28096 0 0.016-0.059 0.086-0.043 0.15598-0.063 0.12498-0.034 0.29796-0.1529 0.40595-0.1249m0.24996 0.3128c0.031 0 0.056 0.059 0.094 0.063 0.036 0 0.072-0.036 0.094-0.031 0.056 0.015 0.084 0.115 0.031 0.156-0.044 0-0.061-0.037-0.094-0.031-0.091 0.016-0.11999 0.1929-0.18798 0.1879-0.064-0.01-0.096-0.1409-0.031-0.1879 2e-3 -0.04-0.033-0.054-0.031-0.094 0.02-0.025 0.072-0.066 0.12498-0.063m-0.31296 0.031c0.019 1e-3 0.024 0 0.031 0-9e-3 0.071-0.039 0.091-0.094 0.125-0.095 0.057-0.15698 0.1279-0.18797 0.2499-9e-3 0.036-0.11099 0.1339-0.15598 0.1249-0.10599-0.022 0.038-0.2199 0.063-0.2499 0.027-0.033 0.062-0.056 0.094-0.094 0.03-0.037 0.033-0.105 0.063-0.125 0.032-0.022 0.13198-0.033 0.18797-0.031m9.4988 0.031c0.048 0.013 0.058 0.069 0.094 0.094 0.027 0.018 0.064 0.012 0.094 0.031 0.035 0.022 0.054 0.06 0.094 0.094 0.056 0.047 0.13998 0.088 0.21897 0.125 0.016 0.01 0.044 0.023 0.063 0.031 0.055 0.071 0.10399 0.1449 0.15598 0.2189 6e-3 0.04 0.012 0.099 0.031 0.1249 0.052 0.071 0.13098 0.1319 0.18798 0.2189-1e-3 0.083 0.036 0.133 0.094 0.1559 0.073 0.124 0.14898 0.2479 0.21897 0.3748 0.029 0.058 0.035 0.1289 0.063 0.1879-0.021 0-0.043 0.01-0.063 0-0.066-0.116-0.40895-0.1389-0.43795 0.031-0.013 0.075 0.049 0.1749-0.063 0.1879-0.071 0.01-0.15298-0.073-0.24997-0.094-0.04-0.01-0.094 0.014-0.12498 0-0.073-0.025-0.062-0.1119-0.12498-0.1559-0.036-0.025-0.12999-0.056-0.18798-0.063h-0.094c-0.045-0.01-0.11798-0.01-0.15598-0.031-0.036-0.022-0.11599-0.062-0.12498-0.094-0.014-0.049 0.09-0.1139 0.094-0.1558 2e-3 -0.031-0.023-0.045-0.031-0.094-5e-3 -0.029 6e-3 -0.074 0-0.094-0.01-0.034-0.071-0.062-0.12499-0.063-0.048 0-0.084 0.03-0.12498 0.031-0.059 1e-3 -0.17698-0.037-0.24997-0.031-0.044 0-0.084 0.028-0.12499 0.031-0.11598 0.01-0.19097-0.01-0.28096 0-0.066 0-0.18898 0.034-0.24997 0.063-0.031 0.014-0.054 0.043-0.094 0.063-0.018 0.01-0.039 0.021-0.063 0.031-0.038 0.017-0.089 0.053-0.12498 0.063-0.052 0.013-0.12399 0-0.21898 0-0.068 0-0.18697-0.014-0.18797-0.094-1e-3 -0.1229 0.22697-0.072 0.34396-0.094 0.044-0.01 0.073-0.063 0.12498-0.094 0.025-0.015 0.039-0.015 0.063-0.031 0.04-0.028 0.11898-0.093 0.12498-0.1249 6e-3 -0.03-0.035-0.072-0.031-0.094 5e-3 -0.028 0.057-0.058 0.094-0.094 0.056-0.055 0.087-0.1199 0.15598-0.1559 0.047-0.025 0.13499-0.024 0.15599-0.063 5e-3 -0.043-1e-3 -0.055 0-0.094 0.029-0.027 0.038-0.058 0.063-0.063 0.072-0.016 0.13498 0.035 0.21897 0.031 0.036 0 0.086-0.01 0.12498-0.031 0.033-0.022 0.062-0.045 0.094-0.063 0.035-0.018 0.051-0.059 0.094-0.063 0.10499-0.01 0.17098 0.1239 0.21897 0.1879 0.04 0.053 0.15299 0.1189 0.21898 0.1559 0.037 0.021 0.084 0.045 0.12498 0.063 0.087 0.039 0.24697 0.1649 0.24997 0.2499 2e-3 0.042-0.038 0.054-0.031 0.094 0.066 0.011 0.12298-0.059 0.12498-0.1249 1e-3 -0.041-0.039-0.05-0.031-0.094 0.031-0.066 0.14798-0.01 0.18798-0.031-7e-3 -0.075-0.12398-0.086-0.18798-0.1249-0.034-0.021-0.058-0.048-0.094-0.063-0.052-0.021-0.11598-0.032-0.15598-0.063-0.038-0.029-0.057-0.08-0.094-0.1249-0.054-0.064-0.15798-0.073-0.12498-0.2189 0.016-0.022 0.037-0.069 0.063-0.063m-8.8119 0.2189h0.094c0.034 1e-3 0.08-0.018 0.094 0-0.022 0.088-0.21197 0.063-0.28096 0.031 4e-3 -0.033 0.05-0.027 0.094-0.031m-0.31296 0.156c0.023 0 0.039-0.01 0.063 0-0.062 0.052-0.14398 0.092-0.24997 0.1249-0.051 0.016-0.11598 0.025-0.12498-0.031-0.011-0.069 0.047-0.056 0.094-0.063 0.058-0.01 0.14999-0.029 0.21898-0.031m8.6869 0c-0.043 0.014-0.066 0.1129 0 0.1249 0.031-0.018 0.039-0.068 0.031-0.1249-0.017-0.018-0.017 0-0.031 0m-0.031 0.1879c-0.021 0.01-0.04 0.01-0.063 0.031 1e-3 0.075 0.015 0.1229 0 0.1879 0.043 0.082 0.13398 0.026 0.15598-0.031 0.026-0.1389-0.03-0.2049-0.094-0.1879m0.43795 0.3748c0.049 0.08 0.14098 0.137 0.24997 0.1559 0.04-0.03 0.044-0.1049 0.063-0.1559-0.047 1e-3 -0.097 0-0.15598 0-0.059 0-0.12198-0.028-0.15598 0m-11.687 2.6867c0.16398-0.01 0.21197 0.2159 0.34395 0.2809 0.033 0.017 0.082 0.022 0.12499 0.031 0.035 0.01 0.061 0.02 0.094 0.031 0.071 0.024 0.16198 0.01 0.21897 0.031 0.085 0.038 0.14598 0.2069 0.21897 0.2499 4e-3 0.043-0.013 0.093 0 0.1249 0.035 0.047 0.099 0.064 0.15598 0.094 0.068 0.037 0.092 0.1269 0.15598 0.1559 0.022 0.01 0.059-0.01 0.094 0 0.088 0.027 0.11199 0.1468 0.18798 0.1248 0.05-0.014 0.055-0.078 0.063-0.1248 0.033-0.036 0.074-0.093 0.12498-0.094 0.083 0 0.095 0.075 0.12499 0.1559 0.017 0.046 0.051 0.1079 0.063 0.1559 0.021 0.083 0.017 0.3249 0 0.3748-0.021 0.061-0.10599 0.089-0.15598 0.156-0.024 0.031-0.044 0.071-0.063 0.094-0.032 0.04-0.069 0.057-0.094 0.094-0.014 0.021-0.018 0.066-0.031 0.094-0.04 0.085-0.096 0.148-0.063 0.2499 0.014 0.042 0.062 0.076 0.063 0.125 0 0.058-0.11498 0.093-0.12498 0.1559-7e-3 0.047 0.048 0.126 0.063 0.1879 0.011 0.047 0.097 0.094 0.12498 0.125 0.047 0.053 0.082 0.1209 0.12499 0.1879 0.085 0.1299 0.13598 0.2799 0.21897 0.4058 0.043 0.066 0.12698 0.119 0.15598 0.1879 0.015 0.035-0.014 0.094 0 0.125 0.048 0.1079 0.26597 0.2279 0.37495 0.2809 0.051 0.025 0.10999 0 0.15598 0.031 0.071 0.039 0.21398 0.1569 0.24997 0.2189 0.032 0.056 0.047 0.1929 0.063 0.2808 0.021 0.117-5e-3 0.2169 0 0.3439 4e-3 0.069 0.03 0.1189 0.031 0.1879 0 0.024 1e-3 0.07 0 0.094-2e-3 0.083 7e-3 0.1659 0 0.2498-4e-3 0.046-3e-3 0.087 0 0.125 4e-3 0.041 0.028 0.057 0.031 0.094 2e-3 0.039-0.035 0.095-0.031 0.125 9e-3 0.084 0.077 0.1419 0.094 0.2189 0.013 0.061 0.039 0.2079 0.031 0.2809-5e-3 0.039-0.025 0.083-0.031 0.1249-4e-3 0.033 5e-3 0.062 0 0.094-6e-3 0.047-0.034 0.081-0.031 0.1249 6e-3 0.09 0.08 0.16 0.094 0.2499 5e-3 0.03-1e-3 0.065 0 0.094 1e-3 0.027 0.023 0.038 0.031 0.063-0.26297-0.1499-0.50894-0.3178-0.74991-0.4997-0.22897-0.173-0.45094-0.3639-0.65592-0.5628l-0.031-0.031c-0.20698-0.2039-0.41395-0.4278-0.59393-0.6557-0.10398-0.1319-0.21797-0.2669-0.31296-0.4058-0.056-0.083-0.10399-0.1639-0.15598-0.2499-0.032-0.051-0.063-0.104-0.094-0.1559-0.089-0.153-0.17297-0.3078-0.24997-0.4687-0.049-0.101-0.081-0.2079-0.12498-0.3129-0.10499-0.2479-0.20497-0.4888-0.28096-0.7497-0.054-0.1849-0.086-0.3708-0.12499-0.5627-0.03-0.146-0.073-0.2889-0.094-0.4378-0.011-0.081-0.023-0.168-0.031-0.2499-0.024-0.2349-0.031-0.4768-0.031-0.7186 0-0.3019 0.026-0.5837 0.063-0.8746 1e-3 -0.01-1e-3 -0.021 0-0.031 0.063 0 0.14899-0.092 0.21898-0.094m2.6877 0.7497c0.064-0.029 0.084 0.117 0.031 0.125-0.05 0.01-0.08-0.102-0.031-0.125" color="#eff0f1"/>
+ </g>
+</svg>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/eric6/Plugins/UiExtensionPlugins/Translator/icons/engines/mymemory-light.svg	Sat May 02 13:51:07 2020 +0200
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="48" height="48" version="1.1" viewBox="0 0 48 48" xmlns="http://www.w3.org/2000/svg">
+ <defs>
+  <style type="text/css">.ColorScheme-Text {
+        color:#eff0f1;
+      }</style>
+ </defs>
+ <g transform="matrix(3 0 0 3 -1274.1 -1586.4)" fill="#232629">
+  <rect class="ColorScheme-Text" x="383.46" y="518.13" width="0" height="11" color="#eff0f1"/>
+  <path class="ColorScheme-Text" d="m432.72 528.79c-0.31896 0-0.62792 0.026-0.93788 0.063-0.30396 0.036-0.61392 0.087-0.90589 0.1559-0.094 0.022-0.18497 0.067-0.28096 0.094-0.084 0.023-0.16698 0.037-0.24997 0.063-0.10499 0.033-0.21397 0.059-0.31296 0.094-0.10699 0.038-0.20697 0.083-0.31296 0.1249-0.20597 0.083-0.39695 0.182-0.59393 0.2809-0.071 0.036-0.14898 0.056-0.21897 0.094-0.22997 0.1209-0.44094 0.2629-0.65592 0.4058-0.082 0.055-0.16997 0.098-0.24996 0.1559-0.033 0.024-0.061 0.038-0.094 0.063-0.094 0.071-0.19098 0.1418-0.28097 0.2188-0.10698 0.089-0.20997 0.1869-0.31296 0.2809-0.032 0.03-0.062 0.064-0.094 0.094l-0.031 0.031c-0.016 0.016-0.015 0.047-0.031 0.063-0.20997 0.2039-0.43894 0.3988-0.62492 0.6247-5e-3 0.01 5e-3 0.025 0 0.031-0.18098 0.2199-0.34296 0.4478-0.49994 0.6877-0.021 0.032-0.042 0.061-0.063 0.094-0.015 0.024-0.047 0.037-0.063 0.063-0.06 0.098-0.10099 0.209-0.15598 0.3129-0.018 0.033-0.045 0.061-0.063 0.094-0.075 0.1459-0.14998 0.2898-0.21897 0.4378-4e-3 0.01 4e-3 0.023 0 0.031-0.11699 0.2528-0.22198 0.5136-0.31296 0.7805-0.019 0.053-0.045 0.103-0.063 0.156-3e-3 0.01 3e-3 0.022 0 0.031-0.02 0.062-0.044 0.125-0.063 0.188-0.073 0.2568-0.13998 0.5137-0.18798 0.7806-0.034 0.1919-0.074 0.3968-0.094 0.5938-0.027 0.2648-0.031 0.5417-0.031 0.8125 0 0.4038 0.036 0.7996 0.094 1.1875 6e-3 0.041-7e-3 0.085 0 0.1249 0.044 0.2659 0.11798 0.5248 0.18798 0.7807 0.026 0.096 0.064 0.1859 0.094 0.2809 0.04 0.1289 0.079 0.2489 0.12499 0.3748 0.077 0.2119 0.15598 0.4218 0.24997 0.6246 0.05 0.106 0.10198 0.2099 0.15598 0.3129 0.15198 0.2919 0.31496 0.5747 0.49993 0.8436 0.016 0.024 0.046 0.039 0.063 0.063 0.19797 0.2809 0.39395 0.5597 0.62492 0.8126 0.04 0.044 0.084 0.082 0.12498 0.125 0.04 0.042 0.084 0.084 0.12499 0.1249 0.21397 0.2139 0.45094 0.4048 0.68791 0.5938 0.30596 0.2438 0.62892 0.4587 0.96888 0.6556 0.012 0.01 0.019 0.024 0.031 0.031 0.053 0.03 0.10299 0.065 0.15598 0.094 0.31596 0.156 0.69192 0.3249 0.93788 0.4378 0.10999 0.042 0.23098 0.057 0.34396 0.094 0.053 0.018 0.10299 0.046 0.15598 0.063 0.13598 0.041 0.26797 0.09 0.40595 0.1249 0.042 0.011 0.083 0.021 0.12499 0.031 0.29196 0.069 0.60192 0.1209 0.90588 0.1559 0.30896 0.036 0.61792 0.063 0.93788 0.063 0.33996 0 0.67092-0.021 0.99988-0.063 0.36495-0.048 0.68091-0.1239 0.99987-0.1879 1.6978-0.4358 3.1616-1.4213 4.2185-2.7487 0.028-0.035 0.067-0.058 0.094-0.094 9e-3 -0.012 0.022-0.02 0.031-0.031 0.014-0.018 0.018-0.044 0.031-0.063 0.62292-0.8246 1.0769-1.7801 1.3438-2.8117 0.056-0.2169 0.11799-0.4318 0.15598-0.6557 5e-3 -0.03-5e-3 -0.063 0-0.094 6e-3 -0.04 0.025-0.079 0.031-0.125 6e-3 -0.043 0.026-0.082 0.031-0.1249h-0.031c0.044-0.3289 0.094-0.6587 0.094-0.9996 0-0.5517-0.05-1.1034-0.15598-1.6242-9e-3 -0.043-0.022-0.082-0.031-0.1249-0.046-0.2079-0.12398-0.4229-0.18798-0.6248-3e-3 -0.01 3e-3 -0.022 0-0.031-0.012-0.038-0.018-0.056-0.031-0.094-0.039-0.119-0.081-0.2579-0.12498-0.3748-0.012-0.032-0.018-0.064-0.031-0.094-0.043-0.109-0.10799-0.2059-0.15598-0.3128-2e-3 0 2e-3 -0.026 0-0.031-0.025-0.054-0.068-0.1029-0.094-0.1559-0.098-0.2029-0.19797-0.3998-0.31296-0.5937-0.058-0.098-0.094-0.2169-0.15598-0.3129-0.024-0.036-0.069-0.058-0.094-0.094-0.067-0.099-0.14698-0.185-0.21897-0.2809-0.08-0.1-0.13999-0.2159-0.21898-0.3129-5e-3 -0.01 5e-3 -0.025 0-0.031-0.17197-0.2089-0.36995-0.4028-0.56292-0.5937-0.093-0.092-0.18398-0.1939-0.28097-0.2809-0.028-0.025-0.065-0.038-0.094-0.063-0.20897-0.1819-0.42994-0.3398-0.65592-0.4996-0.055-0.038-0.10098-0.088-0.15598-0.125-0.07-0.046-0.14798-0.081-0.21897-0.1249-0.13498-0.084-0.26597-0.174-0.40595-0.2499-0.12298-0.067-0.24797-0.127-0.37495-0.1879-0.21397-0.102-0.43195-0.198-0.65592-0.2809-0.26596-0.099-0.53393-0.1799-0.8129-0.2499-0.24496-0.062-0.49693-0.118-0.7499-0.1559-0.39695-0.061-0.8049-0.094-1.2188-0.094m0 0.9996c0.29896 0 0.58493 0.027 0.87489 0.063 0.17998 0.023 0.35496 0.058 0.53093 0.094h0.031c0.16598 0.035 0.33796 0.079 0.49994 0.1249 0.096 0.027 0.18698 0.063 0.28097 0.094 0.17197 0.057 0.33395 0.1169 0.49993 0.1879 0.19398 0.08 0.37896 0.1528 0.56293 0.2498-0.031 0.01-0.063 0.021-0.094 0.031-0.047 0.017-0.11298 0.096-0.12498 0.1249-0.02 0.048 5e-3 0.115 0 0.188 0.038 0.017 0.06 0.089 0.12498 0.1249 0.025 0.014 0.041-0.01 0.063 0 0.038 0.021 0.07 0.087 0.063 0.1249-0.011 0.055-0.088 0.022-0.12498 0.063 6e-3 0.078-0.043 0.105-0.063 0.1559 0.012 0.033 0.057 0.024 0.063 0.063-7e-3 0.043-0.079 0.049-0.063 0.094 0.072 0.056 0.15098-0.022 0.21897-0.031 0.14898-0.019 0.28297 0.041 0.37495-0.031-0.012-0.071 0.10099-0.092 0.094-0.1559-6e-3 -0.048-0.09-0.061-0.12498-0.094-0.019-0.018-0.04-0.059-0.063-0.094-0.026-0.04-0.064-0.087-0.094-0.125-0.039-0.052-0.12498-0.1169-0.12498-0.1559 1e-3 -0.045 0.052-0.063 0.063-0.125-0.012-0.057-0.11699 0-0.12499-0.063 2e-3 -0.019 0.021-0.051 0.031-0.063 0.14998 0.082 0.29796 0.1789 0.43795 0.2809 0.032 0.021 0.062 0.041 0.094 0.063 0.10798 0.081 0.20697 0.17 0.31296 0.2499-0.067 0.012-0.10099 0.09-0.15598 0.156-0.038 0.046-0.099 0.1009-0.15598 0.1249-0.028 0.012-0.068-0.016-0.094 0-0.037 0.025-0.051 0.096-0.094 0.125-0.031 0.021-0.12399 0.094-0.15598 0.094-0.038 1e-3 -0.098-0.04-0.12499-0.031-0.04 0.013-0.017 0.077-0.063 0.094-0.088 0.031-0.24997-0.069-0.28096 0.063 0.038 0.076 0.15298 0.051 0.21897 0.094 0.042 0.026 0.11399 0.143 0.12498 0.1879 0.01 0.038 0.015 0.179 0 0.2189-0.041 0.106-0.15898 0.097-0.28096 0.094-0.034-1e-3 -0.063 0-0.094 0-0.20697-0.014-0.40695-0.085-0.49994 0.063 7e-3 0.1129 0.025 0.1829 0 0.2808-0.018 0.072-0.097 0.125-0.094 0.188 2e-3 0.032 0.055 0.082 0.063 0.1249 5e-3 0.023-0.011 0.073 0 0.094 0.034 0.066 0.12699-0.01 0.18798 0 0.059 0.01 0.12598 0.1209 0.12498 0.1879-1e-3 0.046-0.033 0.1119-0.063 0.1559-0.058 0.089-0.16698 0.077-0.24997 0.1249-0.07 0.039-0.084 0.1189-0.12498 0.1879-0.044 0.074-0.081 0.1109-0.063 0.2189-0.06 0.1179-0.12598 0.1939-0.24997 0.2499-0.037 0.017-0.092 0.039-0.12498 0.063-0.027 0.019-0.056 0.051-0.094 0.094-0.047 0.052-0.1 0.085-0.12499 0.125-0.019 0.031-0.01 0.084-0.031 0.1249-0.029 0.056-0.088 0.1-0.12498 0.1559-0.017 0.026-0.043 0.059-0.063 0.094-0.042 0.077-0.10099 0.1509-0.094 0.2189 7e-3 0.066 0.089 0.068 0.094 0.1249 4e-3 0.032-0.033 0.059-0.031 0.094 1e-3 0.051 0.027 0.086 0.031 0.1249 0.01 0.099-0.044 0.12-0.063 0.188-9e-3 0.032 8e-3 0.068 0 0.094-0.016 0.05-0.093 0.098-0.094 0.156-1e-3 0.042 0.059 0.097 0.063 0.1559 2e-3 0.04-0.038 0.057-0.031 0.094 0.014 0.073 0.16198 0.162 0.21897 0.2189 0.075 0.075 0.15498 0.139 0.18798 0.219 0.027 0.067 0.041 0.1678 0.094 0.2188 0.039 0.037 0.10598 0.054 0.15598 0.094 0.047 0.036 0.10698 0.055 0.15598 0.094 0.081 0.064 0.18297 0.1969 0.31296 0.1879 0.068-0.01 0.14198-0.05 0.21897-0.063 0.079-0.014 0.16998-0.039 0.24997-0.031 0.061 0.01 0.12398 0.066 0.18797 0.063 0.067 0 0.14299-0.061 0.21898-0.094 0.13198-0.057 0.33896-0.1529 0.53093-0.1249 0.14598 0.021 0.14898 0.2169 0.24997 0.2809 0.11798 0.01 0.21897-0.054 0.31296-0.031 0.07 0.017 0.14898 0.1319 0.15598 0.1879 7e-3 0.058-0.054 0.121-0.063 0.1559-0.018 0.078-0.017 0.169-0.031 0.2189-0.011 0.038-0.032 0.086-0.031 0.125 0 0.035 0.058 0.1419 0.094 0.1879 0.044 0.056 0.10299 0.096 0.15598 0.1559 0.087 0.109 0.15498 0.2359 0.21897 0.3749 0.017 0.037-0.016 0.077 0 0.1249-0.029 0.2239-0.10298 0.3769-0.24997 0.6247-0.069 0.08-0.15798 0.15-0.15598 0.2499-5e-3 0.2399 0.13599 0.3928 0.12499 0.6247-0.024 0.3118 0.024 0.3328 0 0.4997 0.10499 0.053 0.031 0.2329 0 0.3439-0.045 0.1319-0.1 0.1619-0.12499 0.2499 0.071 0.031 0.17098 0.019 0.24997 0 0 0 0.096 0.4008 0.094 0.4058-0.8069 0.7967-1.8188 1.3874-2.9376 1.7182-0.54993 0.1329-0.71291 0.1329-0.96888 0.1879-0.33395 0.055-0.68291 0.094-1.0309 0.094-0.24296 0-0.48293-0.01-0.71891-0.031-0.18197-0.018-0.35395-0.062-0.53093-0.094-0.053-0.01-0.10398-0.02-0.15598-0.031-0.16298-0.055-0.35095-0.088-0.49994-0.1249-0.16997-0.048-0.33495-0.096-0.49993-0.156 0.014-0.013 0.027-0.011 0.031-0.031 9e-3 -0.04 2e-3 -0.062 0-0.1249 0.015-0.065 0.08-0.058 0.094-0.1249-0.028-0.048-0.083-0.038-0.12498-0.063-0.041-0.024-0.068-0.074-0.063-0.125 0.07-0.029 0.19997 0.066 0.24996-0.031 0.025-0.046-0.034-0.1409 0-0.1879 0.023-0.031 0.16898-0.055 0.21898-0.063 0.071-0.012 0.14798-0.01 0.18797-0.031 0.044-0.029 0.10099-0.105 0.094-0.188-4e-3 -0.039-0.033-0.059-0.063-0.094-0.025-0.029-0.013-0.066-0.031-0.094-0.031-0.047-0.08-0.058-0.094-0.1249 0.096-0.019 0.23597 0.1019 0.37496 0.063 0.066-0.019 0.15698-0.188 0.18797-0.2499 0.01-0.019-0.01-0.04 0-0.063 0.012-0.026 0.059-0.049 0.063-0.063 0.01-0.036-8e-3 -0.071 0-0.094 0.024-0.068 0.085-0.075 0.12498-0.125 0.03-0.038 0.065-0.087 0.094-0.1249 0.031-0.041 0.042-0.089 0.063-0.125 0.02-0.1219-0.06-0.2059-0.031-0.3128 0.032-0.12 0.19598-0.165 0.31296-0.2189 0.04-0.019 0.092-0.05 0.12499-0.063 0.08-0.028 0.17598-0.036 0.24997-0.063 0.12498-0.046 0.15698-0.1669 0.21897-0.2809 0.029-0.054 0.057-0.1179 0.063-0.1559 5e-3 -0.035-7e-3 -0.053 0-0.094 6e-3 -0.04 0.02-0.081 0.031-0.1248 0.014-0.058 0.031-0.1539 0.031-0.2189 0-0.053-0.029-0.078-0.031-0.1249-9e-3 -0.173 0.061-0.218 0.12498-0.3129 0.032-0.047 0.04-0.091 0.063-0.125 0.10799-0.1609 0.29497-0.2259 0.28097-0.4688-5e-3 -0.08-0.035-0.2558-0.094-0.2808-0.034-0.015-0.10699-0.011-0.15598-0.031-0.15798-0.059-0.27397-0.2689-0.43795-0.2809-0.035 0-0.055 0.031-0.094 0.031-0.065 0-0.14698-0.053-0.21897-0.063-0.046-0.01-0.12898 0.013-0.15598 0-0.042-0.02-0.029-0.1019-0.063-0.1249-0.027-0.018-0.084-0.015-0.12498-0.031-0.066-0.025-0.11199-0.056-0.18798-0.063-0.023-1e-3 -0.067 0-0.094 0-0.042-0.01-0.086-0.04-0.12498-0.063-0.048-0.029-0.074-0.052-0.094-0.094 0.044-0.1439-0.096-0.1669-0.12498-0.2499-0.014-0.039 0.013-0.09 0-0.1249-0.017-0.05-0.071-0.084-0.12499-0.125-0.097-0.074-0.17398-0.1389-0.31296-0.1559-0.061-0.01-0.14498 0-0.21897 0-0.078-0.01-0.16098-0.058-0.21897-0.125-0.056-0.065-0.076-0.1249-0.12499-0.1559-0.047-0.03-0.12398-0.031-0.15598-0.063-0.014-0.014-0.017-0.031-0.031-0.063-0.023-0.048-0.061-0.098-0.031-0.156-0.053-0.027-0.035 0.072-0.094 0.063-0.052-0.074-0.10099-0.115-0.21897-0.094-0.054 0.01-0.093 0.06-0.15598 0.063-0.052 0-0.088-0.053-0.15598-0.063-0.052-0.01-0.11999 0.036-0.15598 0.031-0.057-0.011-0.073-0.059-0.12499-0.094-0.038-0.025-0.10398-0.095-0.12498-0.094-0.067 0-0.12598 0.1429-0.21897 0.094-0.045-0.057 0.085-0.071 0.031-0.125-0.04-0.041-0.061 0.01-0.094 0.031-0.037 0.025-0.084 0.047-0.12499 0.063-0.092 0.034-0.14698 0.025-0.21897 0.063-0.066 0.034-0.087 0.088-0.12499 0.156-0.031 0.056-0.079 0.1529-0.12498 0.1559-0.056 0-0.10599-0.072-0.15598-0.094-0.15298-0.066-0.24797 0.03-0.37495 0.031-0.11799 0-0.28697-0.1709-0.28097-0.2808 4e-3 -0.067 0.054-0.166 0.063-0.2499 6e-3 -0.066 0.062-0.127 0.063-0.1879 1e-3 -0.081-0.13499-0.147-0.18798-0.156-0.12498-0.023-0.29496 0.061-0.43794 0-0.027-0.045 0.047-0.081 0.063-0.1249 9e-3 -0.025-9e-3 -0.034 0-0.063 0.016-0.042 0.074-0.08 0.094-0.1249 0.015-0.034 0.016-0.082 0.031-0.125 0.017-0.049 0.059-0.091 0.063-0.1249 5e-3 -0.045-0.027-0.095-0.063-0.125-0.11098 0.01-0.18697 0-0.24997 0.031-0.14398 0.066-0.10598 0.2659-0.24997 0.3129-0.05 0.016-0.13298 0.021-0.18797 0.031-0.047 0.01-0.10699 0.032-0.15598 0.031-0.058-1e-3 -0.15298-0.057-0.18798-0.094-9e-3 -0.01-0.024-0.036-0.031-0.063 2e-3 -0.01-2e-3 -0.021 0-0.031 0.046-0.2229 0.093-0.4438 0.15598-0.6557 3e-3 -0.01-3e-3 -0.022 0-0.031 0.042-0.1389 0.10298-0.2699 0.15598-0.4058 0.013-0.01 0.019-0.023 0.031-0.031 0.077-0.053 0.15598-0.1189 0.24997-0.1249 0.057 0 0.16398 0.02 0.21897 0.031 0.05 0.01 0.082 0.059 0.12499 0.063 0.12298 0.01 0.14898-0.1029 0.24997-0.1559 0.10398 0.015 0.15598-0.01 0.24996 0 0.064 0.01 0.13799 0.09 0.18798 0.094 0.042 0 0.053-0.069 0.094-0.063 0.04 0.01 0.11898 0.1079 0.12498 0.1559 7e-3 0.06-0.048 0.122-0.031 0.1879 0.063 0.064 0.19097 0.056 0.28096 0.094 0.059-0.048 9e-3 -0.118 0-0.1879-2e-3 -0.031 4e-3 -0.066 0-0.094-6e-3 -0.048-0.031-0.084-0.031-0.1249-1e-3 -0.1899 0.15398-0.2999 0.28096-0.3749 0.055-0.033 0.10799-0.069 0.15598-0.094 0.067-0.034 0.1-0.063 0.15598-0.094 0.10099-0.057 0.20198-0.092 0.28097-0.1559 0.037-0.086-4e-3 -0.1959 0-0.2809 0.037-0.022 0.055 0 0.094 0 0.061-0.013 0.09-0.091 0.12499-0.1249 0.02-0.02 0.069-0.043 0.094-0.063 0.061-0.048 0.072-0.104 0.12498-0.125 0.019-0.01 0.064-0.017 0.094-0.031 0.04-0.011 0.092-0.04 0.15598-0.063 0.042-0.014 0.13998-0.015 0.15598-0.031 0.02-0.02-6e-3 -0.095 0-0.1249 0.032-0.151 0.27196-0.168 0.40595-0.2189 0.094-0.036 0.17798-0.114 0.28096-0.094-0.02 0.072-0.10998 0.038-0.094 0.1249 0.023 0.121 0.17598-0.013 0.21898-0.031 0.081-0.034 0.23697-0.055 0.34395-0.094 0.094-0.034 0.24497-0.08 0.15598-0.1879-0.074 0-0.092 0.066-0.15598 0.094-0.044 0.01-0.056-0.027-0.094-0.031-0.036 0-0.057 0.038-0.094 0.031-0.037-0.01-0.088-0.082-0.094-0.1249-0.015-0.111 0.10999-0.136 0.15598-0.2189-0.03-0.101-0.16598-0.024-0.24997-0.063 9e-3 -0.06 0.055-0.1139 0.12499-0.1249 0.057-0.01 0.18497 0.01 0.21897 0.031 0.02 0.017 0 0.066 0.031 0.094 0.034 0.031 0.081 0.01 0.12499 0 0.016-0.076-0.10599-0.043-0.094-0.094 0.09-0.059 0.26497-0.016 0.37495-0.031 0.063-0.01 0.13099-0.062 0.18798-0.094 0.054-0.03 0.099-0.081 0.15598-0.031 0.016 0.054-0.032 0.066-0.063 0.094-0.10199 0.091-0.20198 0.2069-0.28097 0.3128 0.049 0.048 0.13599 0.022 0.21898 0.031 0.032 0 0.06 0.025 0.094 0.031 0.04 0.01 0.094-0.012 0.12499 0 0.056 0.014 0.07 0.094 0.12498 0.094 0.091 0 0.083-0.125 0.031-0.1879 0.016-0.063 0.053-0.08 0.031-0.125-0.041-0.082-0.21097 0.014-0.21897-0.094-5e-3 -0.067 0.07-0.075 0.094-0.125-0.011-0.1289 0.10598-0.1349 0.094-0.2499-6e-3 -0.048-0.06-0.049-0.094-0.094-0.017-0.023-0.01-0.076-0.031-0.094-0.07-0.059-0.20997-0.044-0.21897-0.1559-4e-3 -0.066 0.01-0.115 0-0.1879-9e-3 -0.067-0.066-0.2679-0.12498-0.2809-0.075-0.016-0.12899 0.1139-0.21898 0.1559-0.049 0.023-0.13898 0.04-0.18797 0.031-0.032-0.01-0.089-0.032-0.094-0.094-6e-3 -0.07 0.05-0.082 0.063-0.1558-0.011-0.044-0.051-0.029-0.094-0.063-0.049-0.037-0.091-0.1159-0.15598-0.1249-0.033 0-0.093 0.029-0.12498 0.031-0.06 0-0.10599-0.015-0.15598-0.031 0.021-0.01 0.041-0.024 0.063-0.031 0.12198-0.042 0.24997-0.059 0.37495-0.094 0.022-0.01 0.041-0.025 0.063-0.031 0.031 0.033 0.056 0.1029 0.094 0.1249 0.025 0.014 0.063-0.01 0.094 0 0.098 0.03 0.17398 0.085 0.28097 0.063 0.037-0.065-0.074-0.074-0.031-0.125 0.072 0.01 0.13198 0.04 0.18798 0.063 0.077-0.056 0.12798-0.066 0.12498-0.1559-1e-3 -0.046-0.062-0.063-0.094-0.094 0.063-0.011 0.12399-0.022 0.18798-0.031 5e-3 0.017 0.021 0.03 0.031 0.031 0.038 0.01 0.16498-0.051 0.18797-0.063 4e-3 0-6e-3 -0.027 0-0.031 0.25297-0.027 0.52094-0.031 0.7809-0.031m-2.4997 0.4688c-0.023 0.043-0.047 0.079-0.094 0.094 0.012 0.065-0.084 0.1049-0.094 0.1558-6e-3 0.035-2e-3 0.094 0 0.125 0.02 0.3189-0.25096 0.4768-0.56293 0.4688-0.061 0.058-0.029 0.1699-0.063 0.2499-0.028 0.067-0.11998 0.1309-0.18797 0.1249-0.05 0-0.12499-0.079-0.12499-0.1249 0-0.057 0.081-0.091 0.031-0.156 7e-3 -0.044 0.10598-0.086 0.094-0.1559-0.012-0.074-0.096-0.019-0.18798-0.031-0.052-0.01-0.13298-0.037-0.18798-0.063 0.10099-0.067 0.20498-0.126 0.31296-0.188 0.094-0.056 0.18498-0.1049 0.28097-0.1559 0.25197-0.1269 0.52193-0.2438 0.7809-0.3437m5.3743 0.7495c-0.027 0-0.04 0.018-0.063 0.031-0.051 0.031-0.054 0.079-0.094 0.094-0.054 0.021-0.11698 0.01-0.12498 0.063-6e-3 0.041 0.033 0.055 0.031 0.094-0.02 0.049-0.053 0.066-0.063 0.1249 0.068 0.11 0.22897-0.01 0.31296-0.031 0.038-0.011 0.073 0 0.094-0.031 0.023-0.035 0.013-0.105 0.031-0.156 0.019-0.056 0.069-0.043 0.063-0.094-6e-3 -0.05-0.10599-0.102-0.18797-0.094m-7.3121 0.7807c0.061 0.016 0.19597 0.1929 0.063 0.2499-0.013 0.01-0.18698 0.036-0.21897 0.031-0.046-0.01-0.078-0.086-0.12499-0.094-0.092-0.016-0.21797 0.101-0.28096 0 0.016-0.059 0.086-0.043 0.15598-0.063 0.12498-0.034 0.29796-0.1529 0.40595-0.1249m0.24996 0.3128c0.031 0 0.056 0.059 0.094 0.063 0.036 0 0.072-0.036 0.094-0.031 0.056 0.015 0.084 0.115 0.031 0.156-0.044 0-0.061-0.037-0.094-0.031-0.091 0.016-0.11999 0.1929-0.18798 0.1879-0.064-0.01-0.096-0.1409-0.031-0.1879 2e-3 -0.04-0.033-0.054-0.031-0.094 0.02-0.025 0.072-0.066 0.12498-0.063m-0.31296 0.031c0.019 1e-3 0.024 0 0.031 0-9e-3 0.071-0.039 0.091-0.094 0.125-0.095 0.057-0.15698 0.1279-0.18797 0.2499-9e-3 0.036-0.11099 0.1339-0.15598 0.1249-0.10599-0.022 0.038-0.2199 0.063-0.2499 0.027-0.033 0.062-0.056 0.094-0.094 0.03-0.037 0.033-0.105 0.063-0.125 0.032-0.022 0.13198-0.033 0.18797-0.031m9.4988 0.031c0.048 0.013 0.058 0.069 0.094 0.094 0.027 0.018 0.064 0.012 0.094 0.031 0.035 0.022 0.054 0.06 0.094 0.094 0.056 0.047 0.13998 0.088 0.21897 0.125 0.016 0.01 0.044 0.023 0.063 0.031 0.055 0.071 0.10399 0.1449 0.15598 0.2189 6e-3 0.04 0.012 0.099 0.031 0.1249 0.052 0.071 0.13098 0.1319 0.18798 0.2189-1e-3 0.083 0.036 0.133 0.094 0.1559 0.073 0.124 0.14898 0.2479 0.21897 0.3748 0.029 0.058 0.035 0.1289 0.063 0.1879-0.021 0-0.043 0.01-0.063 0-0.066-0.116-0.40895-0.1389-0.43795 0.031-0.013 0.075 0.049 0.1749-0.063 0.1879-0.071 0.01-0.15298-0.073-0.24997-0.094-0.04-0.01-0.094 0.014-0.12498 0-0.073-0.025-0.062-0.1119-0.12498-0.1559-0.036-0.025-0.12999-0.056-0.18798-0.063h-0.094c-0.045-0.01-0.11798-0.01-0.15598-0.031-0.036-0.022-0.11599-0.062-0.12498-0.094-0.014-0.049 0.09-0.1139 0.094-0.1558 2e-3 -0.031-0.023-0.045-0.031-0.094-5e-3 -0.029 6e-3 -0.074 0-0.094-0.01-0.034-0.071-0.062-0.12499-0.063-0.048 0-0.084 0.03-0.12498 0.031-0.059 1e-3 -0.17698-0.037-0.24997-0.031-0.044 0-0.084 0.028-0.12499 0.031-0.11598 0.01-0.19097-0.01-0.28096 0-0.066 0-0.18898 0.034-0.24997 0.063-0.031 0.014-0.054 0.043-0.094 0.063-0.018 0.01-0.039 0.021-0.063 0.031-0.038 0.017-0.089 0.053-0.12498 0.063-0.052 0.013-0.12399 0-0.21898 0-0.068 0-0.18697-0.014-0.18797-0.094-1e-3 -0.1229 0.22697-0.072 0.34396-0.094 0.044-0.01 0.073-0.063 0.12498-0.094 0.025-0.015 0.039-0.015 0.063-0.031 0.04-0.028 0.11898-0.093 0.12498-0.1249 6e-3 -0.03-0.035-0.072-0.031-0.094 5e-3 -0.028 0.057-0.058 0.094-0.094 0.056-0.055 0.087-0.1199 0.15598-0.1559 0.047-0.025 0.13499-0.024 0.15599-0.063 5e-3 -0.043-1e-3 -0.055 0-0.094 0.029-0.027 0.038-0.058 0.063-0.063 0.072-0.016 0.13498 0.035 0.21897 0.031 0.036 0 0.086-0.01 0.12498-0.031 0.033-0.022 0.062-0.045 0.094-0.063 0.035-0.018 0.051-0.059 0.094-0.063 0.10499-0.01 0.17098 0.1239 0.21897 0.1879 0.04 0.053 0.15299 0.1189 0.21898 0.1559 0.037 0.021 0.084 0.045 0.12498 0.063 0.087 0.039 0.24697 0.1649 0.24997 0.2499 2e-3 0.042-0.038 0.054-0.031 0.094 0.066 0.011 0.12298-0.059 0.12498-0.1249 1e-3 -0.041-0.039-0.05-0.031-0.094 0.031-0.066 0.14798-0.01 0.18798-0.031-7e-3 -0.075-0.12398-0.086-0.18798-0.1249-0.034-0.021-0.058-0.048-0.094-0.063-0.052-0.021-0.11598-0.032-0.15598-0.063-0.038-0.029-0.057-0.08-0.094-0.1249-0.054-0.064-0.15798-0.073-0.12498-0.2189 0.016-0.022 0.037-0.069 0.063-0.063m-8.8119 0.2189h0.094c0.034 1e-3 0.08-0.018 0.094 0-0.022 0.088-0.21197 0.063-0.28096 0.031 4e-3 -0.033 0.05-0.027 0.094-0.031m-0.31296 0.156c0.023 0 0.039-0.01 0.063 0-0.062 0.052-0.14398 0.092-0.24997 0.1249-0.051 0.016-0.11598 0.025-0.12498-0.031-0.011-0.069 0.047-0.056 0.094-0.063 0.058-0.01 0.14999-0.029 0.21898-0.031m8.6869 0c-0.043 0.014-0.066 0.1129 0 0.1249 0.031-0.018 0.039-0.068 0.031-0.1249-0.017-0.018-0.017 0-0.031 0m-0.031 0.1879c-0.021 0.01-0.04 0.01-0.063 0.031 1e-3 0.075 0.015 0.1229 0 0.1879 0.043 0.082 0.13398 0.026 0.15598-0.031 0.026-0.1389-0.03-0.2049-0.094-0.1879m0.43795 0.3748c0.049 0.08 0.14098 0.137 0.24997 0.1559 0.04-0.03 0.044-0.1049 0.063-0.1559-0.047 1e-3 -0.097 0-0.15598 0-0.059 0-0.12198-0.028-0.15598 0m-11.687 2.6867c0.16398-0.01 0.21197 0.2159 0.34395 0.2809 0.033 0.017 0.082 0.022 0.12499 0.031 0.035 0.01 0.061 0.02 0.094 0.031 0.071 0.024 0.16198 0.01 0.21897 0.031 0.085 0.038 0.14598 0.2069 0.21897 0.2499 4e-3 0.043-0.013 0.093 0 0.1249 0.035 0.047 0.099 0.064 0.15598 0.094 0.068 0.037 0.092 0.1269 0.15598 0.1559 0.022 0.01 0.059-0.01 0.094 0 0.088 0.027 0.11199 0.1468 0.18798 0.1248 0.05-0.014 0.055-0.078 0.063-0.1248 0.033-0.036 0.074-0.093 0.12498-0.094 0.083 0 0.095 0.075 0.12499 0.1559 0.017 0.046 0.051 0.1079 0.063 0.1559 0.021 0.083 0.017 0.3249 0 0.3748-0.021 0.061-0.10599 0.089-0.15598 0.156-0.024 0.031-0.044 0.071-0.063 0.094-0.032 0.04-0.069 0.057-0.094 0.094-0.014 0.021-0.018 0.066-0.031 0.094-0.04 0.085-0.096 0.148-0.063 0.2499 0.014 0.042 0.062 0.076 0.063 0.125 0 0.058-0.11498 0.093-0.12498 0.1559-7e-3 0.047 0.048 0.126 0.063 0.1879 0.011 0.047 0.097 0.094 0.12498 0.125 0.047 0.053 0.082 0.1209 0.12499 0.1879 0.085 0.1299 0.13598 0.2799 0.21897 0.4058 0.043 0.066 0.12698 0.119 0.15598 0.1879 0.015 0.035-0.014 0.094 0 0.125 0.048 0.1079 0.26597 0.2279 0.37495 0.2809 0.051 0.025 0.10999 0 0.15598 0.031 0.071 0.039 0.21398 0.1569 0.24997 0.2189 0.032 0.056 0.047 0.1929 0.063 0.2808 0.021 0.117-5e-3 0.2169 0 0.3439 4e-3 0.069 0.03 0.1189 0.031 0.1879 0 0.024 1e-3 0.07 0 0.094-2e-3 0.083 7e-3 0.1659 0 0.2498-4e-3 0.046-3e-3 0.087 0 0.125 4e-3 0.041 0.028 0.057 0.031 0.094 2e-3 0.039-0.035 0.095-0.031 0.125 9e-3 0.084 0.077 0.1419 0.094 0.2189 0.013 0.061 0.039 0.2079 0.031 0.2809-5e-3 0.039-0.025 0.083-0.031 0.1249-4e-3 0.033 5e-3 0.062 0 0.094-6e-3 0.047-0.034 0.081-0.031 0.1249 6e-3 0.09 0.08 0.16 0.094 0.2499 5e-3 0.03-1e-3 0.065 0 0.094 1e-3 0.027 0.023 0.038 0.031 0.063-0.26297-0.1499-0.50894-0.3178-0.74991-0.4997-0.22897-0.173-0.45094-0.3639-0.65592-0.5628l-0.031-0.031c-0.20698-0.2039-0.41395-0.4278-0.59393-0.6557-0.10398-0.1319-0.21797-0.2669-0.31296-0.4058-0.056-0.083-0.10399-0.1639-0.15598-0.2499-0.032-0.051-0.063-0.104-0.094-0.1559-0.089-0.153-0.17297-0.3078-0.24997-0.4687-0.049-0.101-0.081-0.2079-0.12498-0.3129-0.10499-0.2479-0.20497-0.4888-0.28096-0.7497-0.054-0.1849-0.086-0.3708-0.12499-0.5627-0.03-0.146-0.073-0.2889-0.094-0.4378-0.011-0.081-0.023-0.168-0.031-0.2499-0.024-0.2349-0.031-0.4768-0.031-0.7186 0-0.3019 0.026-0.5837 0.063-0.8746 1e-3 -0.01-1e-3 -0.021 0-0.031 0.063 0 0.14899-0.092 0.21898-0.094m2.6877 0.7497c0.064-0.029 0.084 0.117 0.031 0.125-0.05 0.01-0.08-0.102-0.031-0.125" color="#eff0f1"/>
+ </g>
+</svg>
Binary file eric6/Plugins/UiExtensionPlugins/Translator/icons/engines/mymemory.png has changed
Binary file eric6/Plugins/UiExtensionPlugins/Translator/icons/engines/promt.png has changed
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/eric6/Plugins/UiExtensionPlugins/Translator/icons/engines/promt.svg	Sat May 02 13:51:07 2020 +0200
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="48" height="48" version="1.1" viewBox="0 0 12.7 12.7" xmlns="http://www.w3.org/2000/svg">
+ <g transform="translate(0 -284.3)">
+  <g transform="matrix(-.19072 -.33461 -.33375 .19519 93.139 237.87)" stroke-width="0">
+   <rect transform="matrix(1 0 -.5 .86603 0 0)" x="144.46" y="305.93" width="21.801" height="11.238" fill="#3d82f7"/>
+   <rect transform="matrix(-.5 -.86603 1 0 0 0)" x="-305.93" y="-150.9" width="21.801" height="11.238" fill="#fcd04b"/>
+   <rect transform="matrix(-.5 .86603 -.5 -.86603 0 0)" x="150.9" y="-144.46" width="21.801" height="11.238" fill="#0fa961"/>
+  </g>
+ </g>
+</svg>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/eric6/Plugins/UiExtensionPlugins/Translator/icons/engines/yandex-dark.svg	Sat May 02 13:51:07 2020 +0200
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="48" height="48" version="1.1" viewBox="0 0 12.7 12.7" xmlns="http://www.w3.org/2000/svg">
+ <g fill="#eff0f1">
+  <g transform="matrix(1.4999 0 0 1.4999 -1.5874 -434.52)">
+   <text transform="scale(-.98995 1.0102)" x="-5.522522" y="293.75308" fill="#eff0f1" font-family="sans-serif" font-size="7.3368px" letter-spacing="0px" stroke-width=".18342" word-spacing="0px" style="line-height:1.25" xml:space="preserve"><tspan x="-5.522522" y="293.75308" fill="#eff0f1" stroke-width=".18342">R</tspan></text>
+  </g>
+  <text transform="matrix(.9842 -.27225 0 1.0161 0 0)" x="7.796083" y="12.504968" font-family="sans-serif" font-size="9.0243px" letter-spacing="0px" stroke-width=".22561" word-spacing="0px" style="line-height:1.25" xml:space="preserve"><tspan x="7.796083" y="12.504968" fill="#eff0f1" stroke-width=".22561">Y</tspan></text>
+  <path d="m6.9673 8.202v-0.88194h-0.88194v-0.88194h0.88194v-0.88194l1.7639 1.3229-1.7639 1.3229" stroke-width=".01378"/>
+ </g>
+</svg>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/eric6/Plugins/UiExtensionPlugins/Translator/icons/engines/yandex-light.svg	Sat May 02 13:51:07 2020 +0200
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="48" height="48" version="1.1" viewBox="0 0 12.7 12.7" xmlns="http://www.w3.org/2000/svg">
+ <g fill="#232629">
+  <g transform="matrix(1.4999 0 0 1.4999 -1.5874 -434.52)">
+   <text transform="scale(-.98995 1.0102)" x="-5.522522" y="293.75308" fill="#232629" font-family="sans-serif" font-size="7.3368px" letter-spacing="0px" stroke-width=".18342" word-spacing="0px" style="line-height:1.25" xml:space="preserve"><tspan x="-5.522522" y="293.75308" fill="#232629" stroke-width=".18342">R</tspan></text>
+  </g>
+  <text transform="matrix(.9842 -.27225 0 1.0161 0 0)" x="7.796083" y="12.504968" font-family="sans-serif" font-size="9.0243px" letter-spacing="0px" stroke-width=".22561" word-spacing="0px" style="line-height:1.25" xml:space="preserve"><tspan x="7.796083" y="12.504968" fill="#232629" stroke-width=".22561">Y</tspan></text>
+  <path d="m6.9673 8.202v-0.88194h-0.88194v-0.88194h0.88194v-0.88194l1.7639 1.3229-1.7639 1.3229" stroke-width=".01378"/>
+ </g>
+</svg>
Binary file eric6/Plugins/UiExtensionPlugins/Translator/icons/engines/yandex.png has changed
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/eric6/Plugins/UiExtensionPlugins/Translator/icons/flag-dark.svg	Sat May 02 13:51:07 2020 +0200
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="22" height="22" version="1.1" xmlns="http://www.w3.org/2000/svg">
+ <g transform="translate(-326 -534.36)">
+  <rect x="273.38" y="518.48" width="0" height="14.668" fill="#04896a"/>
+  <rect x="280.34" y="541.05" width="0" height="14.668" fill="#16907d"/>
+  <rect x="282.16" y="539.99" width="0" height="14.668" fill="#6c7a89"/>
+  <path d="m337.79 548.13-2.3091-2.259 0.0273-0.027c1.5818-1.746 2.7091-3.753 3.3727-5.877h2.6636v-1.8h-6.3636v-1.8h-1.8182v1.8h-6.3636v1.791h10.155c-0.60909 1.737-1.5727 3.384-2.8818 4.824-0.84545-0.927-1.5454-1.944-2.1-3.015h-1.8182c0.66363 1.467 1.5727 2.853 2.7091 4.104l-4.6273 4.518 1.2909 1.278 4.5454-4.5 2.8273 2.799zm5.1182-4.563h-1.8182l-4.0909 10.8h1.8182l1.0182-2.7h4.3182l1.0273 2.7h1.8182zm-2.3818 6.3 1.4727-3.897 1.4727 3.897z" fill="#eff0f1" stroke-width="1.17"/>
+ </g>
+</svg>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/eric6/Plugins/UiExtensionPlugins/Translator/icons/flag-light.svg	Sat May 02 13:51:07 2020 +0200
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="22" height="22" version="1.1" xmlns="http://www.w3.org/2000/svg">
+ <g transform="translate(-326 -534.36)">
+  <rect x="273.38" y="518.48" width="0" height="14.668" fill="#04896a"/>
+  <rect x="280.34" y="541.05" width="0" height="14.668" fill="#16907d"/>
+  <rect x="282.16" y="539.99" width="0" height="14.668" fill="#6c7a89"/>
+  <path d="m337.79 548.13-2.3091-2.259 0.0273-0.027c1.5818-1.746 2.7091-3.753 3.3727-5.877h2.6636v-1.8h-6.3636v-1.8h-1.8182v1.8h-6.3636v1.791h10.155c-0.60909 1.737-1.5727 3.384-2.8818 4.824-0.84545-0.927-1.5454-1.944-2.1-3.015h-1.8182c0.66363 1.467 1.5727 2.853 2.7091 4.104l-4.6273 4.518 1.2909 1.278 4.5454-4.5 2.8273 2.799zm5.1182-4.563h-1.8182l-4.0909 10.8h1.8182l1.0182-2.7h4.3182l1.0273 2.7h1.8182zm-2.3818 6.3 1.4727-3.897 1.4727 3.897z" fill="#232629" stroke-width="1.17"/>
+ </g>
+</svg>
Binary file eric6/Plugins/UiExtensionPlugins/Translator/icons/flag.png has changed
Binary file eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/af.png has changed
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/af.svg	Sat May 02 13:51:07 2020 +0200
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="48" height="48" enable-background="new 0 0 512 512" version="1.1" viewBox="0 0 48 48" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
+<rect x=".00028125" y="8.0005" width="48" height="31.999" fill="#f0f0f0" stroke-width=".093749"/>
+<polygon transform="matrix(.093749 0 0 .093749 .00028125 .00020191)" points="0 141.93 0 370.1 114.02 256"/>
+<polygon transform="matrix(.093749 0 0 .093749 .00028125 .00020191)" points="0 94.7 0 141.93 114.02 256 0 370.1 0 417.23 161.19 256" fill="#ffda44"/>
+<path d="m47.797 27.13c0.0054-0.04125 0.07537-0.08231 0.20316-0.12356v-6.1372h-27.131l-12.869-12.869h-7.9996v0.87778l15.111 15.122-15.111 15.115v0.88396h7.9996l12.869-12.869h26.928z" fill="#6da544" stroke-width=".093749"/>
+<polygon transform="matrix(.093749 0 0 .093749 .00028125 .00020191)" points="132.55 426.66 512 426.66 512 322.78 503.18 322.78 236.43 322.78" fill="#0052b4"/>
+<polygon transform="matrix(.093749 0 0 .093749 .00028125 .00020191)" points="512 85.337 132.55 85.337 236.43 189.22 503.18 189.22 512 189.22" fill="#d80027"/>
+</svg>
Binary file eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/ar.png has changed
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/ar.svg	Sat May 02 13:51:07 2020 +0200
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="48" height="48" enable-background="new 0 0 512 512" version="1.1" viewBox="0 0 48 48" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
+<rect y="8" width="48" height="32" fill="#6da544" stroke-width=".093749"/>
+<g transform="matrix(.09375 0 0 .093748 0 .0003755)" fill="#f0f0f0">
+	<path d="m183.55 289.39c0 12.295 9.731 22.261 21.736 22.261h65.208c0 10.244 8.11 18.551 18.114 18.551h21.736c10.004 0 18.114-8.306 18.114-18.551v-22.261h-144.91z"/>
+	<path d="m330.26 181.79v51.942c0 8.183-6.5 14.84-14.491 14.84v22.261c19.976 0 36.226-16.643 36.226-37.101v-51.942z"/>
+	<path d="m174.49 233.73c0 8.183-6.5 14.84-14.491 14.84v22.261c19.976 0 36.226-16.643 36.226-37.101v-51.942h-21.736v51.942z"/>
+	<rect x="297.66" y="181.79" width="21.736" height="51.942"/>
+	<path d="m265.06 211.47c0 2.046-1.625 3.71-3.623 3.71s-3.623-1.664-3.623-3.71v-29.682h-21.736v29.682c0 2.046-1.625 3.71-3.623 3.71s-3.623-1.664-3.623-3.71v-29.682h-21.736v29.682c0 14.32 11.376 25.971 25.358 25.971 5.385 0 10.38-1.733 14.491-4.677 4.11 2.944 9.106 4.677 14.491 4.677 1.084 0 2.15-0.078 3.2-0.215-1.54 6.499-7.255 11.345-14.068 11.345v22.261c19.976 0 36.226-16.643 36.226-37.101v-51.943h-21.736z"/>
+	<rect x="207.09" y="248.57" width="32.601" height="22.261"/>
+</g>
+</svg>
Binary file eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/be.png has changed
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/be.svg	Sat May 02 13:51:07 2020 +0200
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="48" height="48" enable-background="new 0 0 512 512" version="1.1" viewBox="0 0 48 48" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
+<rect x=".052125" y="8.0005" width="47.948" height="32" fill="#6da544" stroke-width=".093801"/>
+<polyline transform="matrix(.093751 0 0 .093851 0 -.025973)" points="0 315.3 511.44 315.3 511.44 85.52 511.44 85.52 0 85.52 0 85.52" fill="#a2001d"/>
+<polygon transform="matrix(.093751 0 0 .093851 0 -.025973)" points="100.06 426.48 100.06 315.3 100.06 300.47 100.06 85.52 0 85.52 0 426.48 511.44 426.48" fill="#f0f0f0"/>
+<g transform="matrix(.093751 0 0 .093851 0 -.025973)" fill="#a2001d">
+	<polygon points="87.093 210.03 68.564 243.65 50.033 210.03 68.564 176.94"/>
+	<polygon points="50.033 210.03 31.502 243.65 12.972 210.03 31.502 176.94"/>
+	<polygon points="87.093 301.45 68.564 335.06 50.033 301.45 68.564 268.35"/>
+	<polygon points="50.033 301.45 31.502 335.06 12.972 301.45 31.502 268.35"/>
+	<polygon points="87.093 392.86 68.564 426.48 50.033 392.86 68.564 359.77"/>
+	<polygon points="50.033 392.86 31.502 426.48 12.972 392.86 31.502 359.77"/>
+	<polygon points="87.093 118.61 68.564 152.23 50.033 118.61 68.564 85.518"/>
+	<polygon points="50.033 118.61 31.502 152.23 12.972 118.61 31.502 85.518"/>
+</g>
+</svg>
Binary file eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/bg.png has changed
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/bg.svg	Sat May 02 13:51:07 2020 +0200
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="48" height="48" enable-background="new 0 0 512 512" version="1.1" viewBox="0 0 48 48" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
+<rect y="8" width="48" height="32" fill="#496e2d" stroke-width=".09375"/>
+<rect y="8" width="48" height="10.667" fill="#f0f0f0" stroke-width=".09375"/>
+<rect y="29.333" width="48" height="10.667" fill="#d80027" stroke-width=".09375"/>
+</svg>
Binary file eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/bs.png has changed
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/bs.svg	Sat May 02 13:51:07 2020 +0200
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="48" height="48" version="1.1" viewBox="0 0 48 48" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
+<rect y="8.0005" width="48" height="32" fill="#0052b4" stroke-width=".093749"/>
+<polyline transform="matrix(.09375 0 0 .093748 0 .00061092)" points="99.905 85.329 441.24 85.329 441.24 426.66" fill="#ffda44"/>
+<g transform="matrix(.09375 0 0 .093748 0 .00061092)" fill="#f0f0f0">
+	<polygon points="66.271 100.63 61.292 85.33 41.525 85.33 36.561 100.64 51.404 89.838"/>
+	<polygon points="97.527 131.89 91.843 114.42 106.7 103.62 88.332 103.63 82.649 86.16 76.977 103.63 58.612 103.64 73.479 114.44 67.818 131.9 82.661 121.1"/>
+	<polygon points="128.78 163.15 123.1 145.67 137.96 134.88 119.59 134.89 113.91 117.42 108.23 134.89 89.868 134.9 104.74 145.7 99.074 163.16 113.92 152.35"/>
+	<polygon points="160.04 194.4 154.36 176.93 169.21 166.14 150.85 166.15 145.16 148.67 139.49 166.15 121.13 166.16 135.99 176.95 130.33 194.41 145.17 183.61"/>
+	<polygon points="191.3 225.66 185.61 208.19 200.47 197.39 182.1 197.4 176.42 179.93 170.75 197.4 152.38 197.41 167.25 208.21 161.59 225.67 176.43 214.86"/>
+	<polygon points="222.55 256.92 216.87 239.44 231.72 228.65 213.36 228.66 207.68 211.19 202 228.66 183.64 228.67 198.5 239.47 192.84 256.93 207.69 246.12"/>
+	<polygon points="253.81 288.17 248.13 270.7 262.98 259.91 244.62 259.92 238.93 242.44 233.26 259.92 214.9 259.93 229.76 270.72 224.1 288.18 238.94 277.38"/>
+	<polygon points="285.07 319.43 279.38 301.96 294.24 291.16 275.87 291.17 270.19 273.7 264.52 291.17 246.15 291.18 261.02 301.98 255.36 319.44 270.2 308.64"/>
+	<polygon points="316.32 350.69 310.64 333.21 325.5 322.42 307.13 322.43 301.45 304.96 295.77 322.43 277.41 322.44 292.28 333.24 286.61 350.7 301.46 339.89"/>
+	<polygon points="347.58 381.94 341.9 364.47 356.75 353.68 338.39 353.69 332.7 336.21 327.03 353.69 308.67 353.7 323.53 364.49 317.87 381.96 332.71 371.15"/>
+	<polygon points="378.84 413.2 373.15 395.73 388.01 384.93 369.64 384.94 363.96 367.47 358.29 384.94 339.92 384.96 354.79 395.75 349.13 413.21 363.97 402.4"/>
+	<polygon points="395.22 398.73 389.54 416.2 371.18 416.21 385.57 426.66 404.85 426.66 419.26 416.19 400.9 416.2"/>
+</g>
+</svg>
Binary file eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/ca.png has changed
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/ca.svg	Sat May 02 13:51:07 2020 +0200
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="48" height="48" enable-background="new 0 0 512 512" version="1.1" viewBox="0 0 48 48" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
+<rect y="8" width="48" height="32" fill="#d80027" stroke-width=".093749"/>
+<g transform="matrix(.09375 0 0 .093748 0 .0003755)" fill="#ffda44">
+	<rect y="161.17" width="512" height="37.921"/>
+	<rect y="237.03" width="512" height="37.921"/>
+	<rect y="312.88" width="512" height="37.921"/>
+	<rect y="388.74" width="512" height="37.921"/>
+	<rect y="85.331" width="512" height="37.921"/>
+</g>
+</svg>
Binary file eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/cs.png has changed
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/cs.svg	Sat May 02 13:51:07 2020 +0200
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="48" height="48" enable-background="new 0 0 512 512" version="1.1" viewBox="0 0 48 48" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
+<rect y="8" width="48" height="32" fill="#0052b4" stroke-width=".09375"/>
+<polygon transform="matrix(.09375 0 0 .093751 0 -.00042211)" points="215.18 256 512 256 512 426.66 0 426.66" fill="#d80027"/>
+<polygon transform="matrix(.09375 0 0 .093751 0 -.00042211)" points="0 85.337 512 85.337 512 256 215.18 256" fill="#f0f0f0"/>
+</svg>
Binary file eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/da.png has changed
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/da.svg	Sat May 02 13:51:07 2020 +0200
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="48" height="48" enable-background="new 0 0 512 512" version="1.1" viewBox="0 0 48 48" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
+<rect y="8.0003" width="48" height="32" fill="#d80027" stroke-width=".093749"/>
+<polygon transform="matrix(.09375 0 0 .093747 0 .00053905)" points="192 426.66 192 288 512 288 512 224 192 224 192 85.33 128 85.33 128 224 0 224 0 288 128 288 128 426.66" fill="#f0f0f0"/>
+</svg>
Binary file eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/de.png has changed
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/de.svg	Sat May 02 13:51:07 2020 +0200
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="48" height="48" enable-background="new 0 0 512 512" version="1.1" viewBox="0 0 48 48" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
+<rect y="8" width="48" height="32" fill="#d80027" stroke-width=".093749"/>
+<rect y="8" width="48" height="10.667" stroke-width=".093749"/>
+<rect y="29.332" width="48" height="10.667" fill="#ffda44" stroke-width=".093749"/>
+</svg>
Binary file eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/el.png has changed
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/el.svg	Sat May 02 13:51:07 2020 +0200
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="48" height="48" enable-background="new 0 0 362.023 362.023" version="1.1" viewBox="0 0 48 48" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
+<rect y="8" width="48" height="32" fill="#f0f0f0" stroke-width=".13259"/>
+<g transform="matrix(.13259 0 0 .13259 0 -6.5282e-5)" fill="#338af3">
+	<rect y="60.338" width="362.02" height="30.168"/>
+	<rect y="120.68" width="362.02" height="30.168"/>
+	<rect y="181.01" width="362.02" height="30.168"/>
+	<rect y="241.35" width="362.02" height="30.168"/>
+	<rect y="60.338" width="133.79" height="120.68"/>
+</g>
+<g transform="matrix(.13259 0 0 .13259 0 -6.5282e-5)" fill="#f0f0f0">
+	<rect y="107.27" width="133.79" height="26.814"/>
+	<rect x="53.487" y="60.338" width="26.814" height="120.68"/>
+</g>
+</svg>
Binary file eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/en.png has changed
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/en.svg	Sat May 02 13:51:07 2020 +0200
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="48" height="48" enable-background="new 0 0 512 512" version="1.1" viewBox="0 0 48 48" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
+<rect y="8.0003" width="48" height="32" fill="#f0f0f0" stroke-width=".093749"/>
+<polygon transform="matrix(.09375 0 0 .093747 0 .00053905)" points="288 426.66 288 288 512 288 512 224 288 224 288 85.33 224 85.33 224 224 0 224 0 288 224 288 224 426.66" fill="#d80027"/>
+<g transform="matrix(.09375 0 0 .093747 0 .00053905)" fill="#0052b4">
+	<polygon points="512 381.03 512 315.36 393.78 315.36"/>
+	<polygon points="368.31 315.36 311.65 315.36 512 426.66 512 395.19"/>
+	<polygon points="311.65 345 311.65 426.66 458.63 426.66"/>
+</g>
+<polygon transform="matrix(.09375 0 0 .093747 0 .00053905)" points="368.31 315.36 311.65 315.36 512 426.66 512 395.19" fill="#f0f0f0"/>
+<polygon transform="matrix(.09375 0 0 .093747 0 .00053905)" points="368.31 315.36 311.65 315.36 512 426.66 512 395.19" fill="#d80027"/>
+<g transform="matrix(.09375 0 0 .093747 0 .00053905)" fill="#0052b4">
+	<polygon points="0 365.55 0 315.36 90.341 315.36"/>
+	<polygon points="200.35 426.66 25.491 426.66 200.35 329.51"/>
+</g>
+<polygon transform="matrix(.09375 0 0 .093747 0 .00053905)" points="0 426.66 200.35 315.36 143.69 315.36 0 395.19" fill="#d80027"/>
+<g transform="matrix(.09375 0 0 .093747 0 .00053905)" fill="#0052b4">
+	<polygon points="0 130.96 0 196.63 118.22 196.63"/>
+	<polygon points="143.69 196.63 200.35 196.63 0 85.33 0 116.8"/>
+	<polygon points="200.35 166.99 200.35 85.33 53.366 85.33"/>
+</g>
+<polygon transform="matrix(.09375 0 0 .093747 0 .00053905)" points="143.69 196.63 200.35 196.63 0 85.33 0 116.8" fill="#f0f0f0"/>
+<polygon transform="matrix(.09375 0 0 .093747 0 .00053905)" points="143.69 196.63 200.35 196.63 0 85.33 0 116.8" fill="#d80027"/>
+<g transform="matrix(.09375 0 0 .093747 0 .00053905)" fill="#0052b4">
+	<polygon points="512 146.45 512 196.64 421.66 196.64"/>
+	<polygon points="311.65 85.331 486.51 85.331 311.65 182.48"/>
+</g>
+<polygon transform="matrix(.09375 0 0 .093747 0 .00053905)" points="512 85.33 311.65 196.63 368.31 196.63 512 116.8" fill="#d80027"/>
+</svg>
Binary file eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/es.png has changed
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/es.svg	Sat May 02 13:51:07 2020 +0200
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="48" height="48" enable-background="new 0 0 512 512" version="1.1" viewBox="0 0 48 48" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
+<rect y="8" width="48" height="32" fill="#ffda44" stroke-width=".093749"/>
+<g transform="matrix(.09375 0 0 .093748 0 .0003755)" fill="#d80027">
+	<rect y="85.331" width="512" height="113.78"/>
+	<rect y="312.88" width="512" height="113.78"/>
+</g>
+</svg>
Binary file eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/et.png has changed
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/et.svg	Sat May 02 13:51:07 2020 +0200
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="48" height="48" enable-background="new 0 0 512 512" version="1.1" viewBox="0 0 48 48" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
+<rect y="8" width="48" height="32" stroke-width=".09375"/>
+<rect y="8" width="48" height="10.667" fill="#0052b4" stroke-width=".09375"/>
+<rect y="29.333" width="48" height="10.667" fill="#f0f0f0" stroke-width=".09375"/>
+</svg>
Binary file eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/fi.png has changed
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/fi.svg	Sat May 02 13:51:07 2020 +0200
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="48" height="48" enable-background="new 0 0 512 512" version="1.1" viewBox="0 0 48 48" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
+<rect y="8.0005" width="48" height="32" fill="#f0f0f0" stroke-width=".093748"/>
+<polygon transform="matrix(.09375 0 0 .093747 0 .0006792)" points="0 234.67 140.98 234.67 140.98 85.329 183.65 85.329 183.65 234.67 512 234.67 512 277.33 183.65 277.33 183.65 426.67 140.98 426.67 140.98 277.33 0 277.33" fill="#2e52b2"/>
+</svg>
Binary file eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/fr.png has changed
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/fr.svg	Sat May 02 13:51:07 2020 +0200
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="48" height="48" enable-background="new 0 0 512 512" version="1.1" viewBox="0 0 48 48" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
+<rect y="8" width="48" height="32" fill="#f0f0f0" stroke-width=".093749"/>
+<rect y="8" width="15.999" height="32" fill="#0052b4" stroke-width=".093749"/>
+<rect x="32.001" y="8" width="15.999" height="32" fill="#d80027" stroke-width=".093749"/>
+</svg>
Binary file eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/ga.png has changed
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/ga.svg	Sat May 02 13:51:07 2020 +0200
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="48" height="48" enable-background="new 0 0 512 512" version="1.1" viewBox="0 0 48 48" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
+<rect y="8" width="48" height="31.999" fill="#f0f0f0" stroke-width=".093749"/>
+<rect y="8" width="15.999" height="32" fill="#6da544" stroke-width=".093749"/>
+<rect x="32.001" y="8" width="15.999" height="32" fill="#ff9811" stroke-width=".093749"/>
+</svg>
Binary file eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/gl.png has changed
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/gl.svg	Sat May 02 13:51:07 2020 +0200
@@ -0,0 +1,190 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="48" height="48" version="1.0" xmlns="http://www.w3.org/2000/svg">
+ <g transform="matrix(.079999 0 0 .080006 -.0032 .31558)">
+  <rect x=".040048" y="96.048" width="600" height="399.97" fill="#fff" fill-rule="evenodd" stroke-width="1pt"/>
+  <path d="m600.04 437.8-513.97-341.75h-86.03v56.935l515.9 343.03h84.104v-58.22" fill="#09c"/>
+ </g>
+ <g transform="matrix(.079999 0 0 .080006 -.0032 .31558)">
+  <path d="m296.65 401.23c-60.134 0-58.181-56.575-58.181-56.575v-86.833h116.36v86.833s2.0369 56.575-58.179 56.575" fill="#005bbf"/>
+  <path d="m296.65 401.23c-60.134 0-58.181-56.575-58.181-56.575v-86.833h116.36v86.833s2.0369 56.575-58.179 56.575z" fill="none" stroke="#000" stroke-width="1.0064"/>
+  <path d="m296.14 203.18s-12.406-6.0358-24.142 2.851c0 0-21.118-3.0479-22.672 17.18-0.0624 0.81902-0.18975 2.3274 0.18736 2.7669 0.37712 0.43954 0.75423 1.2586 0.75423 1.8206 0 0.56683 0.37712 0.88146 0.50443 1.1312 0.12489 0.25219 0.43955 0.62928 0.50201 1.6981 0.0624 1.0688-0.12491 1.5708 0.88154 2.6396 1.004 1.0688 1.0665 4.1503 1.0665 5.0294 0 0.87906 0.62933 3.3313 1.0689 3.8357 0.43957 0.50197 1.1938 1.7581 1.1938 2.8269s0.43957 4.023 0.24981 4.7748c-0.18735 0.75417 1.1313 1.6981 2.3275 2.0752 1.1938 0.37709 16.031 5.2167 37.656 4.8396 21.628-0.37708 29.415-1.5276 38.35-4.7772 1.3812-0.50199 1.6334-1.6332 1.5085-2.2625-0.12731-0.62686 0-2.6372 0.37711-3.1416 0.37711-0.50197 2.892-4.525 2.3876-5.2792-0.50202-0.75417-0.50202-2.3898 0-3.0167 0.50442-0.62928 2.0777-3.6532 2.3876-4.9045 0.31226-1.2537 0.35309-2.7309 0.92957-3.168 0.57888-0.43713 0.77344-1.8542 0.88394-2.1496 0.11288-0.29782 0.53324-1.2201 1.1193-1.6404 0 0 1.0905-5.111 0.41794-7.6234-0.66775-2.5147-4.4413-13.328-19.78-11.063 0 0-11.4-8.6345-28.163-4.4434" fill="#d81126"/>
+  <path d="m296.14 203.18s-12.406-6.0358-24.142 2.851c0 0-21.118-3.0479-22.672 17.18-0.0624 0.81902-0.18975 2.3274 0.18736 2.7669 0.37712 0.43954 0.75423 1.2586 0.75423 1.8206 0 0.56683 0.37712 0.88146 0.50443 1.1312 0.12489 0.25219 0.43955 0.62928 0.50201 1.6981 0.0624 1.0688-0.12491 1.5708 0.88154 2.6396 1.004 1.0688 1.0665 4.1503 1.0665 5.0294 0 0.87906 0.62933 3.3313 1.0689 3.8357 0.43957 0.50197 1.1938 1.7581 1.1938 2.8269s0.43957 4.023 0.24981 4.7748c-0.18735 0.75417 1.1313 1.6981 2.3275 2.0752 1.1938 0.37709 16.031 5.2167 37.656 4.8396 21.628-0.37708 29.415-1.5276 38.35-4.7772 1.3812-0.50199 1.6334-1.6332 1.5085-2.2625-0.12731-0.62686 0-2.6372 0.37711-3.1416 0.37711-0.50197 2.892-4.525 2.3876-5.2792-0.50202-0.75417-0.50202-2.3898 0-3.0167 0.50442-0.62928 2.0777-3.6532 2.3876-4.9045 0.31226-1.2537 0.35309-2.7309 0.92957-3.168 0.57888-0.43713 0.77344-1.8542 0.88394-2.1496 0.11288-0.29782 0.53324-1.2201 1.1193-1.6404 0 0 1.0905-5.111 0.41794-7.6234-0.66775-2.5147-4.4413-13.328-19.78-11.063 0 0-11.4-8.6345-28.163-4.4434h5e-3z" fill="none" stroke="#000" stroke-width="1.5084"/>
+  <path d="m337.64 240.83c-47.108-14.92-83.414-0.73976-83.414-0.73976s0.33627 1.6452 0.75422 2.1472c0.42035 0.50198 1.0064 1.6765 1.0064 2.5579 0 0.87906 0.0841 2.1376 0.0841 2.8077 0 0.6677-0.51403 3.6748 2.1738 3.6388 0 0 32.742-12.842 75.377 0.6605 0 0 1.1674-1.0472 1.2106-2.5555 0.0408-1.5083 0.29064-3.1007 0.87912-3.939 0.58609-0.83823 1.9264-3.4562 1.9264-4.5779" fill="#bcac0b"/>
+  <path d="m293.97 319.35h-20.453s-2.0129 18.271 13.747 23.804v1.6765h3.3532v2.1784s-5.784 5.1951-0.75663 11.147v1.8446h0.8407v2.9326h0.91996v4.7748s-0.75423 17.058-17.477 25.229v1.0064h44.651v-1.0064c-16.72-8.171-17.477-25.229-17.477-25.229v-4.7748h0.91996v-2.9326h0.8383v-1.8446c5.0298-5.9517-0.75423-11.147-0.75423-11.147v-2.1784h3.3532v-1.6765c15.76-5.5338 13.747-23.804 13.747-23.804h-25.454" fill="#c8b100" fill-opacity=".94118"/>
+  <path d="m293.97 319.35h-20.453s-2.0129 18.271 13.747 23.804v1.6765h3.3532v2.1784s-5.784 5.1951-0.75663 11.147v1.8446h0.8407v2.9326h0.91996v4.7748s-0.75423 17.058-17.477 25.229v1.0064h44.651v-1.0064c-16.72-8.171-17.477-25.229-17.477-25.229v-4.7748h0.91996v-2.9326h0.8383v-1.8446c5.0298-5.9517-0.75423-11.147-0.75423-11.147v-2.1784h3.3532v-1.6765c15.76-5.5338 13.747-23.804 13.747-23.804h-25.454 2e-3z" fill="none" stroke="#000" stroke-width="1.0064"/>
+  <path d="m286.59 342.9h19.742m-19.069 1.5083h18.399m-15.046 2.5147h11.568m-12.325 11.44h13.204m-12.322 1.4051h11.527m-11.527 2.851h11.484m-18.524 23.153h25.524m-32.732 5.9085h39.984m-41.492 0.87906h43.041" fill="none" stroke="#000" stroke-width=".2522"/>
+  <path d="m296.64 318.27c7.2012 0 13.04-5.8388 13.04-13.039 0-7.2006-5.8393-13.039-13.04-13.039-7.2012 0-13.04 5.8388-13.04 13.039 0 7.2006 5.8392 13.039 13.04 13.039" fill="#ccc"/>
+  <path d="m296.64 318.27c7.2012 0 13.04-5.8388 13.04-13.039 0-7.2006-5.8393-13.039-13.04-13.039-7.2012 0-13.04 5.8388-13.04 13.039 0 7.2006 5.8392 13.039 13.04 13.039z" fill="none" stroke="#000" stroke-width="1.0064"/>
+  <path d="m266.29 279.96h-8.1308v-8.1326h-7.2084v8.1326h-8.1308v7.2054h8.1308v8.1302h7.2084v-8.1302h8.1308v-7.2054" fill="#ccc"/>
+  <path d="m266.29 279.96h-8.1308v-8.1326h-7.2084v8.1326h-8.1308v7.2054h8.1308v8.1302h7.2084v-8.1302h8.1308v-7.2054" fill="none" stroke="#000" stroke-width="1.0064"/>
+  <path d="m350.8 279.96h-8.1308v-8.1326h-7.2108v8.1326h-8.1284v7.2054h8.1284v8.1302h7.2108v-8.1302h8.1308v-7.2054" fill="#ccc"/>
+  <path d="m350.8 279.96h-8.1308v-8.1326h-7.2108v8.1326h-8.1284v7.2054h8.1284v8.1302h7.2108v-8.1302h8.1308v-7.2054" fill="none" stroke="#000" stroke-width="1.0064"/>
+  <path d="m307.98 269.74h-8.1308v-8.1301h-7.2084v8.1301h-8.1308v7.2078h8.1308v8.1301h7.2084v-8.1301h8.1308v-7.2078" fill="#ccc"/>
+  <path d="m307.98 269.74h-8.1308v-8.1301h-7.2084v8.1301h-8.1308v7.2078h8.1308v8.1301h7.2084v-8.1301h8.1308v-7.2078" fill="none" stroke="#000" stroke-width="1.0064"/>
+  <path d="m266.29 315.16h-8.1308v-8.1301h-7.2084v8.1301h-8.1308v7.2078h8.1308v8.1301h7.2084v-8.1301h8.1308v-7.2078" fill="#ccc"/>
+  <path d="m266.29 315.16h-8.1308v-8.1301h-7.2084v8.1301h-8.1308v7.2078h8.1308v8.1301h7.2084v-8.1301h8.1308v-7.2078" fill="none" stroke="#000" stroke-width="1.0064"/>
+  <path d="m350.8 315.16h-8.1308v-8.1301h-7.2108v8.1301h-8.1284v7.2078h8.1284v8.1301h7.2108v-8.1301h8.1308v-7.2078" fill="#ccc"/>
+  <path d="m350.8 315.16h-8.1308v-8.1301h-7.2108v8.1301h-8.1284v7.2078h8.1284v8.1301h7.2108v-8.1301h8.1308v-7.2078" fill="none" stroke="#000" stroke-width="1.0064"/>
+  <path d="m266.29 350.71h-8.1308v-8.1325h-7.2084v8.1325h-8.1308v7.2078h8.1308v8.1277h7.2084v-8.1277h8.1308v-7.2078" fill="#ccc"/>
+  <path d="m266.29 350.71h-8.1308v-8.1325h-7.2084v8.1325h-8.1308v7.2078h8.1308v8.1277h7.2084v-8.1277h8.1308v-7.2078" fill="none" stroke="#000" stroke-width="1.0064"/>
+  <path d="m350.8 350.71h-8.1308v-8.1325h-7.2108v8.1325h-8.1284v7.2078h8.1284v8.1277h7.2108v-8.1277h8.1308v-7.2078" fill="#ccc"/>
+  <path d="m350.8 350.71h-8.1308v-8.1325h-7.2108v8.1325h-8.1284v7.2078h8.1284v8.1277h7.2108v-8.1277h8.1308v-7.2078" fill="none" stroke="#000" stroke-width="1.0064"/>
+  <path d="m296.53 185.77c4.3212 0 7.8257-3.5018 7.8257-7.8227s-3.5045-7.8227-7.8257-7.8227-7.8233 3.5018-7.8233 7.8227 3.5021 7.8227 7.8233 7.8227" fill="#005bbf"/>
+  <path d="m296.53 185.77c4.3212 0 7.8257-3.5018 7.8257-7.8227s-3.5045-7.8227-7.8257-7.8227-7.8233 3.5018-7.8233 7.8227 3.5021 7.8227 7.8233 7.8227z" fill="none" stroke="#000" stroke-width="1.0064"/>
+  <path d="m303.83 176.57h-6.4133v-10.371h2.45v-2.0752h-2.45v-2.4523h-2.0753v2.4523h-2.4524v2.0752h2.4524v10.371h-6.0987v1.3834h6.0987v0.0625h2.0753v-0.0625h6.4133v-1.3834" fill="#fc0"/>
+  <path d="m303.83 176.57h-6.4133v-10.371h2.45v-2.0752h-2.45v-2.4523h-2.0753v2.4523h-2.4524v2.0752h2.4524v10.371h-6.0987v1.3834h6.0987v0.0625h2.0753v-0.0625h6.4133v-1.3834" fill="#bcac0b" stroke="#000" stroke-width=".502"/>
+  <path d="m265.21 195.13s5.784-0.6701 9.1348 0.67011c0 0-3.8408 4.3689-3.0169 10.14 0.42034 2.935 1.0064 4.4434 1.8447 5.8676 0.8383 1.4267 1.7583 4.3593 1.2562 6.7058h1.0905s1.0905-4.7772-0.75423-7.46c-1.8447-2.6804-2.7671-6.3696-0.92236-10.225 1.8423-3.8549 4.5254-5.3632 4.5254-5.3632 3.101 1.2562 9.6416 0.0817 11.484-1.2585 1.8423-1.3426 2.7647-3.1848-0.67015-3.3529-3.4349-0.16812-9.303-0.0841-13.326 2.935 0 0-2.0969-2.433-12.574-1.2586-10.478 1.1745-18.051 5.6491-20.369 15.088-1.1722 4.7772 3.2691 14.834 7.3765 17.264 0 0-0.12491-1.6332 0.29305-2.8077 0 0-6.9994-7.8371-4.9025-15.129 2.0946-7.2919 10.478-12.069 19.531-11.817" fill="#fc0"/>
+  <path d="m265.21 195.13s5.784-0.6701 9.1348 0.67011c0 0-3.8408 4.3689-3.0169 10.14 0.42034 2.935 1.0064 4.4434 1.8447 5.8676 0.8383 1.4267 1.7583 4.3593 1.2562 6.7058h1.0905s1.0905-4.7772-0.75423-7.46c-1.8447-2.6804-2.7671-6.3696-0.92236-10.225 1.8423-3.8549 4.5254-5.3632 4.5254-5.3632 3.101 1.2562 9.6416 0.0817 11.484-1.2585 1.8423-1.3426 2.7647-3.1848-0.67015-3.3529-3.4349-0.16812-9.303-0.0841-13.326 2.935 0 0-2.0969-2.433-12.574-1.2586-10.478 1.1745-18.051 5.6491-20.369 15.088-1.1722 4.7772 3.2691 14.834 7.3765 17.264 0 0-0.12491-1.6332 0.29305-2.8077 0 0-6.9994-7.8371-4.9025-15.129 2.0946-7.2919 10.478-12.069 19.531-11.817z" fill="#bcac0b" stroke="#000" stroke-width=".65332"/>
+  <path d="m284.9 193.69c1.8111-0.14651 3.2619-0.46114 3.2427-0.70853-0.0192-0.24259-1.5036-0.32425-3.3148-0.17774s-3.2619 0.46355-3.2427 0.70854c0.0192 0.24498 1.5036 0.32424 3.3148 0.17773" fill="#fff"/>
+  <path d="m278.3 195.43s-2.0729 1.9479 0 0c2.0753-1.9479 6.4133-3.2689 8.8658-2.702 2.45 0.56443-0.44197 0.87906-1.2586 0.94151-0.81663 0.0624-2.4524 0.37709-4.84 0" fill="none" stroke="#000" stroke-width=".65332"/>
+  <path d="m327.74 195.76s-5.7816-0.6677-9.1348 0.67251c0 0 3.8432 4.3665 3.0169 10.14-0.41795 2.935-1.004 4.4434-1.8423 5.8676-0.84071 1.4219-1.7607 4.3593-1.2587 6.7059h-1.0905s-1.0881-4.7772 0.75422-7.46c1.8448-2.6828 2.7671-6.3696 0.92237-10.225-1.8423-3.8573-4.5254-5.3656-4.5254-5.3656-3.101 1.2586-9.6392 0.0841-11.484-1.2562-1.8399-1.3426-2.7647-3.1848 0.67016-3.3529 3.4373-0.16813 9.3053-0.0841 13.329 2.9326 0 0 2.0946-2.4306 12.572-1.2561 10.48 1.1721 18.051 5.6491 20.369 15.086 1.1746 4.7772-3.2691 14.836-7.3765 17.267 0 0 0.12729-1.6332-0.29305-2.8077 0 0 6.9994-7.8371 4.9049-15.129-2.097-7.2919-10.478-12.069-19.533-11.819" fill="#fc0"/>
+  <path d="m327.74 195.76s-5.7816-0.6677-9.1348 0.67251c0 0 3.8432 4.3665 3.0169 10.14-0.41795 2.935-1.004 4.4434-1.8423 5.8676-0.84071 1.4219-1.7607 4.3593-1.2587 6.7059h-1.0905s-1.0881-4.7772 0.75422-7.46c1.8448-2.6828 2.7671-6.3696 0.92237-10.225-1.8423-3.8573-4.5254-5.3656-4.5254-5.3656-3.101 1.2586-9.6392 0.0841-11.484-1.2562-1.8399-1.3426-2.7647-3.1848 0.67016-3.3529 3.4373-0.16813 9.3053-0.0841 13.329 2.9326 0 0 2.0946-2.4306 12.572-1.2561 10.48 1.1721 18.051 5.6491 20.369 15.086 1.1746 4.7772-3.2691 14.836-7.3765 17.267 0 0 0.12729-1.6332-0.29305-2.8077 0 0 6.9994-7.8371 4.9049-15.129-2.097-7.2919-10.478-12.069-19.533-11.819z" fill="#bcac0b" stroke="#000" stroke-width=".65332"/>
+  <path d="m308.04 194.32c-1.8087-0.14651-3.2619-0.46355-3.2427-0.70853 0.0216-0.24498 1.5036-0.32425 3.3148-0.17773 1.8111 0.14651 3.2643 0.46355 3.2451 0.70854-0.0216 0.24497-1.506 0.32424-3.3172 0.17772" fill="#fff"/>
+  <path d="m314.64 196.05s2.0753 1.9479 0 0c-2.0729-1.9503-6.4109-3.2689-8.8634-2.7044-2.4524 0.56683 0.43957 0.88147 1.2562 0.94392 0.81908 0.0624 2.4524 0.37708 4.8424 0" fill="none" stroke="#000" stroke-width=".65332"/>
+  <path d="m291.11 189.35v22.296c-0.25221 2.1784 2.6806 5.2792 4.7776 6.2015 0 0 4.9457-1.6765 5.2796-6.2015v-23.555h-1.6766v20.367c-0.0817 2.0968-1.4244 5.8676-3.2691 6.4561 0 0-3.603-0.58845-3.7711-6.372v-19.861l-1.3403 0.6677" fill="#fc0"/>
+  <path d="m291.11 189.35v22.296c-0.25221 2.1784 2.6806 5.2792 4.7776 6.2015 0 0 4.9457-1.6765 5.2796-6.2015v-23.555h-1.6766v20.367c-0.0817 2.0968-1.4244 5.8676-3.2691 6.4561 0 0-3.603-0.58845-3.7711-6.372v-19.861l-1.3403 0.6677" fill="#bcac0b" stroke="#000" stroke-width=".65332"/>
+  <path d="m241.78 219.84c1.4724 0 2.6662-1.1937 2.6662-2.666 0-1.4699-1.1938-2.666-2.6662-2.666s-2.6662 1.1937-2.6662 2.666 1.1938 2.666 2.6662 2.666" fill="#fff"/>
+  <path d="m241.78 219.84c1.4724 0 2.6662-1.1937 2.6662-2.666 0-1.4699-1.1938-2.666-2.6662-2.666s-2.6662 1.1937-2.6662 2.666 1.1938 2.666 2.6662 2.666z" fill="none" stroke="#000" stroke-width="1.0064"/>
+  <path d="m240.11 213.71c1.4748 0 2.6686-1.1937 2.6686-2.666 0-1.4699-1.1938-2.666-2.6686-2.666-1.4724 0-2.6662 1.1937-2.6662 2.666s1.1938 2.666 2.6662 2.666" fill="#fff"/>
+  <path d="m240.11 213.71c1.4748 0 2.6686-1.1937 2.6686-2.666 0-1.4699-1.1938-2.666-2.6686-2.666-1.4724 0-2.6662 1.1937-2.6662 2.666s1.1938 2.666 2.6662 2.666z" fill="none" stroke="#000" stroke-width="1.0064"/>
+  <path d="m240.99 206.3c1.4724 0 2.6662-1.1937 2.6662-2.6684 0-1.4723-1.1938-2.666-2.6662-2.666s-2.6662 1.1937-2.6662 2.666c0 1.4747 1.1938 2.6684 2.6662 2.6684" fill="#fff"/>
+  <path d="m240.99 206.3c1.4724 0 2.6662-1.1937 2.6662-2.6684 0-1.4723-1.1938-2.666-2.6662-2.666s-2.6662 1.1937-2.6662 2.666c0 1.4747 1.1938 2.6684 2.6662 2.6684z" fill="none" stroke="#000" stroke-width="1.0064"/>
+  <path d="m245.14 200.14c1.4748 0 2.6686-1.1937 2.6686-2.666 0-1.4747-1.1938-2.6684-2.6686-2.6684-1.4724 0-2.6662 1.1937-2.6662 2.6684 0 1.4723 1.1938 2.666 2.6662 2.666" fill="#fff"/>
+  <path d="m245.14 200.14c1.4748 0 2.6686-1.1937 2.6686-2.666 0-1.4747-1.1938-2.6684-2.6686-2.6684-1.4724 0-2.6662 1.1937-2.6662 2.6684 0 1.4723 1.1938 2.666 2.6662 2.666z" fill="none" stroke="#000" stroke-width="1.0064"/>
+  <path d="m250.04 195.64c1.4724 0 2.6662-1.1937 2.6662-2.6684 0-1.4723-1.1938-2.666-2.6662-2.666s-2.6686 1.1937-2.6686 2.666c0 1.4747 1.1962 2.6684 2.6686 2.6684" fill="#fff"/>
+  <path d="m250.04 195.64c1.4724 0 2.6662-1.1937 2.6662-2.6684 0-1.4723-1.1938-2.666-2.6662-2.666s-2.6686 1.1937-2.6686 2.666c0 1.4747 1.1962 2.6684 2.6686 2.6684z" fill="none" stroke="#000" stroke-width="1.0064"/>
+  <path d="m256.36 193.13c1.4724 0 2.6662-1.1937 2.6662-2.6684 0-1.4723-1.1938-2.666-2.6662-2.666s-2.6662 1.1937-2.6662 2.666c0 1.4747 1.1938 2.6684 2.6662 2.6684" fill="#fff"/>
+  <path d="m256.36 193.13c1.4724 0 2.6662-1.1937 2.6662-2.6684 0-1.4723-1.1938-2.666-2.6662-2.666s-2.6662 1.1937-2.6662 2.666c0 1.4747 1.1938 2.6684 2.6662 2.6684z" fill="none" stroke="#000" stroke-width="1.0064"/>
+  <path d="m262.96 191.93c1.4724 0 2.6662-1.1961 2.6662-2.6684s-1.1938-2.666-2.6662-2.666-2.6662 1.1937-2.6662 2.666 1.1938 2.6684 2.6662 2.6684" fill="#fff"/>
+  <path d="m262.96 191.93c1.4724 0 2.6662-1.1961 2.6662-2.6684s-1.1938-2.666-2.6662-2.666-2.6662 1.1937-2.6662 2.666 1.1938 2.6684 2.6662 2.6684z" fill="none" stroke="#000" stroke-width="1.0064"/>
+  <path d="m269.25 191.56c1.4724 0 2.6662-1.1961 2.6662-2.6684s-1.1938-2.666-2.6662-2.666c-1.4748 0-2.6686 1.1937-2.6686 2.666s1.1938 2.6684 2.6686 2.6684" fill="#fff"/>
+  <path d="m269.25 191.56c1.4724 0 2.6662-1.1961 2.6662-2.6684s-1.1938-2.666-2.6662-2.666c-1.4748 0-2.6686 1.1937-2.6686 2.666s1.1938 2.6684 2.6686 2.6684z" fill="none" stroke="#000" stroke-width="1.0064"/>
+  <path d="m274.91 192.06c1.4724 0 2.6662-1.1937 2.6662-2.666 0-1.4747-1.1938-2.6684-2.6662-2.6684s-2.6662 1.1937-2.6662 2.6684c0 1.4723 1.1938 2.666 2.6662 2.666" fill="#fff"/>
+  <path d="m274.91 192.06c1.4724 0 2.6662-1.1937 2.6662-2.666 0-1.4747-1.1938-2.6684-2.6662-2.6684s-2.6662 1.1937-2.6662 2.6684c0 1.4723 1.1938 2.666 2.6662 2.666z" fill="none" stroke="#000" stroke-width="1.0064"/>
+  <path d="m291.04 190.05c1.4724 0 2.6686-1.1937 2.6686-2.666 0-1.4699-1.1962-2.666-2.6686-2.666s-2.6662 1.1937-2.6662 2.666 1.1938 2.666 2.6662 2.666" fill="#fff"/>
+  <path d="m291.04 190.05c1.4724 0 2.6686-1.1937 2.6686-2.666 0-1.4699-1.1962-2.666-2.6686-2.666s-2.6662 1.1937-2.6662 2.666 1.1938 2.666 2.6662 2.666z" fill="none" stroke="#000" stroke-width="1.0064"/>
+  <path d="m296.19 191.43c1.4724 0 2.6686-1.1937 2.6686-2.666s-1.1962-2.666-2.6686-2.666-2.6662 1.1937-2.6662 2.666 1.1938 2.666 2.6662 2.666" fill="#fff"/>
+  <path d="m296.19 191.43c1.4724 0 2.6686-1.1937 2.6686-2.666s-1.1962-2.666-2.6686-2.666-2.6662 1.1937-2.6662 2.666 1.1938 2.666 2.6662 2.666z" fill="none" stroke="#000" stroke-width="1.0064"/>
+  <path d="m296.19 211.17c1.4724 0 2.6686-1.1937 2.6686-2.666s-1.1962-2.666-2.6686-2.666-2.6662 1.1937-2.6662 2.666 1.1938 2.666 2.6662 2.666" fill="#fff"/>
+  <path d="m296.19 211.17c1.4724 0 2.6686-1.1937 2.6686-2.666s-1.1962-2.666-2.6686-2.666-2.6662 1.1937-2.6662 2.666 1.1938 2.666 2.6662 2.666z" fill="none" stroke="#000" stroke-width="1.0064"/>
+  <path d="m351.33 221.54c1.4724 0 2.6662-1.1937 2.6662-2.6684 0-1.4723-1.1938-2.666-2.6662-2.666-1.4748 0-2.6686 1.1937-2.6686 2.666 0 1.4747 1.1938 2.6684 2.6686 2.6684" fill="#fff"/>
+  <path d="m351.33 221.54c1.4724 0 2.6662-1.1937 2.6662-2.6684 0-1.4723-1.1938-2.666-2.6662-2.666-1.4748 0-2.6686 1.1937-2.6686 2.666 0 1.4747 1.1938 2.6684 2.6686 2.6684z" fill="none" stroke="#000" stroke-width="1.0064"/>
+  <path d="m352.71 214.91c1.4748 0 2.6686-1.1937 2.6686-2.666s-1.1938-2.666-2.6686-2.666c-1.4724 0-2.6662 1.1937-2.6662 2.666s1.1938 2.666 2.6662 2.666" fill="#fff"/>
+  <path d="m352.71 214.91c1.4748 0 2.6686-1.1937 2.6686-2.666s-1.1938-2.666-2.6686-2.666c-1.4724 0-2.6662 1.1937-2.6662 2.666s1.1938 2.666 2.6662 2.666z" fill="none" stroke="#000" stroke-width="1.0064"/>
+  <path d="m351.58 207.99c1.4748 0 2.6686-1.1937 2.6686-2.6684 0-1.4723-1.1938-2.666-2.6686-2.666-1.4724 0-2.6662 1.1937-2.6662 2.666 0 1.4747 1.1938 2.6684 2.6662 2.6684" fill="#fff"/>
+  <path d="m351.58 207.99c1.4748 0 2.6686-1.1937 2.6686-2.6684 0-1.4723-1.1938-2.666-2.6686-2.666-1.4724 0-2.6662 1.1937-2.6662 2.666 0 1.4747 1.1938 2.6684 2.6662 2.6684z" fill="none" stroke="#000" stroke-width="1.0064"/>
+  <path d="m348.69 201.46c1.4748 0 2.6686-1.1961 2.6686-2.6684 0-1.4699-1.1938-2.666-2.6686-2.666-1.4724 0-2.6662 1.1937-2.6662 2.666s1.1938 2.6684 2.6662 2.6684" fill="#fff"/>
+  <path d="m348.69 201.46c1.4748 0 2.6686-1.1961 2.6686-2.6684 0-1.4699-1.1938-2.666-2.6686-2.666-1.4724 0-2.6662 1.1937-2.6662 2.666s1.1938 2.6684 2.6662 2.6684z" fill="none" stroke="#000" stroke-width="1.0064"/>
+  <path d="m343.78 196.93c1.4724 0 2.6662-1.1937 2.6662-2.666s-1.1938-2.666-2.6662-2.666-2.6686 1.1937-2.6686 2.666 1.1962 2.666 2.6686 2.666" fill="#fff"/>
+  <path d="m343.78 196.93c1.4724 0 2.6662-1.1937 2.6662-2.666s-1.1938-2.666-2.6662-2.666-2.6686 1.1937-2.6686 2.666 1.1962 2.666 2.6686 2.666z" fill="none" stroke="#000" stroke-width="1.0064"/>
+  <path d="m337.87 194.04c1.4724 0 2.6662-1.1937 2.6662-2.666s-1.1938-2.666-2.6662-2.666c-1.4748 0-2.6686 1.1937-2.6686 2.666s1.1938 2.666 2.6686 2.666" fill="#fff"/>
+  <path d="m337.87 194.04c1.4724 0 2.6662-1.1937 2.6662-2.666s-1.1938-2.666-2.6662-2.666c-1.4748 0-2.6686 1.1937-2.6686 2.666s1.1938 2.666 2.6686 2.666z" fill="none" stroke="#000" stroke-width="1.0064"/>
+  <path d="m331.15 192.5c1.4748 0 2.6686-1.1937 2.6686-2.666 0-1.4699-1.1938-2.666-2.6686-2.666-1.4724 0-2.6662 1.1937-2.6662 2.666s1.1938 2.666 2.6662 2.666" fill="#fff"/>
+  <path d="m331.15 192.5c1.4748 0 2.6686-1.1937 2.6686-2.666 0-1.4699-1.1938-2.666-2.6686-2.666-1.4724 0-2.6662 1.1937-2.6662 2.666s1.1938 2.666 2.6662 2.666z" fill="none" stroke="#000" stroke-width="1.0064"/>
+  <path d="m324.98 192c1.4748 0 2.6686-1.1937 2.6686-2.6684 0-1.4699-1.1938-2.666-2.6686-2.666-1.4724 0-2.6662 1.1937-2.6662 2.666 0 1.4747 1.1938 2.6684 2.6662 2.6684" fill="#fff"/>
+  <path d="m324.98 192c1.4748 0 2.6686-1.1937 2.6686-2.6684 0-1.4699-1.1938-2.666-2.6686-2.666-1.4724 0-2.6662 1.1937-2.6662 2.666 0 1.4747 1.1938 2.6684 2.6662 2.6684z" fill="none" stroke="#000" stroke-width="1.0064"/>
+  <path d="m319.4 191.26c1.4748 0 2.6686-1.1937 2.6686-2.666s-1.1938-2.666-2.6686-2.666c-1.4724 0-2.6662 1.1937-2.6662 2.666s1.1938 2.666 2.6662 2.666" fill="#fff"/>
+  <path d="m319.4 191.26c1.4748 0 2.6686-1.1937 2.6686-2.666s-1.1938-2.666-2.6686-2.666c-1.4724 0-2.6662 1.1937-2.6662 2.666s1.1938 2.666 2.6662 2.666z" fill="none" stroke="#000" stroke-width="1.0064"/>
+  <path d="m323.01 213.09c1.4724 0 2.6662-1.1961 2.6662-2.6684 0-1.4699-1.1938-2.666-2.6662-2.666s-2.6662 1.1937-2.6662 2.666 1.1938 2.6684 2.6662 2.6684" fill="#fff"/>
+  <path d="m323.01 213.09c1.4724 0 2.6662-1.1961 2.6662-2.6684 0-1.4699-1.1938-2.666-2.6662-2.666s-2.6662 1.1937-2.6662 2.666 1.1938 2.6684 2.6662 2.6684z" fill="none" stroke="#000" stroke-width="1.0064"/>
+  <path d="m324.39 207.93c1.4724 0 2.6662-1.1937 2.6662-2.666s-1.1938-2.666-2.6662-2.666c-1.4748 0-2.6686 1.1937-2.6686 2.666s1.1938 2.666 2.6686 2.666" fill="#fff"/>
+  <path d="m324.39 207.93c1.4724 0 2.6662-1.1937 2.6662-2.666s-1.1938-2.666-2.6662-2.666c-1.4748 0-2.6686 1.1937-2.6686 2.666s1.1938 2.666 2.6686 2.666z" fill="none" stroke="#000" stroke-width="1.0064"/>
+  <path d="m301.98 190.86c1.4748 0 2.6686-1.1961 2.6686-2.6684s-1.1938-2.666-2.6686-2.666c-1.4724 0-2.6662 1.1937-2.6662 2.666s1.1938 2.6684 2.6662 2.6684" fill="#fff"/>
+  <path d="m301.98 190.86c1.4748 0 2.6686-1.1961 2.6686-2.6684s-1.1938-2.666-2.6686-2.666c-1.4724 0-2.6662 1.1937-2.6662 2.666s1.1938 2.6684 2.6662 2.6684z" fill="none" stroke="#000" stroke-width="1.0064"/>
+  <path d="m288.93 190.14c1.4748 0 2.6686-1.1937 2.6686-2.6684 0-1.4699-1.1938-2.6636-2.6686-2.6636-1.4724 0-2.6662 1.1913-2.6662 2.6636 0 1.4747 1.1938 2.6684 2.6662 2.6684" fill="#fff"/>
+  <path d="m288.93 190.14c1.4748 0 2.6686-1.1937 2.6686-2.6684 0-1.4699-1.1938-2.6636-2.6686-2.6636-1.4724 0-2.6662 1.1913-2.6662 2.6636 0 1.4747 1.1938 2.6684 2.6662 2.6684z" fill="none" stroke="#000" stroke-width="1.0064"/>
+  <path d="m285.78 190.01c1.4724 0 2.6662-1.1937 2.6662-2.666s-1.1938-2.666-2.6662-2.666-2.6662 1.1937-2.6662 2.666 1.1938 2.666 2.6662 2.666" fill="#fff"/>
+  <path d="m285.78 190.01c1.4724 0 2.6662-1.1937 2.6662-2.666s-1.1938-2.666-2.6662-2.666-2.6662 1.1937-2.6662 2.666 1.1938 2.666 2.6662 2.666z" fill="none" stroke="#000" stroke-width="1.0064"/>
+  <path d="m268.84 213.15c1.4724 0 2.6686-1.1937 2.6686-2.6684 0-1.4723-1.1962-2.666-2.6686-2.666s-2.6662 1.1937-2.6662 2.666c0 1.4747 1.1938 2.6684 2.6662 2.6684" fill="#fff"/>
+  <path d="m268.84 213.15c1.4724 0 2.6686-1.1937 2.6686-2.6684 0-1.4723-1.1962-2.666-2.6686-2.666s-2.6662 1.1937-2.6662 2.666c0 1.4747 1.1938 2.6684 2.6662 2.6684z" fill="none" stroke="#000" stroke-width="1.0064"/>
+  <path d="m268.06 206.77c1.4724 0 2.6686-1.1937 2.6686-2.666s-1.1962-2.666-2.6686-2.666-2.6662 1.1937-2.6662 2.666 1.1938 2.666 2.6662 2.666" fill="#fff"/>
+  <path d="m268.06 206.77c1.4724 0 2.6686-1.1937 2.6686-2.666s-1.1962-2.666-2.6686-2.666-2.6662 1.1937-2.6662 2.666 1.1938 2.666 2.6662 2.666z" fill="none" stroke="#000" stroke-width="1.0064"/>
+  <path d="m269.94 200.61c1.4748 0 2.6686-1.1937 2.6686-2.666s-1.1938-2.666-2.6686-2.666c-1.4724 0-2.6662 1.1937-2.6662 2.666s1.1938 2.666 2.6662 2.666" fill="#fff"/>
+  <path d="m269.94 200.61c1.4748 0 2.6686-1.1937 2.6686-2.666s-1.1938-2.666-2.6686-2.666c-1.4724 0-2.6662 1.1937-2.6662 2.666s1.1938 2.666 2.6662 2.666z" fill="none" stroke="#000" stroke-width="1.0064"/>
+  <path d="m281.66 190.61c1.4748 0 2.6686-1.1937 2.6686-2.666 0-1.4747-1.1938-2.6684-2.6686-2.6684-1.4724 0-2.6662 1.1937-2.6662 2.6684 0 1.4723 1.1938 2.666 2.6662 2.666" fill="#fff"/>
+  <path d="m281.66 190.61c1.4748 0 2.6686-1.1937 2.6686-2.666 0-1.4747-1.1938-2.6684-2.6686-2.6684-1.4724 0-2.6662 1.1937-2.6662 2.6684 0 1.4723 1.1938 2.666 2.6662 2.666z" fill="none" stroke="#000" stroke-width="1.0064"/>
+  <path d="m277.23 192.44c1.4748 0 2.6686-1.1937 2.6686-2.666 0-1.4747-1.1938-2.6684-2.6686-2.6684-1.4724 0-2.6662 1.1937-2.6662 2.6684 0 1.4723 1.1938 2.666 2.6662 2.666" fill="#fff"/>
+  <path d="m277.23 192.44c1.4748 0 2.6686-1.1937 2.6686-2.666 0-1.4747-1.1938-2.6684-2.6686-2.6684-1.4724 0-2.6662 1.1937-2.6662 2.6684 0 1.4723 1.1938 2.666 2.6662 2.666z" fill="none" stroke="#000" stroke-width="1.0064"/>
+  <path d="m272.99 196.02c1.4724 0 2.6662-1.1961 2.6662-2.6684s-1.1938-2.666-2.6662-2.666c-1.4748 0-2.6686 1.1937-2.6686 2.666s1.1938 2.6684 2.6686 2.6684" fill="#fff"/>
+  <path d="m272.99 196.02c1.4724 0 2.6662-1.1961 2.6662-2.6684s-1.1938-2.666-2.6662-2.666c-1.4748 0-2.6686 1.1937-2.6686 2.666s1.1938 2.6684 2.6686 2.6684z" fill="none" stroke="#000" stroke-width="1.0064"/>
+  <path d="m296.19 194.45c1.4724 0 2.6686-1.1961 2.6686-2.6684 0-1.4699-1.1962-2.666-2.6686-2.666s-2.6662 1.1937-2.6662 2.666 1.1938 2.6684 2.6662 2.6684" fill="#fff"/>
+  <path d="m296.19 194.45c1.4724 0 2.6686-1.1961 2.6686-2.6684 0-1.4699-1.1962-2.666-2.6686-2.666s-2.6662 1.1937-2.6662 2.666 1.1938 2.6684 2.6662 2.6684z" fill="none" stroke="#000" stroke-width="1.0064"/>
+  <path d="m296.19 199.48c1.4724 0 2.6686-1.1937 2.6686-2.666s-1.1962-2.666-2.6686-2.666-2.6662 1.1937-2.6662 2.666 1.1938 2.666 2.6662 2.666" fill="#fff"/>
+  <path d="m296.19 199.48c1.4724 0 2.6686-1.1937 2.6686-2.666s-1.1962-2.666-2.6686-2.666-2.6662 1.1937-2.6662 2.666 1.1938 2.666 2.6662 2.666z" fill="none" stroke="#000" stroke-width="1.0064"/>
+  <path d="m296.19 204.88c1.4724 0 2.6686-1.1937 2.6686-2.666 0-1.4699-1.1962-2.666-2.6686-2.666s-2.6662 1.1937-2.6662 2.666 1.1938 2.666 2.6662 2.666" fill="#fff"/>
+  <path d="m296.19 204.88c1.4724 0 2.6686-1.1937 2.6686-2.666 0-1.4699-1.1962-2.666-2.6686-2.666s-2.6662 1.1937-2.6662 2.666 1.1938 2.666 2.6662 2.666z" fill="none" stroke="#000" stroke-width="1.0064"/>
+  <path d="m305.43 190.17c1.4724 0 2.6662-1.1961 2.6662-2.6684 0-1.4699-1.1938-2.666-2.6662-2.666-1.4748 0-2.6686 1.1937-2.6686 2.666s1.1938 2.6684 2.6686 2.6684" fill="#fff"/>
+  <path d="m305.43 190.17c1.4724 0 2.6662-1.1961 2.6662-2.6684 0-1.4699-1.1938-2.666-2.6662-2.666-1.4748 0-2.6686 1.1937-2.6686 2.666s1.1938 2.6684 2.6686 2.6684z" fill="none" stroke="#000" stroke-width="1.0064"/>
+  <path d="m309.08 189.42c1.4724 0 2.6662-1.1961 2.6662-2.6684 0-1.4699-1.1938-2.666-2.6662-2.666-1.4748 0-2.6686 1.1937-2.6686 2.666s1.1938 2.6684 2.6686 2.6684" fill="#fff"/>
+  <path d="m309.08 189.42c1.4724 0 2.6662-1.1961 2.6662-2.6684 0-1.4699-1.1938-2.666-2.6662-2.666-1.4748 0-2.6686 1.1937-2.6686 2.666s1.1938 2.6684 2.6686 2.6684z" fill="none" stroke="#000" stroke-width="1.0064"/>
+  <path d="m313.2 190.08c1.4724 0 2.6662-1.1961 2.6662-2.6684s-1.1938-2.666-2.6662-2.666-2.6662 1.1937-2.6662 2.666 1.1938 2.6684 2.6662 2.6684" fill="#fff"/>
+  <path d="m313.2 190.08c1.4724 0 2.6662-1.1961 2.6662-2.6684s-1.1938-2.666-2.6662-2.666-2.6662 1.1937-2.6662 2.666 1.1938 2.6684 2.6662 2.6684z" fill="none" stroke="#000" stroke-width="1.0064"/>
+  <path d="m323.51 201.39c1.4724 0 2.6686-1.1937 2.6686-2.666s-1.1962-2.666-2.6686-2.666-2.6662 1.1937-2.6662 2.666 1.1938 2.666 2.6662 2.666" fill="#fff"/>
+  <path d="m323.51 201.39c1.4724 0 2.6686-1.1937 2.6686-2.666s-1.1962-2.666-2.6686-2.666-2.6662 1.1937-2.6662 2.666 1.1938 2.666 2.6662 2.666z" fill="none" stroke="#000" stroke-width="1.0064"/>
+  <path d="m317.35 192.47c1.4748 0 2.6686-1.1937 2.6686-2.666 0-1.4747-1.1938-2.6684-2.6686-2.6684-1.4724 0-2.6662 1.1937-2.6662 2.6684 0 1.4723 1.1938 2.666 2.6662 2.666" fill="#fff"/>
+  <path d="m317.35 192.47c1.4748 0 2.6686-1.1937 2.6686-2.666 0-1.4747-1.1938-2.6684-2.6686-2.6684-1.4724 0-2.6662 1.1937-2.6662 2.6684 0 1.4723 1.1938 2.666 2.6662 2.666z" fill="none" stroke="#000" stroke-width="1.0064"/>
+  <path d="m321.12 196.11c1.4724 0 2.6662-1.1937 2.6662-2.6684 0-1.4723-1.1938-2.666-2.6662-2.666-1.4748 0-2.6686 1.1937-2.6686 2.666 0 1.4747 1.1938 2.6684 2.6686 2.6684" fill="#fff"/>
+  <path d="m321.12 196.11c1.4724 0 2.6662-1.1937 2.6662-2.6684 0-1.4723-1.1938-2.666-2.6662-2.666-1.4748 0-2.6686 1.1937-2.6686 2.666 0 1.4747 1.1938 2.6684 2.6686 2.6684z" fill="none" stroke="#000" stroke-width="1.0064"/>
+  <path d="m296.02 236.05-7.0403 3.521 6.3365 3.9894 7.511-3.754-6.8073-3.7564" fill="#fff"/>
+  <path d="m296.02 236.05-7.0403 3.521 6.3365 3.9894 7.511-3.754-6.8073-3.7564" fill="none" stroke="#000" stroke-width=".502"/>
+  <path d="m280.63 236.79-10.562 1.6332s-0.1273 5.6587 0.37711 7.0421l10.811-1.5107s0.50442-5.2792-0.62692-7.1646" fill="#fff"/>
+  <path d="m280.63 236.79-10.562 1.6332s-0.1273 5.6587 0.37711 7.0421l10.811-1.5107s0.50442-5.2792-0.62692-7.1646z" fill="none" stroke="#000" stroke-width=".502"/>
+  <path d="m279.45 238.8s-6.3701 0.58604-7.9626 1.1745l0.0841 3.8549s4.1915-0.75418 8.0467-1.0904l-0.16814-3.939" fill="#058e6e" fill-opacity=".94118"/>
+  <path d="m279.45 238.8s-6.3701 0.58604-7.9626 1.1745l0.0841 3.8549s4.1915-0.75418 8.0467-1.0904l-0.16814-3.939" fill="none" stroke="#000" stroke-width=".502"/>
+  <path d="m310.74 237.09 10.559 1.6356s0.12731 5.6563-0.37711 7.0397l-10.811-1.5083s-0.50442-5.2816 0.62932-7.167" fill="#fff"/>
+  <path d="m310.74 237.09 10.559 1.6356s0.12731 5.6563-0.37711 7.0397l-10.811-1.5083s-0.50442-5.2816 0.62932-7.167z" fill="none" stroke="#000" stroke-width=".502"/>
+  <path d="m311.92 239.11s6.3701 0.58605 7.9626 1.1721l-0.0841 3.8549s-4.1915-0.75416-8.0467-1.088l0.16813-3.939" fill="#058e6e" fill-opacity=".94118"/>
+  <path d="m311.92 239.11s6.3701 0.58605 7.9626 1.1721l-0.0841 3.8549s-4.1915-0.75416-8.0467-1.088l0.16813-3.939" fill="none" stroke="#000" stroke-width=".502"/>
+  <path d="m254.22 241.82s37.048-13.758 84.159 1.1625m-82.65 6.7563s35.835-13.402 80.03 0.59566m-79.862-9.0188 7.2084 2.0944-5.0298 5.3657" fill="none" stroke="#000" stroke-width=".502"/>
+  <path d="m256.07 247.77 4.1074-3.437-4.6935-0.9223s0.63893 0.72535 0.50682 1.3907c-0.12971 0.6653 0.0384 2.3826 0.0793 2.9686" fill="#f00"/>
+  <path d="m256.07 247.77 4.1074-3.437-4.6935-0.9223s0.63893 0.72535 0.50682 1.3907c-0.12971 0.6653 0.0384 2.3826 0.0793 2.9686z" fill="none" stroke="#000" stroke-width=".502"/>
+  <path d="m337.59 242.7-7.6696 1.3834 5.1547 6.0334" fill="none" stroke="#000" stroke-width=".502"/>
+  <path d="m335.32 247.98-2.892-3.0191 4.1482-0.37709s-1.1313 0.75417-1.1313 1.3834c0 0.62927 0.12731 1.5083-0.1249 2.0127" fill="#f00"/>
+  <path d="m335.32 247.98-2.892-3.0191 4.1482-0.37709s-1.1313 0.75417-1.1313 1.3834c0 0.62927 0.12731 1.5083-0.1249 2.0127z" fill="none" stroke="#000" stroke-width=".502"/>
+  <path d="m265.29 241.85c0.65335 0 1.1842-0.42511 1.1842-0.95111 0-0.52119-0.53084-0.94632-1.1842-0.94632-0.65574 0-1.1866 0.42513-1.1866 0.94632 0 0.526 0.53084 0.95111 1.1866 0.95111zm20.607-2.349c0.65575 0 1.1866-0.42512 1.1866-0.94631 0-0.526-0.53084-0.94872-1.1866-0.94872-0.65334 0-1.1842 0.42272-1.1842 0.94872 0 0.52119 0.53084 0.94631 1.1842 0.94631zm0 3.3529c0.65575 0 1.1866-0.42513 1.1866-0.94872 0-0.5236-0.53084-0.94631-1.1866-0.94631-0.65334 0-1.1842 0.42271-1.1842 0.94631 0 0.52359 0.53084 0.94872 1.1842 0.94872zm20.285-3.1848c0.65574 0 1.1866-0.42272 1.1866-0.94872 0-0.52119-0.53084-0.94631-1.1866-0.94631-0.65334 0-1.1842 0.42271-1.1842 0.94631 0 0.526 0.53084 0.94872 1.1842 0.94872zm20.117 3.6892c0.65575 0 1.1866-0.42511 1.1866-0.95111 0-0.5212-0.53084-0.94632-1.1866-0.94632-0.65334 0-1.1842 0.42512-1.1842 0.94632 0 0.526 0.53084 0.95111 1.1842 0.95111zm-0.33387 2.6804c0.65574 0 1.1866-0.42512 1.1866-0.94632 0-0.52119-0.53084-0.95112-1.1866-0.95112-0.65575 0-1.1866 0.42753-1.1866 0.95112 0 0.5212 0.53085 0.94632 1.1866 0.94632zm-19.783-3.0167c0.65574 0 1.1866-0.42512 1.1866-0.94871 0-0.5212-0.53084-0.94632-1.1866-0.94632-0.65334 0-1.1842 0.42272-1.1842 0.94632 0 0.52359 0.53084 0.94871 1.1842 0.94871zm-39.897 3.0167c0.65334 0 1.1842-0.42512 1.1842-0.94632 0-0.52119-0.53085-0.95112-1.1842-0.95112-0.65575 0-1.1866 0.42753-1.1866 0.95112 0 0.5212 0.53084 0.94632 1.1866 0.94632z" fill="none" stroke="#000" stroke-width=".502"/>
+  <path d="m253.55 231.01s0.16814 7.2078 4.8616 6.2015c4.6935-1.0064 4.1915-6.874 4.5278-7.2078 0.33388-0.33626 0.8359-0.33626 0.8359-0.33626s0.67015 5.6995 5.0274 5.0294c4.3596-0.67011 4.1915-7.7098 3.6895-8.8843l1.0064-0.33625s1.6742 8.2142 6.704 7.0421c5.0298-1.1745 4.5278-6.3696 4.5278-6.3696h0.38672s1.1218 5.5314 5.1451 5.1951c4.021-0.33385 4.8616-1.6765 4.3572-7.2078l2.683-0.50198s-1.0064 8.0461 3.8528 7.878c4.864-0.16813 5.0298-4.023 5.3661-4.6931h0.73261s0.27383 5.6995 4.2972 5.6995c4.0233 0 4.8592-4.8613 4.8592-6.7059l3.9297 0.17534s-4.0954 7.5369 1.9408 8.5432c6.0338 1.004 6.202-4.8637 6.202-4.8637h1.1722s-0.16813 7.5441 3.1851 7.7122c3.3508 0.16812 5.3637-1.0064 5.6975-6.5377l1.8448 0.67011s-1.5997 8.942-7.8786 7.3736c-3.3532-0.83583-4.3596-4.6907-4.1915-5.6971 0 0-2.3444 4.1888-6.8721 2.8486-4.5254-1.3402-4.0233-4.525-4.0233-5.5314 0 0-2.7215 4.9982-6.5382 3.8525-3.3508-1.004-4.6935-2.1784-4.6935-4.525 0 0-1.6766 3.8549-5.0298 3.6892-3.3532-0.16813-5.0274-2.1808-5.1955-4.023 0 0-0.66536 3.6027-5.1979 3.8549-3.0169 0.16813-4.6935-1.3378-5.3637-3.3529 0 0-0.86712 3.6508-5.1955 4.1912-2.6806 0.33625-5.3637-1.1721-6.0362-3.6868 0 0-0.66775 4.8589-5.0274 5.5314-4.3596 0.6701-5.3661-2.3466-5.3661-2.3466s-0.8359 3.8573-4.3572 4.6932c-3.5213 0.83823-5.8681-0.6677-6.7064-4.1888-0.83829-3.5211-0.50201-5.0294-0.50201-5.0294l1.3403 1.8422" fill="#fc0"/>
+  <path d="m253.55 231.01s0.16814 7.2078 4.8616 6.2015c4.6935-1.0064 4.1915-6.874 4.5278-7.2078 0.33388-0.33626 0.8359-0.33626 0.8359-0.33626s0.67015 5.6995 5.0274 5.0294c4.3596-0.67011 4.1915-7.7098 3.6895-8.8843l1.0064-0.33625s1.6742 8.2142 6.704 7.0421c5.0298-1.1745 4.5278-6.3696 4.5278-6.3696h0.38672s1.1218 5.5314 5.1451 5.1951c4.021-0.33385 4.8616-1.6765 4.3572-7.2078l2.683-0.50198s-1.0064 8.0461 3.8528 7.878c4.864-0.16813 5.0298-4.023 5.3661-4.6931h0.73261s0.27383 5.6995 4.2972 5.6995c4.0233 0 4.8592-4.8613 4.8592-6.7059l3.9297 0.17534s-4.0954 7.5369 1.9408 8.5432c6.0338 1.004 6.202-4.8637 6.202-4.8637h1.1722s-0.16813 7.5441 3.1851 7.7122c3.3508 0.16812 5.3637-1.0064 5.6975-6.5377l1.8448 0.67011s-1.5997 8.942-7.8786 7.3736c-3.3532-0.83583-4.3596-4.6907-4.1915-5.6971 0 0-2.3444 4.1888-6.8721 2.8486-4.5254-1.3402-4.0233-4.525-4.0233-5.5314 0 0-2.7215 4.9982-6.5382 3.8525-3.3508-1.004-4.6935-2.1784-4.6935-4.525 0 0-1.6766 3.8549-5.0298 3.6892-3.3532-0.16813-5.0274-2.1808-5.1955-4.023 0 0-0.66536 3.6027-5.1979 3.8549-3.0169 0.16813-4.6935-1.3378-5.3637-3.3529 0 0-0.86712 3.6508-5.1955 4.1912-2.6806 0.33625-5.3637-1.1721-6.0362-3.6868 0 0-0.66775 4.8589-5.0274 5.5314-4.3596 0.6701-5.3661-2.3466-5.3661-2.3466s-0.8359 3.8573-4.3572 4.6932c-3.5213 0.83823-5.8681-0.6677-6.7064-4.1888-0.83829-3.5211-0.50201-5.0294-0.50201-5.0294l1.3403 1.8422 2e-3 2e-3z" fill="#bcac0b" stroke="#000" stroke-width=".65332"/>
+  <path d="m263.28 231.32c0.91756 0 1.6598-0.74216 1.6598-1.6597 0-0.91509-0.74222-1.6596-1.6598-1.6596-0.91757 0-1.6598 0.74456-1.6598 1.6596 0 0.9175 0.74221 1.6597 1.6598 1.6597" fill="#fc0"/>
+  <path d="m263.28 231.32c0.91756 0 1.6598-0.74216 1.6598-1.6597 0-0.91509-0.74222-1.6596-1.6598-1.6596-0.91757 0-1.6598 0.74456-1.6598 1.6596 0 0.9175 0.74221 1.6597 1.6598 1.6597z" fill="#bcac0b" stroke="#000" stroke-width=".65332"/>
+  <path d="m285.12 227.83c0.91756 0 1.6598-0.74456 1.6598-1.6596 0-0.91749-0.74222-1.6597-1.6598-1.6597-0.91757 0-1.6598 0.74217-1.6598 1.6597 0 0.91509 0.74221 1.6596 1.6598 1.6596" fill="#fc0"/>
+  <path d="m285.12 227.83c0.91756 0 1.6598-0.74456 1.6598-1.6596 0-0.91749-0.74222-1.6597-1.6598-1.6597-0.91757 0-1.6598 0.74217-1.6598 1.6597 0 0.91509 0.74221 1.6596 1.6598 1.6596z" fill="#bcac0b" stroke="#000" stroke-width=".65332"/>
+  <path d="m307.26 228.47c0.91757 0 1.6598-0.74456 1.6598-1.6596 0-0.91749-0.74221-1.6597-1.6598-1.6597-0.91756 0-1.6598 0.74217-1.6598 1.6597 0 0.91509 0.74222 1.6596 1.6598 1.6596" fill="#fc0"/>
+  <path d="m307.26 228.47c0.91757 0 1.6598-0.74456 1.6598-1.6596 0-0.91749-0.74221-1.6597-1.6598-1.6597-0.91756 0-1.6598 0.74217-1.6598 1.6597 0 0.91509 0.74222 1.6596 1.6598 1.6596z" fill="#bcac0b" stroke="#000" stroke-width=".65332"/>
+  <path d="m329.23 232.01c0.91756 0 1.6598-0.74456 1.6598-1.6596 0-0.91749-0.74221-1.6597-1.6598-1.6597-0.91517 0-1.6574 0.74217-1.6574 1.6597 0 0.91509 0.74222 1.6596 1.6574 1.6596" fill="#fc0"/>
+  <path d="m329.23 232.01c0.91756 0 1.6598-0.74456 1.6598-1.6596 0-0.91749-0.74221-1.6597-1.6598-1.6597-0.91517 0-1.6574 0.74217-1.6574 1.6597 0 0.91509 0.74222 1.6596 1.6574 1.6596z" fill="#bcac0b" stroke="#000" stroke-width=".65332"/>
+  <path d="m295.21 225.98h-1.5084c-0.37712 1.5083-3.5838 2.4523-3.5838 2.4523-0.37712-1.1937 0.43957-2.8918 0.43957-2.8918-3.7087-0.94391-3.7087-2.2649-3.7087-2.2649 0.56447-1.2562 3.9609-1.4435 3.9609-1.4435-0.88154-1.1312-0.69178-2.9542-0.69178-2.9542 2.2627 0.1273 4.1482 2.3874 4.1482 2.3874s-2.2627-1.1289-2.0105-5.1543c0 0 1.2562-0.06 2.0105 0.75417 0 0 0-4.3353 1.8231-4.8372h0.18735c1.8231 0.50198 1.8231 4.8372 1.8231 4.8372 0.75423-0.81421 2.0105-0.75417 2.0105-0.75417 0.25221 4.023-2.0105 5.1543-2.0105 5.1543s1.8856-2.2601 4.1482-2.3874c0 0 0.18976 1.8206-0.69178 2.9542 0 0 3.3964 0.18734 3.9609 1.4435 0 0 0 1.321-3.7087 2.2649 0 0 0.81669 1.6981 0.43957 2.8918 0 0-3.2067-0.94392-3.5838-2.4523h-3.4565" fill="#fc0"/>
+  <path d="m295.21 225.98h-1.5084c-0.37712 1.5083-3.5838 2.4523-3.5838 2.4523-0.37712-1.1937 0.43957-2.8918 0.43957-2.8918-3.7087-0.94391-3.7087-2.2649-3.7087-2.2649 0.56447-1.2562 3.9609-1.4435 3.9609-1.4435-0.88154-1.1312-0.69178-2.9542-0.69178-2.9542 2.2627 0.1273 4.1482 2.3874 4.1482 2.3874s-2.2627-1.1289-2.0105-5.1543c0 0 1.2562-0.06 2.0105 0.75417 0 0 0-4.3353 1.8231-4.8372h0.18735c1.8231 0.50198 1.8231 4.8372 1.8231 4.8372 0.75423-0.81421 2.0105-0.75417 2.0105-0.75417 0.25221 4.023-2.0105 5.1543-2.0105 5.1543s1.8856-2.2601 4.1482-2.3874c0 0 0.18976 1.8206-0.69178 2.9542 0 0 3.3964 0.18734 3.9609 1.4435 0 0 0 1.321-3.7087 2.2649 0 0 0.81669 1.6981 0.43957 2.8918 0 0-3.2067-0.94392-3.5838-2.4523h-3.4565 2e-3z" fill="#bcac0b" stroke="#000" stroke-width=".65332"/>
+  <path d="m296.07 226.83c1.679 0 3.0385-1.3594 3.0385-3.0383 0-1.6765-1.3595-3.0359-3.0385-3.0359-1.6766 0-3.0361 1.3594-3.0361 3.0359 0 1.6789 1.3595 3.0383 3.0361 3.0383" fill="#fff"/>
+  <path d="m296.07 226.83c1.679 0 3.0385-1.3594 3.0385-3.0383 0-1.6765-1.3595-3.0359-3.0385-3.0359-1.6766 0-3.0361 1.3594-3.0361 3.0359 0 1.6789 1.3595 3.0383 3.0361 3.0383z" fill="none" stroke="#000" stroke-width=".40352"/>
+  <path d="m296.07 225.46c0.91756 0 1.6622-0.74216 1.6622-1.6597 0-0.91509-0.74463-1.6572-1.6622-1.6572-0.91516 0-1.6574 0.74216-1.6574 1.6572 0 0.9175 0.74222 1.6597 1.6574 1.6597" fill="#fff"/>
+  <path d="m296.07 225.46c0.91756 0 1.6622-0.74216 1.6622-1.6597 0-0.91509-0.74463-1.6572-1.6622-1.6572-0.91516 0-1.6574 0.74216-1.6574 1.6572 0 0.9175 0.74222 1.6597 1.6574 1.6597z" fill="none" stroke="#000" stroke-width=".2522"/>
+  <path d="m319.11 227.94 1.4748 0.31944c0.0456 1.554 2.9857 3.1512 2.9857 3.1512 0.61731-1.088 0.17775-2.9182 0.17775-2.9182 3.824-0.13931 4.1002-1.4291 4.1002-1.4291-0.28583-1.3498-3.5646-2.2505-3.5646-2.2505 1.0977-0.9199 1.2995-2.7429 1.2995-2.7429-2.2387-0.35306-4.5614 1.4603-4.5614 1.4603s2.4524-0.62686 3.0553-4.6139c0 0-1.2178-0.32425-2.1234 0.31222 0 0 0.91276-4.2392-0.76143-5.1134l-0.18495-0.0408c-1.888 0.10809-2.8031 4.3473-2.8031 4.3473-0.56448-0.95833-1.8063-1.1625-1.8063-1.1625-1.0953 3.8789 0.87913 5.4641 0.87913 5.4641s-1.3667-2.6108-3.5526-3.2112c0 0-0.56928 1.7413 0.0528 3.0335 0 0-3.358-0.5308-4.1771 0.57884 0 0-0.27624 1.2898 3.149 2.9951 0 0-1.1578 1.4867-1.0401 2.7333 0 0 3.334-0.24499 4.021-1.6404l1.4724 0.31704 1.9072 0.41071" fill="#fc0"/>
+  <path d="m319.11 227.94 1.4748 0.31944c0.0456 1.554 2.9857 3.1512 2.9857 3.1512 0.61731-1.088 0.17775-2.9182 0.17775-2.9182 3.824-0.13931 4.1002-1.4291 4.1002-1.4291-0.28583-1.3498-3.5646-2.2505-3.5646-2.2505 1.0977-0.9199 1.2995-2.7429 1.2995-2.7429-2.2387-0.35306-4.5614 1.4603-4.5614 1.4603s2.4524-0.62686 3.0553-4.6139c0 0-1.2178-0.32425-2.1234 0.31222 0 0 0.91276-4.2392-0.76143-5.1134l-0.18495-0.0408c-1.888 0.10809-2.8031 4.3473-2.8031 4.3473-0.56448-0.95833-1.8063-1.1625-1.8063-1.1625-1.0953 3.8789 0.87913 5.4641 0.87913 5.4641s-1.3667-2.6108-3.5526-3.2112c0 0-0.56928 1.7413 0.0528 3.0335 0 0-3.358-0.5308-4.1771 0.57884 0 0-0.27624 1.2898 3.149 2.9951 0 0-1.1578 1.4867-1.0401 2.7333 0 0 3.334-0.24499 4.021-1.6404l1.4724 0.31704 1.9072 0.41071" fill="#bcac0b" stroke="#000" stroke-width=".65332"/>
+  <path d="m318.08 228.6c-1.6382-0.35306-2.6806-1.9695-2.3275-3.6099 0.35309-1.638 1.9696-2.6828 3.6102-2.3274 1.6406 0.35307 2.683 1.9695 2.3299 3.6099-0.35549 1.638-1.972 2.6828-3.6126 2.3274" fill="#fff"/>
+  <path d="m318.08 228.6c-1.6382-0.35306-2.6806-1.9695-2.3275-3.6099 0.35309-1.638 1.9696-2.6828 3.6102-2.3274 1.6406 0.35307 2.683 1.9695 2.3299 3.6099-0.35549 1.638-1.972 2.6828-3.6126 2.3274z" fill="none" stroke="#000" stroke-width=".40352"/>
+  <path d="m318.38 227.25c-0.89835-0.19214-1.4676-1.076-1.2731-1.9719 0.19216-0.89347 1.0761-1.4651 1.972-1.2706 0.89595 0.19215 1.4652 1.0784 1.2731 1.9719-0.19456 0.89588-1.0785 1.4651-1.972 1.2706" fill="#fff"/>
+  <path d="m318.38 227.25c-0.89835-0.19214-1.4676-1.076-1.2731-1.9719 0.19216-0.89347 1.0761-1.4651 1.972-1.2706 0.89595 0.19215 1.4652 1.0784 1.2731 1.9719-0.19456 0.89588-1.0785 1.4651-1.972 1.2706z" fill="none" stroke="#000" stroke-width=".2522"/>
+  <path d="m272.27 227.65-1.4964 0.19695c-0.17534 1.5468-3.2307 2.9038-3.2307 2.9038-0.53084-1.1337 0.0553-2.923 0.0553-2.923-3.8-0.44674-3.9753-1.7557-3.9753-1.7557 0.39633-1.3186 3.7351-1.9551 3.7351-1.9551-1.0208-1.004-1.0737-2.8365-1.0737-2.8365 2.2603-0.17054 4.4293 1.8206 4.4293 1.8206s-2.3924-0.82382-2.6734-4.8445c0 0 1.2394-0.22817 2.0945 0.48277 0 0-0.57167-4.2992 1.165-5.039l0.18736-0.0216c1.8736 0.25459 2.4452 4.5562 2.4452 4.5562 0.64133-0.90788 1.8952-1.0136 1.8952-1.0136 0.78065 3.9558-1.3139 5.3729-1.3139 5.3729s1.5709-2.4883 3.7976-2.911c0 0 0.42755 1.7798-0.29545 3.0167 0 0 3.3892-0.2618 4.117 0.91029 0 0 0.17295 1.309-3.3796 2.7333 0 0 1.0352 1.5732 0.81907 2.8077 0 0-3.3027-0.51158-3.8768-1.9575l-3.4252 0.45635" fill="#fc0"/>
+  <path d="m272.27 227.65-1.4964 0.19695c-0.17534 1.5468-3.2307 2.9038-3.2307 2.9038-0.53084-1.1337 0.0553-2.923 0.0553-2.923-3.8-0.44674-3.9753-1.7557-3.9753-1.7557 0.39633-1.3186 3.7351-1.9551 3.7351-1.9551-1.0208-1.004-1.0737-2.8365-1.0737-2.8365 2.2603-0.17054 4.4293 1.8206 4.4293 1.8206s-2.3924-0.82382-2.6734-4.8445c0 0 1.2394-0.22817 2.0945 0.48277 0 0-0.57167-4.2992 1.165-5.039l0.18736-0.0216c1.8736 0.25459 2.4452 4.5562 2.4452 4.5562 0.64133-0.90788 1.8952-1.0136 1.8952-1.0136 0.78065 3.9558-1.3139 5.3729-1.3139 5.3729s1.5709-2.4883 3.7976-2.911c0 0 0.42755 1.7798-0.29545 3.0167 0 0 3.3892-0.2618 4.117 0.91029 0 0 0.17295 1.309-3.3796 2.7333 0 0 1.0352 1.5732 0.81907 2.8077 0 0-3.3027-0.51158-3.8768-1.9575l-3.4252 0.45635" fill="#bcac0b" stroke="#000" stroke-width=".65332"/>
+  <path d="m273.23 228.39c1.6646-0.22097 2.8344-1.7485 2.611-3.413-0.22098-1.6621-1.7486-2.8317-3.4108-2.6084-1.6646 0.22096-2.832 1.7485-2.611 3.4106 0.22098 1.662 1.7486 2.8317 3.4108 2.6108" fill="#fff"/>
+  <path d="m273.23 228.39c1.6646-0.22097 2.8344-1.7485 2.611-3.413-0.22098-1.6621-1.7486-2.8317-3.4108-2.6084-1.6646 0.22096-2.832 1.7485-2.611 3.4106 0.22098 1.662 1.7486 2.8317 3.4108 2.6108z" fill="none" stroke="#000" stroke-width=".40352"/>
+  <path d="m273.05 227.02c0.90796-0.12009 1.5469-0.95352 1.4244-1.8638-0.12011-0.90789-0.9536-1.5444-1.8616-1.4267-0.91035 0.12249-1.5493 0.95593-1.4268 1.8638 0.1201 0.91029 0.95599 1.5468 1.864 1.4267" fill="#fff"/>
+  <path d="m273.05 227.02c0.90796-0.12009 1.5469-0.95352 1.4244-1.8638-0.12011-0.90789-0.9536-1.5444-1.8616-1.4267-0.91035 0.12249-1.5493 0.95593-1.4268 1.8638 0.1201 0.91029 0.95599 1.5468 1.864 1.4267z" fill="none" stroke="#000" stroke-width=".2522"/>
+  <path d="m340.16 234.1s-0.76142-1.9983-2.4428-1.2802c-1.6814 0.71815-1.5084 0.97994-3.0121 0.88868 0 0-0.58609-1.7966 0.15372-2.5724 0 0-2.402-0.89828-2.9064-3.0071 0 0 1.2875-1.4939 4.338-0.9367 0 0-0.0961-1.5156 0.32186-2.1833 0 0 3.2763 1.0136 3.2931 2.8414 0 0-0.98242-3.5859 0.74703-6.1895 0 0 1.5349 0.6581 1.4364 2.2913 0 0 0.70619-3.3601 5.2484-2.4571 0 0-2.462 2.1832-2.5845 3.1824-0.1225 0.99916-2.1762 2.702-2.2122 3.2689-0.0312 0.56443-0.28104 1.5564-0.88394 2.1496-0.6029 0.59324-0.66295 1.5996-0.61491 1.9142 0.0408 0.31943-0.10329 1.6957-0.88154 2.0896" fill="#fc0"/>
+  <path d="m340.16 234.1s-0.76142-1.9983-2.4428-1.2802c-1.6814 0.71815-1.5084 0.97994-3.0121 0.88868 0 0-0.58609-1.7966 0.15372-2.5724 0 0-2.402-0.89828-2.9064-3.0071 0 0 1.2875-1.4939 4.338-0.9367 0 0-0.0961-1.5156 0.32186-2.1833 0 0 3.2763 1.0136 3.2931 2.8414 0 0-0.98242-3.5859 0.74703-6.1895 0 0 1.5349 0.6581 1.4364 2.2913 0 0 0.70619-3.3601 5.2484-2.4571 0 0-2.462 2.1832-2.5845 3.1824-0.1225 0.99916-2.1762 2.702-2.2122 3.2689-0.0312 0.56443-0.28104 1.5564-0.88394 2.1496-0.6029 0.59324-0.66295 1.5996-0.61491 1.9142 0.0408 0.31943-0.10329 1.6957-0.88154 2.0896z" fill="#bcac0b" stroke="#000" stroke-width=".65332"/>
+  <path d="m337.7 230.12c0.32186-1.6452 1.9168-2.7212 3.5622-2.3994 0.46839 0.0889 0.88634 0.28581 1.2418 0.55482-0.0913 0.56923-0.34588 1.3354-0.8455 1.8278-0.6029 0.59324-0.66295 1.5996-0.61731 1.9142 0.0336 0.24978-0.0552 1.1481-0.46839 1.7173-0.15613-7e-3 -0.31466-0.0216-0.4708-0.0528-1.643-0.31944-2.719-1.9142-2.402-3.5619" fill="#fff"/>
+  <path d="m337.7 230.12c0.32186-1.6452 1.9168-2.7212 3.5622-2.3994 0.46839 0.0889 0.88634 0.28581 1.2418 0.55482-0.0913 0.56923-0.34588 1.3354-0.8455 1.8278-0.6029 0.59324-0.66295 1.5996-0.61731 1.9142 0.0336 0.24978-0.0552 1.1481-0.46839 1.7173-0.15613-7e-3 -0.31466-0.0216-0.4708-0.0528-1.643-0.31944-2.719-1.9142-2.402-3.5619z" fill="none" stroke="#000" stroke-width=".40352"/>
+  <path d="m339.06 230.38c0.17295-0.89827 1.0449-1.4867 1.9456-1.3114 0.40834 0.0793 0.74703 0.30743 0.98722 0.61487-0.0961 0.1489-0.20417 0.29301-0.32907 0.41551-0.6029 0.59324-0.66295 1.5996-0.61731 1.9142 7e-3 0.0649 7e-3 0.17532-5e-3 0.30502-0.21379 0.0456-0.44197 0.0528-0.67017 7e-3 -0.90074-0.17533-1.4868-1.0448-1.3115-1.9455" fill="#fff"/>
+  <path d="m339.06 230.38c0.17295-0.89827 1.0449-1.4867 1.9456-1.3114 0.40834 0.0793 0.74703 0.30743 0.98722 0.61487-0.0961 0.1489-0.20417 0.29301-0.32907 0.41551-0.6029 0.59324-0.66295 1.5996-0.61731 1.9142 7e-3 0.0649 7e-3 0.17532-5e-3 0.30502-0.21379 0.0456-0.44197 0.0528-0.67017 7e-3 -0.90074-0.17533-1.4868-1.0448-1.3115-1.9455z" fill="none" stroke="#000" stroke-width=".2522"/>
+  <path d="m252.15 233.27s0.87912-1.9479 2.5125-1.1313c1.6358 0.81662 1.446 1.0688 2.9569 1.0688 0 0 0.68937-1.7605 0-2.5772 0 0 2.45-0.75416 3.0794-2.8293 0 0-1.1938-1.5708-4.2756-1.1937 0 0 0.18975-1.5108-0.18736-2.2001 0 0-3.3316 0.81661-3.4589 2.6396 0 0 1.1962-3.5211-0.37711-6.2231 0 0-1.5709 0.56443-1.5709 2.2001 0 0-0.50201-3.3962-5.0922-2.7669 0 0 2.3251 2.3274 2.39 3.3313 0.0625 1.0064 2.0105 2.8293 2.0105 3.3962 0 0.56443 0.18976 1.5708 0.75422 2.2001 0.56688 0.62928 0.56688 1.6332 0.50202 1.9479-0.0625 0.31223 0 1.6957 0.75664 2.1376" fill="#fc0"/>
+  <path d="m252.15 233.27s0.87912-1.9479 2.5125-1.1313c1.6358 0.81662 1.446 1.0688 2.9569 1.0688 0 0 0.68937-1.7605 0-2.5772 0 0 2.45-0.75416 3.0794-2.8293 0 0-1.1938-1.5708-4.2756-1.1937 0 0 0.18975-1.5108-0.18736-2.2001 0 0-3.3316 0.81661-3.4589 2.6396 0 0 1.1962-3.5211-0.37711-6.2231 0 0-1.5709 0.56443-1.5709 2.2001 0 0-0.50201-3.3962-5.0922-2.7669 0 0 2.3251 2.3274 2.39 3.3313 0.0625 1.0064 2.0105 2.8293 2.0105 3.3962 0 0.56443 0.18976 1.5708 0.75422 2.2001 0.56688 0.62928 0.56688 1.6332 0.50202 1.9479-0.0625 0.31223 0 1.6957 0.75664 2.1376z" fill="#bcac0b" stroke="#000" stroke-width=".65332"/>
+  <path d="m254.84 229.44c-0.22098-1.6645-1.7462-2.8317-3.4108-2.6108-0.4708 0.0624-0.90076 0.23298-1.2731 0.48035 0.0576 0.57404 0.26422 1.3522 0.73501 1.8758 0.56688 0.62928 0.56688 1.6332 0.50202 1.9479-0.048 0.24498-0.0144 1.1481 0.36751 1.7389 0.15373 2e-3 0.31226 0 0.47079-0.0216 1.6622-0.22096 2.832-1.7485 2.6086-3.4106" fill="#fff"/>
+  <path d="m254.84 229.44c-0.22098-1.6645-1.7462-2.8317-3.4108-2.6108-0.4708 0.0624-0.90076 0.23298-1.2731 0.48035 0.0576 0.57404 0.26422 1.3522 0.73501 1.8758 0.56688 0.62928 0.56688 1.6332 0.50202 1.9479-0.048 0.24498-0.0144 1.1481 0.36751 1.7389 0.15373 2e-3 0.31226 0 0.47079-0.0216 1.6622-0.22096 2.832-1.7485 2.6086-3.4106z" fill="none" stroke="#000" stroke-width=".40352"/>
+  <path d="m253.48 229.62c-0.12011-0.90788-0.956-1.5468-1.864-1.4267-0.41554 0.0576-0.76623 0.2642-1.0232 0.55481 0.0889 0.15612 0.18495 0.30503 0.30264 0.43713 0.56688 0.62928 0.56688 1.6332 0.50202 1.9479-0.012 0.0624-0.0168 0.17053-0.0144 0.30263 0.21138 0.06 0.43957 0.0793 0.67016 0.0504 0.90795-0.12249 1.5469-0.95592 1.4268-1.8662" fill="#fff"/>
+  <path d="m253.48 229.62c-0.12011-0.90788-0.956-1.5468-1.864-1.4267-0.41554 0.0576-0.76623 0.2642-1.0232 0.55481 0.0889 0.15612 0.18495 0.30503 0.30264 0.43713 0.56688 0.62928 0.56688 1.6332 0.50202 1.9479-0.012 0.0624-0.0168 0.17053-0.0144 0.30263 0.21138 0.06 0.43957 0.0793 0.67016 0.0504 0.90795-0.12249 1.5469-0.95592 1.4268-1.8662z" fill="none" stroke="#000" stroke-width=".2522"/>
+  <path d="m257.24 251.62s33.748-13.22 76.384 0.28342" fill="none" stroke="#000" stroke-width="1.5084"/>
+  <path d="m338.38 241.1c-47.11-14.92-84.661-0.83823-84.661-0.83823" fill="none" stroke="#000" stroke-width=".502"/>
+  <path d="m295.97 237.8-3.7735 1.8854 3.3964 2.1376 4.0234-2.0127-3.6462-2.0103" fill="#f00"/>
+  <path d="m295.97 237.8-3.7735 1.8854 3.3964 2.1376 4.0234-2.0127-3.6462-2.0103" fill="none" stroke="#000" stroke-width=".502"/>
+ </g>
+</svg>
Binary file eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/he.png has changed
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/he.svg	Sat May 02 13:51:07 2020 +0200
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="48" height="48" enable-background="new 0 0 512 512" version="1.1" viewBox="0 0 48 48" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
+<rect y="8" width="48" height="32" fill="#f0f0f0" stroke-width=".093749"/>
+<g transform="matrix(.09375 0 0 .093748 0 .0003755)" fill="#2e52b2">
+	<path d="m320 219.04h-42.667l-21.333-36.951-21.333 36.95h-42.667l21.335 36.951-21.335 36.949h42.667l21.333 36.951 21.333-36.95h42.667l-21.335-36.951zm-37.791 36.949-13.104 22.699h-26.209l-13.105-22.699 13.105-22.699h26.209zm-26.209-45.397 4.877 8.448h-9.754zm-39.315 22.698h9.755l-4.877 8.448zm0 45.399 4.877-8.448 4.877 8.448zm39.315 22.698-4.876-8.448h9.754zm39.315-22.698h-9.755l4.877-8.448zm-9.755-45.399h9.755l-4.877 8.448z"/>
+	<rect y="106.66" width="512" height="42.663"/>
+	<rect y="362.66" width="512" height="42.663"/>
+</g>
+</svg>
Binary file eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/hi.png has changed
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/hi.svg	Sat May 02 13:51:07 2020 +0200
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="48" height="48" enable-background="new 0 0 512 512" version="1.1" viewBox="0 0 48 48" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
+<rect y="8" width="48" height="32" fill="#f0f0f0" stroke-width=".09375"/>
+<rect y="8" width="48" height="10.667" fill="#ff9811" stroke-width=".09375"/>
+<rect y="29.333" width="48" height="10.667" fill="#6da544" stroke-width=".09375"/>
+<ellipse cx="24" cy="24" rx="4.1153" ry="4.1153" fill="#0052b4" stroke-width=".09375"/>
+<ellipse cx="24" cy="24" rx="2.5719" ry="2.5719" fill="#f0f0f0" stroke-width=".09375"/>
+<polygon transform="matrix(.09375 0 0 .09375 0 -.00035158)" points="247.54 270.66 226.68 272.93 239.07 256 226.68 239.07 247.54 241.34 256 222.15 264.46 241.34 285.32 239.07 272.93 256 285.32 272.93 264.46 270.66 256 289.85" fill="#0052b4"/>
+</svg>
Binary file eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/hr.png has changed
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/hr.svg	Sat May 02 13:51:07 2020 +0200
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="48" height="48" enable-background="new 0 0 512 512" version="1.1" viewBox="0 0 48 48" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
+<rect y="8" width="48" height="32" fill="#f0f0f0" stroke-width=".09375"/>
+<rect y="8" width="48" height="10.667" fill="#d80027" stroke-width=".09375"/>
+<rect y="29.333" width="48" height="10.667" fill="#0052b4" stroke-width=".09375"/>
+<g transform="matrix(.09375 0 0 .09375 0 -.00035158)" fill="#338af3">
+	<polygon points="270.84 204.06 275.79 166.96 295.58 152.12 315.36 166.96 315.36 196.64 300.52 204.06"/>
+	<polygon points="241.16 204.06 236.21 166.96 216.42 152.12 196.64 166.96 196.64 196.64 211.48 204.06"/>
+</g>
+<polygon transform="matrix(.09375 0 0 .09375 0 -.00035158)" points="236.21 166.96 256 152.12 275.79 166.96 275.79 204.06 236.21 204.06" fill="#0052b4"/>
+<path d="m18.435 18.435v7.6522c0 1.8221 0.88022 3.4424 2.2376 4.4583l0.97388-0.24375 1.229 1.2364c0.36338 0.07481 0.73941 0.11428 1.1246 0.11428 0.38316 0 0.75722-0.03891 1.1188-0.11297l1.4029-1.168 0.80578 0.17194c1.3569-1.0157 2.2376-2.6345 2.2376-4.456v-7.6522l-11.13-9.4e-5z" fill="#f0f0f0" stroke-width=".09375"/>
+<g transform="matrix(.09375 0 0 .09375 0 -.00035158)" fill="#d80027">
+	<rect x="196.64" y="196.64" width="23.745" height="23.745"/>
+	<rect x="244.12" y="196.64" width="23.745" height="23.745"/>
+	<rect x="291.62" y="196.64" width="23.745" height="23.745"/>
+	<rect x="220.38" y="220.38" width="23.745" height="23.745"/>
+	<rect x="267.88" y="220.38" width="23.745" height="23.745"/>
+	<rect x="196.64" y="244.12" width="23.745" height="23.745"/>
+	<rect x="220.38" y="267.86" width="23.745" height="23.745"/>
+	<rect x="244.12" y="244.12" width="23.745" height="23.745"/>
+	<rect x="291.62" y="244.12" width="23.745" height="23.745"/>
+	<rect x="267.88" y="267.86" width="23.745" height="23.745"/>
+	<rect x="244.12" y="291.62" width="23.745" height="23.745"/>
+	<path d="m220.38 291.61h-22.212c2.038 8.826 6.042 16.904 11.536 23.745h10.676z"/>
+	<path d="m291.62 315.36h10.677c5.493-6.842 9.498-14.919 11.536-23.745h-22.213z"/>
+	<path d="m220.38 315.36v10.361c6.906 5.196 14.976 8.923 23.745 10.71v-21.071z"/>
+	<path d="m267.87 315.36v21.071c8.769-1.786 16.839-5.514 23.745-10.71v-10.361z"/>
+</g>
+</svg>
Binary file eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/hu.png has changed
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/hu.svg	Sat May 02 13:51:07 2020 +0200
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="48" height="48" enable-background="new 0 0 512 512" version="1.1" viewBox="0 0 48 48" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
+<rect y="8" width="48" height="32" fill="#f0f0f0" stroke-width=".09375"/>
+<rect y="8" width="48" height="10.667" fill="#d80027" stroke-width=".09375"/>
+<rect y="29.333" width="48" height="10.667" fill="#6da544" stroke-width=".09375"/>
+</svg>
Binary file eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/id.png has changed
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/id.svg	Sat May 02 13:51:07 2020 +0200
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="48" height="48" enable-background="new 0 0 512 512" version="1.1" viewBox="0 0 48 48" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
+<rect y="8" width="48" height="32" fill="#f0f0f0" stroke-width=".09375"/>
+<rect y="8" width="48" height="16" fill="#a2001d" stroke-width=".09375"/>
+</svg>
Binary file eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/is.png has changed
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/is.svg	Sat May 02 13:51:07 2020 +0200
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="48" height="48" enable-background="new 0 0 512 512" version="1.1" viewBox="0 0 48 48" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
+<rect y="8.0005" width="48" height="32" fill="#0052b4" stroke-width=".093748"/>
+<polygon transform="matrix(.09375 0 0 .093747 0 .0006792)" points="0 295.88 0 277.33 0 234.67 0 216.11 122.44 216.11 122.44 85.329 140.98 85.329 183.65 85.329 202.2 85.329 202.2 216.11 512 216.11 512 234.67 512 277.33 512 295.88 202.2 295.88 202.2 426.67 183.65 426.67 140.98 426.67 122.44 426.67 122.44 295.88" fill="#f0f0f0"/>
+<polygon transform="matrix(.09375 0 0 .093747 0 .0006792)" points="0 234.67 140.98 234.67 140.98 85.329 183.65 85.329 183.65 234.67 512 234.67 512 277.33 183.65 277.33 183.65 426.67 140.98 426.67 140.98 277.33 0 277.33" fill="#d80027"/>
+</svg>
Binary file eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/it.png has changed
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/it.svg	Sat May 02 13:51:07 2020 +0200
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="48" height="48" enable-background="new 0 0 512 512" version="1.1" viewBox="0 0 48 48" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
+<polygon transform="matrix(.09375 0 0 .093747 0 .00053905)" points="512 85.33 341.33 85.33 170.67 85.33 0 85.33 0 426.66 170.67 426.66 341.33 426.66 512 426.66" fill="#f0f0f0"/>
+<rect y="8.0003" width="15.999" height="32" fill="#6da544" stroke-width=".093749"/>
+<rect x="32.001" y="8.0003" width="15.999" height="32" fill="#d80027" stroke-width=".093749"/>
+</svg>
Binary file eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/iw.png has changed
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/iw.svg	Sat May 02 13:51:07 2020 +0200
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="48" height="48" enable-background="new 0 0 512 512" version="1.1" viewBox="0 0 48 48" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
+<rect y="8" width="48" height="32" fill="#f0f0f0" stroke-width=".093749"/>
+<g transform="matrix(.09375 0 0 .093748 0 .0003755)" fill="#2e52b2">
+	<path d="m320 219.04h-42.667l-21.333-36.951-21.333 36.95h-42.667l21.335 36.951-21.335 36.949h42.667l21.333 36.951 21.333-36.95h42.667l-21.335-36.951zm-37.791 36.949-13.104 22.699h-26.209l-13.105-22.699 13.105-22.699h26.209zm-26.209-45.397 4.877 8.448h-9.754zm-39.315 22.698h9.755l-4.877 8.448zm0 45.399 4.877-8.448 4.877 8.448zm39.315 22.698-4.876-8.448h9.754zm39.315-22.698h-9.755l4.877-8.448zm-9.755-45.399h9.755l-4.877 8.448z"/>
+	<rect y="106.66" width="512" height="42.663"/>
+	<rect y="362.66" width="512" height="42.663"/>
+</g>
+</svg>
Binary file eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/ja.png has changed
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/ja.svg	Sat May 02 13:51:07 2020 +0200
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="48" height="48" enable-background="new 0 0 512 512" version="1.1" viewBox="0 0 48 48" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
+<rect y="8" width="48" height="32" fill="#f0f0f0" stroke-width=".093749"/>
+<ellipse cx="24" cy="23.999" rx="9" ry="8.9998" fill="#d80027" stroke-width=".093749"/>
+</svg>
Binary file eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/ka.png has changed
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/ka.svg	Sat May 02 13:51:07 2020 +0200
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="48" height="48" enable-background="new 0 0 512 512" version="1.1" viewBox="0 0 48 48" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
+<rect y="8.0003" width="48" height="32" fill="#f0f0f0" stroke-width=".093749"/>
+<g transform="matrix(.09375 0 0 .093747 0 .00053905)" fill="#d80027">
+	<polygon points="288 426.66 288 288 512 288 512 224 288 224 288 85.33 224 85.33 224 224 0 224 0 288 224 288 224 426.66"/>
+	<polygon points="100.87 188.06 123.13 188.06 123.13 165.8 145.39 165.8 145.39 143.53 123.13 143.53 123.13 121.27 100.87 121.27 100.87 143.53 78.609 143.53 78.609 165.8 100.87 165.8"/>
+	<polygon points="388.87 188.06 411.13 188.06 411.13 165.8 433.39 165.8 433.39 143.53 411.13 143.53 411.13 121.27 388.87 121.27 388.87 143.53 366.61 143.53 366.61 165.8 388.87 165.8"/>
+	<polygon points="100.87 390.72 123.13 390.72 123.13 368.46 145.39 368.46 145.39 346.2 123.13 346.2 123.13 323.94 100.87 323.94 100.87 346.2 78.609 346.2 78.609 368.46 100.87 368.46"/>
+	<polygon points="388.87 390.72 411.13 390.72 411.13 368.46 433.39 368.46 433.39 346.2 411.13 346.2 411.13 323.94 388.87 323.94 388.87 346.2 366.61 346.2 366.61 368.46 388.87 368.46"/>
+</g>
+</svg>
Binary file eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/ko.png has changed
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/ko.svg	Sat May 02 13:51:07 2020 +0200
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="48" height="48" enable-background="new 0 0 512 512" version="1.1" viewBox="0 0 48 48" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
+<rect y="8" width="48" height="32" fill="#fff" stroke-width=".093749"/>
+<path d="m29.843 23.999c0 1.4609-2.6162 5.1129-5.8434 5.1129s-5.8434-3.6521-5.8434-5.1129c0-3.2272 2.6162-5.8433 5.8434-5.8433s5.8434 2.6161 5.8434 5.8433z" fill="#d80027" stroke-width=".093749"/>
+<path d="m29.843 23.999c0 3.2272-2.6162 5.8433-5.8434 5.8433s-5.8434-2.6161-5.8434-5.8433" fill="#0052b4" stroke-width=".093749"/>
+<rect transform="matrix(.70711 -.7071 .70711 .7071 0 0)" x=".72984" y="41.976" width="2.1913" height="1.4608" stroke-width=".093748"/>
+<rect transform="matrix(.70711 -.7071 .70711 .7071 0 0)" x="-2.9213" y="41.975" width="2.1913" height="1.4608" stroke-width=".093748"/>
+<rect transform="matrix(.70711 -.7071 .70711 .7071 0 0)" x=".73139" y="46.357" width="2.1913" height="1.4608" stroke-width=".093748"/>
+<rect transform="matrix(.70711 -.7071 .70711 .7071 0 0)" x="-2.9213" y="46.358" width="2.1913" height="1.4608" stroke-width=".093748"/>
+<rect transform="matrix(.70711 -.7071 .70711 .7071 0 0)" x=".73028" y="44.167" width="2.1913" height="1.4608" stroke-width=".093748"/>
+<rect transform="matrix(.70711 -.7071 .70711 .7071 0 0)" x="-2.9224" y="44.166" width="2.1913" height="1.4608" stroke-width=".093748"/>
+<rect transform="matrix(-.70711 -.7071 .70711 -.7071 0 0)" x="-36.863" y="10.227" width="5.8433" height="1.4608" stroke-width=".093748"/>
+<rect transform="matrix(-.70711 -.7071 .70711 -.7071 0 0)" x="-33.21" y="8.036" width="2.1913" height="1.4607" stroke-width=".093748"/>
+<rect transform="matrix(-.70711 -.7071 .70711 -.7071 0 0)" x="-36.863" y="8.0345" width="2.1913" height="1.4607" stroke-width=".093748"/>
+<rect transform="matrix(-.70711 -.7071 .70711 -.7071 0 0)" x="-33.209" y="12.417" width="2.1913" height="1.4608" stroke-width=".093748"/>
+<rect transform="matrix(-.70711 -.7071 .70711 -.7071 0 0)" x="-36.863" y="12.418" width="2.1913" height="1.4608" stroke-width=".093748"/>
+<rect transform="matrix(.70711 .7071 -.70711 .7071 0 0)" x="31.019" y="12.417" width="5.8433" height="1.4608" stroke-width=".093748"/>
+<rect transform="matrix(.70711 .7071 -.70711 .7071 0 0)" x="34.671" y="10.227" width="2.1913" height="1.4607" stroke-width=".093748"/>
+<rect transform="matrix(.70711 .7071 -.70711 .7071 0 0)" x="31.019" y="10.226" width="2.1913" height="1.4608" stroke-width=".093748"/>
+<rect transform="matrix(.70711 .7071 -.70711 .7071 0 0)" x="31.019" y="8.0343" width="5.8433" height="1.4608" stroke-width=".093748"/>
+<rect transform="matrix(-.70711 .7071 -.70711 -.7071 0 0)" x="-2.923" y="-21.523" width="5.8433" height="1.4608" stroke-width=".093748"/>
+<rect transform="matrix(-.70711 .7071 -.70711 -.7071 0 0)" x="-2.9218" y="-23.713" width="5.8433" height="1.4608" stroke-width=".093748"/>
+<rect transform="matrix(-.70711 .7071 -.70711 -.7071 0 0)" x="-2.9213" y="-25.905" width="5.8433" height="1.4607" stroke-width=".093748"/>
+</svg>
Binary file eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/lt.png has changed
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/lt.svg	Sat May 02 13:51:07 2020 +0200
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="48" height="48" enable-background="new 0 0 512 512" version="1.1" viewBox="0 0 48 48" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
+<rect y="8" width="48" height="32" fill="#6da544" stroke-width=".09375"/>
+<rect y="8" width="48" height="10.667" fill="#ffda44" stroke-width=".09375"/>
+<rect y="29.333" width="48" height="10.667" fill="#d80027" stroke-width=".09375"/>
+</svg>
Binary file eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/lv.png has changed
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/lv.svg	Sat May 02 13:51:07 2020 +0200
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="48" height="48" enable-background="new 0 0 512 512" version="1.1" viewBox="0 0 48 48" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
+<rect y="8" width="48" height="32" fill="#f0f0f0" stroke-width=".09375"/>
+<g transform="matrix(.09375 0 0 .09375 0 -.00034758)" fill="#a2001d">
+	<rect y="85.337" width="512" height="113.78"/>
+	<rect y="312.89" width="512" height="113.78"/>
+</g>
+</svg>
Binary file eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/mk.png has changed
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/mk.svg	Sat May 02 13:51:07 2020 +0200
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="48" height="48" enable-background="new 0 0 512 512" version="1.1" viewBox="0 0 48 48" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
+<rect y="8.0003" width="48" height="32" fill="#ffda44" stroke-width=".093749"/>
+<g transform="matrix(.09375 0 0 .093747 0 .00053905)" fill="#d80027">
+	<polygon points="256 252.29 282.83 426.66 383.88 426.66"/>
+	<polygon points="256 252.29 230.31 85.33 133.56 85.33"/>
+	<polygon points="256 252.29 128.12 426.66 229.17 426.66"/>
+	<polygon points="28.333 85.33 0 85.33 0 212.9 256 252.29"/>
+	<polygon points="0 291.67 0 426.66 18.212 426.66 256 252.29"/>
+	<polygon points="483.67 85.33 256 252.29 512 212.9 512 85.33"/>
+	<polygon points="256 252.29 378.43 85.33 281.69 85.33"/>
+	<polygon points="493.79 426.66 512 426.66 512 291.67 256 252.29"/>
+	<circle cx="256" cy="252.29" r="59.359"/>
+</g>
+<ellipse cx="24" cy="23.652" rx="4.1739" ry="4.1738" fill="#ffda44" stroke-width=".093749"/>
+</svg>
Binary file eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/mt.png has changed
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/mt.svg	Sat May 02 13:51:07 2020 +0200
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="48" height="48" enable-background="new 0 0 512 512" version="1.1" viewBox="0 0 48 48" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
+<rect y="8" width="48" height="31.999" fill="#f0f0f0" stroke-width=".093749"/>
+<rect x="24" y="8" width="24" height="32" fill="#d80027" stroke-width=".093749"/>
+<polygon transform="matrix(.09375 0 0 .093748 0 .0003755)" points="186.9 181.34 208.23 181.34 208.23 160 229.56 160 229.56 138.67 208.23 138.67 208.23 117.34 186.9 117.34 186.9 138.67 165.56 138.67 165.56 160 186.9 160" fill="#acabb1"/>
+</svg>
Binary file eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/nl.png has changed
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/nl.svg	Sat May 02 13:51:07 2020 +0200
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="48" height="48" enable-background="new 0 0 512 512" version="1.1" viewBox="0 0 48 48" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
+<rect y="8" width="48" height="32" fill="#f0f0f0" stroke-width=".09375"/>
+<rect y="8" width="48" height="10.667" fill="#a2001d" stroke-width=".09375"/>
+<rect y="29.333" width="48" height="10.667" fill="#0052b4" stroke-width=".09375"/>
+</svg>
Binary file eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/no.png has changed
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/no.svg	Sat May 02 13:51:07 2020 +0200
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="48" height="48" enable-background="new 0 0 512 512" version="1.1" viewBox="0 0 48 48" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
+<rect y="8.0005" width="48" height="32" fill="#d80027" stroke-width=".093748"/>
+<polygon transform="matrix(.09375 0 0 .093747 0 .0006792)" points="0 295.88 0 277.33 0 234.67 0 216.11 122.44 216.11 122.44 85.329 140.98 85.329 183.65 85.329 202.2 85.329 202.2 216.11 512 216.11 512 234.67 512 277.33 512 295.88 202.2 295.88 202.2 426.67 183.65 426.67 140.98 426.67 122.44 426.67 122.44 295.88" fill="#f0f0f0"/>
+<polygon transform="matrix(.09375 0 0 .093747 0 .0006792)" points="0 234.67 140.98 234.67 140.98 85.329 183.65 85.329 183.65 234.67 512 234.67 512 277.33 183.65 277.33 183.65 426.67 140.98 426.67 140.98 277.33 0 277.33" fill="#2e52b2"/>
+</svg>
Binary file eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/pl.png has changed
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/pl.svg	Sat May 02 13:51:07 2020 +0200
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="48" height="48" enable-background="new 0 0 512 512" version="1.1" viewBox="0 0 48 48" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
+<g transform="matrix(.09375 0 0 .093751 0 -.00041745)" fill="#f0f0f0">
+	<rect y="85.337" width="512" height="341.33"/>
+	<rect y="85.337" width="512" height="170.66"/>
+</g>
+<rect y="24" width="48" height="16" fill="#d80027" stroke-width=".09375"/>
+</svg>
Binary file eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/pt.png has changed
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/pt.svg	Sat May 02 13:51:07 2020 +0200
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="48" height="48" enable-background="new 0 0 512 512" version="1.1" viewBox="0 0 48 48" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
+<rect y="8" width="48" height="32" fill="#d80027" stroke-width=".09375"/>
+<polygon transform="matrix(.09375 0 0 .093751 0 -.00042211)" points="196.64 426.66 0 426.66 0 85.337 196.64 85.337 196.64 261.56" fill="#6da544"/>
+<ellipse cx="18.435" cy="24" rx="6" ry="6.0001" fill="#ffda44" stroke-width=".09375"/>
+<path d="m15.06 21v3.7501c0 1.864 1.5111 3.375 3.375 3.375 1.8639 0 3.375-1.5111 3.375-3.375v-3.7501z" fill="#d80027" stroke-width=".09375"/>
+<path d="m18.435 25.875c-0.62034 0-1.125-0.50466-1.125-1.125v-1.5h2.2501v1.5c-9.4e-5 0.62026-0.50484 1.125-1.1251 1.125z" fill="#f0f0f0" stroke-width=".09375"/>
+</svg>
Binary file eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/ro.png has changed
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/ro.svg	Sat May 02 13:51:07 2020 +0200
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="48" height="48" enable-background="new 0 0 512 512" version="1.1" viewBox="0 0 48 48" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
+<rect y="8" width="48" height="31.999" fill="#ffda44" stroke-width=".093749"/>
+<rect y="8" width="15.999" height="32" fill="#0052b4" stroke-width=".093749"/>
+<rect x="32.001" y="8" width="15.999" height="32" fill="#d80027" stroke-width=".093749"/>
+</svg>
Binary file eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/ru.png has changed
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/ru.svg	Sat May 02 13:51:07 2020 +0200
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="48" height="48" enable-background="new 0 0 512 512" version="1.1" viewBox="0 0 48 48" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
+<polygon transform="matrix(.09375 0 0 .093747 0 .00053905)" points="512 85.33 0 85.33 0 199.11 0 312.88 0 426.66 512 426.66 512 312.88 512 199.11" fill="#f0f0f0"/>
+<rect y="8.0003" width="48" height="32" fill="#0052b4" stroke-width=".093749"/>
+<rect y="8.0003" width="48" height="10.667" fill="#f0f0f0" stroke-width=".093749"/>
+<rect y="29.332" width="48" height="10.667" fill="#d80027" stroke-width=".093749"/>
+</svg>
Binary file eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/sk.png has changed
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/sk.svg	Sat May 02 13:51:07 2020 +0200
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="48" height="48" enable-background="new 0 0 512 512" version="1.1" viewBox="0 0 48 48" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
+<rect y="8" width="48" height="32" fill="#f0f0f0" stroke-width=".09375"/>
+<rect y="18.435" width="48" height="11.13" fill="#0052b4" stroke-width=".09375"/>
+<rect y="29.565" width="48" height="10.434" fill="#d80027" stroke-width=".09375"/>
+<path d="m12.138 17.043v7.9816c0 4.5403 5.9313 5.9313 5.9313 5.9313s5.9311-1.3913 5.9311-5.9313v-7.9816h-11.862z" fill="#f0f0f0" stroke-width=".09375"/>
+<path d="m13.7 17.277v7.682c0 0.513 0.11391 0.99751 0.33966 1.4517h8.0597c0.22575-0.45413 0.33966-0.93863 0.33966-1.4517v-7.682z" fill="#d80027" stroke-width=".09375"/>
+<polygon transform="matrix(.09375 0 0 .093751 0 -.00042252)" points="185.59 198.58 185.59 212.86 171.31 212.86 171.31 227.14 185.59 227.14 185.59 241.43 164.17 241.43 164.17 255.71 185.59 255.71 185.59 269.99 199.88 269.99 199.88 255.71 221.3 255.71 221.3 241.43 199.88 241.43 199.88 227.14 214.16 227.14 214.16 212.86 199.88 212.86 199.88 198.58" fill="#f0f0f0"/>
+<path d="m15.865 28.28c0.86288 0.54216 1.7494 0.85716 2.2033 0.99713 0.45394-0.14006 1.3404-0.45488 2.2033-0.99713 0.87019-0.54685 1.4803-1.1724 1.8266-1.8693-0.38203-0.27028-0.84816-0.42966-1.3517-0.42966-0.18338 0-0.3615 0.02175-0.53269 0.06159-0.36291-0.82463-1.1867-1.4006-2.1454-1.4006-0.95878 0-1.7825 0.57601-2.1454 1.4006-0.17128-0.03984-0.3495-0.06159-0.53269-0.06159-0.50362 0-0.96975 0.15947-1.3517 0.42966 0.34603 0.69685 0.95606 1.3224 1.8262 1.8693z" fill="#0052b4" stroke-width=".09375"/>
+</svg>
Binary file eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/sl.png has changed
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/sl.svg	Sat May 02 13:51:07 2020 +0200
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="48" height="48" enable-background="new 0 0 512 512" version="1.1" viewBox="0 0 48 48" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
+<rect y="8" width="48" height="32" fill="#f0f0f0" stroke-width=".09375"/>
+<rect y="18.666" width="48" height="10.667" fill="#0052b4" stroke-width=".09375"/>
+<rect y="29.333" width="48" height="10.667" fill="#d80027" stroke-width=".09375"/>
+<path d="m21.901 18.435v1.391c0 3.1951-4.1739 4.1739-4.1739 4.1739s-4.1739-0.97875-4.1739-4.1739v-1.391l-0.01359-4.1426 8.3478-0.02494z" fill="#f0f0f0" stroke-width=".09375"/>
+<path d="m21.901 18.435v1.391c0 3.1951-4.1739 4.1739-4.1739 4.1739s-4.1739-0.97875-4.1739-4.1739v-1.391l-0.01359-4.1426 8.3478-0.02494z" fill="#0052b4" stroke-width=".09375"/>
+<path d="m21.901 18.435v1.391c0 3.1951-4.1739 4.1739-4.1739 4.1739s-4.1739-0.97875-4.1739-4.1739v-1.391l1.392 1.391 2.7819-2.087 2.783 2.087z" fill="#f0f0f0" stroke-width=".09375"/>
+</svg>
Binary file eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/sq.png has changed
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/sq.svg	Sat May 02 13:51:07 2020 +0200
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="48" height="48" enable-background="new 0 0 512 512" version="1.1" viewBox="0 0 48 48" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
+<rect y="8" width="48" height="32" fill="#d80027" stroke-width=".093749"/>
+<path d="m33.043 19.875h-5.7953c0.35784-0.37462 0.57797-0.8817 0.57797-1.4407 0-1.1526-0.93431-2.0869-2.087-2.0869-0.72609 0-1.3653 0.37096-1.7392 0.93354-0.37388-0.56249-1.013-0.93354-1.7392-0.93354-1.1527 0-2.087 0.93429-2.087 2.0869 0 0.55902 0.22022 1.0661 0.57797 1.4407h-5.7953c0 1.5368 1.3386 2.7824 2.8753 2.7824h-0.09262c0 1.5368 1.2458 2.7826 2.7827 2.7826 0 0.49771 0.13116 0.96439 0.36019 1.3683l-2.308 2.3082 1.7708 1.7707 2.5119-2.5119c0.09844 0.03609 0.20025 0.06487 0.30534 0.08465l-1.5179 3.4272 2.3558 2.5469 2.3559-2.5469-1.5179-3.4272c0.10519-0.01969 0.20691-0.04856 0.30534-0.08465l2.5119 2.5119 1.7708-1.7707-2.3082-2.3082c0.22903-0.40396 0.36019-0.87055 0.36019-1.3683 1.5368 0 2.7827-1.2458 2.7827-2.7826h-0.09262c1.5368 9.4e-5 2.8754-1.2456 2.8754-2.7824z" stroke-width=".093749"/>
+</svg>
Binary file eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/sr.png has changed
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/sr.svg	Sat May 02 13:51:07 2020 +0200
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="48" height="48" enable-background="new 0 0 512 512" version="1.1" viewBox="0 0 48 48" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
+<rect y="8" width="48" height="32" fill="#0052b4" stroke-width=".093749"/>
+<rect y="8" width="48" height="10.667" fill="#d80027" stroke-width=".093749"/>
+<rect y="29.332" width="48" height="10.667" fill="#f0f0f0" stroke-width=".093749"/>
+<path d="m12.138 17.043v7.9813c0 4.5401 5.9313 5.9312 5.9313 5.9312s5.9311-1.3912 5.9311-5.9312v-7.9813h-11.862z" fill="#d80027" stroke-width=".093749"/>
+<g transform="matrix(.09375 0 0 .093748 0 .0003755)" fill="#ffda44">
+	<polygon points="155.63 196.63 229.84 196.63 229.84 166.95 214.99 174.37 192.73 152.11 170.47 174.37 155.63 166.95"/>
+	<polygon points="192.93 230.55 144.7 278.78 160.44 294.52 192.93 262.03 225.42 294.52 241.16 278.78"/>
+</g>
+<path d="m22.609 21.912h-2.1098c0.11869-0.20475 0.18759-0.44184 0.18759-0.69542 0-0.76836-0.62297-1.3912-1.3912-1.3912-0.53091 0-0.99197 0.29737-1.2265 0.73461-0.23456-0.43715-0.69572-0.73461-1.2265-0.73461-0.76828 0-1.3912 0.62286-1.3912 1.3912 0 0.25368 0.069 0.49077 0.18759 0.69542h-2.0732c0 0.76836 0.66928 1.3912 1.4376 1.3912h-0.04631c0 0.76836 0.62288 1.3912 1.3912 1.3912 0 0.68033 0.48853 1.2455 1.1338 1.3665l-1.0963 2.475c0.52528 0.21356 1.0994 0.33224 1.7015 0.33224 0.60206 0 1.1761-0.11868 1.7015-0.33224l-1.0963-2.475c0.64528-0.12094 1.1338-0.68614 1.1338-1.3665 0.76838 0 1.3912-0.62286 1.3912-1.3912h-0.04631c0.76866 0 1.4379-0.62286 1.4379-1.3912z" fill="#f0f0f0" stroke-width=".093749"/>
+</svg>
Binary file eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/sv.png has changed
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/sv.svg	Sat May 02 13:51:07 2020 +0200
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="48" height="48" enable-background="new 0 0 512 512" version="1.1" viewBox="0 0 48 48" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
+<rect y="8.0003" width="48" height="32" fill="#0052b4" stroke-width=".093749"/>
+<polygon transform="matrix(.09375 0 0 .093747 0 .00053905)" points="192 426.66 192 288 512 288 512 224 192 224 192 85.33 128 85.33 128 224 0 224 0 288 128 288 128 426.66" fill="#ffda44"/>
+</svg>
Binary file eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/th.png has changed
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/th.svg	Sat May 02 13:51:07 2020 +0200
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="48" height="48" enable-background="new 0 0 512 512" version="1.1" viewBox="0 0 48 48" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
+<rect y="8" width="48" height="32" fill="#f0f0f0" stroke-width=".09375"/>
+<rect y="18.193" width="48" height="11.614" fill="#0052b4" stroke-width=".09375"/>
+<g transform="matrix(.09375 0 0 .093751 0 -.00013939)" fill="#d80027">
+	<rect y="85.334" width="512" height="54.522"/>
+	<rect y="372.14" width="512" height="54.522"/>
+</g>
+</svg>
Binary file eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/tl.png has changed
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/tl.svg	Sat May 02 13:51:07 2020 +0200
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="48" height="48" enable-background="new 0 0 512 512" version="1.1" viewBox="0 0 48 48" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
+
+	<rect y="8" width="48" height="32" fill="#f0f0f0" stroke-width=".09375"/>
+
+<polygon transform="matrix(.09375 0 0 .093751 0 -.00042211)" points="0 85.337 512 85.337 512 256 256 256" fill="#0052b4"/>
+<polygon transform="matrix(.09375 0 0 .093751 0 -.00042211)" points="256 256 512 256 512 426.66 0 426.66" fill="#d80027"/>
+<g transform="matrix(.09375 0 0 .093751 0 -.00042211)" fill="#ffda44">
+	<polygon points="70.731 222.4 41.1 216.74 55.631 243.16 28.343 256 55.631 268.84 41.1 295.26 70.733 289.6 74.486 319.53 95.125 297.51 115.76 319.53 119.52 289.6 149.15 295.26 134.62 268.84 161.91 256 134.62 243.16 149.15 216.74 119.52 222.4 115.76 192.47 95.125 214.49 74.486 192.47"/>
+	<polygon points="21.602 142.86 6.793 137.93 21.673 133.22 21.789 117.61 30.87 130.3 45.749 125.59 36.481 138.15 45.562 150.84 30.753 145.91 21.485 158.47"/>
+	<polygon points="21.602 378.78 6.793 373.85 21.673 369.14 21.789 353.53 30.87 366.23 45.749 361.51 36.481 374.07 45.562 386.77 30.753 381.83 21.485 394.39"/>
+	<polygon points="210.58 260.82 225.39 255.89 210.51 251.18 210.4 235.57 201.31 248.26 186.44 243.55 195.7 256.11 186.62 268.81 201.43 263.87 210.7 276.43"/>
+</g>
+</svg>
Binary file eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/tr.png has changed
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/tr.svg	Sat May 02 13:51:07 2020 +0200
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="48" height="48" enable-background="new 0 0 512 512" version="1.1" viewBox="0 0 48 48" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
+<rect y="8" width="48" height="32" fill="#d80027" stroke-width=".09375"/>
+<g transform="matrix(.09375 0 0 .093751 0 -.00042252)" fill="#f0f0f0">
+	<polygon points="247.18 265.26 218.7 255.98 247.19 246.74 247.21 216.79 264.81 241.03 293.3 231.79 275.68 256.02 293.27 280.26 264.79 270.99 247.17 295.21"/>
+	<path d="m199.2 316.6c-33.469 0-60.602-27.133-60.602-60.602s27.133-60.602 60.602-60.602c10.436 0 20.254 2.639 28.827 7.284-13.448-13.152-31.84-21.269-52.135-21.269-41.193 0-74.586 33.394-74.586 74.586s33.394 74.586 74.586 74.586c20.295 0 38.687-8.117 52.135-21.269-8.572 4.647-18.391 7.286-28.827 7.286z"/>
+</g>
+</svg>
Binary file eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/uk.png has changed
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/uk.svg	Sat May 02 13:51:07 2020 +0200
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="48" height="48" enable-background="new 0 0 512 512" version="1.1" viewBox="0 0 48 48" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
+<rect y="8" width="48" height="32" fill="#ffda44" stroke-width=".09375"/>
+<rect y="8" width="48" height="16" fill="#338af3" stroke-width=".09375"/>
+</svg>
Binary file eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/vi.png has changed
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/vi.svg	Sat May 02 13:51:07 2020 +0200
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="48" height="48" enable-background="new 0 0 512 512" version="1.1" viewBox="0 0 48 48" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
+<polygon transform="matrix(.09375 0 0 .093753 0 -.00058596)" points="0 85.337 0 426.66 196.64 426.66 512 426.66 512 85.337 196.64 85.337" fill="#d80027"/>
+<polygon transform="matrix(.09375 0 0 .093753 0 -.00058596)" points="219.33 270.13 160 227.03 233.34 227.03 256 157.28 278.66 227.03 352 227.03 292.67 270.13 315.33 339.88 256 296.77 196.67 339.88" fill="#ffda44"/>
+</svg>
Binary file eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/zh-CN.png has changed
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/zh-CN.svg	Sat May 02 13:51:07 2020 +0200
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="48" height="48" enable-background="new 0 0 512 512" version="1.1" viewBox="0 0 48 48" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
+<rect y="8" width="48" height="32" fill="#d80027" stroke-width=".093749"/>
+<g transform="matrix(.09375 0 0 .093748 -9.0788 -6.2874)" fill="#ffda44">
+	<polygon points="241.01 234.67 202.64 262.55 217.29 307.66 178.92 279.78 140.55 307.66 155.21 262.55 116.84 234.67 164.27 234.67 178.92 189.57 193.58 234.67"/>
+	<polygon points="242.52 339.59 248.02 322.68 233.63 312.22 251.41 312.22 256.91 295.31 262.41 312.22 280.19 312.22 265.8 322.68 271.3 339.59 256.91 329.14"/>
+	<polygon points="285.56 304.84 280.06 287.93 262.27 287.93 276.66 277.47 271.17 260.56 285.56 271.01 299.94 260.56 294.45 277.47 308.84 287.93 291.05 287.93"/>
+	<polygon points="299.94 251.43 285.56 240.98 271.17 251.43 276.66 234.52 262.27 224.06 280.06 224.06 285.56 207.15 291.05 224.06 308.84 224.06 294.45 234.52"/>
+	<polygon points="280.19 199.77 262.41 199.77 256.91 216.68 251.41 199.77 233.63 199.77 248.02 189.31 242.52 172.4 256.91 182.85 271.3 172.4 265.8 189.31"/>
+</g>
+</svg>
Binary file eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/zh-TW.png has changed
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/zh-TW.svg	Sat May 02 13:51:07 2020 +0200
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="48" height="48" enable-background="new 0 0 512 512" version="1.1" viewBox="0 0 48 48" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
+<rect y="8" width="48" height="32" fill="#d80027" stroke-width=".09375"/>
+<rect y="8" width="24" height="16" fill="#0052b4" stroke-width=".09375"/>
+<polygon transform="matrix(.09375 0 0 .093751 0 -.00042252)" points="106.66 200.06 80.728 205.02 93.442 181.9 69.565 170.67 93.442 159.44 80.728 136.31 106.66 141.27 109.94 115.08 128 134.34 146.06 115.08 149.34 141.27 175.27 136.31 162.56 159.44 186.44 170.67 162.56 181.9 175.27 205.02 149.34 200.06 146.06 226.26 128 206.99 109.94 226.26" fill="#f0f0f0"/>
+<ellipse cx="12" cy="16" rx="2.7193" ry="2.7193" fill="#0052b4" stroke-width=".09375"/>
+<path d="m12 17.818c-1.0024 0-1.8179-0.81563-1.8179-1.8179 0-1.0024 0.81562-1.8179 1.8179-1.8179 1.0024 0 1.8179 0.81563 1.8179 1.8179s-0.81553 1.8179-1.8179 1.8179z" fill="#f0f0f0" stroke-width=".09375"/>
+</svg>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/eric6/Plugins/UiExtensionPlugins/Translator/icons/pronounce-dark.svg	Sat May 02 13:51:07 2020 +0200
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg viewBox="0 0 22 22" xmlns="http://www.w3.org/2000/svg">
+ <defs>
+  <style type="text/css">.ColorScheme-Text {
+        color:#eff0f1;
+      }</style>
+ </defs>
+ <path class="ColorScheme-Text" d="m15 4-12 3.418v1.043 4.5391 0.58203l1 0.28516v2.1328 0.30078l6 1.6992v-1-1.4238l5 1.4238v-1.043-10.914-1.043zm4.0293 0.42773-0.77148 0.63086c1.1373 1.7722 1.7419 3.8337 1.7422 5.9395-4e-3 2.1039-0.61142 4.1625-1.75 5.9316l0.7832 0.64258c1.2816-1.9532 1.9651-4.2381 1.9668-6.5742-4e-3 -2.3352-0.6885-4.6186-1.9707-6.5703zm-5.0293 0.90039v10.344l-10-2.8477v-4.6484l10-2.8477zm2.6895 1.0156-0.78125 0.63867c0.71179 1.2188 1.0885 2.6042 1.0918 4.0156-2e-3 1.4119-0.3784 2.798-1.0898 4.0176l0.78125 0.64062c0.85323-1.4042 1.3058-3.0151 1.3086-4.6582-4e-3 -1.6419-0.45732-3.2515-1.3105-4.6543zm-14.689 1.3594-1 0.28516v0.011719 1 3 1 0.011719l1 0.28516v-0.29688-0.74609-3.5078-0.74609-0.29688zm3 6.4492 4 1.1387v1.4258l-4-1.1328v-1.4316z" fill="currentColor"/>
+</svg>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/eric6/Plugins/UiExtensionPlugins/Translator/icons/pronounce-light.svg	Sat May 02 13:51:07 2020 +0200
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" viewBox="0 0 22 22" xmlns="http://www.w3.org/2000/svg">
+ <defs>
+  <style type="text/css">.ColorScheme-Text {
+        color:#eff0f1;
+      }</style>
+ </defs>
+ <path class="ColorScheme-Text" d="m15 4-12 3.418v1.043 4.5391 0.58203l1 0.28516v2.1328 0.30078l6 1.6992v-1-1.4238l5 1.4238v-1.043-10.914-1.043zm4.0293 0.42773-0.77148 0.63086c1.1373 1.7722 1.7419 3.8337 1.7422 5.9395-4e-3 2.1039-0.61142 4.1625-1.75 5.9316l0.7832 0.64258c1.2816-1.9532 1.9651-4.2381 1.9668-6.5742-4e-3 -2.3352-0.6885-4.6186-1.9707-6.5703zm-5.0293 0.90039v10.344l-10-2.8477v-4.6484l10-2.8477zm2.6895 1.0156-0.78125 0.63867c0.71179 1.2188 1.0885 2.6042 1.0918 4.0156-2e-3 1.4119-0.3784 2.798-1.0898 4.0176l0.78125 0.64062c0.85323-1.4042 1.3058-3.0151 1.3086-4.6582-4e-3 -1.6419-0.45732-3.2515-1.3105-4.6543zm-14.689 1.3594-1 0.28516v0.011719 1 3 1 0.011719l1 0.28516v-0.29688-0.74609-3.5078-0.74609-0.29688zm3 6.4492 4 1.1387v1.4258l-4-1.1328v-1.4316z" fill="#232629"/>
+</svg>
Binary file eric6/Plugins/UiExtensionPlugins/Translator/icons/pronounce.png has changed
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/eric6/Plugins/UiExtensionPlugins/Translator/icons/swap-dark.svg	Sat May 02 13:51:07 2020 +0200
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="22" height="22" version="1.1" viewBox="0 0 352 352" xmlns="http://www.w3.org/2000/svg">
+ <defs>
+  <style type="text/css">.ColorScheme-Text {
+        color:#eff0f1;
+      }</style>
+ </defs>
+ <path d="m272 336v-64h64v-64h-64v-64l-128 96 128 96" fill="#eff0f1"/>
+ <path d="m80 208v-64h-64v-64h64v-64l128 96-128 96" fill="#eff0f1"/>
+</svg>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/eric6/Plugins/UiExtensionPlugins/Translator/icons/swap-light.svg	Sat May 02 13:51:07 2020 +0200
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="22" height="22" version="1.1" viewBox="0 0 352 352" xmlns="http://www.w3.org/2000/svg">
+ <defs>
+  <style type="text/css">.ColorScheme-Text {
+        color:#eff0f1;
+      }</style>
+ </defs>
+ <path d="m272 336v-64h64v-64h-64v-64l-128 96 128 96" fill="#232629"/>
+ <path d="m80 208v-64h-64v-64h64v-64l128 96-128 96" fill="#232629"/>
+</svg>
Binary file eric6/Plugins/UiExtensionPlugins/Translator/icons/swap.png has changed
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/eric6/Plugins/UiExtensionPlugins/Translator/icons/translate-dark.svg	Sat May 02 13:51:07 2020 +0200
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="22" height="22" version="1.1" viewBox="0 0 352 352" xmlns="http://www.w3.org/2000/svg">
+ <defs>
+  <style type="text/css">.ColorScheme-Text {
+        color:#eff0f1;
+      }</style>
+ </defs>
+ <path d="m122.67 336v-106.67h-106.67v-106.67h106.67v-106.67l213.33 160-213.33 160" fill="#eff0f1" stroke-width="1.6667"/>
+</svg>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/eric6/Plugins/UiExtensionPlugins/Translator/icons/translate-light.svg	Sat May 02 13:51:07 2020 +0200
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="22" height="22" version="1.1" viewBox="0 0 352 352" xmlns="http://www.w3.org/2000/svg">
+ <defs>
+  <style type="text/css">.ColorScheme-Text {
+        color:#eff0f1;
+      }</style>
+ </defs>
+ <path d="m122.67 336v-106.67h-106.67v-106.67h106.67v-106.67l213.33 160-213.33 160" fill="#232629" stroke-width="1.6667"/>
+</svg>
Binary file eric6/Plugins/UiExtensionPlugins/Translator/icons/translate.png has changed
--- a/eric6/Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.py	Sat May 02 13:51:07 2020 +0200
@@ -38,7 +38,7 @@
         super(GitArchiveDataDialog, self).__init__(parent)
         self.setupUi(self)
        
-        self.fileButton.setIcon(UI.PixmapCache.getIcon("open.png"))
+        self.fileButton.setIcon(UI.PixmapCache.getIcon("open"))
         
         self.buttonBox.button(QDialogButtonBox.Ok).setEnabled(False)
         
--- a/eric6/Plugins/VcsPlugins/vcsGit/GitCopyDialog.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/Plugins/VcsPlugins/vcsGit/GitCopyDialog.py	Sat May 02 13:51:07 2020 +0200
@@ -38,7 +38,7 @@
         super(GitCopyDialog, self).__init__(parent)
         self.setupUi(self)
         
-        self.dirButton.setIcon(UI.PixmapCache.getIcon("open.png"))
+        self.dirButton.setIcon(UI.PixmapCache.getIcon("open"))
        
         self.source = source
         if os.path.isdir(self.source):
--- a/eric6/Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py	Sat May 02 13:51:07 2020 +0200
@@ -87,8 +87,8 @@
         self.filesTree.headerItem().setText(self.filesTree.columnCount(), "")
         self.filesTree.header().setSortIndicator(1, Qt.AscendingOrder)
         
-        self.upButton.setIcon(UI.PixmapCache.getIcon("1uparrow.png"))
-        self.downButton.setIcon(UI.PixmapCache.getIcon("1downarrow.png"))
+        self.upButton.setIcon(UI.PixmapCache.getIcon("1uparrow"))
+        self.downButton.setIcon(UI.PixmapCache.getIcon("1downarrow"))
         
         self.refreshButton = self.buttonBox.addButton(
             self.tr("&Refresh"), QDialogButtonBox.ActionRole)
@@ -96,8 +96,8 @@
             self.tr("Press to refresh the list of commits"))
         self.refreshButton.setEnabled(False)
         
-        self.findPrevButton.setIcon(UI.PixmapCache.getIcon("1leftarrow.png"))
-        self.findNextButton.setIcon(UI.PixmapCache.getIcon("1rightarrow.png"))
+        self.findPrevButton.setIcon(UI.PixmapCache.getIcon("1leftarrow"))
+        self.findNextButton.setIcon(UI.PixmapCache.getIcon("1rightarrow"))
         self.__findBackwards = False
         
         self.modeComboBox.addItem(self.tr("Find"), "find")
@@ -350,7 +350,7 @@
             "Show the most recent tag reachable from a commit"))
         
         self.actionsButton.setIcon(
-            UI.PixmapCache.getIcon("actionsToolButton.png"))
+            UI.PixmapCache.getIcon("actionsToolButton"))
         self.actionsButton.setMenu(self.__actionsMenu)
     
     def __initData(self):
--- a/eric6/Plugins/VcsPlugins/vcsGit/GitNewProjectOptionsDialog.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/Plugins/VcsPlugins/vcsGit/GitNewProjectOptionsDialog.py	Sat May 02 13:51:07 2020 +0200
@@ -40,10 +40,10 @@
         
         self.__vcs = vcs
         
-        self.projectDirButton.setIcon(UI.PixmapCache.getIcon("open.png"))
-        self.vcsUrlButton.setIcon(UI.PixmapCache.getIcon("open.png"))
+        self.projectDirButton.setIcon(UI.PixmapCache.getIcon("open"))
+        self.vcsUrlButton.setIcon(UI.PixmapCache.getIcon("open"))
         self.vcsUrlClearHistoryButton.setIcon(
-            UI.PixmapCache.getIcon("editDelete.png"))
+            UI.PixmapCache.getIcon("editDelete"))
         
         vcsUrlHistory = self.__vcs.getPlugin().getPreferences(
             "RepositoryUrlHistory")
--- a/eric6/Plugins/VcsPlugins/vcsGit/GitPatchFilesDialog.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/Plugins/VcsPlugins/vcsGit/GitPatchFilesDialog.py	Sat May 02 13:51:07 2020 +0200
@@ -42,10 +42,10 @@
             self.eofCheckBox.setChecked(patchCheckData[2])
             self.lineCountsCheckBox.setChecked(patchCheckData[3])
         
-        self.addButton.setIcon(UI.PixmapCache.getIcon("plus.png"))
-        self.deleteButton.setIcon(UI.PixmapCache.getIcon("minus.png"))
-        self.upButton.setIcon(UI.PixmapCache.getIcon("1uparrow.png"))
-        self.downButton.setIcon(UI.PixmapCache.getIcon("1downarrow.png"))
+        self.addButton.setIcon(UI.PixmapCache.getIcon("plus"))
+        self.deleteButton.setIcon(UI.PixmapCache.getIcon("minus"))
+        self.upButton.setIcon(UI.PixmapCache.getIcon("1uparrow"))
+        self.downButton.setIcon(UI.PixmapCache.getIcon("1downarrow"))
         
         self.__okButton = self.buttonBox.button(QDialogButtonBox.Ok)
         self.__okButton.setEnabled(len(self.__getPatchFilesList()) > 0)
--- a/eric6/Plugins/VcsPlugins/vcsGit/GitStatusDialog.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/Plugins/VcsPlugins/vcsGit/GitStatusDialog.py	Sat May 02 13:51:07 2020 +0200
@@ -101,29 +101,29 @@
         
         self.__lDiffMenu = QMenu()
         self.__stageLinesAct = self.__lDiffMenu.addAction(
-            UI.PixmapCache.getIcon("vcsAdd.png"),
+            UI.PixmapCache.getIcon("vcsAdd"),
             self.tr("Stage Selected Lines"),
             self.__stageHunkOrLines)
         self.__revertLinesAct = self.__lDiffMenu.addAction(
-            UI.PixmapCache.getIcon("vcsRevert.png"),
+            UI.PixmapCache.getIcon("vcsRevert"),
             self.tr("Revert Selected Lines"),
             self.__revertHunkOrLines)
         self.__stageHunkAct = self.__lDiffMenu.addAction(
-            UI.PixmapCache.getIcon("vcsAdd.png"),
+            UI.PixmapCache.getIcon("vcsAdd"),
             self.tr("Stage Hunk"),
             self.__stageHunkOrLines)
         self.__revertHunkAct = self.__lDiffMenu.addAction(
-            UI.PixmapCache.getIcon("vcsRevert.png"),
+            UI.PixmapCache.getIcon("vcsRevert"),
             self.tr("Revert Hunk"),
             self.__revertHunkOrLines)
         
         self.__rDiffMenu = QMenu()
         self.__unstageLinesAct = self.__rDiffMenu.addAction(
-            UI.PixmapCache.getIcon("vcsRemove.png"),
+            UI.PixmapCache.getIcon("vcsRemove"),
             self.tr("Unstage Selected Lines"),
             self.__unstageHunkOrLines)
         self.__unstageHunkAct = self.__rDiffMenu.addAction(
-            UI.PixmapCache.getIcon("vcsRemove.png"),
+            UI.PixmapCache.getIcon("vcsRemove"),
             self.tr("Unstage Hunk"),
             self.__unstageHunkOrLines)
         
@@ -257,7 +257,7 @@
             "Adjusts the width of all columns to their contents"))
         
         self.actionsButton.setIcon(
-            UI.PixmapCache.getIcon("actionsToolButton.png"))
+            UI.PixmapCache.getIcon("actionsToolButton"))
         self.actionsButton.setMenu(self.__actionsMenu)
     
     def closeEvent(self, e):
--- a/eric6/Plugins/VcsPlugins/vcsGit/GitSubmoduleAddDialog.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/Plugins/VcsPlugins/vcsGit/GitSubmoduleAddDialog.py	Sat May 02 13:51:07 2020 +0200
@@ -43,10 +43,10 @@
         self.__vcs = vcs
         self.__repodir = repodir
         
-        self.submoduleDirButton.setIcon(UI.PixmapCache.getIcon("open.png"))
-        self.submoduleUrlButton.setIcon(UI.PixmapCache.getIcon("open.png"))
+        self.submoduleDirButton.setIcon(UI.PixmapCache.getIcon("open"))
+        self.submoduleUrlButton.setIcon(UI.PixmapCache.getIcon("open"))
         self.submoduleUrlClearHistoryButton.setIcon(
-            UI.PixmapCache.getIcon("editDelete.png"))
+            UI.PixmapCache.getIcon("editDelete"))
         
         submoduleUrlHistory = self.__vcs.getPlugin().getPreferences(
             "RepositoryUrlHistory")
--- a/eric6/Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py	Sat May 02 13:51:07 2020 +0200
@@ -180,28 +180,28 @@
         menu.addSeparator()
         
         act = menu.addAction(
-            UI.PixmapCache.getIcon("vcsCommit.png"),
+            UI.PixmapCache.getIcon("vcsCommit"),
             self.tr('Commit changes to repository...'),
             self._VCSCommit)
         self.vcsMenuActions.append(act)
         menu.addSeparator()
         act = menu.addAction(
-            UI.PixmapCache.getIcon("vcsAdd.png"),
+            UI.PixmapCache.getIcon("vcsAdd"),
             self.tr('Add/Stage to repository'),
             self._VCSAdd)
         act = menu.addAction(
-            UI.PixmapCache.getIcon("vcsRevert.png"),
+            UI.PixmapCache.getIcon("vcsRevert"),
             self.tr('Unstage changes'),
             self.__GitUnstage)
         self.vcsMenuActions.append(act)
         menu.addSeparator()
         act = menu.addAction(
-            UI.PixmapCache.getIcon("vcsRemove.png"),
+            UI.PixmapCache.getIcon("vcsRemove"),
             self.tr('Remove from repository (and disk)'),
             self._VCSRemove)
         self.vcsMenuActions.append(act)
         act = menu.addAction(
-            UI.PixmapCache.getIcon("vcsRemove.png"),
+            UI.PixmapCache.getIcon("vcsRemove"),
             self.tr('Remove from repository only'),
             self.__GitForget)
         self.vcsMenuActions.append(act)
@@ -212,30 +212,30 @@
         self.vcsMenuActions.append(act)
         menu.addSeparator()
         act = menu.addAction(
-            UI.PixmapCache.getIcon("vcsLog.png"),
+            UI.PixmapCache.getIcon("vcsLog"),
             self.tr('Show log browser'), self._VCSLogBrowser)
         self.vcsMenuActions.append(act)
         menu.addSeparator()
         act = menu.addAction(
-            UI.PixmapCache.getIcon("vcsStatus.png"),
+            UI.PixmapCache.getIcon("vcsStatus"),
             self.tr('Show status'), self._VCSStatus)
         self.vcsMenuActions.append(act)
         menu.addSeparator()
         act = menu.addAction(
-            UI.PixmapCache.getIcon("vcsDiff.png"),
+            UI.PixmapCache.getIcon("vcsDiff"),
             self.tr('Show differences'), self._VCSDiff)
         self.vcsMenuActions.append(act)
         act = menu.addAction(
-            UI.PixmapCache.getIcon("vcsSbsDiff.png"),
+            UI.PixmapCache.getIcon("vcsSbsDiff"),
             self.tr('Show differences side-by-side'), self.__GitSbsDiff)
         self.vcsMenuActions.append(act)
         act = menu.addAction(
-            UI.PixmapCache.getIcon("vcsDiff.png"),
+            UI.PixmapCache.getIcon("vcsDiff"),
             self.tr('Show differences (extended)'),
             self.__GitExtendedDiff)
         self.vcsMenuActions.append(act)
         act = menu.addAction(
-            UI.PixmapCache.getIcon("vcsSbsDiff.png"),
+            UI.PixmapCache.getIcon("vcsSbsDiff"),
             self.tr('Show differences side-by-side (extended)'),
             self.__GitSbsExtendedDiff)
         self.vcsMenuActions.append(act)
@@ -246,7 +246,7 @@
         self.vcsMenuActions.append(self.annotateAct)
         menu.addSeparator()
         act = menu.addAction(
-            UI.PixmapCache.getIcon("vcsRevert.png"),
+            UI.PixmapCache.getIcon("vcsRevert"),
             self.tr('Revert changes'), self.__GitRevert)
         self.vcsMenuActions.append(act)
         menu.addSeparator()
@@ -288,48 +288,48 @@
         menu.addSeparator()
         
         act = menu.addAction(
-            UI.PixmapCache.getIcon("vcsCommit.png"),
+            UI.PixmapCache.getIcon("vcsCommit"),
             self.tr('Commit changes to repository...'),
             self._VCSCommit)
         self.vcsMultiMenuActions.append(act)
         menu.addSeparator()
         act = menu.addAction(
-            UI.PixmapCache.getIcon("vcsAdd.png"),
+            UI.PixmapCache.getIcon("vcsAdd"),
             self.tr('Add/Stage to repository'), self._VCSAdd)
         act = menu.addAction(
-            UI.PixmapCache.getIcon("vcsRevert.png"),
+            UI.PixmapCache.getIcon("vcsRevert"),
             self.tr('Unstage changes'),
             self.__GitUnstage)
         self.vcsMultiMenuActions.append(act)
         menu.addSeparator()
         act = menu.addAction(
-            UI.PixmapCache.getIcon("vcsRemove.png"),
+            UI.PixmapCache.getIcon("vcsRemove"),
             self.tr('Remove from repository (and disk)'),
             self._VCSRemove)
         self.vcsMultiMenuActions.append(act)
         act = menu.addAction(
-            UI.PixmapCache.getIcon("vcsRemove.png"),
+            UI.PixmapCache.getIcon("vcsRemove"),
             self.tr('Remove from repository only'),
             self.__GitForget)
         self.vcsMultiMenuActions.append(act)
         menu.addSeparator()
         act = menu.addAction(
-            UI.PixmapCache.getIcon("vcsStatus.png"),
+            UI.PixmapCache.getIcon("vcsStatus"),
             self.tr('Show status'), self._VCSStatus)
         self.vcsMultiMenuActions.append(act)
         menu.addSeparator()
         act = menu.addAction(
-            UI.PixmapCache.getIcon("vcsDiff.png"),
+            UI.PixmapCache.getIcon("vcsDiff"),
             self.tr('Show differences'), self._VCSDiff)
         self.vcsMultiMenuActions.append(act)
         act = menu.addAction(
-            UI.PixmapCache.getIcon("vcsDiff.png"),
+            UI.PixmapCache.getIcon("vcsDiff"),
             self.tr('Show differences (extended)'),
             self.__GitExtendedDiff)
         self.vcsMultiMenuActions.append(act)
         menu.addSeparator()
         act = menu.addAction(
-            UI.PixmapCache.getIcon("vcsRevert.png"),
+            UI.PixmapCache.getIcon("vcsRevert"),
             self.tr('Revert changes'), self.__GitRevert)
         self.vcsMultiMenuActions.append(act)
         menu.addSeparator()
@@ -406,22 +406,22 @@
         menu.addSeparator()
         
         act = menu.addAction(
-            UI.PixmapCache.getIcon("vcsCommit.png"),
+            UI.PixmapCache.getIcon("vcsCommit"),
             self.tr('Commit changes to repository...'),
             self._VCSCommit)
         self.vcsDirMenuActions.append(act)
         menu.addSeparator()
         act = menu.addAction(
-            UI.PixmapCache.getIcon("vcsAdd.png"),
+            UI.PixmapCache.getIcon("vcsAdd"),
             self.tr('Add/Stage to repository'), self._VCSAdd)
         act = menu.addAction(
-            UI.PixmapCache.getIcon("vcsRevert.png"),
+            UI.PixmapCache.getIcon("vcsRevert"),
             self.tr('Unstage changes'),
             self.__GitUnstage)
         self.vcsDirMenuActions.append(act)
         menu.addSeparator()
         act = menu.addAction(
-            UI.PixmapCache.getIcon("vcsRemove.png"),
+            UI.PixmapCache.getIcon("vcsRemove"),
             self.tr('Remove from repository (and disk)'),
             self._VCSRemove)
         self.vcsDirMenuActions.append(act)
@@ -432,27 +432,27 @@
         self.vcsDirMenuActions.append(act)
         menu.addSeparator()
         act = menu.addAction(
-            UI.PixmapCache.getIcon("vcsLog.png"),
+            UI.PixmapCache.getIcon("vcsLog"),
             self.tr('Show log browser'), self._VCSLogBrowser)
         self.vcsDirMenuActions.append(act)
         menu.addSeparator()
         act = menu.addAction(
-            UI.PixmapCache.getIcon("vcsStatus.png"),
+            UI.PixmapCache.getIcon("vcsStatus"),
             self.tr('Show status'), self._VCSStatus)
         self.vcsDirMenuActions.append(act)
         menu.addSeparator()
         act = menu.addAction(
-            UI.PixmapCache.getIcon("vcsDiff.png"),
+            UI.PixmapCache.getIcon("vcsDiff"),
             self.tr('Show differences'), self._VCSDiff)
         self.vcsDirMenuActions.append(act)
         act = menu.addAction(
-            UI.PixmapCache.getIcon("vcsDiff.png"),
+            UI.PixmapCache.getIcon("vcsDiff"),
             self.tr('Show differences (extended)'),
             self.__GitExtendedDiff)
         self.vcsDirMenuActions.append(act)
         menu.addSeparator()
         act = menu.addAction(
-            UI.PixmapCache.getIcon("vcsRevert.png"),
+            UI.PixmapCache.getIcon("vcsRevert"),
             self.tr('Revert changes'), self.__GitRevert)
         self.vcsDirMenuActions.append(act)
         menu.addSeparator()
@@ -496,43 +496,43 @@
         menu.addSeparator()
         
         act = menu.addAction(
-            UI.PixmapCache.getIcon("vcsCommit.png"),
+            UI.PixmapCache.getIcon("vcsCommit"),
             self.tr('Commit changes to repository...'),
             self._VCSCommit)
         self.vcsDirMultiMenuActions.append(act)
         menu.addSeparator()
         act = menu.addAction(
-            UI.PixmapCache.getIcon("vcsAdd.png"),
+            UI.PixmapCache.getIcon("vcsAdd"),
             self.tr('Add/Stage to repository'), self._VCSAdd)
         act = menu.addAction(
-            UI.PixmapCache.getIcon("vcsRevert.png"),
+            UI.PixmapCache.getIcon("vcsRevert"),
             self.tr('Unstage changes'),
             self.__GitUnstage)
         self.vcsDirMultiMenuActions.append(act)
         menu.addSeparator()
         act = menu.addAction(
-            UI.PixmapCache.getIcon("vcsRemove.png"),
+            UI.PixmapCache.getIcon("vcsRemove"),
             self.tr('Remove from repository (and disk)'),
             self._VCSRemove)
         self.vcsDirMultiMenuActions.append(act)
         menu.addSeparator()
         act = menu.addAction(
-            UI.PixmapCache.getIcon("vcsStatus.png"),
+            UI.PixmapCache.getIcon("vcsStatus"),
             self.tr('Show status'), self._VCSStatus)
         self.vcsDirMultiMenuActions.append(act)
         menu.addSeparator()
         act = menu.addAction(
-            UI.PixmapCache.getIcon("vcsDiff.png"),
+            UI.PixmapCache.getIcon("vcsDiff"),
             self.tr('Show differences'), self._VCSDiff)
         self.vcsDirMultiMenuActions.append(act)
         act = menu.addAction(
-            UI.PixmapCache.getIcon("vcsDiff.png"),
+            UI.PixmapCache.getIcon("vcsDiff"),
             self.tr('Show differences (extended)'),
             self.__GitExtendedDiff)
         self.vcsDirMultiMenuActions.append(act)
         menu.addSeparator()
         act = menu.addAction(
-            UI.PixmapCache.getIcon("vcsRevert.png"),
+            UI.PixmapCache.getIcon("vcsRevert"),
             self.tr('Revert changes'), self.__GitRevert)
         self.vcsDirMultiMenuActions.append(act)
         menu.addSeparator()
@@ -620,12 +620,14 @@
             fn = itm.dirName()
         isFile = os.path.isfile(fn)
         movefiles = self.browser.project.getFiles(fn)
+        self.browser.project.stopFileSystemMonitoring()
         if self.vcs.vcsMove(fn, self.project):
             if isFile:
                 self.browser.closeSourceWindow.emit(fn)
             else:
                 for mf in movefiles:
                     self.browser.closeSourceWindow.emit(mf)
+        self.browser.project.startFileSystemMonitoring()
     
     def __GitExtendedDiff(self):
         """
--- a/eric6/Plugins/VcsPlugins/vcsGit/ProjectHelper.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/Plugins/VcsPlugins/vcsGit/ProjectHelper.py	Sat May 02 13:51:07 2020 +0200
@@ -71,7 +71,7 @@
         """
         self.vcsNewAct = E5Action(
             self.tr('New from repository'),
-            UI.PixmapCache.getIcon("vcsCheckout.png"),
+            UI.PixmapCache.getIcon("vcsCheckout"),
             self.tr('&New from repository...'), 0, 0,
             self, 'git_new')
         self.vcsNewAct.setStatusTip(self.tr(
@@ -87,7 +87,7 @@
         
         self.gitFetchAct = E5Action(
             self.tr('Fetch changes'),
-            UI.PixmapCache.getIcon("vcsUpdate.png"),
+            UI.PixmapCache.getIcon("vcsUpdate"),
             self.tr('Fetch changes'),
             0, 0, self, 'git_fetch')
         self.gitFetchAct.setStatusTip(self.tr(
@@ -103,7 +103,7 @@
         
         self.gitPullAct = E5Action(
             self.tr('Pull changes'),
-            UI.PixmapCache.getIcon("vcsUpdate.png"),
+            UI.PixmapCache.getIcon("vcsUpdate"),
             self.tr('Pull changes'),
             0, 0, self, 'git_pull')
         self.gitPullAct.setStatusTip(self.tr(
@@ -119,7 +119,7 @@
         
         self.vcsCommitAct = E5Action(
             self.tr('Commit changes to repository'),
-            UI.PixmapCache.getIcon("vcsCommit.png"),
+            UI.PixmapCache.getIcon("vcsCommit"),
             self.tr('Commit changes to repository...'), 0, 0, self,
             'git_commit')
         self.vcsCommitAct.setStatusTip(self.tr(
@@ -135,7 +135,7 @@
         
         self.gitPushAct = E5Action(
             self.tr('Push changes'),
-            UI.PixmapCache.getIcon("vcsCommit.png"),
+            UI.PixmapCache.getIcon("vcsCommit"),
             self.tr('Push changes'),
             0, 0, self, 'git_push')
         self.gitPushAct.setStatusTip(self.tr(
@@ -151,7 +151,7 @@
         
         self.vcsExportAct = E5Action(
             self.tr('Export from repository'),
-            UI.PixmapCache.getIcon("vcsExport.png"),
+            UI.PixmapCache.getIcon("vcsExport"),
             self.tr('&Export from repository...'),
             0, 0, self, 'git_export_repo')
         self.vcsExportAct.setStatusTip(self.tr(
@@ -166,7 +166,7 @@
         
         self.gitLogBrowserAct = E5Action(
             self.tr('Show log browser'),
-            UI.PixmapCache.getIcon("vcsLog.png"),
+            UI.PixmapCache.getIcon("vcsLog"),
             self.tr('Show log browser'),
             0, 0, self, 'git_log_browser')
         self.gitLogBrowserAct.setStatusTip(self.tr(
@@ -183,7 +183,7 @@
         
         self.gitReflogBrowserAct = E5Action(
             self.tr('Show reflog browser'),
-            UI.PixmapCache.getIcon("vcsLog.png"),
+            UI.PixmapCache.getIcon("vcsLog"),
             self.tr('Show reflog browser'),
             0, 0, self, 'git_reflog_browser')
         self.gitReflogBrowserAct.setStatusTip(self.tr(
@@ -200,7 +200,7 @@
         
         self.vcsDiffAct = E5Action(
             self.tr('Show differences'),
-            UI.PixmapCache.getIcon("vcsDiff.png"),
+            UI.PixmapCache.getIcon("vcsDiff"),
             self.tr('Show &differences...'),
             0, 0, self, 'git_diff')
         self.vcsDiffAct.setStatusTip(self.tr(
@@ -216,7 +216,7 @@
         
         self.gitExtDiffAct = E5Action(
             self.tr('Show differences (extended)'),
-            UI.PixmapCache.getIcon("vcsDiff.png"),
+            UI.PixmapCache.getIcon("vcsDiff"),
             self.tr('Show differences (extended) ...'),
             0, 0, self, 'git_extendeddiff')
         self.gitExtDiffAct.setStatusTip(self.tr(
@@ -232,7 +232,7 @@
         
         self.vcsStatusAct = E5Action(
             self.tr('Show status'),
-            UI.PixmapCache.getIcon("vcsStatus.png"),
+            UI.PixmapCache.getIcon("vcsStatus"),
             self.tr('Show &status...'),
             0, 0, self, 'git_status')
         self.vcsStatusAct.setStatusTip(self.tr(
@@ -247,7 +247,7 @@
         
         self.vcsSwitchAct = E5Action(
             self.tr('Switch'),
-            UI.PixmapCache.getIcon("vcsSwitch.png"),
+            UI.PixmapCache.getIcon("vcsSwitch"),
             self.tr('S&witch...'),
             0, 0, self, 'git_switch')
         self.vcsSwitchAct.setStatusTip(self.tr(
@@ -263,7 +263,7 @@
         
         self.vcsTagAct = E5Action(
             self.tr('Tag in repository'),
-            UI.PixmapCache.getIcon("vcsTag.png"),
+            UI.PixmapCache.getIcon("vcsTag"),
             self.tr('&Tag in repository...'),
             0, 0, self, 'git_tag')
         self.vcsTagAct.setStatusTip(self.tr(
@@ -352,7 +352,7 @@
         
         self.gitBranchAct = E5Action(
             self.tr('Branch in repository'),
-            UI.PixmapCache.getIcon("vcsBranch.png"),
+            UI.PixmapCache.getIcon("vcsBranch"),
             self.tr('&Branch in repository...'),
             0, 0, self, 'git_branch')
         self.gitBranchAct.setStatusTip(self.tr(
@@ -396,7 +396,7 @@
         
         self.vcsRevertAct = E5Action(
             self.tr('Revert changes'),
-            UI.PixmapCache.getIcon("vcsRevert.png"),
+            UI.PixmapCache.getIcon("vcsRevert"),
             self.tr('Re&vert changes'),
             0, 0, self, 'git_revert')
         self.vcsRevertAct.setStatusTip(self.tr(
@@ -411,7 +411,7 @@
         
         self.gitUnstageAct = E5Action(
             self.tr('Unstage changes'),
-            UI.PixmapCache.getIcon("vcsRevert.png"),
+            UI.PixmapCache.getIcon("vcsRevert"),
             self.tr('&Unstage changes'),
             0, 0, self, 'git_revert')
         self.gitUnstageAct.setStatusTip(self.tr(
@@ -426,7 +426,7 @@
         
         self.vcsMergeAct = E5Action(
             self.tr('Merge'),
-            UI.PixmapCache.getIcon("vcsMerge.png"),
+            UI.PixmapCache.getIcon("vcsMerge"),
             self.tr('Mer&ge changes...'),
             0, 0, self, 'git_merge')
         self.vcsMergeAct.setStatusTip(self.tr(
@@ -632,7 +632,7 @@
         
         self.gitCherryPickAct = E5Action(
             self.tr('Copy Commits'),
-            UI.PixmapCache.getIcon("vcsGraft.png"),
+            UI.PixmapCache.getIcon("vcsGraft"),
             self.tr('Copy Commits'),
             0, 0, self, 'git_cherrypick')
         self.gitCherryPickAct.setStatusTip(self.tr(
@@ -1083,7 +1083,7 @@
         
         self.gitBisectLogBrowserAct = E5Action(
             self.tr('Show bisect log browser'),
-            UI.PixmapCache.getIcon("vcsLog.png"),
+            UI.PixmapCache.getIcon("vcsLog"),
             self.tr('Show bisect log browser'),
             0, 0, self, 'git_bisect_log_browser')
         self.gitBisectLogBrowserAct.setStatusTip(self.tr(
@@ -1424,7 +1424,7 @@
         self.subMenus.append(bisectMenu)
         
         tagsMenu = QMenu(self.tr("Tags"), menu)
-        tagsMenu.setIcon(UI.PixmapCache.getIcon("vcsTag.png"))
+        tagsMenu.setIcon(UI.PixmapCache.getIcon("vcsTag"))
         tagsMenu.setTearOffEnabled(True)
         tagsMenu.addAction(self.vcsTagAct)
         tagsMenu.addAction(self.gitTagListAct)
@@ -1432,7 +1432,7 @@
         self.subMenus.append(tagsMenu)
         
         branchesMenu = QMenu(self.tr("Branches"), menu)
-        branchesMenu.setIcon(UI.PixmapCache.getIcon("vcsBranch.png"))
+        branchesMenu.setIcon(UI.PixmapCache.getIcon("vcsBranch"))
         branchesMenu.setTearOffEnabled(True)
         branchesMenu.addAction(self.gitBranchAct)
         branchesMenu.addSeparator()
@@ -1465,7 +1465,7 @@
         remotesMenu.addAction(self.gitRemotePruneAct)
         
         cherrypickMenu = QMenu(self.tr("Cherry-pick"), menu)
-        cherrypickMenu.setIcon(UI.PixmapCache.getIcon("vcsGraft.png"))
+        cherrypickMenu.setIcon(UI.PixmapCache.getIcon("vcsGraft"))
         cherrypickMenu.setTearOffEnabled(True)
         cherrypickMenu.addAction(self.gitCherryPickAct)
         cherrypickMenu.addAction(self.gitCherryPickContinueAct)
--- a/eric6/Plugins/VcsPlugins/vcsMercurial/FetchExtension/ProjectHelper.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/Plugins/VcsPlugins/vcsMercurial/FetchExtension/ProjectHelper.py	Sat May 02 13:51:07 2020 +0200
@@ -34,7 +34,7 @@
         """
         self.hgFetchAct = E5Action(
             self.tr('Fetch changes'),
-            UI.PixmapCache.getIcon("vcsUpdate.png"),
+            UI.PixmapCache.getIcon("vcsUpdate"),
             self.tr('Fetch changes'),
             0, 0, self, 'mercurial_fetch')
         self.hgFetchAct.setStatusTip(self.tr(
@@ -59,7 +59,7 @@
         @return populated menu (QMenu)
         """
         menu = QMenu(self.menuTitle(), mainMenu)
-        menu.setIcon(UI.PixmapCache.getIcon("vcsUpdate.png"))
+        menu.setIcon(UI.PixmapCache.getIcon("vcsUpdate"))
         menu.setTearOffEnabled(True)
         
         menu.addAction(self.hgFetchAct)
--- a/eric6/Plugins/VcsPlugins/vcsMercurial/GpgExtension/ProjectHelper.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/Plugins/VcsPlugins/vcsMercurial/GpgExtension/ProjectHelper.py	Sat May 02 13:51:07 2020 +0200
@@ -33,7 +33,7 @@
         """
         self.hgGpgListAct = E5Action(
             self.tr('List Signed Changesets'),
-            UI.PixmapCache.getIcon("changesetSignList.png"),
+            UI.PixmapCache.getIcon("changesetSignList"),
             self.tr('List Signed Changesets...'),
             0, 0, self, 'mercurial_gpg_list')
         self.hgGpgListAct.setStatusTip(self.tr(
@@ -48,7 +48,7 @@
         
         self.hgGpgVerifyAct = E5Action(
             self.tr('Verify Signatures'),
-            UI.PixmapCache.getIcon("changesetSignVerify.png"),
+            UI.PixmapCache.getIcon("changesetSignVerify"),
             self.tr('Verify Signatures'),
             0, 0, self, 'mercurial_gpg_verify')
         self.hgGpgVerifyAct.setStatusTip(self.tr(
@@ -64,7 +64,7 @@
         
         self.hgGpgSignAct = E5Action(
             self.tr('Sign Revision'),
-            UI.PixmapCache.getIcon("changesetSign.png"),
+            UI.PixmapCache.getIcon("changesetSign"),
             self.tr('Sign Revision'),
             0, 0, self, 'mercurial_gpg_sign')
         self.hgGpgSignAct.setStatusTip(self.tr(
@@ -85,7 +85,7 @@
         @return populated menu (QMenu)
         """
         menu = QMenu(self.menuTitle(), mainMenu)
-        menu.setIcon(UI.PixmapCache.getIcon("changesetSign.png"))
+        menu.setIcon(UI.PixmapCache.getIcon("changesetSign"))
         menu.setTearOffEnabled(True)
         
         menu.addAction(self.hgGpgListAct)
--- a/eric6/Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py	Sat May 02 13:51:07 2020 +0200
@@ -259,22 +259,22 @@
         if itm is not None:
             menu = QMenu(self.bookmarksList)
             menu.addAction(
-                UI.PixmapCache.getIcon("vcsSwitch.png"),
+                UI.PixmapCache.getIcon("vcsSwitch"),
                 self.tr("Switch to"), self.__switchTo)
             menu.addSeparator()
             menu.addAction(
-                UI.PixmapCache.getIcon("deleteBookmark.png"),
+                UI.PixmapCache.getIcon("deleteBookmark"),
                 self.tr("Delete"), self.__deleteBookmark)
             menu.addAction(
-                UI.PixmapCache.getIcon("renameBookmark.png"),
+                UI.PixmapCache.getIcon("renameBookmark"),
                 self.tr("Rename"), self.__renameBookmark)
             menu.addSeparator()
             act = menu.addAction(
-                UI.PixmapCache.getIcon("pullBookmark.png"),
+                UI.PixmapCache.getIcon("pullBookmark"),
                 self.tr("Pull"), self.__pullBookmark)
             act.setEnabled(self.vcs.canPull())
             act = menu.addAction(
-                UI.PixmapCache.getIcon("pushBookmark.png"),
+                UI.PixmapCache.getIcon("pushBookmark"),
                 self.tr("Push"), self.__pushBookmark)
             act.setEnabled(self.vcs.canPush())
             menu.popup(self.bookmarksList.mapToGlobal(pos))
--- a/eric6/Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py	Sat May 02 13:51:07 2020 +0200
@@ -109,8 +109,8 @@
         self.filesTree.headerItem().setText(self.filesTree.columnCount(), "")
         self.filesTree.header().setSortIndicator(0, Qt.AscendingOrder)
         
-        self.upButton.setIcon(UI.PixmapCache.getIcon("1uparrow.png"))
-        self.downButton.setIcon(UI.PixmapCache.getIcon("1downarrow.png"))
+        self.upButton.setIcon(UI.PixmapCache.getIcon("1uparrow"))
+        self.downButton.setIcon(UI.PixmapCache.getIcon("1downarrow"))
         
         self.refreshButton = self.buttonBox.addButton(
             self.tr("&Refresh"), QDialogButtonBox.ActionRole)
@@ -118,8 +118,8 @@
             self.tr("Press to refresh the list of changesets"))
         self.refreshButton.setEnabled(False)
         
-        self.findPrevButton.setIcon(UI.PixmapCache.getIcon("1leftarrow.png"))
-        self.findNextButton.setIcon(UI.PixmapCache.getIcon("1rightarrow.png"))
+        self.findPrevButton.setIcon(UI.PixmapCache.getIcon("1leftarrow"))
+        self.findNextButton.setIcon(UI.PixmapCache.getIcon("1rightarrow"))
         self.__findBackwards = False
         
         self.modeComboBox.addItem(self.tr("Find"), "find")
@@ -259,13 +259,13 @@
         self.__actionsMenu.setToolTipsVisible(True)
         
         self.__graftAct = self.__actionsMenu.addAction(
-            UI.PixmapCache.getIcon("vcsGraft.png"),
+            UI.PixmapCache.getIcon("vcsGraft"),
             self.tr("Copy Changesets"), self.__graftActTriggered)
         self.__graftAct.setToolTip(self.tr(
             "Copy the selected changesets to the current branch"))
         
         self.__mergeAct = self.__actionsMenu.addAction(
-            UI.PixmapCache.getIcon("vcsMerge.png"),
+            UI.PixmapCache.getIcon("vcsMerge"),
             self.tr("Merge with Changeset"), self.__mergeActTriggered)
         self.__mergeAct.setToolTip(self.tr(
             "Merge the working directory with the selected changeset"))
@@ -280,7 +280,7 @@
             """ the same current phase.</p>"""))
         
         self.__tagAct = self.__actionsMenu.addAction(
-            UI.PixmapCache.getIcon("vcsTag.png"), self.tr("Tag"),
+            UI.PixmapCache.getIcon("vcsTag"), self.tr("Tag"),
             self.__tagActTriggered)
         self.__tagAct.setToolTip(self.tr("Tag the selected revision"))
         
@@ -290,7 +290,7 @@
         self.__closeHeadsAct.setToolTip(self.tr("Close the selected heads"))
         
         self.__switchAct = self.__actionsMenu.addAction(
-            UI.PixmapCache.getIcon("vcsSwitch.png"), self.tr("Switch"),
+            UI.PixmapCache.getIcon("vcsSwitch"), self.tr("Switch"),
             self.__switchActTriggered)
         self.__switchAct.setToolTip(self.tr(
             "Switch the working directory to the selected revision"))
@@ -298,12 +298,12 @@
         self.__actionsMenu.addSeparator()
         
         self.__bookmarkAct = self.__actionsMenu.addAction(
-            UI.PixmapCache.getIcon("addBookmark.png"),
+            UI.PixmapCache.getIcon("addBookmark"),
             self.tr("Define Bookmark..."), self.__bookmarkActTriggered)
         self.__bookmarkAct.setToolTip(
             self.tr("Bookmark the selected revision"))
         self.__bookmarkMoveAct = self.__actionsMenu.addAction(
-            UI.PixmapCache.getIcon("moveBookmark.png"),
+            UI.PixmapCache.getIcon("moveBookmark"),
             self.tr("Move Bookmark..."), self.__bookmarkMoveActTriggered)
         self.__bookmarkMoveAct.setToolTip(
             self.tr("Move bookmark to the selected revision"))
@@ -311,7 +311,7 @@
         self.__actionsMenu.addSeparator()
         
         self.__pullAct = self.__actionsMenu.addAction(
-            UI.PixmapCache.getIcon("vcsUpdate.png"), self.tr("Pull Changes"),
+            UI.PixmapCache.getIcon("vcsUpdate"), self.tr("Pull Changes"),
             self.__pullActTriggered)
         self.__pullAct.setToolTip(self.tr(
             "Pull changes from a remote repository"))
@@ -327,13 +327,13 @@
         self.__actionsMenu.addSeparator()
         
         self.__pushAct = self.__actionsMenu.addAction(
-            UI.PixmapCache.getIcon("vcsCommit.png"),
+            UI.PixmapCache.getIcon("vcsCommit"),
             self.tr("Push Selected Changes"), self.__pushActTriggered)
         self.__pushAct.setToolTip(self.tr(
             "Push changes of the selected changeset and its ancestors"
             " to a remote repository"))
         self.__pushAllAct = self.__actionsMenu.addAction(
-            UI.PixmapCache.getIcon("vcsCommit.png"),
+            UI.PixmapCache.getIcon("vcsCommit"),
             self.tr("Push All Changes"), self.__pushAllActTriggered)
         self.__pushAllAct.setToolTip(self.tr(
             "Push all changes to a remote repository"))
@@ -341,7 +341,7 @@
         self.__actionsMenu.addSeparator()
         
         self.__bundleAct = self.__actionsMenu.addAction(
-            UI.PixmapCache.getIcon("vcsCreateChangegroup.png"),
+            UI.PixmapCache.getIcon("vcsCreateChangegroup"),
             self.tr("Create Changegroup"), self.__bundleActTriggered)
         self.__bundleAct.setToolTip(self.tr(
             "Create a changegroup file containing the selected changesets"))
@@ -355,7 +355,7 @@
             """ If the dialog is showing outgoing changesets, all"""
             """ selected changesets will be bundled.</p>"""))
         self.__unbundleAct = self.__actionsMenu.addAction(
-            UI.PixmapCache.getIcon("vcsApplyChangegroup.png"),
+            UI.PixmapCache.getIcon("vcsApplyChangegroup"),
             self.tr("Apply Changegroup"), self.__unbundleActTriggered)
         self.__unbundleAct.setToolTip(self.tr(
             "Apply the currently viewed changegroup file"))
@@ -363,12 +363,12 @@
         self.__actionsMenu.addSeparator()
         
         self.__gpgSignAct = self.__actionsMenu.addAction(
-            UI.PixmapCache.getIcon("changesetSign.png"),
+            UI.PixmapCache.getIcon("changesetSign"),
             self.tr("Sign Revisions"), self.__gpgSignActTriggered)
         self.__gpgSignAct.setToolTip(self.tr(
             "Add a signature for the selected revisions"))
         self.__gpgVerifyAct = self.__actionsMenu.addAction(
-            UI.PixmapCache.getIcon("changesetSignVerify.png"),
+            UI.PixmapCache.getIcon("changesetSignVerify"),
             self.tr("Verify Signatures"), self.__gpgVerifyActTriggered)
         self.__gpgVerifyAct.setToolTip(self.tr(
             "Verify all signatures there may be for the selected revision"))
@@ -376,7 +376,7 @@
         self.__actionsMenu.addSeparator()
         
         self.__stripAct = self.__actionsMenu.addAction(
-            UI.PixmapCache.getIcon("fileDelete.png"),
+            UI.PixmapCache.getIcon("fileDelete"),
             self.tr("Strip Changesets"), self.__stripActTriggered)
         self.__stripAct.setToolTip(self.tr(
             "Strip changesets from a repository"))
@@ -390,7 +390,7 @@
             lambda: self.__selectAllActTriggered(False))
         
         self.actionsButton.setIcon(
-            UI.PixmapCache.getIcon("actionsToolButton.png"))
+            UI.PixmapCache.getIcon("actionsToolButton"))
         self.actionsButton.setMenu(self.__actionsMenu)
     
     def __initData(self):
--- a/eric6/Plugins/VcsPlugins/vcsMercurial/HgNewProjectOptionsDialog.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/Plugins/VcsPlugins/vcsMercurial/HgNewProjectOptionsDialog.py	Sat May 02 13:51:07 2020 +0200
@@ -49,7 +49,7 @@
             QComboBox.AdjustToMinimumContentsLength)
         self.vcsUrlPicker.setPathsList(vcsUrlHistory)
         self.vcsUrlClearHistoryButton.setIcon(
-            UI.PixmapCache.getIcon("editDelete.png"))
+            UI.PixmapCache.getIcon("editDelete"))
         self.vcsUrlPicker.setText("")
         
         ipath = (
--- a/eric6/Plugins/VcsPlugins/vcsMercurial/HgRepoConfigDataDialog.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/Plugins/VcsPlugins/vcsMercurial/HgRepoConfigDataDialog.py	Sat May 02 13:51:07 2020 +0200
@@ -38,9 +38,9 @@
         self.setupUi(self)
         
         self.defaultShowPasswordButton.setIcon(
-            UI.PixmapCache.getIcon("showPassword.png"))
+            UI.PixmapCache.getIcon("showPassword"))
         self.defaultPushShowPasswordButton.setIcon(
-            UI.PixmapCache.getIcon("showPassword.png"))
+            UI.PixmapCache.getIcon("showPassword"))
         
         self.__withLargefiles = withLargefiles
         if withLargefiles:
--- a/eric6/Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py	Sat May 02 13:51:07 2020 +0200
@@ -67,7 +67,7 @@
             self.tr("Stop Server"), self)
         self.__stopAct.triggered.connect(self.__stopServer)
         self.__browserAct = QAction(
-            UI.PixmapCache.getIcon("home.png"),
+            UI.PixmapCache.getIcon("home"),
             self.tr("Start Browser"), self)
         self.__browserAct.triggered.connect(self.__startBrowser)
         
--- a/eric6/Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py	Sat May 02 13:51:07 2020 +0200
@@ -194,7 +194,7 @@
             "Adjusts the width of all columns to their contents"))
         
         self.actionsButton.setIcon(
-            UI.PixmapCache.getIcon("actionsToolButton.png"))
+            UI.PixmapCache.getIcon("actionsToolButton"))
         self.actionsButton.setMenu(self.__actionsMenu)
     
     def closeEvent(self, e):
--- a/eric6/Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py	Sat May 02 13:51:07 2020 +0200
@@ -285,11 +285,11 @@
             menu = QMenu(self.tagList)
             if self.tagsMode:
                 menu.addAction(
-                    UI.PixmapCache.getIcon("vcsSwitch.png"),
+                    UI.PixmapCache.getIcon("vcsSwitch"),
                     self.tr("Switch to"), self.__switchTo)
             else:
                 act = menu.addAction(
-                    UI.PixmapCache.getIcon("vcsSwitch.png"),
+                    UI.PixmapCache.getIcon("vcsSwitch"),
                     self.tr("Switch to"), self.__switchTo)
                 act.setEnabled(itm.text(3) != self.__currentBranch)
                 menu.addSeparator()
--- a/eric6/Plugins/VcsPlugins/vcsMercurial/HgTagDialog.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/Plugins/VcsPlugins/vcsMercurial/HgTagDialog.py	Sat May 02 13:51:07 2020 +0200
@@ -44,9 +44,9 @@
         self.tagCombo.addItem("", False)
         for tag, isLocal in sorted(taglist, reverse=True):
             if isLocal:
-                icon = UI.PixmapCache.getIcon("vcsTagLocal.png")
+                icon = UI.PixmapCache.getIcon("vcsTagLocal")
             else:
-                icon = UI.PixmapCache.getIcon("vcsTagGlobal.png")
+                icon = UI.PixmapCache.getIcon("vcsTagGlobal")
             self.tagCombo.addItem(icon, tag, isLocal)
         
         if revision:
--- a/eric6/Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py	Sat May 02 13:51:07 2020 +0200
@@ -67,13 +67,13 @@
             self.lfUserCachePicker.setDefaultDirectory(os.path.expanduser(
                 "~\\AppData\\Local\\largefiles"))
         
-        self.fpAddButton.setIcon(UI.PixmapCache.getIcon("plus.png"))
-        self.fpDeleteButton.setIcon(UI.PixmapCache.getIcon("minus.png"))
-        self.fpEditButton.setIcon(UI.PixmapCache.getIcon("edit.png"))
+        self.fpAddButton.setIcon(UI.PixmapCache.getIcon("plus"))
+        self.fpDeleteButton.setIcon(UI.PixmapCache.getIcon("minus"))
+        self.fpEditButton.setIcon(UI.PixmapCache.getIcon("edit"))
         
-        self.protocolAddButton.setIcon(UI.PixmapCache.getIcon("plus.png"))
-        self.protocolDeleteButton.setIcon(UI.PixmapCache.getIcon("minus.png"))
-        self.protocolEditButton.setIcon(UI.PixmapCache.getIcon("edit.png"))
+        self.protocolAddButton.setIcon(UI.PixmapCache.getIcon("plus"))
+        self.protocolDeleteButton.setIcon(UI.PixmapCache.getIcon("minus"))
+        self.protocolEditButton.setIcon(UI.PixmapCache.getIcon("edit"))
         
         self.minimumProtocolComboBox.addItem(self.tr("Default"), "")
         for protocol in sorted(self.__minimumProtocols.keys()):
--- a/eric6/Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditPlanEditor.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditPlanEditor.py	Sat May 02 13:51:07 2020 +0200
@@ -87,8 +87,8 @@
         super(HgHisteditPlanEditor, self).__init__(parent)
         self.setupUi(self)
         
-        self.upButton.setIcon(UI.PixmapCache.getIcon("1uparrow.png"))
-        self.downButton.setIcon(UI.PixmapCache.getIcon("1downarrow.png"))
+        self.upButton.setIcon(UI.PixmapCache.getIcon("1uparrow"))
+        self.downButton.setIcon(UI.PixmapCache.getIcon("1downarrow"))
         
         self.planTreeWidget.headerItem().setText(
             self.planTreeWidget.columnCount(), "")
--- a/eric6/Plugins/VcsPlugins/vcsMercurial/HisteditExtension/ProjectHelper.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/Plugins/VcsPlugins/vcsMercurial/HisteditExtension/ProjectHelper.py	Sat May 02 13:51:07 2020 +0200
@@ -34,7 +34,7 @@
         """
         self.hgHisteditStartAct = E5Action(
             self.tr('Start'),
-            UI.PixmapCache.getIcon("vcsEditHistory.png"),
+            UI.PixmapCache.getIcon("vcsEditHistory"),
             self.tr('Start'),
             0, 0, self, 'mercurial_histedit_start')
         self.hgHisteditStartAct.setStatusTip(self.tr(
@@ -100,7 +100,7 @@
         @return populated menu (QMenu)
         """
         menu = QMenu(self.menuTitle(), mainMenu)
-        menu.setIcon(UI.PixmapCache.getIcon("vcsEditHistory.png"))
+        menu.setIcon(UI.PixmapCache.getIcon("vcsEditHistory"))
         menu.setTearOffEnabled(True)
         
         menu.addAction(self.hgHisteditStartAct)
--- a/eric6/Plugins/VcsPlugins/vcsMercurial/LargefilesExtension/ProjectBrowserHelper.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/Plugins/VcsPlugins/vcsMercurial/LargefilesExtension/ProjectBrowserHelper.py	Sat May 02 13:51:07 2020 +0200
@@ -47,12 +47,12 @@
         menu = QMenu(self.menuTitle())
         menu.setTearOffEnabled(True)
         act = menu.addAction(
-            UI.PixmapCache.getIcon("vcsAdd.png"),
+            UI.PixmapCache.getIcon("vcsAdd"),
             self.tr('Add as Large File'),
             lambda: self.__hgAddLargefiles("large"))
         self.__addSingleActs.append(act)
         act = menu.addAction(
-            UI.PixmapCache.getIcon("vcsAdd.png"),
+            UI.PixmapCache.getIcon("vcsAdd"),
             self.tr('Add as Normal File'),
             lambda: self.__hgAddLargefiles("normal"))
         self.__addSingleActs.append(act)
@@ -61,12 +61,12 @@
         menu = QMenu(self.menuTitle())
         menu.setTearOffEnabled(True)
         act = menu.addAction(
-            UI.PixmapCache.getIcon("vcsAdd.png"),
+            UI.PixmapCache.getIcon("vcsAdd"),
             self.tr('Add as Large Files'),
             lambda: self.__hgAddLargefiles("large"))
         self.__addMultiActs.append(act)
         act = menu.addAction(
-            UI.PixmapCache.getIcon("vcsAdd.png"),
+            UI.PixmapCache.getIcon("vcsAdd"),
             self.tr('Add as Normal Files'),
             lambda: self.__hgAddLargefiles("normal"))
         self.__addMultiActs.append(act)
--- a/eric6/Plugins/VcsPlugins/vcsMercurial/LargefilesExtension/ProjectHelper.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/Plugins/VcsPlugins/vcsMercurial/LargefilesExtension/ProjectHelper.py	Sat May 02 13:51:07 2020 +0200
@@ -67,7 +67,7 @@
         
         self.hgLfPullAct = E5Action(
             self.tr('Pull Large Files'),
-            UI.PixmapCache.getIcon("vcsUpdate.png"),
+            UI.PixmapCache.getIcon("vcsUpdate"),
             self.tr('Pull Large Files'),
             0, 0, self, 'mercurial_pull_largefiles')
         self.hgLfPullAct.setStatusTip(self.tr(
@@ -83,7 +83,7 @@
         
         self.hgLfSummaryAct = E5Action(
             self.tr('Show Summary'),
-            UI.PixmapCache.getIcon("vcsSummary.png"),
+            UI.PixmapCache.getIcon("vcsSummary"),
             self.tr('Show summary...'),
             0, 0, self, 'mercurial_summary_largefiles')
         self.hgLfSummaryAct.setStatusTip(self.tr(
--- a/eric6/Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py	Sat May 02 13:51:07 2020 +0200
@@ -287,24 +287,24 @@
         menu.addSeparator()
         
         act = menu.addAction(
-            UI.PixmapCache.getIcon("vcsCommit.png"),
+            UI.PixmapCache.getIcon("vcsCommit"),
             self.tr('Commit changes to repository...'),
             self._VCSCommit)
         self.vcsMenuActions.append(act)
         self.__addExtensionsMenu(menu, 'mainMenu')
         menu.addSeparator()
         act = menu.addAction(
-            UI.PixmapCache.getIcon("vcsAdd.png"),
+            UI.PixmapCache.getIcon("vcsAdd"),
             self.tr('Add to repository'),
             self._VCSAdd)
         self.vcsAddMenuActions.append(act)
         act = menu.addAction(
-            UI.PixmapCache.getIcon("vcsRemove.png"),
+            UI.PixmapCache.getIcon("vcsRemove"),
             self.tr('Remove from repository (and disk)'),
             self._VCSRemove)
         self.vcsMenuActions.append(act)
         act = menu.addAction(
-            UI.PixmapCache.getIcon("vcsRemove.png"),
+            UI.PixmapCache.getIcon("vcsRemove"),
             self.tr('Remove from repository only'),
             self.__HgForget)
         self.vcsMenuActions.append(act)
@@ -315,30 +315,30 @@
         self.vcsMenuActions.append(act)
         menu.addSeparator()
         act = menu.addAction(
-            UI.PixmapCache.getIcon("vcsLog.png"),
+            UI.PixmapCache.getIcon("vcsLog"),
             self.tr('Show log browser'), self._VCSLogBrowser)
         self.vcsMenuActions.append(act)
         menu.addSeparator()
         act = menu.addAction(
-            UI.PixmapCache.getIcon("vcsStatus.png"),
+            UI.PixmapCache.getIcon("vcsStatus"),
             self.tr('Show status'), self._VCSStatus)
         self.vcsMenuActions.append(act)
         menu.addSeparator()
         act = menu.addAction(
-            UI.PixmapCache.getIcon("vcsDiff.png"),
+            UI.PixmapCache.getIcon("vcsDiff"),
             self.tr('Show differences'), self._VCSDiff)
         self.vcsMenuActions.append(act)
         act = menu.addAction(
-            UI.PixmapCache.getIcon("vcsSbsDiff.png"),
+            UI.PixmapCache.getIcon("vcsSbsDiff"),
             self.tr('Show differences side-by-side'), self.__HgSbsDiff)
         self.vcsMenuActions.append(act)
         act = menu.addAction(
-            UI.PixmapCache.getIcon("vcsDiff.png"),
+            UI.PixmapCache.getIcon("vcsDiff"),
             self.tr('Show differences (extended)'),
             self.__HgExtendedDiff)
         self.vcsMenuActions.append(act)
         act = menu.addAction(
-            UI.PixmapCache.getIcon("vcsSbsDiff.png"),
+            UI.PixmapCache.getIcon("vcsSbsDiff"),
             self.tr('Show differences side-by-side (extended)'),
             self.__HgSbsExtendedDiff)
         self.vcsMenuActions.append(act)
@@ -348,7 +348,7 @@
         self.vcsMenuActions.append(self.annotateAct)
         menu.addSeparator()
         act = menu.addAction(
-            UI.PixmapCache.getIcon("vcsRevert.png"),
+            UI.PixmapCache.getIcon("vcsRevert"),
             self.tr('Revert changes'), self.__HgRevert)
         self.vcsMenuActions.append(act)
         act = menu.addAction(
@@ -399,44 +399,44 @@
         menu.addSeparator()
         
         act = menu.addAction(
-            UI.PixmapCache.getIcon("vcsCommit.png"),
+            UI.PixmapCache.getIcon("vcsCommit"),
             self.tr('Commit changes to repository...'),
             self._VCSCommit)
         self.vcsMultiMenuActions.append(act)
         self.__addExtensionsMenu(menu, 'multiMenu')
         menu.addSeparator()
         act = menu.addAction(
-            UI.PixmapCache.getIcon("vcsAdd.png"),
+            UI.PixmapCache.getIcon("vcsAdd"),
             self.tr('Add to repository'), self._VCSAdd)
         self.vcsAddMultiMenuActions.append(act)
         act = menu.addAction(
-            UI.PixmapCache.getIcon("vcsRemove.png"),
+            UI.PixmapCache.getIcon("vcsRemove"),
             self.tr('Remove from repository (and disk)'),
             self._VCSRemove)
         self.vcsMultiMenuActions.append(act)
         act = menu.addAction(
-            UI.PixmapCache.getIcon("vcsRemove.png"),
+            UI.PixmapCache.getIcon("vcsRemove"),
             self.tr('Remove from repository only'),
             self.__HgForget)
         self.vcsMultiMenuActions.append(act)
         menu.addSeparator()
         act = menu.addAction(
-            UI.PixmapCache.getIcon("vcsStatus.png"),
+            UI.PixmapCache.getIcon("vcsStatus"),
             self.tr('Show status'), self._VCSStatus)
         self.vcsMultiMenuActions.append(act)
         menu.addSeparator()
         act = menu.addAction(
-            UI.PixmapCache.getIcon("vcsDiff.png"),
+            UI.PixmapCache.getIcon("vcsDiff"),
             self.tr('Show differences'), self._VCSDiff)
         self.vcsMultiMenuActions.append(act)
         act = menu.addAction(
-            UI.PixmapCache.getIcon("vcsDiff.png"),
+            UI.PixmapCache.getIcon("vcsDiff"),
             self.tr('Show differences (extended)'),
             self.__HgExtendedDiff)
         self.vcsMultiMenuActions.append(act)
         menu.addSeparator()
         act = menu.addAction(
-            UI.PixmapCache.getIcon("vcsRevert.png"),
+            UI.PixmapCache.getIcon("vcsRevert"),
             self.tr('Revert changes'), self.__HgRevert)
         self.vcsMultiMenuActions.append(act)
         act = menu.addAction(
@@ -522,18 +522,18 @@
         menu.addSeparator()
         
         act = menu.addAction(
-            UI.PixmapCache.getIcon("vcsCommit.png"),
+            UI.PixmapCache.getIcon("vcsCommit"),
             self.tr('Commit changes to repository...'),
             self._VCSCommit)
         self.vcsDirMenuActions.append(act)
         self.__addExtensionsMenu(menu, 'dirMenu')
         menu.addSeparator()
         act = menu.addAction(
-            UI.PixmapCache.getIcon("vcsAdd.png"),
+            UI.PixmapCache.getIcon("vcsAdd"),
             self.tr('Add to repository'), self._VCSAdd)
         self.vcsAddDirMenuActions.append(act)
         act = menu.addAction(
-            UI.PixmapCache.getIcon("vcsRemove.png"),
+            UI.PixmapCache.getIcon("vcsRemove"),
             self.tr('Remove from repository (and disk)'),
             self._VCSRemove)
         self.vcsDirMenuActions.append(act)
@@ -544,27 +544,27 @@
         self.vcsDirMenuActions.append(act)
         menu.addSeparator()
         act = menu.addAction(
-            UI.PixmapCache.getIcon("vcsLog.png"),
+            UI.PixmapCache.getIcon("vcsLog"),
             self.tr('Show log browser'), self._VCSLogBrowser)
         self.vcsDirMenuActions.append(act)
         menu.addSeparator()
         act = menu.addAction(
-            UI.PixmapCache.getIcon("vcsStatus.png"),
+            UI.PixmapCache.getIcon("vcsStatus"),
             self.tr('Show status'), self._VCSStatus)
         self.vcsDirMenuActions.append(act)
         menu.addSeparator()
         act = menu.addAction(
-            UI.PixmapCache.getIcon("vcsDiff.png"),
+            UI.PixmapCache.getIcon("vcsDiff"),
             self.tr('Show differences'), self._VCSDiff)
         self.vcsDirMenuActions.append(act)
         act = menu.addAction(
-            UI.PixmapCache.getIcon("vcsDiff.png"),
+            UI.PixmapCache.getIcon("vcsDiff"),
             self.tr('Show differences (extended)'),
             self.__HgExtendedDiff)
         self.vcsDirMenuActions.append(act)
         menu.addSeparator()
         act = menu.addAction(
-            UI.PixmapCache.getIcon("vcsRevert.png"),
+            UI.PixmapCache.getIcon("vcsRevert"),
             self.tr('Revert changes'), self.__HgRevert)
         self.vcsDirMenuActions.append(act)
         act = menu.addAction(
@@ -617,39 +617,39 @@
         menu.addSeparator()
         
         act = menu.addAction(
-            UI.PixmapCache.getIcon("vcsCommit.png"),
+            UI.PixmapCache.getIcon("vcsCommit"),
             self.tr('Commit changes to repository...'),
             self._VCSCommit)
         self.vcsDirMultiMenuActions.append(act)
         self.__addExtensionsMenu(menu, 'dirMultiMenu')
         menu.addSeparator()
         act = menu.addAction(
-            UI.PixmapCache.getIcon("vcsAdd.png"),
+            UI.PixmapCache.getIcon("vcsAdd"),
             self.tr('Add to repository'), self._VCSAdd)
         self.vcsAddDirMultiMenuActions.append(act)
         act = menu.addAction(
-            UI.PixmapCache.getIcon("vcsRemove.png"),
+            UI.PixmapCache.getIcon("vcsRemove"),
             self.tr('Remove from repository (and disk)'),
             self._VCSRemove)
         self.vcsDirMultiMenuActions.append(act)
         menu.addSeparator()
         act = menu.addAction(
-            UI.PixmapCache.getIcon("vcsStatus.png"),
+            UI.PixmapCache.getIcon("vcsStatus"),
             self.tr('Show status'), self._VCSStatus)
         self.vcsDirMultiMenuActions.append(act)
         menu.addSeparator()
         act = menu.addAction(
-            UI.PixmapCache.getIcon("vcsDiff.png"),
+            UI.PixmapCache.getIcon("vcsDiff"),
             self.tr('Show differences'), self._VCSDiff)
         self.vcsDirMultiMenuActions.append(act)
         act = menu.addAction(
-            UI.PixmapCache.getIcon("vcsDiff.png"),
+            UI.PixmapCache.getIcon("vcsDiff"),
             self.tr('Show differences (extended)'),
             self.__HgExtendedDiff)
         self.vcsDirMultiMenuActions.append(act)
         menu.addSeparator()
         act = menu.addAction(
-            UI.PixmapCache.getIcon("vcsRevert.png"),
+            UI.PixmapCache.getIcon("vcsRevert"),
             self.tr('Revert changes'), self.__HgRevert)
         self.vcsDirMultiMenuActions.append(act)
         act = menu.addAction(
@@ -716,12 +716,14 @@
             fn = itm.dirName()
         isFile = os.path.isfile(fn)
         movefiles = self.browser.project.getFiles(fn)
+        self.browser.project.stopFileSystemMonitoring()
         if self.vcs.vcsMove(fn, self.project):
             if isFile:
                 self.browser.closeSourceWindow.emit(fn)
             else:
                 for mf in movefiles:
                     self.browser.closeSourceWindow.emit(mf)
+        self.browser.project.startFileSystemMonitoring()
     
     def __HgExtendedDiff(self):
         """
--- a/eric6/Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py	Sat May 02 13:51:07 2020 +0200
@@ -124,7 +124,7 @@
         """
         self.vcsNewAct = E5Action(
             self.tr('New from repository'),
-            UI.PixmapCache.getIcon("vcsCheckout.png"),
+            UI.PixmapCache.getIcon("vcsCheckout"),
             self.tr('&New from repository...'), 0, 0,
             self, 'mercurial_new')
         self.vcsNewAct.setStatusTip(self.tr(
@@ -140,7 +140,7 @@
         
         self.hgIncomingAct = E5Action(
             self.tr('Show incoming log'),
-            UI.PixmapCache.getIcon("vcsUpdate.png"),
+            UI.PixmapCache.getIcon("vcsUpdate"),
             self.tr('Show incoming log'),
             0, 0, self, 'mercurial_incoming')
         self.hgIncomingAct.setStatusTip(self.tr(
@@ -156,7 +156,7 @@
         
         self.hgPullAct = E5Action(
             self.tr('Pull changes'),
-            UI.PixmapCache.getIcon("vcsUpdate.png"),
+            UI.PixmapCache.getIcon("vcsUpdate"),
             self.tr('Pull changes'),
             0, 0, self, 'mercurial_pull')
         self.hgPullAct.setStatusTip(self.tr(
@@ -172,7 +172,7 @@
         
         self.vcsUpdateAct = E5Action(
             self.tr('Update from repository'),
-            UI.PixmapCache.getIcon("vcsUpdate.png"),
+            UI.PixmapCache.getIcon("vcsUpdate"),
             self.tr('&Update from repository'), 0, 0, self,
             'mercurial_update')
         self.vcsUpdateAct.setStatusTip(self.tr(
@@ -188,7 +188,7 @@
         
         self.vcsCommitAct = E5Action(
             self.tr('Commit changes to repository'),
-            UI.PixmapCache.getIcon("vcsCommit.png"),
+            UI.PixmapCache.getIcon("vcsCommit"),
             self.tr('&Commit changes to repository...'), 0, 0, self,
             'mercurial_commit')
         self.vcsCommitAct.setStatusTip(self.tr(
@@ -204,7 +204,7 @@
         
         self.hgOutgoingAct = E5Action(
             self.tr('Show outgoing log'),
-            UI.PixmapCache.getIcon("vcsCommit.png"),
+            UI.PixmapCache.getIcon("vcsCommit"),
             self.tr('Show outgoing log'),
             0, 0, self, 'mercurial_outgoing')
         self.hgOutgoingAct.setStatusTip(self.tr(
@@ -220,7 +220,7 @@
         
         self.hgPushAct = E5Action(
             self.tr('Push changes'),
-            UI.PixmapCache.getIcon("vcsCommit.png"),
+            UI.PixmapCache.getIcon("vcsCommit"),
             self.tr('Push changes'),
             0, 0, self, 'mercurial_push')
         self.hgPushAct.setStatusTip(self.tr(
@@ -236,7 +236,7 @@
         
         self.hgPushForcedAct = E5Action(
             self.tr('Push changes (force)'),
-            UI.PixmapCache.getIcon("vcsCommit.png"),
+            UI.PixmapCache.getIcon("vcsCommit"),
             self.tr('Push changes (force)'),
             0, 0, self, 'mercurial_push_forced')
         self.hgPushForcedAct.setStatusTip(self.tr(
@@ -252,7 +252,7 @@
         
         self.vcsExportAct = E5Action(
             self.tr('Export from repository'),
-            UI.PixmapCache.getIcon("vcsExport.png"),
+            UI.PixmapCache.getIcon("vcsExport"),
             self.tr('&Export from repository...'),
             0, 0, self, 'mercurial_export_repo')
         self.vcsExportAct.setStatusTip(self.tr(
@@ -267,7 +267,7 @@
         
         self.hgLogBrowserAct = E5Action(
             self.tr('Show log browser'),
-            UI.PixmapCache.getIcon("vcsLog.png"),
+            UI.PixmapCache.getIcon("vcsLog"),
             self.tr('Show log browser'),
             0, 0, self, 'mercurial_log_browser')
         self.hgLogBrowserAct.setStatusTip(self.tr(
@@ -284,7 +284,7 @@
         
         self.vcsDiffAct = E5Action(
             self.tr('Show differences'),
-            UI.PixmapCache.getIcon("vcsDiff.png"),
+            UI.PixmapCache.getIcon("vcsDiff"),
             self.tr('Show &difference'),
             0, 0, self, 'mercurial_diff')
         self.vcsDiffAct.setStatusTip(self.tr(
@@ -300,7 +300,7 @@
         
         self.hgExtDiffAct = E5Action(
             self.tr('Show differences (extended)'),
-            UI.PixmapCache.getIcon("vcsDiff.png"),
+            UI.PixmapCache.getIcon("vcsDiff"),
             self.tr('Show differences (extended)'),
             0, 0, self, 'mercurial_extendeddiff')
         self.hgExtDiffAct.setStatusTip(self.tr(
@@ -316,7 +316,7 @@
         
         self.vcsStatusAct = E5Action(
             self.tr('Show status'),
-            UI.PixmapCache.getIcon("vcsStatus.png"),
+            UI.PixmapCache.getIcon("vcsStatus"),
             self.tr('Show &status...'),
             0, 0, self, 'mercurial_status')
         self.vcsStatusAct.setStatusTip(self.tr(
@@ -331,7 +331,7 @@
         
         self.hgSummaryAct = E5Action(
             self.tr('Show Summary'),
-            UI.PixmapCache.getIcon("vcsSummary.png"),
+            UI.PixmapCache.getIcon("vcsSummary"),
             self.tr('Show summary...'),
             0, 0, self, 'mercurial_summary')
         self.hgSummaryAct.setStatusTip(self.tr(
@@ -389,7 +389,7 @@
         
         self.vcsRevertAct = E5Action(
             self.tr('Revert changes'),
-            UI.PixmapCache.getIcon("vcsRevert.png"),
+            UI.PixmapCache.getIcon("vcsRevert"),
             self.tr('Re&vert changes'),
             0, 0, self, 'mercurial_revert')
         self.vcsRevertAct.setStatusTip(self.tr(
@@ -404,7 +404,7 @@
         
         self.vcsMergeAct = E5Action(
             self.tr('Merge'),
-            UI.PixmapCache.getIcon("vcsMerge.png"),
+            UI.PixmapCache.getIcon("vcsMerge"),
             self.tr('Mer&ge changes...'),
             0, 0, self, 'mercurial_merge')
         self.vcsMergeAct.setStatusTip(self.tr(
@@ -449,7 +449,7 @@
         
         self.hgReMergeAct = E5Action(
             self.tr('Re-Merge'),
-            UI.PixmapCache.getIcon("vcsMerge.png"),
+            UI.PixmapCache.getIcon("vcsMerge"),
             self.tr('Re-Merge'),
             0, 0, self, 'mercurial_remerge')
         self.hgReMergeAct.setStatusTip(self.tr(
@@ -510,7 +510,7 @@
         
         self.vcsTagAct = E5Action(
             self.tr('Tag in repository'),
-            UI.PixmapCache.getIcon("vcsTag.png"),
+            UI.PixmapCache.getIcon("vcsTag"),
             self.tr('&Tag in repository...'),
             0, 0, self, 'mercurial_tag')
         self.vcsTagAct.setStatusTip(self.tr(
@@ -553,7 +553,7 @@
         
         self.hgBranchAct = E5Action(
             self.tr('Create branch'),
-            UI.PixmapCache.getIcon("vcsBranch.png"),
+            UI.PixmapCache.getIcon("vcsBranch"),
             self.tr('Create &branch...'),
             0, 0, self, 'mercurial_branch')
         self.hgBranchAct.setStatusTip(self.tr(
@@ -569,7 +569,7 @@
         
         self.hgPushBranchAct = E5Action(
             self.tr('Push new branch'),
-            UI.PixmapCache.getIcon("vcsCommit.png"),
+            UI.PixmapCache.getIcon("vcsCommit"),
             self.tr('Push new branch'),
             0, 0, self, 'mercurial_push_branch')
         self.hgPushBranchAct.setStatusTip(self.tr(
@@ -615,7 +615,7 @@
         
         self.vcsSwitchAct = E5Action(
             self.tr('Switch'),
-            UI.PixmapCache.getIcon("vcsSwitch.png"),
+            UI.PixmapCache.getIcon("vcsSwitch"),
             self.tr('S&witch...'),
             0, 0, self, 'mercurial_switch')
         self.vcsSwitchAct.setStatusTip(self.tr(
@@ -790,7 +790,7 @@
         
         self.hgBundleAct = E5Action(
             self.tr('Create changegroup'),
-            UI.PixmapCache.getIcon("vcsCreateChangegroup.png"),
+            UI.PixmapCache.getIcon("vcsCreateChangegroup"),
             self.tr('Create changegroup...'),
             0, 0, self, 'mercurial_bundle')
         self.hgBundleAct.setStatusTip(self.tr(
@@ -806,7 +806,7 @@
         
         self.hgPreviewBundleAct = E5Action(
             self.tr('Preview changegroup'),
-            UI.PixmapCache.getIcon("vcsPreviewChangegroup.png"),
+            UI.PixmapCache.getIcon("vcsPreviewChangegroup"),
             self.tr('Preview changegroup...'),
             0, 0, self, 'mercurial_preview_bundle')
         self.hgPreviewBundleAct.setStatusTip(self.tr(
@@ -822,7 +822,7 @@
         
         self.hgUnbundleAct = E5Action(
             self.tr('Apply changegroups'),
-            UI.PixmapCache.getIcon("vcsApplyChangegroup.png"),
+            UI.PixmapCache.getIcon("vcsApplyChangegroup"),
             self.tr('Apply changegroups...'),
             0, 0, self, 'mercurial_unbundle')
         self.hgUnbundleAct.setStatusTip(self.tr(
@@ -949,7 +949,7 @@
         
         self.hgImportAct = E5Action(
             self.tr('Import Patch'),
-            UI.PixmapCache.getIcon("vcsImportPatch.png"),
+            UI.PixmapCache.getIcon("vcsImportPatch"),
             self.tr('Import Patch...'),
             0, 0, self, 'mercurial_import')
         self.hgImportAct.setStatusTip(self.tr(
@@ -965,7 +965,7 @@
         
         self.hgExportAct = E5Action(
             self.tr('Export Patches'),
-            UI.PixmapCache.getIcon("vcsExportPatch.png"),
+            UI.PixmapCache.getIcon("vcsExportPatch"),
             self.tr('Export Patches...'),
             0, 0, self, 'mercurial_export')
         self.hgExportAct.setStatusTip(self.tr(
@@ -994,7 +994,7 @@
         
         self.hgGraftAct = E5Action(
             self.tr('Copy Changesets'),
-            UI.PixmapCache.getIcon("vcsGraft.png"),
+            UI.PixmapCache.getIcon("vcsGraft"),
             self.tr('Copy Changesets'),
             0, 0, self, 'mercurial_graft')
         self.hgGraftAct.setStatusTip(self.tr(
@@ -1055,7 +1055,7 @@
         
         self.hgAddSubrepoAct = E5Action(
             self.tr('Add'),
-            UI.PixmapCache.getIcon("vcsAdd.png"),
+            UI.PixmapCache.getIcon("vcsAdd"),
             self.tr('Add...'),
             0, 0, self, 'mercurial_add_subrepo')
         self.hgAddSubrepoAct.setStatusTip(self.tr(
@@ -1070,7 +1070,7 @@
         
         self.hgRemoveSubreposAct = E5Action(
             self.tr('Remove'),
-            UI.PixmapCache.getIcon("vcsRemove.png"),
+            UI.PixmapCache.getIcon("vcsRemove"),
             self.tr('Remove...'),
             0, 0, self, 'mercurial_remove_subrepos')
         self.hgRemoveSubreposAct.setStatusTip(self.tr(
@@ -1086,7 +1086,7 @@
         
         self.hgArchiveAct = E5Action(
             self.tr('Create unversioned archive'),
-            UI.PixmapCache.getIcon("vcsExport.png"),
+            UI.PixmapCache.getIcon("vcsExport"),
             self.tr('Create unversioned archive...'),
             0, 0, self, 'mercurial_archive')
         self.hgArchiveAct.setStatusTip(self.tr(
@@ -1102,7 +1102,7 @@
         
         self.hgBookmarksListAct = E5Action(
             self.tr('List bookmarks'),
-            UI.PixmapCache.getIcon("listBookmarks.png"),
+            UI.PixmapCache.getIcon("listBookmarks"),
             self.tr('List bookmarks...'),
             0, 0, self, 'mercurial_list_bookmarks')
         self.hgBookmarksListAct.setStatusTip(self.tr(
@@ -1117,7 +1117,7 @@
     
         self.hgBookmarkDefineAct = E5Action(
             self.tr('Define bookmark'),
-            UI.PixmapCache.getIcon("addBookmark.png"),
+            UI.PixmapCache.getIcon("addBookmark"),
             self.tr('Define bookmark...'),
             0, 0, self, 'mercurial_define_bookmark')
         self.hgBookmarkDefineAct.setStatusTip(self.tr(
@@ -1132,7 +1132,7 @@
     
         self.hgBookmarkDeleteAct = E5Action(
             self.tr('Delete bookmark'),
-            UI.PixmapCache.getIcon("deleteBookmark.png"),
+            UI.PixmapCache.getIcon("deleteBookmark"),
             self.tr('Delete bookmark...'),
             0, 0, self, 'mercurial_delete_bookmark')
         self.hgBookmarkDeleteAct.setStatusTip(self.tr(
@@ -1147,7 +1147,7 @@
     
         self.hgBookmarkRenameAct = E5Action(
             self.tr('Rename bookmark'),
-            UI.PixmapCache.getIcon("renameBookmark.png"),
+            UI.PixmapCache.getIcon("renameBookmark"),
             self.tr('Rename bookmark...'),
             0, 0, self, 'mercurial_rename_bookmark')
         self.hgBookmarkRenameAct.setStatusTip(self.tr(
@@ -1162,7 +1162,7 @@
     
         self.hgBookmarkMoveAct = E5Action(
             self.tr('Move bookmark'),
-            UI.PixmapCache.getIcon("moveBookmark.png"),
+            UI.PixmapCache.getIcon("moveBookmark"),
             self.tr('Move bookmark...'),
             0, 0, self, 'mercurial_move_bookmark')
         self.hgBookmarkMoveAct.setStatusTip(self.tr(
@@ -1178,7 +1178,7 @@
         
         self.hgBookmarkIncomingAct = E5Action(
             self.tr('Show incoming bookmarks'),
-            UI.PixmapCache.getIcon("incomingBookmark.png"),
+            UI.PixmapCache.getIcon("incomingBookmark"),
             self.tr('Show incoming bookmarks'),
             0, 0, self, 'mercurial_incoming_bookmarks')
         self.hgBookmarkIncomingAct.setStatusTip(self.tr(
@@ -1195,7 +1195,7 @@
         
         self.hgBookmarkPullAct = E5Action(
             self.tr('Pull bookmark'),
-            UI.PixmapCache.getIcon("pullBookmark.png"),
+            UI.PixmapCache.getIcon("pullBookmark"),
             self.tr('Pull bookmark'),
             0, 0, self, 'mercurial_pull_bookmark')
         self.hgBookmarkPullAct.setStatusTip(self.tr(
@@ -1211,7 +1211,7 @@
         
         self.hgBookmarkPullCurrentAct = E5Action(
             self.tr('Pull current bookmark'),
-            UI.PixmapCache.getIcon("pullBookmark.png"),
+            UI.PixmapCache.getIcon("pullBookmark"),
             self.tr('Pull current bookmark'),
             0, 0, self, 'mercurial_pull_current_bookmark')
         self.hgBookmarkPullCurrentAct.setStatusTip(self.tr(
@@ -1227,7 +1227,7 @@
         
         self.hgBookmarkOutgoingAct = E5Action(
             self.tr('Show outgoing bookmarks'),
-            UI.PixmapCache.getIcon("outgoingBookmark.png"),
+            UI.PixmapCache.getIcon("outgoingBookmark"),
             self.tr('Show outgoing bookmarks'),
             0, 0, self, 'mercurial_outgoing_bookmarks')
         self.hgBookmarkOutgoingAct.setStatusTip(self.tr(
@@ -1244,7 +1244,7 @@
         
         self.hgBookmarkPushAct = E5Action(
             self.tr('Push bookmark'),
-            UI.PixmapCache.getIcon("pushBookmark.png"),
+            UI.PixmapCache.getIcon("pushBookmark"),
             self.tr('Push bookmark'),
             0, 0, self, 'mercurial_push_bookmark')
         self.hgBookmarkPushAct.setStatusTip(self.tr(
@@ -1260,7 +1260,7 @@
     
         self.hgBookmarkPushCurrentAct = E5Action(
             self.tr('Push current bookmark'),
-            UI.PixmapCache.getIcon("pushBookmark.png"),
+            UI.PixmapCache.getIcon("pushBookmark"),
             self.tr('Push current bookmark'),
             0, 0, self, 'mercurial_push_current_bookmark')
         self.hgBookmarkPushCurrentAct.setStatusTip(self.tr(
@@ -1277,7 +1277,7 @@
     
         self.hgDeleteBackupsAct = E5Action(
             self.tr('Delete all backups'),
-            UI.PixmapCache.getIcon("clearPrivateData.png"),
+            UI.PixmapCache.getIcon("clearPrivateData"),
             self.tr('Delete all backups'),
             0, 0, self, 'mercurial_delete_all_backups')
         self.hgDeleteBackupsAct.setStatusTip(self.tr(
@@ -1380,14 +1380,14 @@
         self.subMenus.append(bisectMenu)
         
         tagsMenu = QMenu(self.tr("Tags"), menu)
-        tagsMenu.setIcon(UI.PixmapCache.getIcon("vcsTag.png"))
+        tagsMenu.setIcon(UI.PixmapCache.getIcon("vcsTag"))
         tagsMenu.setTearOffEnabled(True)
         tagsMenu.addAction(self.vcsTagAct)
         tagsMenu.addAction(self.hgTagListAct)
         self.subMenus.append(tagsMenu)
         
         branchesMenu = QMenu(self.tr("Branches"), menu)
-        branchesMenu.setIcon(UI.PixmapCache.getIcon("vcsBranch.png"))
+        branchesMenu.setIcon(UI.PixmapCache.getIcon("vcsBranch"))
         branchesMenu.setTearOffEnabled(True)
         branchesMenu.addAction(self.hgBranchAct)
         branchesMenu.addAction(self.hgPushBranchAct)
@@ -1396,7 +1396,7 @@
         self.subMenus.append(branchesMenu)
         
         bookmarksMenu = QMenu(self.tr("Bookmarks"), menu)
-        bookmarksMenu.setIcon(UI.PixmapCache.getIcon("bookmark22.png"))
+        bookmarksMenu.setIcon(UI.PixmapCache.getIcon("bookmark22"))
         bookmarksMenu.setTearOffEnabled(True)
         bookmarksMenu.addAction(self.hgBookmarkDefineAct)
         bookmarksMenu.addAction(self.hgBookmarkDeleteAct)
@@ -1428,7 +1428,7 @@
         self.vcs.activeExtensionsChanged.connect(self.__showExtensionMenu)
         
         graftMenu = QMenu(self.tr("Copy Changesets"), menu)
-        graftMenu.setIcon(UI.PixmapCache.getIcon("vcsGraft.png"))
+        graftMenu.setIcon(UI.PixmapCache.getIcon("vcsGraft"))
         graftMenu.setTearOffEnabled(True)
         graftMenu.addAction(self.hgGraftAct)
         graftMenu.addAction(self.hgGraftContinueAct)
@@ -1442,7 +1442,7 @@
         subrepoMenu.addAction(self.hgRemoveSubreposAct)
         
         mergeMenu = QMenu(self.tr("Merge Changesets"), menu)
-        mergeMenu.setIcon(UI.PixmapCache.getIcon("vcsMerge.png"))
+        mergeMenu.setIcon(UI.PixmapCache.getIcon("vcsMerge"))
         mergeMenu.setTearOffEnabled(True)
         mergeMenu.addAction(self.vcsMergeAct)
         mergeMenu.addAction(self.hgShowConflictsAct)
--- a/eric6/Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py	Sat May 02 13:51:07 2020 +0200
@@ -33,7 +33,7 @@
         """
         self.hgPurgeAct = E5Action(
             self.tr('Purge Files'),
-            UI.PixmapCache.getIcon("fileDelete.png"),
+            UI.PixmapCache.getIcon("fileDelete"),
             self.tr('Purge Files'),
             0, 0, self, 'mercurial_purge')
         self.hgPurgeAct.setStatusTip(self.tr(
@@ -74,7 +74,7 @@
         
         self.hgPurgeListAct = E5Action(
             self.tr('List Files to be Purged'),
-            UI.PixmapCache.getIcon("fileDeleteList.png"),
+            UI.PixmapCache.getIcon("fileDeleteList"),
             self.tr('List Files to be Purged...'),
             0, 0, self, 'mercurial_purge_list')
         self.hgPurgeListAct.setStatusTip(self.tr(
@@ -113,7 +113,7 @@
         @return populated menu (QMenu)
         """
         menu = QMenu(self.menuTitle(), mainMenu)
-        menu.setIcon(UI.PixmapCache.getIcon("fileDelete.png"))
+        menu.setIcon(UI.PixmapCache.getIcon("fileDelete"))
         menu.setTearOffEnabled(True)
         
         menu.addAction(self.hgPurgeAct)
--- a/eric6/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py	Sat May 02 13:51:07 2020 +0200
@@ -45,8 +45,8 @@
         self.__patches = patchesList[:]
         self.patchSelector.addItems([""] + self.__patches)
         
-        self.plusButton.setIcon(UI.PixmapCache.getIcon("plus.png"))
-        self.minusButton.setIcon(UI.PixmapCache.getIcon("minus.png"))
+        self.plusButton.setIcon(UI.PixmapCache.getIcon("plus"))
+        self.minusButton.setIcon(UI.PixmapCache.getIcon("minus"))
         
         self.__dirtyList = False
         self.__currentPatch = ""
@@ -141,11 +141,11 @@
             guardsList = guards.strip().split()
             for guard in guardsList:
                 if guard.startswith("+"):
-                    icon = UI.PixmapCache.getIcon("plus.png")
+                    icon = UI.PixmapCache.getIcon("plus")
                     guard = guard[1:]
                     sign = "+"
                 elif guard.startswith("-"):
-                    icon = UI.PixmapCache.getIcon("minus.png")
+                    icon = UI.PixmapCache.getIcon("minus")
                     guard = guard[1:]
                     sign = "-"
                 else:
@@ -193,10 +193,10 @@
         guard = self.guardCombo.currentText()
         if self.plusButton.isChecked():
             sign = "+"
-            icon = UI.PixmapCache.getIcon("plus.png")
+            icon = UI.PixmapCache.getIcon("plus")
         else:
             sign = "-"
-            icon = UI.PixmapCache.getIcon("minus.png")
+            icon = UI.PixmapCache.getIcon("minus")
         
         guardItem = self.__getGuard(guard)
         if guardItem:
--- a/eric6/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesFoldDialog.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesFoldDialog.py	Sat May 02 13:51:07 2020 +0200
@@ -30,10 +30,10 @@
         super(HgQueuesFoldDialog, self).__init__(parent)
         self.setupUi(self)
         
-        self.addButton.setIcon(UI.PixmapCache.getIcon("plus.png"))
-        self.removeButton.setIcon(UI.PixmapCache.getIcon("minus.png"))
-        self.upButton.setIcon(UI.PixmapCache.getIcon("1uparrow.png"))
-        self.downButton.setIcon(UI.PixmapCache.getIcon("1downarrow.png"))
+        self.addButton.setIcon(UI.PixmapCache.getIcon("plus"))
+        self.removeButton.setIcon(UI.PixmapCache.getIcon("minus"))
+        self.upButton.setIcon(UI.PixmapCache.getIcon("1uparrow"))
+        self.downButton.setIcon(UI.PixmapCache.getIcon("1downarrow"))
         
         for patch in patchesList:
             name, summary = patch.split("@@")
--- a/eric6/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListAllGuardsDialog.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListAllGuardsDialog.py	Sat May 02 13:51:07 2020 +0200
@@ -69,10 +69,10 @@
                 patchItm.setExpanded(True)
                 for guard in guardsDict[patchName]:
                     if guard.startswith("+"):
-                        icon = UI.PixmapCache.getIcon("plus.png")
+                        icon = UI.PixmapCache.getIcon("plus")
                         guard = guard[1:]
                     elif guard.startswith("-"):
-                        icon = UI.PixmapCache.getIcon("minus.png")
+                        icon = UI.PixmapCache.getIcon("minus")
                         guard = guard[1:]
                     else:
                         icon = None
--- a/eric6/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListGuardsDialog.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListGuardsDialog.py	Sat May 02 13:51:07 2020 +0200
@@ -92,10 +92,10 @@
             guardsList = guards.strip().split()
             for guard in guardsList:
                 if guard.startswith("+"):
-                    icon = UI.PixmapCache.getIcon("plus.png")
+                    icon = UI.PixmapCache.getIcon("plus")
                     guard = guard[1:]
                 elif guard.startswith("-"):
-                    icon = UI.PixmapCache.getIcon("minus.png")
+                    icon = UI.PixmapCache.getIcon("minus")
                     guard = guard[1:]
                 else:
                     icon = None
--- a/eric6/Plugins/VcsPlugins/vcsMercurial/RebaseExtension/ProjectHelper.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/Plugins/VcsPlugins/vcsMercurial/RebaseExtension/ProjectHelper.py	Sat May 02 13:51:07 2020 +0200
@@ -34,7 +34,7 @@
         """
         self.hgRebaseAct = E5Action(
             self.tr('Rebase Changesets'),
-            UI.PixmapCache.getIcon("vcsRebase.png"),
+            UI.PixmapCache.getIcon("vcsRebase"),
             self.tr('Rebase Changesets'),
             0, 0, self, 'mercurial_rebase')
         self.hgRebaseAct.setStatusTip(self.tr(
@@ -83,7 +83,7 @@
         @return populated menu (QMenu)
         """
         menu = QMenu(self.menuTitle(), mainMenu)
-        menu.setIcon(UI.PixmapCache.getIcon("vcsRebase.png"))
+        menu.setIcon(UI.PixmapCache.getIcon("vcsRebase"))
         menu.setTearOffEnabled(True)
         
         menu.addAction(self.hgRebaseAct)
--- a/eric6/Plugins/VcsPlugins/vcsMercurial/StripExtension/ProjectHelper.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/Plugins/VcsPlugins/vcsMercurial/StripExtension/ProjectHelper.py	Sat May 02 13:51:07 2020 +0200
@@ -34,7 +34,7 @@
         """
         self.hgStripAct = E5Action(
             self.tr('Strip changesets'),
-            UI.PixmapCache.getIcon("fileDelete.png"),
+            UI.PixmapCache.getIcon("fileDelete"),
             self.tr('Strip changesets'),
             0, 0, self, 'mercurial_strip')
         self.hgStripAct.setStatusTip(self.tr(
@@ -58,7 +58,7 @@
         @return populated menu (QMenu)
         """
         menu = QMenu(self.menuTitle(), mainMenu)
-        menu.setIcon(UI.PixmapCache.getIcon("fileDelete.png"))
+        menu.setIcon(UI.PixmapCache.getIcon("fileDelete"))
         menu.setTearOffEnabled(True)
         
         menu.addAction(self.hgStripAct)
--- a/eric6/Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py	Sat May 02 13:51:07 2020 +0200
@@ -212,28 +212,28 @@
         menu.addSeparator()
         
         act = menu.addAction(
-            UI.PixmapCache.getIcon("vcsUpdate.png"),
+            UI.PixmapCache.getIcon("vcsUpdate"),
             self.tr('Update from repository'), self._VCSUpdate)
         self.vcsMenuActions.append(act)
         act = menu.addAction(
-            UI.PixmapCache.getIcon("vcsCommit.png"),
+            UI.PixmapCache.getIcon("vcsCommit"),
             self.tr('Commit changes to repository...'),
             self._VCSCommit)
         self.vcsMenuActions.append(act)
         menu.addSeparator()
         act = menu.addAction(
-            UI.PixmapCache.getIcon("vcsAdd.png"),
+            UI.PixmapCache.getIcon("vcsAdd"),
             self.tr('Add to repository'),
             self._VCSAdd)
         self.vcsAddMenuActions.append(act)
         if 1 in self.browser.specialMenuEntries:
             self.vcsMenuAddTree = menu.addAction(
-                UI.PixmapCache.getIcon("vcsAdd.png"),
+                UI.PixmapCache.getIcon("vcsAdd"),
                 self.tr('Add tree to repository'),
                 self._VCSAddTree)
             self.vcsAddMenuActions.append(self.vcsMenuAddTree)
         act = menu.addAction(
-            UI.PixmapCache.getIcon("vcsRemove.png"),
+            UI.PixmapCache.getIcon("vcsRemove"),
             self.tr('Remove from repository (and disk)'),
             self._VCSRemove)
         self.vcsMenuActions.append(act)
@@ -255,39 +255,39 @@
             self.vcsMenuActions.append(act)
         menu.addSeparator()
         act = menu.addAction(
-            UI.PixmapCache.getIcon("vcsLog.png"),
+            UI.PixmapCache.getIcon("vcsLog"),
             self.tr('Show log browser'), self._VCSLogBrowser)
         self.vcsMenuActions.append(act)
         menu.addSeparator()
         act = menu.addAction(
-            UI.PixmapCache.getIcon("vcsStatus.png"),
+            UI.PixmapCache.getIcon("vcsStatus"),
             self.tr('Show status'), self._VCSStatus)
         self.vcsMenuActions.append(act)
         act = menu.addAction(
-            UI.PixmapCache.getIcon("vcsRepo.png"),
+            UI.PixmapCache.getIcon("vcsRepo"),
             self.tr('Show repository info'), self.__SVNInfo)
         self.vcsMenuActions.append(act)
         menu.addSeparator()
         act = menu.addAction(
-            UI.PixmapCache.getIcon("vcsDiff.png"),
+            UI.PixmapCache.getIcon("vcsDiff"),
             self.tr('Show differences'), self._VCSDiff)
         self.vcsMenuActions.append(act)
         act = menu.addAction(
-            UI.PixmapCache.getIcon("vcsSbsDiff.png"),
+            UI.PixmapCache.getIcon("vcsSbsDiff"),
             self.tr('Show differences side-by-side'), self.__SVNSbsDiff)
         self.vcsMenuActions.append(act)
         act = menu.addAction(
-            UI.PixmapCache.getIcon("vcsDiff.png"),
+            UI.PixmapCache.getIcon("vcsDiff"),
             self.tr('Show differences (extended)'),
             self.__SVNExtendedDiff)
         self.vcsMenuActions.append(act)
         act = menu.addAction(
-            UI.PixmapCache.getIcon("vcsSbsDiff.png"),
+            UI.PixmapCache.getIcon("vcsSbsDiff"),
             self.tr('Show differences side-by-side (extended)'),
             self.__SVNSbsExtendedDiff)
         self.vcsMenuActions.append(act)
         act = menu.addAction(
-            UI.PixmapCache.getIcon("vcsDiff.png"),
+            UI.PixmapCache.getIcon("vcsDiff"),
             self.tr('Show differences (URLs)'),
             self.__SVNUrlDiff)
         self.vcsMenuActions.append(act)
@@ -297,11 +297,11 @@
         self.vcsMenuActions.append(self.blameAct)
         menu.addSeparator()
         act = menu.addAction(
-            UI.PixmapCache.getIcon("vcsRevert.png"),
+            UI.PixmapCache.getIcon("vcsRevert"),
             self.tr('Revert changes'), self._VCSRevert)
         self.vcsMenuActions.append(act)
         act = menu.addAction(
-            UI.PixmapCache.getIcon("vcsMerge.png"),
+            UI.PixmapCache.getIcon("vcsMerge"),
             self.tr('Merge changes'), self._VCSMerge)
         self.vcsMenuActions.append(act)
         act = menu.addAction(
@@ -309,19 +309,19 @@
         self.vcsMenuActions.append(act)
         menu.addSeparator()
         act = menu.addAction(
-            UI.PixmapCache.getIcon("vcsLock.png"),
+            UI.PixmapCache.getIcon("vcsLock"),
             self.tr('Lock'), self.__SVNLock)
         self.vcsMenuActions.append(act)
         act = menu.addAction(
-            UI.PixmapCache.getIcon("vcsUnlock.png"),
+            UI.PixmapCache.getIcon("vcsUnlock"),
             self.tr('Unlock'), self.__SVNUnlock)
         self.vcsMenuActions.append(act)
         act = menu.addAction(
-            UI.PixmapCache.getIcon("vcsUnlock.png"),
+            UI.PixmapCache.getIcon("vcsUnlock"),
             self.tr('Break Lock'), self.__SVNBreakLock)
         self.vcsMenuActions.append(act)
         act = menu.addAction(
-            UI.PixmapCache.getIcon("vcsUnlock.png"),
+            UI.PixmapCache.getIcon("vcsUnlock"),
             self.tr('Steal Lock'), self.__SVNStealLock)
         self.vcsMenuActions.append(act)
         menu.addSeparator()
@@ -370,26 +370,26 @@
         menu.addSeparator()
         
         act = menu.addAction(
-            UI.PixmapCache.getIcon("vcsUpdate.png"),
+            UI.PixmapCache.getIcon("vcsUpdate"),
             self.tr('Update from repository'), self._VCSUpdate)
         self.vcsMultiMenuActions.append(act)
         act = menu.addAction(
-            UI.PixmapCache.getIcon("vcsCommit.png"),
+            UI.PixmapCache.getIcon("vcsCommit"),
             self.tr('Commit changes to repository...'),
             self._VCSCommit)
         self.vcsMultiMenuActions.append(act)
         menu.addSeparator()
         act = menu.addAction(
-            UI.PixmapCache.getIcon("vcsAdd.png"),
+            UI.PixmapCache.getIcon("vcsAdd"),
             self.tr('Add to repository'), self._VCSAdd)
         self.vcsAddMultiMenuActions.append(act)
         if 1 in self.browser.specialMenuEntries:
             self.vcsMultiMenuAddTree = menu.addAction(
-                UI.PixmapCache.getIcon("vcsAdd.png"),
+                UI.PixmapCache.getIcon("vcsAdd"),
                 self.tr('Add tree to repository'), self._VCSAddTree)
             self.vcsAddMultiMenuActions.append(self.vcsMultiMenuAddTree)
         act = menu.addAction(
-            UI.PixmapCache.getIcon("vcsRemove.png"),
+            UI.PixmapCache.getIcon("vcsRemove"),
             self.tr('Remove from repository (and disk)'),
             self._VCSRemove)
         self.vcsMultiMenuActions.append(act)
@@ -405,27 +405,27 @@
             self.vcsMenuActions.append(act)
         menu.addSeparator()
         act = menu.addAction(
-            UI.PixmapCache.getIcon("vcsStatus.png"),
+            UI.PixmapCache.getIcon("vcsStatus"),
             self.tr('Show status'), self._VCSStatus)
         self.vcsMultiMenuActions.append(act)
         menu.addSeparator()
         act = menu.addAction(
-            UI.PixmapCache.getIcon("vcsDiff.png"),
+            UI.PixmapCache.getIcon("vcsDiff"),
             self.tr('Show differences'), self._VCSDiff)
         self.vcsMultiMenuActions.append(act)
         act = menu.addAction(
-            UI.PixmapCache.getIcon("vcsDiff.png"),
+            UI.PixmapCache.getIcon("vcsDiff"),
             self.tr('Show differences (extended)'),
             self.__SVNExtendedDiff)
         self.vcsMultiMenuActions.append(act)
         act = menu.addAction(
-            UI.PixmapCache.getIcon("vcsDiff.png"),
+            UI.PixmapCache.getIcon("vcsDiff"),
             self.tr('Show differences (URLs)'),
             self.__SVNUrlDiff)
         self.vcsMultiMenuActions.append(act)
         menu.addSeparator()
         act = menu.addAction(
-            UI.PixmapCache.getIcon("vcsRevert.png"),
+            UI.PixmapCache.getIcon("vcsRevert"),
             self.tr('Revert changes'), self._VCSRevert)
         self.vcsMultiMenuActions.append(act)
         act = menu.addAction(
@@ -433,19 +433,19 @@
         self.vcsMultiMenuActions.append(act)
         menu.addSeparator()
         act = menu.addAction(
-            UI.PixmapCache.getIcon("vcsLock.png"),
+            UI.PixmapCache.getIcon("vcsLock"),
             self.tr('Lock'), self.__SVNLock)
         self.vcsMultiMenuActions.append(act)
         act = menu.addAction(
-            UI.PixmapCache.getIcon("vcsUnlock.png"),
+            UI.PixmapCache.getIcon("vcsUnlock"),
             self.tr('Unlock'), self.__SVNUnlock)
         self.vcsMultiMenuActions.append(act)
         act = menu.addAction(
-            UI.PixmapCache.getIcon("vcsUnlock.png"),
+            UI.PixmapCache.getIcon("vcsUnlock"),
             self.tr('Break Lock'), self.__SVNBreakLock)
         self.vcsMultiMenuActions.append(act)
         act = menu.addAction(
-            UI.PixmapCache.getIcon("vcsUnlock.png"),
+            UI.PixmapCache.getIcon("vcsUnlock"),
             self.tr('Steal Lock'), self.__SVNStealLock)
         self.vcsMultiMenuActions.append(act)
         menu.addSeparator()
@@ -528,21 +528,21 @@
         menu.addSeparator()
         
         act = menu.addAction(
-            UI.PixmapCache.getIcon("vcsUpdate.png"),
+            UI.PixmapCache.getIcon("vcsUpdate"),
             self.tr('Update from repository'), self._VCSUpdate)
         self.vcsDirMenuActions.append(act)
         act = menu.addAction(
-            UI.PixmapCache.getIcon("vcsCommit.png"),
+            UI.PixmapCache.getIcon("vcsCommit"),
             self.tr('Commit changes to repository...'),
             self._VCSCommit)
         self.vcsDirMenuActions.append(act)
         menu.addSeparator()
         act = menu.addAction(
-            UI.PixmapCache.getIcon("vcsAdd.png"),
+            UI.PixmapCache.getIcon("vcsAdd"),
             self.tr('Add to repository'), self._VCSAdd)
         self.vcsAddDirMenuActions.append(act)
         act = menu.addAction(
-            UI.PixmapCache.getIcon("vcsRemove.png"),
+            UI.PixmapCache.getIcon("vcsRemove"),
             self.tr('Remove from repository (and disk)'),
             self._VCSRemove)
         self.vcsDirMenuActions.append(act)
@@ -563,40 +563,40 @@
             self.vcsMenuActions.append(act)
         menu.addSeparator()
         act = menu.addAction(
-            UI.PixmapCache.getIcon("vcsLog.png"),
+            UI.PixmapCache.getIcon("vcsLog"),
             self.tr('Show log browser'), self._VCSLogBrowser)
         self.vcsDirMenuActions.append(act)
         menu.addSeparator()
         act = menu.addAction(
-            UI.PixmapCache.getIcon("vcsStatus.png"),
+            UI.PixmapCache.getIcon("vcsStatus"),
             self.tr('Show status'), self._VCSStatus)
         self.vcsDirMenuActions.append(act)
         act = menu.addAction(
-            UI.PixmapCache.getIcon("vcsRepo.png"),
+            UI.PixmapCache.getIcon("vcsRepo"),
             self.tr('Show repository info'), self.__SVNInfo)
         self.vcsDirMenuActions.append(act)
         menu.addSeparator()
         act = menu.addAction(
-            UI.PixmapCache.getIcon("vcsDiff.png"),
+            UI.PixmapCache.getIcon("vcsDiff"),
             self.tr('Show differences'), self._VCSDiff)
         self.vcsDirMenuActions.append(act)
         act = menu.addAction(
-            UI.PixmapCache.getIcon("vcsDiff.png"),
+            UI.PixmapCache.getIcon("vcsDiff"),
             self.tr('Show differences (extended)'),
             self.__SVNExtendedDiff)
         self.vcsDirMenuActions.append(act)
         act = menu.addAction(
-            UI.PixmapCache.getIcon("vcsDiff.png"),
+            UI.PixmapCache.getIcon("vcsDiff"),
             self.tr('Show differences (URLs)'),
             self.__SVNUrlDiff)
         self.vcsDirMenuActions.append(act)
         menu.addSeparator()
         act = menu.addAction(
-            UI.PixmapCache.getIcon("vcsRevert.png"),
+            UI.PixmapCache.getIcon("vcsRevert"),
             self.tr('Revert changes'), self._VCSRevert)
         self.vcsDirMenuActions.append(act)
         act = menu.addAction(
-            UI.PixmapCache.getIcon("vcsMerge.png"),
+            UI.PixmapCache.getIcon("vcsMerge"),
             self.tr('Merge changes'), self._VCSMerge)
         self.vcsDirMenuActions.append(act)
         act = menu.addAction(
@@ -650,21 +650,21 @@
         menu.addSeparator()
         
         act = menu.addAction(
-            UI.PixmapCache.getIcon("vcsUpdate.png"),
+            UI.PixmapCache.getIcon("vcsUpdate"),
             self.tr('Update from repository'), self._VCSUpdate)
         self.vcsDirMultiMenuActions.append(act)
         act = menu.addAction(
-            UI.PixmapCache.getIcon("vcsCommit.png"),
+            UI.PixmapCache.getIcon("vcsCommit"),
             self.tr('Commit changes to repository...'),
             self._VCSCommit)
         self.vcsDirMultiMenuActions.append(act)
         menu.addSeparator()
         act = menu.addAction(
-            UI.PixmapCache.getIcon("vcsAdd.png"),
+            UI.PixmapCache.getIcon("vcsAdd"),
             self.tr('Add to repository'), self._VCSAdd)
         self.vcsAddDirMultiMenuActions.append(act)
         act = menu.addAction(
-            UI.PixmapCache.getIcon("vcsRemove.png"),
+            UI.PixmapCache.getIcon("vcsRemove"),
             self.tr('Remove from repository (and disk)'),
             self._VCSRemove)
         self.vcsDirMultiMenuActions.append(act)
@@ -680,31 +680,31 @@
             self.vcsMenuActions.append(act)
         menu.addSeparator()
         act = menu.addAction(
-            UI.PixmapCache.getIcon("vcsStatus.png"),
+            UI.PixmapCache.getIcon("vcsStatus"),
             self.tr('Show status'), self._VCSStatus)
         self.vcsDirMultiMenuActions.append(act)
         menu.addSeparator()
         act = menu.addAction(
-            UI.PixmapCache.getIcon("vcsDiff.png"),
+            UI.PixmapCache.getIcon("vcsDiff"),
             self.tr('Show differences'), self._VCSDiff)
         self.vcsDirMultiMenuActions.append(act)
         act = menu.addAction(
-            UI.PixmapCache.getIcon("vcsDiff.png"),
+            UI.PixmapCache.getIcon("vcsDiff"),
             self.tr('Show differences (extended)'),
             self.__SVNExtendedDiff)
         self.vcsDirMultiMenuActions.append(act)
         act = menu.addAction(
-            UI.PixmapCache.getIcon("vcsDiff.png"),
+            UI.PixmapCache.getIcon("vcsDiff"),
             self.tr('Show differences (URLs)'),
             self.__SVNUrlDiff)
         self.vcsDirMultiMenuActions.append(act)
         menu.addSeparator()
         act = menu.addAction(
-            UI.PixmapCache.getIcon("vcsRevert.png"),
+            UI.PixmapCache.getIcon("vcsRevert"),
             self.tr('Revert changes'), self._VCSRevert)
         self.vcsDirMultiMenuActions.append(act)
         act = menu.addAction(
-            UI.PixmapCache.getIcon("vcsMerge.png"),
+            UI.PixmapCache.getIcon("vcsMerge"),
             self.tr('Merge changes'), self._VCSMerge)
         self.vcsDirMultiMenuActions.append(act)
         act = menu.addAction(
@@ -760,13 +760,15 @@
             fn = itm.dirName()
         isFile = os.path.isfile(fn)
         movefiles = self.browser.project.getFiles(fn)
+        self.browser.project.stopFileSystemMonitoring()
         if self.vcs.vcsMove(fn, self.project):
             if isFile:
                 self.browser.closeSourceWindow.emit(fn)
             else:
                 for mf in movefiles:
                     self.browser.closeSourceWindow.emit(mf)
-        
+        self.browser.project.startFileSystemMonitoring()
+    
     def __SVNResolve(self):
         """
         Private slot called by the context menu to resolve conflicts of a file.
--- a/eric6/Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py	Sat May 02 13:51:07 2020 +0200
@@ -49,7 +49,7 @@
         """
         self.vcsNewAct = E5Action(
             self.tr('New from repository'),
-            UI.PixmapCache.getIcon("vcsCheckout.png"),
+            UI.PixmapCache.getIcon("vcsCheckout"),
             self.tr('&New from repository...'), 0, 0, self,
             'pysvn_new')
         self.vcsNewAct.setStatusTip(self.tr(
@@ -65,7 +65,7 @@
         
         self.vcsUpdateAct = E5Action(
             self.tr('Update from repository'),
-            UI.PixmapCache.getIcon("vcsUpdate.png"),
+            UI.PixmapCache.getIcon("vcsUpdate"),
             self.tr('&Update from repository'), 0, 0, self,
             'pysvn_update')
         self.vcsUpdateAct.setStatusTip(self.tr(
@@ -81,7 +81,7 @@
         
         self.vcsCommitAct = E5Action(
             self.tr('Commit changes to repository'),
-            UI.PixmapCache.getIcon("vcsCommit.png"),
+            UI.PixmapCache.getIcon("vcsCommit"),
             self.tr('&Commit changes to repository...'), 0, 0, self,
             'pysvn_commit')
         self.vcsCommitAct.setStatusTip(self.tr(
@@ -97,7 +97,7 @@
         
         self.svnLogBrowserAct = E5Action(
             self.tr('Show log browser'),
-            UI.PixmapCache.getIcon("vcsLog.png"),
+            UI.PixmapCache.getIcon("vcsLog"),
             self.tr('Show log browser'),
             0, 0, self, 'pysvn_log_browser')
         self.svnLogBrowserAct.setStatusTip(self.tr(
@@ -114,7 +114,7 @@
         
         self.vcsDiffAct = E5Action(
             self.tr('Show differences'),
-            UI.PixmapCache.getIcon("vcsDiff.png"),
+            UI.PixmapCache.getIcon("vcsDiff"),
             self.tr('Show &difference'),
             0, 0, self, 'pysvn_diff')
         self.vcsDiffAct.setStatusTip(self.tr(
@@ -130,7 +130,7 @@
         
         self.svnExtDiffAct = E5Action(
             self.tr('Show differences (extended)'),
-            UI.PixmapCache.getIcon("vcsDiff.png"),
+            UI.PixmapCache.getIcon("vcsDiff"),
             self.tr('Show differences (extended)'),
             0, 0, self, 'pysvn_extendeddiff')
         self.svnExtDiffAct.setStatusTip(self.tr(
@@ -146,7 +146,7 @@
         
         self.svnUrlDiffAct = E5Action(
             self.tr('Show differences (URLs)'),
-            UI.PixmapCache.getIcon("vcsDiff.png"),
+            UI.PixmapCache.getIcon("vcsDiff"),
             self.tr('Show differences (URLs)'),
             0, 0, self, 'pysvn_urldiff')
         self.svnUrlDiffAct.setStatusTip(self.tr(
@@ -162,7 +162,7 @@
         
         self.vcsStatusAct = E5Action(
             self.tr('Show status'),
-            UI.PixmapCache.getIcon("vcsStatus.png"),
+            UI.PixmapCache.getIcon("vcsStatus"),
             self.tr('Show &status'),
             0, 0, self, 'pysvn_status')
         self.vcsStatusAct.setStatusTip(self.tr(
@@ -177,7 +177,7 @@
         
         self.svnChangeListsAct = E5Action(
             self.tr('Show change lists'),
-            UI.PixmapCache.getIcon("vcsChangeLists.png"),
+            UI.PixmapCache.getIcon("vcsChangeLists"),
             self.tr('Show change lists'),
             0, 0, self, 'pysvn_changelists')
         self.svnChangeListsAct.setStatusTip(self.tr(
@@ -193,7 +193,7 @@
         
         self.svnRepoInfoAct = E5Action(
             self.tr('Show repository info'),
-            UI.PixmapCache.getIcon("vcsRepo.png"),
+            UI.PixmapCache.getIcon("vcsRepo"),
             self.tr('Show repository info'),
             0, 0, self, 'pysvn_repoinfo')
         self.svnRepoInfoAct.setStatusTip(self.tr(
@@ -209,7 +209,7 @@
         
         self.vcsTagAct = E5Action(
             self.tr('Tag in repository'),
-            UI.PixmapCache.getIcon("vcsTag.png"),
+            UI.PixmapCache.getIcon("vcsTag"),
             self.tr('&Tag in repository...'),
             0, 0, self, 'pysvn_tag')
         self.vcsTagAct.setStatusTip(self.tr(
@@ -224,7 +224,7 @@
         
         self.vcsExportAct = E5Action(
             self.tr('Export from repository'),
-            UI.PixmapCache.getIcon("vcsExport.png"),
+            UI.PixmapCache.getIcon("vcsExport"),
             self.tr('&Export from repository...'),
             0, 0, self, 'pysvn_export')
         self.vcsExportAct.setStatusTip(self.tr(
@@ -252,7 +252,7 @@
         
         self.vcsRevertAct = E5Action(
             self.tr('Revert changes'),
-            UI.PixmapCache.getIcon("vcsRevert.png"),
+            UI.PixmapCache.getIcon("vcsRevert"),
             self.tr('Re&vert changes'),
             0, 0, self, 'pysvn_revert')
         self.vcsRevertAct.setStatusTip(self.tr(
@@ -267,7 +267,7 @@
         
         self.vcsMergeAct = E5Action(
             self.tr('Merge'),
-            UI.PixmapCache.getIcon("vcsMerge.png"),
+            UI.PixmapCache.getIcon("vcsMerge"),
             self.tr('Mer&ge changes...'),
             0, 0, self, 'pysvn_merge')
         self.vcsMergeAct.setStatusTip(self.tr(
@@ -283,7 +283,7 @@
         
         self.vcsSwitchAct = E5Action(
             self.tr('Switch'),
-            UI.PixmapCache.getIcon("vcsSwitch.png"),
+            UI.PixmapCache.getIcon("vcsSwitch"),
             self.tr('S&witch...'),
             0, 0, self, 'pysvn_switch')
         self.vcsSwitchAct.setStatusTip(self.tr(
@@ -425,7 +425,7 @@
         
         self.svnRelocateAct = E5Action(
             self.tr('Relocate'),
-            UI.PixmapCache.getIcon("vcsSwitch.png"),
+            UI.PixmapCache.getIcon("vcsSwitch"),
             self.tr('Relocate...'),
             0, 0, self, 'pysvn_relocate')
         self.svnRelocateAct.setStatusTip(self.tr(
@@ -441,7 +441,7 @@
         
         self.svnRepoBrowserAct = E5Action(
             self.tr('Repository Browser'),
-            UI.PixmapCache.getIcon("vcsRepoBrowser.png"),
+            UI.PixmapCache.getIcon("vcsRepoBrowser"),
             self.tr('Repository Browser...'),
             0, 0, self, 'pysvn_repo_browser')
         self.svnRepoBrowserAct.setStatusTip(self.tr(
--- a/eric6/Plugins/VcsPlugins/vcsPySvn/SvnLogBrowserDialog.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/Plugins/VcsPlugins/vcsPySvn/SvnLogBrowserDialog.py	Sat May 02 13:51:07 2020 +0200
@@ -48,8 +48,8 @@
         self.buttonBox.button(QDialogButtonBox.Close).setEnabled(False)
         self.buttonBox.button(QDialogButtonBox.Cancel).setDefault(True)
         
-        self.upButton.setIcon(UI.PixmapCache.getIcon("1uparrow.png"))
-        self.downButton.setIcon(UI.PixmapCache.getIcon("1downarrow.png"))
+        self.upButton.setIcon(UI.PixmapCache.getIcon("1uparrow"))
+        self.downButton.setIcon(UI.PixmapCache.getIcon("1downarrow"))
         
         self.filesTree.headerItem().setText(self.filesTree.columnCount(), "")
         self.filesTree.header().setSortIndicator(0, Qt.AscendingOrder)
--- a/eric6/Plugins/VcsPlugins/vcsPySvn/SvnRepoBrowserDialog.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/Plugins/VcsPlugins/vcsPySvn/SvnRepoBrowserDialog.py	Sat May 02 13:51:07 2020 +0200
@@ -56,8 +56,8 @@
             self.buttonBox.button(QDialogButtonBox.Ok).hide()
             self.buttonBox.button(QDialogButtonBox.Cancel).hide()
         
-        self.__dirIcon = UI.PixmapCache.getIcon("dirClosed.png")
-        self.__fileIcon = UI.PixmapCache.getIcon("fileMisc.png")
+        self.__dirIcon = UI.PixmapCache.getIcon("dirClosed")
+        self.__fileIcon = UI.PixmapCache.getIcon("fileMisc")
         
         self.__urlRole = Qt.UserRole
         self.__ignoreExpand = False
--- a/eric6/Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py	Sat May 02 13:51:07 2020 +0200
@@ -210,28 +210,28 @@
         menu.addSeparator()
         
         act = menu.addAction(
-            UI.PixmapCache.getIcon("vcsUpdate.png"),
+            UI.PixmapCache.getIcon("vcsUpdate"),
             self.tr('Update from repository'), self._VCSUpdate)
         self.vcsMenuActions.append(act)
         act = menu.addAction(
-            UI.PixmapCache.getIcon("vcsCommit.png"),
+            UI.PixmapCache.getIcon("vcsCommit"),
             self.tr('Commit changes to repository...'),
             self._VCSCommit)
         self.vcsMenuActions.append(act)
         menu.addSeparator()
         act = menu.addAction(
-            UI.PixmapCache.getIcon("vcsAdd.png"),
+            UI.PixmapCache.getIcon("vcsAdd"),
             self.tr('Add to repository'),
             self._VCSAdd)
         self.vcsAddMenuActions.append(act)
         if 1 in self.browser.specialMenuEntries:
             self.vcsMenuAddTree = menu.addAction(
-                UI.PixmapCache.getIcon("vcsAdd.png"),
+                UI.PixmapCache.getIcon("vcsAdd"),
                 self.tr('Add tree to repository'),
                 self._VCSAddTree)
             self.vcsAddMenuActions.append(self.vcsMenuAddTree)
         act = menu.addAction(
-            UI.PixmapCache.getIcon("vcsRemove.png"),
+            UI.PixmapCache.getIcon("vcsRemove"),
             self.tr('Remove from repository (and disk)'),
             self._VCSRemove)
         self.vcsMenuActions.append(act)
@@ -252,35 +252,35 @@
             self.vcsMenuActions.append(act)
         menu.addSeparator()
         act = menu.addAction(
-            UI.PixmapCache.getIcon("vcsLog.png"),
+            UI.PixmapCache.getIcon("vcsLog"),
             self.tr('Show log browser'), self._VCSLogBrowser)
         self.vcsMenuActions.append(act)
         menu.addSeparator()
         act = menu.addAction(
-            UI.PixmapCache.getIcon("vcsStatus.png"),
+            UI.PixmapCache.getIcon("vcsStatus"),
             self.tr('Show status'), self._VCSStatus)
         self.vcsMenuActions.append(act)
         menu.addSeparator()
         act = menu.addAction(
-            UI.PixmapCache.getIcon("vcsDiff.png"),
+            UI.PixmapCache.getIcon("vcsDiff"),
             self.tr('Show differences'), self._VCSDiff)
         self.vcsMenuActions.append(act)
         act = menu.addAction(
-            UI.PixmapCache.getIcon("vcsSbsDiff.png"),
+            UI.PixmapCache.getIcon("vcsSbsDiff"),
             self.tr('Show differences side-by-side'), self.__SVNSbsDiff)
         self.vcsMenuActions.append(act)
         act = menu.addAction(
-            UI.PixmapCache.getIcon("vcsDiff.png"),
+            UI.PixmapCache.getIcon("vcsDiff"),
             self.tr('Show differences (extended)'),
             self.__SVNExtendedDiff)
         self.vcsMenuActions.append(act)
         act = menu.addAction(
-            UI.PixmapCache.getIcon("vcsSbsDiff.png"),
+            UI.PixmapCache.getIcon("vcsSbsDiff"),
             self.tr('Show differences side-by-side (extended)'),
             self.__SVNSbsExtendedDiff)
         self.vcsMenuActions.append(act)
         act = menu.addAction(
-            UI.PixmapCache.getIcon("vcsDiff.png"),
+            UI.PixmapCache.getIcon("vcsDiff"),
             self.tr('Show differences (URLs)'),
             self.__SVNUrlDiff)
         self.vcsMenuActions.append(act)
@@ -290,11 +290,11 @@
         self.vcsMenuActions.append(self.blameAct)
         menu.addSeparator()
         act = menu.addAction(
-            UI.PixmapCache.getIcon("vcsRevert.png"),
+            UI.PixmapCache.getIcon("vcsRevert"),
             self.tr('Revert changes'), self._VCSRevert)
         self.vcsMenuActions.append(act)
         act = menu.addAction(
-            UI.PixmapCache.getIcon("vcsMerge.png"),
+            UI.PixmapCache.getIcon("vcsMerge"),
             self.tr('Merge changes'), self._VCSMerge)
         self.vcsMenuActions.append(act)
         act = menu.addAction(
@@ -303,19 +303,19 @@
         if self.vcs.version >= (1, 2, 0):
             menu.addSeparator()
             act = menu.addAction(
-                UI.PixmapCache.getIcon("vcsLock.png"),
+                UI.PixmapCache.getIcon("vcsLock"),
                 self.tr('Lock'), self.__SVNLock)
             self.vcsMenuActions.append(act)
             act = menu.addAction(
-                UI.PixmapCache.getIcon("vcsUnlock.png"),
+                UI.PixmapCache.getIcon("vcsUnlock"),
                 self.tr('Unlock'), self.__SVNUnlock)
             self.vcsMenuActions.append(act)
             act = menu.addAction(
-                UI.PixmapCache.getIcon("vcsUnlock.png"),
+                UI.PixmapCache.getIcon("vcsUnlock"),
                 self.tr('Break Lock'), self.__SVNBreakLock)
             self.vcsMenuActions.append(act)
             act = menu.addAction(
-                UI.PixmapCache.getIcon("vcsUnlock.png"),
+                UI.PixmapCache.getIcon("vcsUnlock"),
                 self.tr('Steal Lock'), self.__SVNStealLock)
             self.vcsMenuActions.append(act)
         menu.addSeparator()
@@ -365,26 +365,26 @@
         menu.addSeparator()
         
         act = menu.addAction(
-            UI.PixmapCache.getIcon("vcsUpdate.png"),
+            UI.PixmapCache.getIcon("vcsUpdate"),
             self.tr('Update from repository'), self._VCSUpdate)
         self.vcsMultiMenuActions.append(act)
         act = menu.addAction(
-            UI.PixmapCache.getIcon("vcsCommit.png"),
+            UI.PixmapCache.getIcon("vcsCommit"),
             self.tr('Commit changes to repository...'),
             self._VCSCommit)
         self.vcsMultiMenuActions.append(act)
         menu.addSeparator()
         act = menu.addAction(
-            UI.PixmapCache.getIcon("vcsAdd.png"),
+            UI.PixmapCache.getIcon("vcsAdd"),
             self.tr('Add to repository'), self._VCSAdd)
         self.vcsAddMultiMenuActions.append(act)
         if 1 in self.browser.specialMenuEntries:
             self.vcsMultiMenuAddTree = menu.addAction(
-                UI.PixmapCache.getIcon("vcsAdd.png"),
+                UI.PixmapCache.getIcon("vcsAdd"),
                 self.tr('Add tree to repository'), self._VCSAddTree)
             self.vcsAddMultiMenuActions.append(self.vcsMultiMenuAddTree)
         act = menu.addAction(
-            UI.PixmapCache.getIcon("vcsRemove.png"),
+            UI.PixmapCache.getIcon("vcsRemove"),
             self.tr('Remove from repository (and disk)'),
             self._VCSRemove)
         self.vcsMultiMenuActions.append(act)
@@ -400,27 +400,27 @@
             self.vcsMenuActions.append(act)
         menu.addSeparator()
         act = menu.addAction(
-            UI.PixmapCache.getIcon("vcsStatus.png"),
+            UI.PixmapCache.getIcon("vcsStatus"),
             self.tr('Show status'), self._VCSStatus)
         self.vcsMultiMenuActions.append(act)
         menu.addSeparator()
         act = menu.addAction(
-            UI.PixmapCache.getIcon("vcsDiff.png"),
+            UI.PixmapCache.getIcon("vcsDiff"),
             self.tr('Show differences'), self._VCSDiff)
         self.vcsMultiMenuActions.append(act)
         act = menu.addAction(
-            UI.PixmapCache.getIcon("vcsDiff.png"),
+            UI.PixmapCache.getIcon("vcsDiff"),
             self.tr('Show differences (extended)'),
             self.__SVNExtendedDiff)
         self.vcsMultiMenuActions.append(act)
         act = menu.addAction(
-            UI.PixmapCache.getIcon("vcsDiff.png"),
+            UI.PixmapCache.getIcon("vcsDiff"),
             self.tr('Show differences (URLs)'),
             self.__SVNUrlDiff)
         self.vcsMultiMenuActions.append(act)
         menu.addSeparator()
         act = menu.addAction(
-            UI.PixmapCache.getIcon("vcsRevert.png"),
+            UI.PixmapCache.getIcon("vcsRevert"),
             self.tr('Revert changes'), self._VCSRevert)
         self.vcsMultiMenuActions.append(act)
         act = menu.addAction(
@@ -429,19 +429,19 @@
         if self.vcs.version >= (1, 2, 0):
             menu.addSeparator()
             act = menu.addAction(
-                UI.PixmapCache.getIcon("vcsLock.png"),
+                UI.PixmapCache.getIcon("vcsLock"),
                 self.tr('Lock'), self.__SVNLock)
             self.vcsMultiMenuActions.append(act)
             act = menu.addAction(
-                UI.PixmapCache.getIcon("vcsUnlock.png"),
+                UI.PixmapCache.getIcon("vcsUnlock"),
                 self.tr('Unlock'), self.__SVNUnlock)
             self.vcsMultiMenuActions.append(act)
             act = menu.addAction(
-                UI.PixmapCache.getIcon("vcsUnlock.png"),
+                UI.PixmapCache.getIcon("vcsUnlock"),
                 self.tr('Break Lock'), self.__SVNBreakLock)
             self.vcsMultiMenuActions.append(act)
             act = menu.addAction(
-                UI.PixmapCache.getIcon("vcsUnlock.png"),
+                UI.PixmapCache.getIcon("vcsUnlock"),
                 self.tr('Steal Lock'), self.__SVNStealLock)
             self.vcsMultiMenuActions.append(act)
         menu.addSeparator()
@@ -526,21 +526,21 @@
         menu.addSeparator()
         
         act = menu.addAction(
-            UI.PixmapCache.getIcon("vcsUpdate.png"),
+            UI.PixmapCache.getIcon("vcsUpdate"),
             self.tr('Update from repository'), self._VCSUpdate)
         self.vcsDirMenuActions.append(act)
         act = menu.addAction(
-            UI.PixmapCache.getIcon("vcsCommit.png"),
+            UI.PixmapCache.getIcon("vcsCommit"),
             self.tr('Commit changes to repository...'),
             self._VCSCommit)
         self.vcsDirMenuActions.append(act)
         menu.addSeparator()
         act = menu.addAction(
-            UI.PixmapCache.getIcon("vcsAdd.png"),
+            UI.PixmapCache.getIcon("vcsAdd"),
             self.tr('Add to repository'), self._VCSAdd)
         self.vcsAddDirMenuActions.append(act)
         act = menu.addAction(
-            UI.PixmapCache.getIcon("vcsRemove.png"),
+            UI.PixmapCache.getIcon("vcsRemove"),
             self.tr('Remove from repository (and disk)'),
             self._VCSRemove)
         self.vcsDirMenuActions.append(act)
@@ -561,36 +561,36 @@
             self.vcsMenuActions.append(act)
         menu.addSeparator()
         act = menu.addAction(
-            UI.PixmapCache.getIcon("vcsLog.png"),
+            UI.PixmapCache.getIcon("vcsLog"),
             self.tr('Show log browser'), self._VCSLogBrowser)
         self.vcsDirMenuActions.append(act)
         menu.addSeparator()
         act = menu.addAction(
-            UI.PixmapCache.getIcon("vcsStatus.png"),
+            UI.PixmapCache.getIcon("vcsStatus"),
             self.tr('Show status'), self._VCSStatus)
         self.vcsDirMenuActions.append(act)
         menu.addSeparator()
         act = menu.addAction(
-            UI.PixmapCache.getIcon("vcsDiff.png"),
+            UI.PixmapCache.getIcon("vcsDiff"),
             self.tr('Show differences'), self._VCSDiff)
         self.vcsDirMenuActions.append(act)
         act = menu.addAction(
-            UI.PixmapCache.getIcon("vcsDiff.png"),
+            UI.PixmapCache.getIcon("vcsDiff"),
             self.tr('Show differences (extended)'),
             self.__SVNExtendedDiff)
         self.vcsDirMenuActions.append(act)
         act = menu.addAction(
-            UI.PixmapCache.getIcon("vcsDiff.png"),
+            UI.PixmapCache.getIcon("vcsDiff"),
             self.tr('Show differences (URLs)'),
             self.__SVNUrlDiff)
         self.vcsDirMenuActions.append(act)
         menu.addSeparator()
         act = menu.addAction(
-            UI.PixmapCache.getIcon("vcsRevert.png"),
+            UI.PixmapCache.getIcon("vcsRevert"),
             self.tr('Revert changes'), self._VCSRevert)
         self.vcsDirMenuActions.append(act)
         act = menu.addAction(
-            UI.PixmapCache.getIcon("vcsMerge.png"),
+            UI.PixmapCache.getIcon("vcsMerge"),
             self.tr('Merge changes'), self._VCSMerge)
         self.vcsDirMenuActions.append(act)
         act = menu.addAction(
@@ -645,21 +645,21 @@
         menu.addSeparator()
         
         act = menu.addAction(
-            UI.PixmapCache.getIcon("vcsUpdate.png"),
+            UI.PixmapCache.getIcon("vcsUpdate"),
             self.tr('Update from repository'), self._VCSUpdate)
         self.vcsDirMultiMenuActions.append(act)
         act = menu.addAction(
-            UI.PixmapCache.getIcon("vcsCommit.png"),
+            UI.PixmapCache.getIcon("vcsCommit"),
             self.tr('Commit changes to repository...'),
             self._VCSCommit)
         self.vcsDirMultiMenuActions.append(act)
         menu.addSeparator()
         act = menu.addAction(
-            UI.PixmapCache.getIcon("vcsAdd.png"),
+            UI.PixmapCache.getIcon("vcsAdd"),
             self.tr('Add to repository'), self._VCSAdd)
         self.vcsAddDirMultiMenuActions.append(act)
         act = menu.addAction(
-            UI.PixmapCache.getIcon("vcsRemove.png"),
+            UI.PixmapCache.getIcon("vcsRemove"),
             self.tr('Remove from repository (and disk)'),
             self._VCSRemove)
         self.vcsDirMultiMenuActions.append(act)
@@ -675,31 +675,31 @@
             self.vcsMenuActions.append(act)
         menu.addSeparator()
         act = menu.addAction(
-            UI.PixmapCache.getIcon("vcsStatus.png"),
+            UI.PixmapCache.getIcon("vcsStatus"),
             self.tr('Show status'), self._VCSStatus)
         self.vcsDirMultiMenuActions.append(act)
         menu.addSeparator()
         act = menu.addAction(
-            UI.PixmapCache.getIcon("vcsDiff.png"),
+            UI.PixmapCache.getIcon("vcsDiff"),
             self.tr('Show differences'), self._VCSDiff)
         self.vcsDirMultiMenuActions.append(act)
         act = menu.addAction(
-            UI.PixmapCache.getIcon("vcsDiff.png"),
+            UI.PixmapCache.getIcon("vcsDiff"),
             self.tr('Show differences (extended)'),
             self.__SVNExtendedDiff)
         self.vcsDirMultiMenuActions.append(act)
         act = menu.addAction(
-            UI.PixmapCache.getIcon("vcsDiff.png"),
+            UI.PixmapCache.getIcon("vcsDiff"),
             self.tr('Show differences (URLs)'),
             self.__SVNUrlDiff)
         self.vcsDirMultiMenuActions.append(act)
         menu.addSeparator()
         act = menu.addAction(
-            UI.PixmapCache.getIcon("vcsRevert.png"),
+            UI.PixmapCache.getIcon("vcsRevert"),
             self.tr('Revert changes'), self._VCSRevert)
         self.vcsDirMultiMenuActions.append(act)
         act = menu.addAction(
-            UI.PixmapCache.getIcon("vcsMerge.png"),
+            UI.PixmapCache.getIcon("vcsMerge"),
             self.tr('Merge changes'), self._VCSMerge)
         self.vcsDirMultiMenuActions.append(act)
         act = menu.addAction(
@@ -755,13 +755,15 @@
             fn = itm.dirName()
         isFile = os.path.isfile(fn)
         movefiles = self.browser.project.getFiles(fn)
+        self.browser.project.stopFileSystemMonitoring()
         if self.vcs.vcsMove(fn, self.project):
             if isFile:
                 self.browser.closeSourceWindow.emit(fn)
             else:
                 for mf in movefiles:
                     self.browser.closeSourceWindow.emit(mf)
-        
+        self.browser.project.startFileSystemMonitoring()
+    
     def __SVNResolve(self):
         """
         Private slot called by the context menu to resolve conflicts of a file.
--- a/eric6/Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py	Sat May 02 13:51:07 2020 +0200
@@ -49,7 +49,7 @@
         """
         self.vcsNewAct = E5Action(
             self.tr('New from repository'),
-            UI.PixmapCache.getIcon("vcsCheckout.png"),
+            UI.PixmapCache.getIcon("vcsCheckout"),
             self.tr('&New from repository...'), 0, 0, self,
             'subversion_new')
         self.vcsNewAct.setStatusTip(self.tr(
@@ -65,7 +65,7 @@
         
         self.vcsUpdateAct = E5Action(
             self.tr('Update from repository'),
-            UI.PixmapCache.getIcon("vcsUpdate.png"),
+            UI.PixmapCache.getIcon("vcsUpdate"),
             self.tr('&Update from repository'), 0, 0, self,
             'subversion_update')
         self.vcsUpdateAct.setStatusTip(self.tr(
@@ -81,7 +81,7 @@
         
         self.vcsCommitAct = E5Action(
             self.tr('Commit changes to repository'),
-            UI.PixmapCache.getIcon("vcsCommit.png"),
+            UI.PixmapCache.getIcon("vcsCommit"),
             self.tr('&Commit changes to repository...'), 0, 0, self,
             'subversion_commit')
         self.vcsCommitAct.setStatusTip(self.tr(
@@ -97,7 +97,7 @@
         
         self.svnLogBrowserAct = E5Action(
             self.tr('Show log browser'),
-            UI.PixmapCache.getIcon("vcsLog.png"),
+            UI.PixmapCache.getIcon("vcsLog"),
             self.tr('Show log browser'),
             0, 0, self, 'subversion_log_browser')
         self.svnLogBrowserAct.setStatusTip(self.tr(
@@ -114,7 +114,7 @@
         
         self.vcsDiffAct = E5Action(
             self.tr('Show differences'),
-            UI.PixmapCache.getIcon("vcsDiff.png"),
+            UI.PixmapCache.getIcon("vcsDiff"),
             self.tr('Show &difference'),
             0, 0, self, 'subversion_diff')
         self.vcsDiffAct.setStatusTip(self.tr(
@@ -130,7 +130,7 @@
         
         self.svnExtDiffAct = E5Action(
             self.tr('Show differences (extended)'),
-            UI.PixmapCache.getIcon("vcsDiff.png"),
+            UI.PixmapCache.getIcon("vcsDiff"),
             self.tr('Show differences (extended)'),
             0, 0, self, 'subversion_extendeddiff')
         self.svnExtDiffAct.setStatusTip(self.tr(
@@ -146,7 +146,7 @@
         
         self.svnUrlDiffAct = E5Action(
             self.tr('Show differences (URLs)'),
-            UI.PixmapCache.getIcon("vcsDiff.png"),
+            UI.PixmapCache.getIcon("vcsDiff"),
             self.tr('Show differences (URLs)'),
             0, 0, self, 'subversion_urldiff')
         self.svnUrlDiffAct.setStatusTip(self.tr(
@@ -162,7 +162,7 @@
         
         self.vcsStatusAct = E5Action(
             self.tr('Show status'),
-            UI.PixmapCache.getIcon("vcsStatus.png"),
+            UI.PixmapCache.getIcon("vcsStatus"),
             self.tr('Show &status'),
             0, 0, self, 'subversion_status')
         self.vcsStatusAct.setStatusTip(self.tr(
@@ -177,7 +177,7 @@
         
         self.svnChangeListsAct = E5Action(
             self.tr('Show change lists'),
-            UI.PixmapCache.getIcon("vcsChangeLists.png"),
+            UI.PixmapCache.getIcon("vcsChangeLists"),
             self.tr('Show change lists'),
             0, 0, self, 'subversion_changelists')
         self.svnChangeListsAct.setStatusTip(self.tr(
@@ -193,7 +193,7 @@
         
         self.vcsTagAct = E5Action(
             self.tr('Tag in repository'),
-            UI.PixmapCache.getIcon("vcsTag.png"),
+            UI.PixmapCache.getIcon("vcsTag"),
             self.tr('&Tag in repository...'),
             0, 0, self, 'subversion_tag')
         self.vcsTagAct.setStatusTip(self.tr(
@@ -208,7 +208,7 @@
         
         self.vcsExportAct = E5Action(
             self.tr('Export from repository'),
-            UI.PixmapCache.getIcon("vcsExport.png"),
+            UI.PixmapCache.getIcon("vcsExport"),
             self.tr('&Export from repository...'),
             0, 0, self, 'subversion_export')
         self.vcsExportAct.setStatusTip(self.tr(
@@ -236,7 +236,7 @@
         
         self.vcsRevertAct = E5Action(
             self.tr('Revert changes'),
-            UI.PixmapCache.getIcon("vcsRevert.png"),
+            UI.PixmapCache.getIcon("vcsRevert"),
             self.tr('Re&vert changes'),
             0, 0, self, 'subversion_revert')
         self.vcsRevertAct.setStatusTip(self.tr(
@@ -251,7 +251,7 @@
         
         self.vcsMergeAct = E5Action(
             self.tr('Merge'),
-            UI.PixmapCache.getIcon("vcsMerge.png"),
+            UI.PixmapCache.getIcon("vcsMerge"),
             self.tr('Mer&ge changes...'),
             0, 0, self, 'subversion_merge')
         self.vcsMergeAct.setStatusTip(self.tr(
@@ -267,7 +267,7 @@
         
         self.vcsSwitchAct = E5Action(
             self.tr('Switch'),
-            UI.PixmapCache.getIcon("vcsSwitch.png"),
+            UI.PixmapCache.getIcon("vcsSwitch"),
             self.tr('S&witch...'),
             0, 0, self, 'subversion_switch')
         self.vcsSwitchAct.setStatusTip(self.tr(
@@ -409,7 +409,7 @@
         
         self.svnRelocateAct = E5Action(
             self.tr('Relocate'),
-            UI.PixmapCache.getIcon("vcsSwitch.png"),
+            UI.PixmapCache.getIcon("vcsSwitch"),
             self.tr('Relocate...'),
             0, 0, self, 'subversion_relocate')
         self.svnRelocateAct.setStatusTip(self.tr(
@@ -425,7 +425,7 @@
         
         self.svnRepoBrowserAct = E5Action(
             self.tr('Repository Browser'),
-            UI.PixmapCache.getIcon("vcsRepoBrowser.png"),
+            UI.PixmapCache.getIcon("vcsRepoBrowser"),
             self.tr('Repository Browser...'),
             0, 0, self, 'subversion_repo_browser')
         self.svnRepoBrowserAct.setStatusTip(self.tr(
--- a/eric6/Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py	Sat May 02 13:51:07 2020 +0200
@@ -47,8 +47,8 @@
         self.buttonBox.button(QDialogButtonBox.Close).setEnabled(False)
         self.buttonBox.button(QDialogButtonBox.Cancel).setDefault(True)
         
-        self.upButton.setIcon(UI.PixmapCache.getIcon("1uparrow.png"))
-        self.downButton.setIcon(UI.PixmapCache.getIcon("1downarrow.png"))
+        self.upButton.setIcon(UI.PixmapCache.getIcon("1uparrow"))
+        self.downButton.setIcon(UI.PixmapCache.getIcon("1downarrow"))
         
         self.filesTree.headerItem().setText(self.filesTree.columnCount(), "")
         self.filesTree.header().setSortIndicator(0, Qt.AscendingOrder)
--- a/eric6/Plugins/VcsPlugins/vcsSubversion/SvnRepoBrowserDialog.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/Plugins/VcsPlugins/vcsSubversion/SvnRepoBrowserDialog.py	Sat May 02 13:51:07 2020 +0200
@@ -61,8 +61,8 @@
             self.buttonBox.button(QDialogButtonBox.Ok).hide()
             self.buttonBox.button(QDialogButtonBox.Cancel).hide()
         
-        self.__dirIcon = UI.PixmapCache.getIcon("dirClosed.png")
-        self.__fileIcon = UI.PixmapCache.getIcon("fileMisc.png")
+        self.__dirIcon = UI.PixmapCache.getIcon("dirClosed")
+        self.__fileIcon = UI.PixmapCache.getIcon("fileMisc")
         
         self.__urlRole = Qt.UserRole
         self.__ignoreExpand = False
--- a/eric6/Plugins/ViewManagerPlugins/Listspace/Listspace.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/Plugins/ViewManagerPlugins/Listspace/Listspace.py	Sat May 02 13:51:07 2020 +0200
@@ -253,23 +253,23 @@
         """
         self.__menu = QMenu(self)
         self.__menu.addAction(
-            UI.PixmapCache.getIcon("tabClose.png"),
+            UI.PixmapCache.getIcon("tabClose"),
             self.tr('Close'), self.__contextMenuClose)
         self.closeOthersMenuAct = self.__menu.addAction(
-            UI.PixmapCache.getIcon("tabCloseOther.png"),
+            UI.PixmapCache.getIcon("tabCloseOther"),
             self.tr("Close Others"),
             self.__contextMenuCloseOthers)
         self.__menu.addAction(
             self.tr('Close All'), self.__contextMenuCloseAll)
         self.__menu.addSeparator()
         self.saveMenuAct = self.__menu.addAction(
-            UI.PixmapCache.getIcon("fileSave.png"),
+            UI.PixmapCache.getIcon("fileSave"),
             self.tr('Save'), self.__contextMenuSave)
         self.__menu.addAction(
-            UI.PixmapCache.getIcon("fileSaveAs.png"),
+            UI.PixmapCache.getIcon("fileSaveAs"),
             self.tr('Save As...'), self.__contextMenuSaveAs)
         self.__menu.addAction(
-            UI.PixmapCache.getIcon("fileSaveAll.png"),
+            UI.PixmapCache.getIcon("fileSaveAll"),
             self.tr('Save All'), self.__contextMenuSaveAll)
         self.__menu.addSeparator()
         self.openRejectionsMenuAct = self.__menu.addAction(
@@ -277,7 +277,7 @@
             self.__contextMenuOpenRejections)
         self.__menu.addSeparator()
         self.__menu.addAction(
-            UI.PixmapCache.getIcon("print.png"),
+            UI.PixmapCache.getIcon("print"),
             self.tr('Print'), self.__contextMenuPrintFile)
         self.__menu.addSeparator()
         self.copyPathAct = self.__menu.addAction(
@@ -596,13 +596,13 @@
         index = self.editors.index(editor)
         keys = []
         if m:
-            keys.append("fileModified.png")
+            keys.append("fileModified")
         if editor.hasSyntaxErrors():
-            keys.append("syntaxError22.png")
+            keys.append("syntaxError22")
         elif editor.hasWarnings():
-            keys.append("warning22.png")
+            keys.append("warning22")
         if not keys:
-            keys.append("empty.png")
+            keys.append("empty")
         item = self.viewlist.item(index)
         if item:
             item.setIcon(UI.PixmapCache.getCombinedIcon(keys))
@@ -620,13 +620,13 @@
         index = self.editors.index(editor)
         keys = []
         if editor.isModified():
-            keys.append("fileModified.png")
+            keys.append("fileModified")
         if editor.hasSyntaxErrors():
-            keys.append("syntaxError22.png")
+            keys.append("syntaxError22")
         elif editor.hasWarnings():
-            keys.append("warning22.png")
+            keys.append("warning22")
         if not keys:
-            keys.append("empty.png")
+            keys.append("empty")
         item = self.viewlist.item(index)
         if item:
             item.setIcon(UI.PixmapCache.getCombinedIcon(keys))
--- a/eric6/Plugins/ViewManagerPlugins/Tabview/Tabview.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/Plugins/ViewManagerPlugins/Tabview/Tabview.py	Sat May 02 13:51:07 2020 +0200
@@ -209,7 +209,7 @@
         self.__navigationMenu.triggered.connect(self.__navigationMenuTriggered)
         
         self.navigationButton = QToolButton(self)
-        self.navigationButton.setIcon(UI.PixmapCache.getIcon("1downarrow.png"))
+        self.navigationButton.setIcon(UI.PixmapCache.getIcon("1downarrow"))
         self.navigationButton.setToolTip(self.tr("Show a navigation menu"))
         self.navigationButton.setPopupMode(QToolButton.InstantPopup)
         self.navigationButton.setMenu(self.__navigationMenu)
@@ -234,7 +234,7 @@
         self.emptyLabel.setAlignment(Qt.AlignVCenter | Qt.AlignHCenter)
         super(TabWidget, self).addTab(
             self.emptyLabel,
-            UI.PixmapCache.getIcon("empty.png"), "")
+            UI.PixmapCache.getIcon("empty"), "")
         
     def __initMenu(self):
         """
@@ -242,35 +242,35 @@
         """
         self.__menu = QMenu(self)
         self.leftMenuAct = self.__menu.addAction(
-            UI.PixmapCache.getIcon("1leftarrow.png"),
+            UI.PixmapCache.getIcon("1leftarrow"),
             self.tr('Move Left'), self.__contextMenuMoveLeft)
         self.rightMenuAct = self.__menu.addAction(
-            UI.PixmapCache.getIcon("1rightarrow.png"),
+            UI.PixmapCache.getIcon("1rightarrow"),
             self.tr('Move Right'), self.__contextMenuMoveRight)
         self.firstMenuAct = self.__menu.addAction(
-            UI.PixmapCache.getIcon("2leftarrow.png"),
+            UI.PixmapCache.getIcon("2leftarrow"),
             self.tr('Move First'), self.__contextMenuMoveFirst)
         self.lastMenuAct = self.__menu.addAction(
-            UI.PixmapCache.getIcon("2rightarrow.png"),
+            UI.PixmapCache.getIcon("2rightarrow"),
             self.tr('Move Last'), self.__contextMenuMoveLast)
         self.__menu.addSeparator()
         self.__menu.addAction(
-            UI.PixmapCache.getIcon("tabClose.png"),
+            UI.PixmapCache.getIcon("tabClose"),
             self.tr('Close'), self.__contextMenuClose)
         self.closeOthersMenuAct = self.__menu.addAction(
-            UI.PixmapCache.getIcon("tabCloseOther.png"),
+            UI.PixmapCache.getIcon("tabCloseOther"),
             self.tr("Close Others"), self.__contextMenuCloseOthers)
         self.__menu.addAction(
             self.tr('Close All'), self.__contextMenuCloseAll)
         self.__menu.addSeparator()
         self.saveMenuAct = self.__menu.addAction(
-            UI.PixmapCache.getIcon("fileSave.png"),
+            UI.PixmapCache.getIcon("fileSave"),
             self.tr('Save'), self.__contextMenuSave)
         self.__menu.addAction(
-            UI.PixmapCache.getIcon("fileSaveAs.png"),
+            UI.PixmapCache.getIcon("fileSaveAs"),
             self.tr('Save As...'), self.__contextMenuSaveAs)
         self.__menu.addAction(
-            UI.PixmapCache.getIcon("fileSaveAll.png"),
+            UI.PixmapCache.getIcon("fileSaveAll"),
             self.tr('Save All'), self.__contextMenuSaveAll)
         self.__menu.addSeparator()
         self.openRejectionsMenuAct = self.__menu.addAction(
@@ -278,7 +278,7 @@
             self.__contextMenuOpenRejections)
         self.__menu.addSeparator()
         self.__menu.addAction(
-            UI.PixmapCache.getIcon("print.png"),
+            UI.PixmapCache.getIcon("print"),
             self.tr('Print'), self.__contextMenuPrintFile)
         self.__menu.addSeparator()
         self.copyPathAct = self.__menu.addAction(
@@ -365,7 +365,7 @@
         """
         editor = assembly.getEditor()
         super(TabWidget, self).addTab(
-            assembly, UI.PixmapCache.getIcon("empty.png"), title)
+            assembly, UI.PixmapCache.getIcon("empty"), title)
         self.setTabsClosable(True)
         self.navigationButton.setEnabled(True)
         
@@ -395,7 +395,7 @@
         editor = assembly.getEditor()
         newIndex = super(TabWidget, self).insertTab(
             index, assembly,
-            UI.PixmapCache.getIcon("empty.png"),
+            UI.PixmapCache.getIcon("empty"),
             title)
         self.setTabsClosable(True)
         self.navigationButton.setEnabled(True)
@@ -476,7 +476,7 @@
         
         if not self.editors:
             super(TabWidget, self).addTab(
-                self.emptyLabel, UI.PixmapCache.getIcon("empty.png"), "")
+                self.emptyLabel, UI.PixmapCache.getIcon("empty"), "")
             self.emptyLabel.show()
             self.setTabsClosable(False)
             self.navigationButton.setEnabled(False)
@@ -1109,13 +1109,13 @@
         index = tw.indexOf(editor)
         keys = []
         if m:
-            keys.append("fileModified.png")
+            keys.append("fileModified")
         if editor.hasSyntaxErrors():
-            keys.append("syntaxError22.png")
+            keys.append("syntaxError22")
         elif editor.hasWarnings():
-            keys.append("warning22.png")
+            keys.append("warning22")
         if not keys:
-            keys.append("empty.png")
+            keys.append("empty")
         tw.setTabIcon(index, UI.PixmapCache.getCombinedIcon(keys))
         self._checkActions(editor)
         
@@ -1132,13 +1132,13 @@
         index = tw.indexOf(editor)
         keys = []
         if editor.isModified():
-            keys.append("fileModified.png")
+            keys.append("fileModified")
         if editor.hasSyntaxErrors():
-            keys.append("syntaxError22.png")
+            keys.append("syntaxError22")
         elif editor.hasWarnings():
-            keys.append("warning22.png")
+            keys.append("warning22")
         if not keys:
-            keys.append("empty.png")
+            keys.append("empty")
         tw.setTabIcon(index, UI.PixmapCache.getCombinedIcon(keys))
         
         ViewManager._syntaxErrorToggled(self, editor)
--- a/eric6/Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.py	Sat May 02 13:51:07 2020 +0200
@@ -73,7 +73,7 @@
                         self,
                         self.tr("QColorDialog Wizard Error"),
                         self.tr(
-                            """<p>The colour <b>{0}</b> is not valid.</p>""")
+                            """<p>The color <b>{0}</b> is not valid.</p>""")
                         .format(coStr))
             
         elif self.rRGBA.isChecked():
--- a/eric6/Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.ui	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.ui	Sat May 02 13:51:07 2020 +0200
@@ -29,7 +29,7 @@
          <string>Select to generate a QColorDialog.getColor dialog</string>
         </property>
         <property name="text">
-         <string>Colour</string>
+         <string>Color</string>
         </property>
         <property name="checked">
          <bool>true</bool>
@@ -140,7 +140,7 @@
    <item>
     <widget class="QGroupBox" name="groupBox_2">
      <property name="title">
-      <string>Colour</string>
+      <string>Color</string>
      </property>
      <layout class="QVBoxLayout">
       <item>
@@ -152,7 +152,7 @@
          </sizepolicy>
         </property>
         <property name="toolTip">
-         <string>Enter a variable name or a colour</string>
+         <string>Enter a variable name or a color</string>
         </property>
         <property name="editable">
          <bool>true</bool>
@@ -289,7 +289,7 @@
       <item row="2" column="0" colspan="4">
        <widget class="QLabel" name="TextLabel2">
         <property name="text">
-         <string>Colour Variable</string>
+         <string>Color Variable</string>
         </property>
        </widget>
       </item>
--- a/eric6/Plugins/WizardPlugins/DotDesktopWizard/DotDesktopWizardDialog.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/Plugins/WizardPlugins/DotDesktopWizard/DotDesktopWizardDialog.py	Sat May 02 13:51:07 2020 +0200
@@ -104,7 +104,7 @@
         projectOpen = e5App().getObject("Project").isOpen()
         self.projectButton.setEnabled(projectOpen)
         
-        icon = UI.PixmapCache.getIcon("listSelection.png")
+        icon = UI.PixmapCache.getIcon("listSelection")
         self.categoriesButton.setIcon(icon)
         self.onlyShowButton.setIcon(icon)
         self.notShowButton.setIcon(icon)
--- a/eric6/Plugins/WizardPlugins/PyRegExpWizard/PyRegExpWizardDialog.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/Plugins/WizardPlugins/PyRegExpWizard/PyRegExpWizardDialog.py	Sat May 02 13:51:07 2020 +0200
@@ -44,32 +44,32 @@
         self.setupUi(self)
         
         # initialize icons of the tool buttons
-        self.commentButton.setIcon(UI.PixmapCache.getIcon("comment.png"))
-        self.charButton.setIcon(UI.PixmapCache.getIcon("characters.png"))
-        self.anycharButton.setIcon(UI.PixmapCache.getIcon("anychar.png"))
-        self.repeatButton.setIcon(UI.PixmapCache.getIcon("repeat.png"))
-        self.nonGroupButton.setIcon(UI.PixmapCache.getIcon("nongroup.png"))
-        self.groupButton.setIcon(UI.PixmapCache.getIcon("group.png"))
-        self.namedGroupButton.setIcon(UI.PixmapCache.getIcon("namedgroup.png"))
+        self.commentButton.setIcon(UI.PixmapCache.getIcon("comment"))
+        self.charButton.setIcon(UI.PixmapCache.getIcon("characters"))
+        self.anycharButton.setIcon(UI.PixmapCache.getIcon("anychar"))
+        self.repeatButton.setIcon(UI.PixmapCache.getIcon("repeat"))
+        self.nonGroupButton.setIcon(UI.PixmapCache.getIcon("nongroup"))
+        self.groupButton.setIcon(UI.PixmapCache.getIcon("group"))
+        self.namedGroupButton.setIcon(UI.PixmapCache.getIcon("namedgroup"))
         self.namedReferenceButton.setIcon(
-            UI.PixmapCache.getIcon("namedreference.png"))
-        self.altnButton.setIcon(UI.PixmapCache.getIcon("altn.png"))
-        self.beglineButton.setIcon(UI.PixmapCache.getIcon("begline.png"))
-        self.endlineButton.setIcon(UI.PixmapCache.getIcon("endline.png"))
+            UI.PixmapCache.getIcon("namedreference"))
+        self.altnButton.setIcon(UI.PixmapCache.getIcon("altn"))
+        self.beglineButton.setIcon(UI.PixmapCache.getIcon("begline"))
+        self.endlineButton.setIcon(UI.PixmapCache.getIcon("endline"))
         self.wordboundButton.setIcon(
-            UI.PixmapCache.getIcon("wordboundary.png"))
+            UI.PixmapCache.getIcon("wordboundary"))
         self.nonwordboundButton.setIcon(
-            UI.PixmapCache.getIcon("nonwordboundary.png"))
+            UI.PixmapCache.getIcon("nonwordboundary"))
         self.poslookaheadButton.setIcon(
-            UI.PixmapCache.getIcon("poslookahead.png"))
+            UI.PixmapCache.getIcon("poslookahead"))
         self.neglookaheadButton.setIcon(
-            UI.PixmapCache.getIcon("neglookahead.png"))
+            UI.PixmapCache.getIcon("neglookahead"))
         self.poslookbehindButton.setIcon(
-            UI.PixmapCache.getIcon("poslookbehind.png"))
+            UI.PixmapCache.getIcon("poslookbehind"))
         self.neglookbehindButton.setIcon(
-            UI.PixmapCache.getIcon("neglookbehind.png"))
-        self.undoButton.setIcon(UI.PixmapCache.getIcon("editUndo.png"))
-        self.redoButton.setIcon(UI.PixmapCache.getIcon("editRedo.png"))
+            UI.PixmapCache.getIcon("neglookbehind"))
+        self.undoButton.setIcon(UI.PixmapCache.getIcon("editUndo"))
+        self.redoButton.setIcon(UI.PixmapCache.getIcon("editRedo"))
         
         self.namedGroups = re.compile(r"""\(?P<([^>]+)>""").findall
         
--- a/eric6/Plugins/WizardPlugins/QRegExpWizard/QRegExpWizardDialog.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/Plugins/WizardPlugins/QRegExpWizard/QRegExpWizardDialog.py	Sat May 02 13:51:07 2020 +0200
@@ -44,36 +44,36 @@
         
         # initialize icons of the tool buttons
         # regexp tool buttons
-        self.charButton.setIcon(UI.PixmapCache.getIcon("characters.png"))
-        self.anycharButton.setIcon(UI.PixmapCache.getIcon("anychar.png"))
-        self.repeatButton.setIcon(UI.PixmapCache.getIcon("repeat.png"))
-        self.nonGroupButton.setIcon(UI.PixmapCache.getIcon("nongroup.png"))
-        self.groupButton.setIcon(UI.PixmapCache.getIcon("group.png"))
-        self.altnButton.setIcon(UI.PixmapCache.getIcon("altn.png"))
-        self.beglineButton.setIcon(UI.PixmapCache.getIcon("begline.png"))
-        self.endlineButton.setIcon(UI.PixmapCache.getIcon("endline.png"))
+        self.charButton.setIcon(UI.PixmapCache.getIcon("characters"))
+        self.anycharButton.setIcon(UI.PixmapCache.getIcon("anychar"))
+        self.repeatButton.setIcon(UI.PixmapCache.getIcon("repeat"))
+        self.nonGroupButton.setIcon(UI.PixmapCache.getIcon("nongroup"))
+        self.groupButton.setIcon(UI.PixmapCache.getIcon("group"))
+        self.altnButton.setIcon(UI.PixmapCache.getIcon("altn"))
+        self.beglineButton.setIcon(UI.PixmapCache.getIcon("begline"))
+        self.endlineButton.setIcon(UI.PixmapCache.getIcon("endline"))
         self.wordboundButton.setIcon(
-            UI.PixmapCache.getIcon("wordboundary.png"))
+            UI.PixmapCache.getIcon("wordboundary"))
         self.nonwordboundButton.setIcon(
-            UI.PixmapCache.getIcon("nonwordboundary.png"))
+            UI.PixmapCache.getIcon("nonwordboundary"))
         self.poslookaheadButton.setIcon(
-            UI.PixmapCache.getIcon("poslookahead.png"))
+            UI.PixmapCache.getIcon("poslookahead"))
         self.neglookaheadButton.setIcon(
-            UI.PixmapCache.getIcon("neglookahead.png"))
-        self.undoButton.setIcon(UI.PixmapCache.getIcon("editUndo.png"))
-        self.redoButton.setIcon(UI.PixmapCache.getIcon("editRedo.png"))
+            UI.PixmapCache.getIcon("neglookahead"))
+        self.undoButton.setIcon(UI.PixmapCache.getIcon("editUndo"))
+        self.redoButton.setIcon(UI.PixmapCache.getIcon("editRedo"))
         # wildcard tool buttons
         self.wildcardCharButton.setIcon(
-            UI.PixmapCache.getIcon("characters.png"))
+            UI.PixmapCache.getIcon("characters"))
         self.wildcardAnycharButton.setIcon(
-            UI.PixmapCache.getIcon("anychar.png"))
-        self.wildcardRepeatButton.setIcon(UI.PixmapCache.getIcon("repeat.png"))
+            UI.PixmapCache.getIcon("anychar"))
+        self.wildcardRepeatButton.setIcon(UI.PixmapCache.getIcon("repeat"))
         # W3C tool buttons
-        self.w3cCharButton.setIcon(UI.PixmapCache.getIcon("characters.png"))
-        self.w3cAnycharButton.setIcon(UI.PixmapCache.getIcon("anychar.png"))
-        self.w3cRepeatButton.setIcon(UI.PixmapCache.getIcon("repeat.png"))
-        self.w3cGroupButton.setIcon(UI.PixmapCache.getIcon("group.png"))
-        self.w3cAltnButton.setIcon(UI.PixmapCache.getIcon("altn.png"))
+        self.w3cCharButton.setIcon(UI.PixmapCache.getIcon("characters"))
+        self.w3cAnycharButton.setIcon(UI.PixmapCache.getIcon("anychar"))
+        self.w3cRepeatButton.setIcon(UI.PixmapCache.getIcon("repeat"))
+        self.w3cGroupButton.setIcon(UI.PixmapCache.getIcon("group"))
+        self.w3cAltnButton.setIcon(UI.PixmapCache.getIcon("altn"))
         
         # initialize the syntax pattern combo
         self.syntaxCombo.addItem("RegExp", QRegExp.RegExp)
--- a/eric6/Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardDialog.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardDialog.py	Sat May 02 13:51:07 2020 +0200
@@ -49,34 +49,34 @@
         self.setupUi(self)
         
         # initialize icons of the tool buttons
-        self.commentButton.setIcon(UI.PixmapCache.getIcon("comment.png"))
-        self.charButton.setIcon(UI.PixmapCache.getIcon("characters.png"))
-        self.anycharButton.setIcon(UI.PixmapCache.getIcon("anychar.png"))
-        self.repeatButton.setIcon(UI.PixmapCache.getIcon("repeat.png"))
-        self.nonGroupButton.setIcon(UI.PixmapCache.getIcon("nongroup.png"))
+        self.commentButton.setIcon(UI.PixmapCache.getIcon("comment"))
+        self.charButton.setIcon(UI.PixmapCache.getIcon("characters"))
+        self.anycharButton.setIcon(UI.PixmapCache.getIcon("anychar"))
+        self.repeatButton.setIcon(UI.PixmapCache.getIcon("repeat"))
+        self.nonGroupButton.setIcon(UI.PixmapCache.getIcon("nongroup"))
         self.atomicGroupButton.setIcon(
-            UI.PixmapCache.getIcon("atomicgroup.png"))
-        self.groupButton.setIcon(UI.PixmapCache.getIcon("group.png"))
-        self.namedGroupButton.setIcon(UI.PixmapCache.getIcon("namedgroup.png"))
+            UI.PixmapCache.getIcon("atomicgroup"))
+        self.groupButton.setIcon(UI.PixmapCache.getIcon("group"))
+        self.namedGroupButton.setIcon(UI.PixmapCache.getIcon("namedgroup"))
         self.namedReferenceButton.setIcon(
-            UI.PixmapCache.getIcon("namedreference.png"))
-        self.altnButton.setIcon(UI.PixmapCache.getIcon("altn.png"))
-        self.beglineButton.setIcon(UI.PixmapCache.getIcon("begline.png"))
-        self.endlineButton.setIcon(UI.PixmapCache.getIcon("endline.png"))
+            UI.PixmapCache.getIcon("namedreference"))
+        self.altnButton.setIcon(UI.PixmapCache.getIcon("altn"))
+        self.beglineButton.setIcon(UI.PixmapCache.getIcon("begline"))
+        self.endlineButton.setIcon(UI.PixmapCache.getIcon("endline"))
         self.wordboundButton.setIcon(
-            UI.PixmapCache.getIcon("wordboundary.png"))
+            UI.PixmapCache.getIcon("wordboundary"))
         self.nonwordboundButton.setIcon(
-            UI.PixmapCache.getIcon("nonwordboundary.png"))
+            UI.PixmapCache.getIcon("nonwordboundary"))
         self.poslookaheadButton.setIcon(
-            UI.PixmapCache.getIcon("poslookahead.png"))
+            UI.PixmapCache.getIcon("poslookahead"))
         self.neglookaheadButton.setIcon(
-            UI.PixmapCache.getIcon("neglookahead.png"))
+            UI.PixmapCache.getIcon("neglookahead"))
         self.poslookbehindButton.setIcon(
-            UI.PixmapCache.getIcon("poslookbehind.png"))
+            UI.PixmapCache.getIcon("poslookbehind"))
         self.neglookbehindButton.setIcon(
-            UI.PixmapCache.getIcon("neglookbehind.png"))
-        self.undoButton.setIcon(UI.PixmapCache.getIcon("editUndo.png"))
-        self.redoButton.setIcon(UI.PixmapCache.getIcon("editRedo.png"))
+            UI.PixmapCache.getIcon("neglookbehind"))
+        self.undoButton.setIcon(UI.PixmapCache.getIcon("editUndo"))
+        self.redoButton.setIcon(UI.PixmapCache.getIcon("editRedo"))
         
         self.namedGroups = re.compile(r"""\(?P<([^>]+)>""").findall
         
--- a/eric6/Plugins/WizardPlugins/SetupWizard/SetupWizardDialog.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/Plugins/WizardPlugins/SetupWizard/SetupWizardDialog.py	Sat May 02 13:51:07 2020 +0200
@@ -55,9 +55,9 @@
         self.__packageRootDirCompleter = E5DirCompleter(self.packageRootEdit)
         self.__sourceDirCompleter = E5DirCompleter(self.sourceDirectoryEdit)
         
-        self.packageRootDirButton.setIcon(UI.PixmapCache.getIcon("open.png"))
-        self.packageDirButton.setIcon(UI.PixmapCache.getIcon("open.png"))
-        self.sourceDirectoryButton.setIcon(UI.PixmapCache.getIcon("open.png"))
+        self.packageRootDirButton.setIcon(UI.PixmapCache.getIcon("open"))
+        self.packageDirButton.setIcon(UI.PixmapCache.getIcon("open"))
+        self.sourceDirectoryButton.setIcon(UI.PixmapCache.getIcon("open"))
         
         self.variantComboBox.addItem(self.tr("distutils"), "distutils.core")
         self.variantComboBox.addItem(self.tr("setuptools"), "setuptools")
--- a/eric6/Preferences/ConfigurationDialog.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/Preferences/ConfigurationDialog.py	Sat May 02 13:51:07 2020 +0200
@@ -140,235 +140,235 @@
                 # create the configuration page. This must have the method
                 # 'save' to save the settings.
                 "applicationPage":
-                [self.tr("Application"), "preferences-application.png",
+                [self.tr("Application"), "preferences-application",
                  "ApplicationPage", None, None],
                 "condaPage":
-                [self.tr("Conda"), "miniconda.png",
+                [self.tr("Conda"), "miniconda",
                  "CondaPage", None, None],
                 "cooperationPage":
-                [self.tr("Cooperation"), "preferences-cooperation.png",
+                [self.tr("Cooperation"), "preferences-cooperation",
                  "CooperationPage", None, None],
                 "corbaPage":
-                [self.tr("CORBA"), "preferences-orbit.png",
+                [self.tr("CORBA"), "preferences-orbit",
                  "CorbaPage", None, None],
                 "diffPage":
-                [self.tr("Diff"), "diffFiles.png",
+                [self.tr("Diff"), "diffFiles",
                  "DiffColoursPage", None, None],
                 "emailPage":
-                [self.tr("Email"), "preferences-mail_generic.png",
+                [self.tr("Email"), "preferences-mail_generic",
                  "EmailPage", None, None],
                 "graphicsPage":
-                [self.tr("Graphics"), "preferences-graphics.png",
+                [self.tr("Graphics"), "preferences-graphics",
                  "GraphicsPage", None, None],
                 "hexEditorPage":
-                [self.tr("Hex Editor"), "hexEditor.png",
+                [self.tr("Hex Editor"), "hexEditor",
                  "HexEditorPage", None, None],
                 "iconsPage":
-                [self.tr("Icons"), "preferences-icons.png",
+                [self.tr("Icons"), "preferences-icons",
                  "IconsPage", None, None],
                 "ircPage":
-                [self.tr("IRC"), "irc.png",
+                [self.tr("IRC"), "irc",
                  "IrcPage", None, None],
                 "logViewerPage":
-                [self.tr("Log-Viewer"), "preferences-logviewer.png",
+                [self.tr("Log-Viewer"), "preferences-logviewer",
                  "LogViewerPage", None, None],
                 "microPythonPage":
                 [self.tr("MicroPython"), "micropython",
                  "MicroPythonPage", None, None],
                 "mimeTypesPage":
-                [self.tr("Mimetypes"), "preferences-mimetypes.png",
+                [self.tr("Mimetypes"), "preferences-mimetypes",
                  "MimeTypesPage", None, None],
                 "networkPage":
-                [self.tr("Network"), "preferences-network.png",
+                [self.tr("Network"), "preferences-network",
                  "NetworkPage", None, None],
                 "notificationsPage":
                 [self.tr("Notifications"),
-                 "preferences-notifications.png",
+                 "preferences-notifications",
                  "NotificationsPage", None, None],
                 "pipPage":
-                [self.tr("Python Package Management"), "pypi.png",
+                [self.tr("Python Package Management"), "pypi",
                  "PipPage", None, None],
                 "pluginManagerPage":
                 [self.tr("Plugin Manager"),
-                 "preferences-pluginmanager.png",
+                 "preferences-pluginmanager",
                  "PluginManagerPage", None, None],
                 "printerPage":
-                [self.tr("Printer"), "preferences-printer.png",
+                [self.tr("Printer"), "preferences-printer",
                  "PrinterPage", None, None],
                 "protobufPage":
-                [self.tr("Protobuf"), "protobuf.png",
+                [self.tr("Protobuf"), "protobuf",
                  "ProtobufPage", None, None],
                 "pythonPage":
-                [self.tr("Python"), "preferences-python.png",
+                [self.tr("Python"), "preferences-python",
                  "PythonPage", None, None],
                 "qtPage":
-                [self.tr("Qt"), "preferences-qtlogo.png",
+                [self.tr("Qt"), "preferences-qtlogo",
                  "QtPage", None, None],
                 "securityPage":
-                [self.tr("Security"), "preferences-security.png",
+                [self.tr("Security"), "preferences-security",
                  "SecurityPage", None, None],
                 "shellPage":
-                [self.tr("Shell"), "preferences-shell.png",
+                [self.tr("Shell"), "preferences-shell",
                  "ShellPage", None, None],
                 "tasksPage":
-                [self.tr("Tasks"), "task.png",
+                [self.tr("Tasks"), "task",
                  "TasksPage", None, None],
                 "templatesPage":
-                [self.tr("Templates"), "preferences-template.png",
+                [self.tr("Templates"), "preferences-template",
                  "TemplatesPage", None, None],
                 "trayStarterPage":
-                [self.tr("Tray Starter"), "erict.png",
+                [self.tr("Tray Starter"), "erict",
                  "TrayStarterPage", None, None],
                 "vcsPage":
                 [self.tr("Version Control Systems"),
-                 "preferences-vcs.png",
+                 "preferences-vcs",
                  "VcsPage", None, None],
                 
                 "0debuggerPage":
-                [self.tr("Debugger"), "preferences-debugger.png",
+                [self.tr("Debugger"), "preferences-debugger",
                  None, None, None],
                 "debuggerGeneralPage":
-                [self.tr("General"), "preferences-debugger.png",
+                [self.tr("General"), "preferences-debugger",
                  "DebuggerGeneralPage", "0debuggerPage", None],
                 "debuggerPython2Page":
-                [self.tr("Python2"), "preferences-pyDebugger.png",
+                [self.tr("Python2"), "preferences-pyDebugger",
                  "DebuggerPython2Page", "0debuggerPage", None],
                 "debuggerPython3Page":
-                [self.tr("Python3"), "preferences-pyDebugger.png",
+                [self.tr("Python3"), "preferences-pyDebugger",
                  "DebuggerPython3Page", "0debuggerPage", None],
                 
                 "0editorPage":
-                [self.tr("Editor"), "preferences-editor.png",
+                [self.tr("Editor"), "preferences-editor",
                  None, None, None],
                 "editorAPIsPage":
-                [self.tr("APIs"), "preferences-api.png",
+                [self.tr("APIs"), "preferences-api",
                  "EditorAPIsPage", "0editorPage", None],
                 "editorAutocompletionPage":
                 [self.tr("Autocompletion"),
-                 "preferences-autocompletion.png",
+                 "preferences-autocompletion",
                  "EditorAutocompletionPage", "0editorPage", None],
                 "editorAutocompletionQScintillaPage":
-                [self.tr("QScintilla"), "qscintilla.png",
+                [self.tr("QScintilla"), "qscintilla",
                  "EditorAutocompletionQScintillaPage",
                  "editorAutocompletionPage", None],
                 "editorCalltipsPage":
-                [self.tr("Calltips"), "preferences-calltips.png",
+                [self.tr("Calltips"), "preferences-calltips",
                  "EditorCalltipsPage", "0editorPage", None],
                 "editorCalltipsQScintillaPage":
-                [self.tr("QScintilla"), "qscintilla.png",
+                [self.tr("QScintilla"), "qscintilla",
                  "EditorCalltipsQScintillaPage", "editorCalltipsPage", None],
                 "editorDocViewerPage":
-                [self.tr("Documentation Viewer"), "codeDocuViewer.png",
+                [self.tr("Documentation Viewer"), "codeDocuViewer",
                  "EditorDocViewerPage", "0editorPage", None],
                 "editorGeneralPage":
-                [self.tr("General"), "preferences-general.png",
+                [self.tr("General"), "preferences-general",
                  "EditorGeneralPage", "0editorPage", None],
                 "editorFilePage":
                 [self.tr("Filehandling"),
-                 "preferences-filehandling.png",
+                 "preferences-filehandling",
                  "EditorFilePage", "0editorPage", None],
                 "editorSearchPage":
-                [self.tr("Searching"), "preferences-search.png",
+                [self.tr("Searching"), "preferences-search",
                  "EditorSearchPage", "0editorPage", None],
                 "editorSpellCheckingPage":
                 [self.tr("Spell checking"),
-                 "preferences-spellchecking.png",
+                 "preferences-spellchecking",
                  "EditorSpellCheckingPage", "0editorPage", None],
                 "editorStylesPage":
-                [self.tr("Style"), "preferences-styles.png",
+                [self.tr("Style"), "preferences-styles",
                  "EditorStylesPage", "0editorPage", None],
                 "editorSyntaxPage":
-                [self.tr("Code Checkers"), "preferences-debugger.png",
+                [self.tr("Code Checkers"), "preferences-debugger",
                  "EditorSyntaxPage", "0editorPage", None],
                 "editorTypingPage":
-                [self.tr("Typing"), "preferences-typing.png",
+                [self.tr("Typing"), "preferences-typing",
                  "EditorTypingPage", "0editorPage", None],
                 "editorExportersPage":
-                [self.tr("Exporters"), "preferences-exporters.png",
+                [self.tr("Exporters"), "preferences-exporters",
                  "EditorExportersPage", "0editorPage", None],
                 
                 "1editorLexerPage":
                 [self.tr("Highlighters"),
-                 "preferences-highlighting-styles.png",
+                 "preferences-highlighting-styles",
                  None, "0editorPage", None],
                 "editorHighlightersPage":
                 [self.tr("Filetype Associations"),
-                 "preferences-highlighter-association.png",
+                 "preferences-highlighter-association",
                  "EditorHighlightersPage", "1editorLexerPage", None],
                 "editorHighlightingStylesPage":
                 [self.tr("Styles"),
-                 "preferences-highlighting-styles.png",
+                 "preferences-highlighting-styles",
                  "EditorHighlightingStylesPage", "1editorLexerPage", None],
                 "editorKeywordsPage":
-                [self.tr("Keywords"), "preferences-keywords.png",
+                [self.tr("Keywords"), "preferences-keywords",
                  "EditorKeywordsPage", "1editorLexerPage", None],
                 "editorPropertiesPage":
-                [self.tr("Properties"), "preferences-properties.png",
+                [self.tr("Properties"), "preferences-properties",
                  "EditorPropertiesPage", "1editorLexerPage", None],
                 
                 "1editorMouseClickHandlers":
                 [self.tr("Mouse Click Handlers"),
-                 "preferences-mouse-click-handler.png",
+                 "preferences-mouse-click-handler",
                  "EditorMouseClickHandlerPage", "0editorPage", None],
                 
                 "0helpPage":
-                [self.tr("Help"), "preferences-help.png",
+                [self.tr("Help"), "preferences-help",
                  None, None, None],
                 "helpDocumentationPage":
                 [self.tr("Help Documentation"),
-                 "preferences-helpdocumentation.png",
+                 "preferences-helpdocumentation",
                  "HelpDocumentationPage", "0helpPage", None],
                 "helpViewersPage":
                 [self.tr("Help Viewers"),
-                 "preferences-helpviewers.png",
+                 "preferences-helpviewers",
                  "HelpViewersPage", "0helpPage", None],
                 
                 "0projectPage":
-                [self.tr("Project"), "preferences-project.png",
+                [self.tr("Project"), "preferences-project",
                  None, None, None],
                 "projectBrowserPage":
-                [self.tr("Project Viewer"), "preferences-project.png",
+                [self.tr("Project Viewer"), "preferences-project",
                  "ProjectBrowserPage", "0projectPage", None],
                 "projectPage":
-                [self.tr("Project"), "preferences-project.png",
+                [self.tr("Project"), "preferences-project",
                  "ProjectPage", "0projectPage", None],
                 "multiProjectPage":
                 [self.tr("Multiproject"),
-                 "preferences-multiproject.png",
+                 "preferences-multiproject",
                  "MultiProjectPage", "0projectPage", None],
                 
                 "0interfacePage":
-                [self.tr("Interface"), "preferences-interface.png",
+                [self.tr("Interface"), "preferences-interface",
                  None, None, None],
                 "interfacePage":
-                [self.tr("Interface"), "preferences-interface.png",
+                [self.tr("Interface"), "preferences-interface",
                  "InterfacePage", "0interfacePage", None],
                 "viewmanagerPage":
-                [self.tr("Viewmanager"), "preferences-viewmanager.png",
+                [self.tr("Viewmanager"), "preferences-viewmanager",
                  "ViewmanagerPage", "0interfacePage", None],
             }
             if self.__webEngine:
                 self.configItems.update({
                     "0webBrowserPage":
-                    [self.tr("Web Browser"), "ericWeb.png",
+                    [self.tr("Web Browser"), "ericWeb",
                      None, None, None],
                     "webBrowserAppearancePage":
-                    [self.tr("Appearance"), "preferences-styles.png",
+                    [self.tr("Appearance"), "preferences-styles",
                      "WebBrowserAppearancePage", "0webBrowserPage", None],
                     "webBrowserPage":
-                    [self.tr("eric6 Web Browser"), "ericWeb.png",
+                    [self.tr("eric6 Web Browser"), "ericWeb",
                      "WebBrowserPage", "0webBrowserPage", None],
                     "webBrowserFlashCookieManagerPage":
                     [self.tr("Flash Cookie Manager"),
-                     "flashCookie16.png",
+                     "flashCookie16",
                      "WebBrowserFlashCookieManagerPage", "0webBrowserPage",
                      None],
                     "webBrowserVirusTotalPage":
-                    [self.tr("VirusTotal Interface"), "virustotal.png",
+                    [self.tr("VirusTotal Interface"), "virustotal",
                      "WebBrowserVirusTotalPage", "0webBrowserPage", None],
                     "webBrowserSpellCheckingPage":
                     [self.tr("Spell checking"),
-                     "preferences-spellchecking.png",
+                     "preferences-spellchecking",
                      "WebBrowserSpellCheckingPage", "0webBrowserPage",
                      None],
                 })
@@ -385,41 +385,41 @@
                 # create the configuration page. This must have the method
                 # 'save' to save the settings.
                 "interfacePage":
-                [self.tr("Interface"), "preferences-interface.png",
+                [self.tr("Interface"), "preferences-interface",
                  "WebBrowserInterfacePage", None, None],
                 "networkPage":
-                [self.tr("Network"), "preferences-network.png",
+                [self.tr("Network"), "preferences-network",
                  "NetworkPage", None, None],
                 "printerPage":
-                [self.tr("Printer"), "preferences-printer.png",
+                [self.tr("Printer"), "preferences-printer",
                  "PrinterPage", None, None],
                 "securityPage":
-                [self.tr("Security"), "preferences-security.png",
+                [self.tr("Security"), "preferences-security",
                  "SecurityPage", None, None],
                 
                 "helpDocumentationPage":
                 [self.tr("Help Documentation"),
-                 "preferences-helpdocumentation.png",
+                 "preferences-helpdocumentation",
                  "HelpDocumentationPage", None, None],
                 
                 "webBrowserAppearancePage":
-                [self.tr("Appearance"), "preferences-styles.png",
+                [self.tr("Appearance"), "preferences-styles",
                  "WebBrowserAppearancePage", None, None],
                 "webBrowserPage":
-                [self.tr("eric6 Web Browser"), "ericWeb.png",
+                [self.tr("eric6 Web Browser"), "ericWeb",
                  "WebBrowserPage", None, None],
                 
                 "webBrowserFlashCookieManagerPage":
                 [self.tr("Flash Cookie Manager"),
-                 "flashCookie16.png",
+                 "flashCookie16",
                  "WebBrowserFlashCookieManagerPage", None, None],
                 "webBrowserVirusTotalPage":
-                [self.tr("VirusTotal Interface"), "virustotal.png",
+                [self.tr("VirusTotal Interface"), "virustotal",
                  "WebBrowserVirusTotalPage", None, None],
                 
                 "webBrowserSpellCheckingPage":
                 [self.tr("Spell checking"),
-                 "preferences-spellchecking.png",
+                 "preferences-spellchecking",
                  "WebBrowserSpellCheckingPage", None, None],
             }
         
@@ -432,7 +432,7 @@
                 # create the configuration page. This must have the method
                 # 'save' to save the settings.
                 "trayStarterPage":
-                [self.tr("Tray Starter"), "erict.png",
+                [self.tr("Tray Starter"), "erict",
                  "TrayStarterPage", None, None],
             }
         
@@ -445,7 +445,7 @@
                 # create the configuration page. This must have the method
                 # 'save' to save the settings.
                 "hexEditorPage":
-                [self.tr("Hex Editor"), "hexEditor.png",
+                [self.tr("Hex Editor"), "hexEditor",
                  "HexEditorPage", None, None],
             }
         
--- a/eric6/Preferences/ConfigurationPages/DebuggerGeneralPage.ui	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/Preferences/ConfigurationPages/DebuggerGeneralPage.ui	Sat May 02 13:51:07 2020 +0200
@@ -627,7 +627,7 @@
       <item>
        <widget class="QGroupBox" name="groupBox_2">
         <property name="title">
-         <string>Background Colours</string>
+         <string>Background Colors</string>
         </property>
         <layout class="QHBoxLayout" name="horizontalLayout_3" stretch="2,1">
          <item>
@@ -656,7 +656,7 @@
               </size>
              </property>
              <property name="toolTip">
-              <string>Select the background colour for changed items.</string>
+              <string>Select the background color for changed items.</string>
              </property>
              <property name="text">
               <string/>
@@ -692,7 +692,7 @@
               </size>
              </property>
              <property name="toolTip">
-              <string>Select the background colour for elements which are loaded for the first time.</string>
+              <string>Select the background color for elements which are loaded for the first time.</string>
              </property>
              <property name="text">
               <string/>
--- a/eric6/Preferences/ConfigurationPages/DebuggerPython2Page.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/Preferences/ConfigurationPages/DebuggerPython2Page.py	Sat May 02 13:51:07 2020 +0200
@@ -38,7 +38,7 @@
             from VirtualEnv.VirtualenvManager import VirtualenvManager
             self.__virtualenvManager = VirtualenvManager()
         
-        self.venvDlgButton.setIcon(UI.PixmapCache.getIcon("virtualenv.png"))
+        self.venvDlgButton.setIcon(UI.PixmapCache.getIcon("virtualenv"))
         
         self.debugClientPicker.setMode(E5PathPickerModes.OpenFileMode)
         self.debugClientPicker.setToolTip(self.tr(
--- a/eric6/Preferences/ConfigurationPages/DebuggerPython3Page.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/Preferences/ConfigurationPages/DebuggerPython3Page.py	Sat May 02 13:51:07 2020 +0200
@@ -38,7 +38,7 @@
             from VirtualEnv.VirtualenvManager import VirtualenvManager
             self.__virtualenvManager = VirtualenvManager()
         
-        self.venvDlgButton.setIcon(UI.PixmapCache.getIcon("virtualenv.png"))
+        self.venvDlgButton.setIcon(UI.PixmapCache.getIcon("virtualenv"))
         
         self.debugClientPicker.setMode(E5PathPickerModes.OpenFileMode)
         self.debugClientPicker.setToolTip(self.tr(
--- a/eric6/Preferences/ConfigurationPages/DiffColoursPage.ui	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/Preferences/ConfigurationPages/DiffColoursPage.ui	Sat May 02 13:51:07 2020 +0200
@@ -14,7 +14,7 @@
    <item>
     <widget class="QLabel" name="headerLabel">
      <property name="text">
-      <string>&lt;b&gt;Configure Diff colours&lt;/b&gt;</string>
+      <string>&lt;b&gt;Configure Diff colors&lt;/b&gt;</string>
      </property>
     </widget>
    </item>
@@ -36,10 +36,10 @@
      <item row="5" column="0">
       <widget class="QPushButton" name="headerButton">
        <property name="toolTip">
-        <string>Select the background colour for header lines</string>
+        <string>Select the background color for header lines</string>
        </property>
        <property name="text">
-        <string>Header Colour</string>
+        <string>Header Color</string>
        </property>
       </widget>
      </item>
@@ -62,10 +62,10 @@
      <item row="6" column="0">
       <widget class="QPushButton" name="whitespaceButton">
        <property name="toolTip">
-        <string>Select the background colour for bad whitespace</string>
+        <string>Select the background color for bad whitespace</string>
        </property>
        <property name="text">
-        <string>Whitespace Colour</string>
+        <string>Whitespace Color</string>
        </property>
       </widget>
      </item>
@@ -85,10 +85,10 @@
      <item row="0" column="0">
       <widget class="QPushButton" name="textButton">
        <property name="toolTip">
-        <string>Select the text foreground colour</string>
+        <string>Select the text foreground color</string>
        </property>
        <property name="text">
-        <string>Text Colour</string>
+        <string>Text Color</string>
        </property>
       </widget>
      </item>
@@ -111,10 +111,10 @@
      <item row="1" column="0">
       <widget class="QPushButton" name="addedButton">
        <property name="toolTip">
-        <string>Select the background colour for additions</string>
+        <string>Select the background color for additions</string>
        </property>
        <property name="text">
-        <string>Added Colour</string>
+        <string>Added Color</string>
        </property>
       </widget>
      </item>
@@ -137,10 +137,10 @@
      <item row="2" column="0">
       <widget class="QPushButton" name="removedButton">
        <property name="toolTip">
-        <string>Select the background colour for removed text</string>
+        <string>Select the background color for removed text</string>
        </property>
        <property name="text">
-        <string>Removed Colour</string>
+        <string>Removed Color</string>
        </property>
       </widget>
      </item>
@@ -163,10 +163,10 @@
      <item row="3" column="0">
       <widget class="QPushButton" name="replacedButton">
        <property name="toolTip">
-        <string>Select the background colour for replaced text</string>
+        <string>Select the background color for replaced text</string>
        </property>
        <property name="text">
-        <string>Replaced Colour</string>
+        <string>Replaced Color</string>
        </property>
       </widget>
      </item>
@@ -189,10 +189,10 @@
      <item row="4" column="0">
       <widget class="QPushButton" name="contextButton">
        <property name="toolTip">
-        <string>Select the background colour for context lines</string>
+        <string>Select the background color for context lines</string>
        </property>
        <property name="text">
-        <string>Context Colour</string>
+        <string>Context Color</string>
        </property>
       </widget>
      </item>
--- a/eric6/Preferences/ConfigurationPages/EditorCalltipsPage.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/Preferences/ConfigurationPages/EditorCalltipsPage.py	Sat May 02 13:51:07 2020 +0200
@@ -41,8 +41,13 @@
         
         self.ctVisibleSlider.setValue(
             Preferences.getEditor("CallTipsVisible"))
+        
         self.initColour("CallTipsBackground", self.calltipsBackgroundButton,
                         Preferences.getEditorColour)
+        self.initColour("CallTipsForeground", self.calltipsForegroundButton,
+                        Preferences.getEditorColour)
+        self.initColour("CallTipsHighlight", self.calltipsHighlightButton,
+                        Preferences.getEditorColour)
         
         self.ctScintillaCheckBox.setChecked(
             Preferences.getEditor("CallTipsScintillaOnFail"))
@@ -62,6 +67,7 @@
         Preferences.setEditor(
             "CallTipsVisible",
             self.ctVisibleSlider.value())
+        
         self.saveColours(Preferences.setEditorColour)
         
         Preferences.setEditor(
--- a/eric6/Preferences/ConfigurationPages/EditorCalltipsPage.ui	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/Preferences/ConfigurationPages/EditorCalltipsPage.ui	Sat May 02 13:51:07 2020 +0200
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>408</width>
-    <height>373</height>
+    <height>556</height>
    </rect>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout_3">
@@ -119,17 +119,17 @@
    <item>
     <widget class="QGroupBox" name="groupBox_2">
      <property name="title">
-      <string>Colours</string>
+      <string>Colors</string>
      </property>
-     <layout class="QHBoxLayout">
-      <item>
+     <layout class="QGridLayout" name="gridLayout">
+      <item row="0" column="0">
        <widget class="QLabel" name="TextLabel2_2_2_2">
         <property name="text">
-         <string>Background colour:</string>
+         <string>Background color:</string>
         </property>
        </widget>
       </item>
-      <item>
+      <item row="0" column="1">
        <widget class="QPushButton" name="calltipsBackgroundButton">
         <property name="minimumSize">
          <size>
@@ -138,14 +138,14 @@
          </size>
         </property>
         <property name="toolTip">
-         <string>Select the background colour for calltips.</string>
+         <string>Select the background color for calltips.</string>
         </property>
         <property name="text">
          <string/>
         </property>
        </widget>
       </item>
-      <item>
+      <item row="0" column="2">
        <spacer>
         <property name="orientation">
          <enum>Qt::Horizontal</enum>
@@ -158,6 +158,52 @@
         </property>
        </spacer>
       </item>
+      <item row="1" column="0">
+       <widget class="QLabel" name="TextLabel2_2_2_3">
+        <property name="text">
+         <string>Foreground color:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="1">
+       <widget class="QPushButton" name="calltipsForegroundButton">
+        <property name="minimumSize">
+         <size>
+          <width>100</width>
+          <height>0</height>
+         </size>
+        </property>
+        <property name="toolTip">
+         <string>Select the foreground color for calltips.</string>
+        </property>
+        <property name="text">
+         <string/>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="0">
+       <widget class="QLabel" name="TextLabel2_2_2_4">
+        <property name="text">
+         <string>Highlight color:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="1">
+       <widget class="QPushButton" name="calltipsHighlightButton">
+        <property name="minimumSize">
+         <size>
+          <width>100</width>
+          <height>0</height>
+         </size>
+        </property>
+        <property name="toolTip">
+         <string>Select the highlight color for calltips.</string>
+        </property>
+        <property name="text">
+         <string/>
+        </property>
+       </widget>
+      </item>
      </layout>
     </widget>
    </item>
@@ -200,7 +246,11 @@
  </widget>
  <tabstops>
   <tabstop>ctEnabledCheckBox</tabstop>
+  <tabstop>ctVisibleSlider</tabstop>
+  <tabstop>positionComboBox</tabstop>
   <tabstop>calltipsBackgroundButton</tabstop>
+  <tabstop>calltipsForegroundButton</tabstop>
+  <tabstop>calltipsHighlightButton</tabstop>
   <tabstop>ctScintillaCheckBox</tabstop>
  </tabstops>
  <resources/>
--- a/eric6/Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui	Sat May 02 13:51:07 2020 +0200
@@ -171,20 +171,20 @@
         <item>
          <widget class="QPushButton" name="foregroundButton">
           <property name="toolTip">
-           <string>Select the foreground colour.</string>
+           <string>Select the foreground color.</string>
           </property>
           <property name="text">
-           <string>Foreground Colour</string>
+           <string>Foreground Color</string>
           </property>
          </widget>
         </item>
         <item>
          <widget class="QPushButton" name="backgroundButton">
           <property name="toolTip">
-           <string>Select the background colour.</string>
+           <string>Select the background color.</string>
           </property>
           <property name="text">
-           <string>Background Colour</string>
+           <string>Background Color</string>
           </property>
          </widget>
         </item>
@@ -270,10 +270,10 @@
         <item>
          <widget class="QPushButton" name="allBackgroundColoursButton">
           <property name="toolTip">
-           <string>Select the background colour for all styles</string>
+           <string>Select the background color for all styles</string>
           </property>
           <property name="text">
-           <string>All Background Colours</string>
+           <string>All Background Colors</string>
           </property>
          </widget>
         </item>
--- a/eric6/Preferences/ConfigurationPages/EditorSearchPage.ui	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/Preferences/ConfigurationPages/EditorSearchPage.ui	Sat May 02 13:51:07 2020 +0200
@@ -124,7 +124,7 @@
         <item>
          <widget class="QLabel" name="TextLabel2_2_2_2_2_2">
           <property name="text">
-           <string>Marker Colour:</string>
+           <string>Marker Color:</string>
           </property>
          </widget>
         </item>
@@ -137,7 +137,7 @@
            </size>
           </property>
           <property name="toolTip">
-           <string>Select the colour for the search markers.</string>
+           <string>Select the color for the search markers.</string>
           </property>
           <property name="text">
            <string/>
--- a/eric6/Preferences/ConfigurationPages/EditorSpellCheckingPage.ui	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/Preferences/ConfigurationPages/EditorSpellCheckingPage.ui	Sat May 02 13:51:07 2020 +0200
@@ -212,13 +212,13 @@
       <item>
        <widget class="QGroupBox" name="groupBox_2">
         <property name="title">
-         <string>Colours</string>
+         <string>Colors</string>
         </property>
         <layout class="QGridLayout" name="gridLayout_2">
          <item row="0" column="0">
           <widget class="QLabel" name="TextLabel2_2_2_2_2_2">
            <property name="text">
-            <string>Marker Colour:</string>
+            <string>Marker Color:</string>
            </property>
           </widget>
          </item>
@@ -231,7 +231,7 @@
             </size>
            </property>
            <property name="toolTip">
-            <string>Select the colour for the spelling markers.</string>
+            <string>Select the color for the spelling markers.</string>
            </property>
            <property name="text">
             <string/>
--- a/eric6/Preferences/ConfigurationPages/EditorStylesPage.ui	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/Preferences/ConfigurationPages/EditorStylesPage.ui	Sat May 02 13:51:07 2020 +0200
@@ -44,16 +44,16 @@
    <item>
     <widget class="QGroupBox" name="groupBox_12">
      <property name="title">
-      <string>Colours</string>
+      <string>Colors</string>
      </property>
      <layout class="QVBoxLayout" name="verticalLayout_10">
       <item>
        <widget class="QGroupBox" name="editAreaOverrideCheckBox">
         <property name="toolTip">
-         <string>Select to set the colour of the edit area different to the default style</string>
+         <string>Select to set the color of the edit area different to the default style</string>
         </property>
         <property name="title">
-         <string>Override edit area colours</string>
+         <string>Override edit area colors</string>
         </property>
         <property name="checkable">
          <bool>true</bool>
@@ -78,7 +78,7 @@
             </size>
            </property>
            <property name="toolTip">
-            <string>Select the foreground colour for the edit area.</string>
+            <string>Select the foreground color for the edit area.</string>
            </property>
            <property name="text">
             <string/>
@@ -101,7 +101,7 @@
             </size>
            </property>
            <property name="toolTip">
-            <string>Select the background colour for the edit area.</string>
+            <string>Select the background color for the edit area.</string>
            </property>
            <property name="text">
             <string/>
@@ -129,7 +129,7 @@
            </size>
           </property>
           <property name="toolTip">
-           <string>Select the colour for the caret.</string>
+           <string>Select the color for the caret.</string>
           </property>
           <property name="text">
            <string/>
@@ -348,7 +348,7 @@
            </size>
           </property>
           <property name="toolTip">
-           <string>Select the foreground colour for the margins</string>
+           <string>Select the foreground color for the margins</string>
           </property>
           <property name="text">
            <string/>
@@ -371,7 +371,7 @@
            </size>
           </property>
           <property name="toolTip">
-           <string>Select the background colour for the margins</string>
+           <string>Select the background color for the margins</string>
           </property>
           <property name="text">
            <string/>
@@ -394,7 +394,7 @@
            </size>
           </property>
           <property name="toolTip">
-           <string>Select the background colour for the foldmargin</string>
+           <string>Select the background color for the foldmargin</string>
           </property>
           <property name="text">
            <string/>
@@ -417,7 +417,7 @@
            </size>
           </property>
           <property name="toolTip">
-           <string>Select the foreground colour of the foldmarkers</string>
+           <string>Select the foreground color of the foldmarkers</string>
           </property>
           <property name="text">
            <string/>
@@ -440,7 +440,7 @@
            </size>
           </property>
           <property name="toolTip">
-           <string>Select the background colour of the foldmarkers</string>
+           <string>Select the background color of the foldmarkers</string>
           </property>
           <property name="text">
            <string/>
@@ -512,23 +512,23 @@
         <item row="0" column="0">
          <widget class="QCheckBox" name="customSelColourCheckBox">
           <property name="toolTip">
-           <string>Select to use custom selection colours</string>
+           <string>Select to use custom selection colors</string>
           </property>
           <property name="whatsThis">
-           <string>&lt;b&gt;Use custom selection colours&lt;/b&gt;&lt;p&gt;Select this entry in order to use custom selection colours in the editor and shell windows. The colours for the selection foreground and background are defined on the colours page.&lt;/p&gt;</string>
+           <string>&lt;b&gt;Use custom selection colors&lt;/b&gt;&lt;p&gt;Select this entry in order to use custom selection colors in the editor and shell windows. The colors for the selection foreground and background are defined on the colors page.&lt;/p&gt;</string>
           </property>
           <property name="text">
-           <string>Use custom selection colours</string>
+           <string>Use custom selection colors</string>
           </property>
          </widget>
         </item>
         <item row="0" column="1">
          <widget class="QCheckBox" name="colourizeSelTextCheckBox">
           <property name="toolTip">
-           <string>Select, if selected text should be colourized by the lexer.</string>
+           <string>Select, if selected text should be colorized by the lexer.</string>
           </property>
           <property name="text">
-           <string>Colourize selected text</string>
+           <string>Colorize selected text</string>
           </property>
          </widget>
         </item>
@@ -562,7 +562,7 @@
            </size>
           </property>
           <property name="toolTip">
-           <string>Select the foreground colour for the selection.</string>
+           <string>Select the foreground color for the selection.</string>
           </property>
           <property name="text">
            <string/>
@@ -585,7 +585,7 @@
            </size>
           </property>
           <property name="toolTip">
-           <string>Select the background colour for the selection.</string>
+           <string>Select the background color for the selection.</string>
           </property>
           <property name="text">
            <string/>
@@ -645,7 +645,7 @@
             </size>
            </property>
            <property name="toolTip">
-            <string>Select the colour for the caret.</string>
+            <string>Select the color for the caret.</string>
            </property>
            <property name="text">
             <string/>
@@ -758,7 +758,7 @@
               </size>
              </property>
              <property name="toolTip">
-              <string>Select the background colour for the line containing the caret.</string>
+              <string>Select the background color for the line containing the caret.</string>
              </property>
              <property name="text">
               <string/>
@@ -795,10 +795,10 @@
       <item row="0" column="0" colspan="4">
        <widget class="QCheckBox" name="debugMarkerBackgroundCheckBox">
         <property name="toolTip">
-         <string>Select to indicate the debug markers using coloured line backgrounds, arrow indicators otherwise</string>
+         <string>Select to indicate the debug markers using colored line backgrounds, arrow indicators otherwise</string>
         </property>
         <property name="text">
-         <string>Use background colours</string>
+         <string>Use background colors</string>
         </property>
        </widget>
       </item>
@@ -818,7 +818,7 @@
          </size>
         </property>
         <property name="toolTip">
-         <string>Select the colour for the current line marker.</string>
+         <string>Select the color for the current line marker.</string>
         </property>
         <property name="text">
          <string/>
@@ -841,7 +841,7 @@
          </size>
         </property>
         <property name="toolTip">
-         <string>Select the colour for the error line marker.</string>
+         <string>Select the color for the error line marker.</string>
         </property>
         <property name="text">
          <string/>
@@ -883,7 +883,7 @@
          </size>
         </property>
         <property name="toolTip">
-         <string>Select the colour for highlighting matching braces.</string>
+         <string>Select the color for highlighting matching braces.</string>
         </property>
         <property name="text">
          <string/>
@@ -906,7 +906,7 @@
          </size>
         </property>
         <property name="toolTip">
-         <string>Select the background colour for highlighting matching braces.</string>
+         <string>Select the background color for highlighting matching braces.</string>
         </property>
         <property name="text">
          <string/>
@@ -929,7 +929,7 @@
       <item row="2" column="1">
        <widget class="QPushButton" name="nonmatchingBracesButton">
         <property name="toolTip">
-         <string>Select the colour for  highlighting nonmatching braces.</string>
+         <string>Select the color for  highlighting nonmatching braces.</string>
         </property>
         <property name="text">
          <string/>
@@ -952,7 +952,7 @@
       <item row="2" column="3">
        <widget class="QPushButton" name="nonmatchingBracesBackButton">
         <property name="toolTip">
-         <string>Select the background colour for  highlighting nonmatching braces.</string>
+         <string>Select the background color for  highlighting nonmatching braces.</string>
         </property>
         <property name="text">
          <string/>
@@ -1121,7 +1121,7 @@
             </size>
            </property>
            <property name="toolTip">
-            <string>Select the colour for the edge marker.</string>
+            <string>Select the color for the edge marker.</string>
            </property>
            <property name="text">
             <string/>
@@ -1131,7 +1131,7 @@
          <item row="2" column="0">
           <widget class="QLabel" name="TextLabel13_3_2_2">
            <property name="text">
-            <string>Background colour:</string>
+            <string>Background color:</string>
            </property>
           </widget>
          </item>
@@ -1219,7 +1219,7 @@
            </item>
            <item>
             <property name="text">
-             <string>Change Background Colour</string>
+             <string>Change Background Color</string>
             </property>
            </item>
           </widget>
@@ -1309,7 +1309,7 @@
          <item row="0" column="0">
           <widget class="QPushButton" name="annotationsWarningFgButton">
            <property name="toolTip">
-            <string>Press to select the foreground colour</string>
+            <string>Press to select the foreground color</string>
            </property>
            <property name="text">
             <string>Foreground</string>
@@ -1319,7 +1319,7 @@
          <item row="0" column="1">
           <widget class="QPushButton" name="annotationsWarningBgButton">
            <property name="toolTip">
-            <string>Press to select the background colour</string>
+            <string>Press to select the background color</string>
            </property>
            <property name="text">
             <string>Background</string>
@@ -1354,7 +1354,7 @@
          <item row="0" column="0">
           <widget class="QPushButton" name="annotationsErrorFgButton">
            <property name="toolTip">
-            <string>Press to select the foreground colour</string>
+            <string>Press to select the foreground color</string>
            </property>
            <property name="text">
             <string>Foreground</string>
@@ -1364,7 +1364,7 @@
          <item row="0" column="1">
           <widget class="QPushButton" name="annotationsErrorBgButton">
            <property name="toolTip">
-            <string>Press to select the background colour</string>
+            <string>Press to select the background color</string>
            </property>
            <property name="text">
             <string>Background</string>
@@ -1399,7 +1399,7 @@
          <item row="0" column="0">
           <widget class="QPushButton" name="annotationsStyleWarningFgButton">
            <property name="toolTip">
-            <string>Press to select the foreground colour</string>
+            <string>Press to select the foreground color</string>
            </property>
            <property name="text">
             <string>Foreground</string>
@@ -1409,7 +1409,7 @@
          <item row="0" column="1">
           <widget class="QPushButton" name="annotationsStyleWarningBgButton">
            <property name="toolTip">
-            <string>Press to select the background colour</string>
+            <string>Press to select the background color</string>
            </property>
            <property name="text">
             <string>Background</string>
@@ -1511,7 +1511,7 @@
         <item>
          <widget class="QLabel" name="TextLabel13_3_2_3">
           <property name="text">
-           <string>Unsaved changes colour:</string>
+           <string>Unsaved changes color:</string>
           </property>
          </widget>
         </item>
@@ -1524,7 +1524,7 @@
            </size>
           </property>
           <property name="toolTip">
-           <string>Select the colour for the change marker for unsaved changes.</string>
+           <string>Select the color for the change marker for unsaved changes.</string>
           </property>
           <property name="text">
            <string/>
@@ -1534,7 +1534,7 @@
         <item>
          <widget class="QLabel" name="TextLabel13_3_2_4">
           <property name="text">
-           <string>Saved changes colour:</string>
+           <string>Saved changes color:</string>
           </property>
          </widget>
         </item>
@@ -1547,7 +1547,7 @@
            </size>
           </property>
           <property name="toolTip">
-           <string>Select the colour for the change marker for saved changes.</string>
+           <string>Select the color for the change marker for saved changes.</string>
           </property>
           <property name="text">
            <string/>
@@ -1633,7 +1633,7 @@
            </size>
           </property>
           <property name="toolTip">
-           <string>Select the foreground colour for visible whitespace</string>
+           <string>Select the foreground color for visible whitespace</string>
           </property>
           <property name="text">
            <string/>
@@ -1656,7 +1656,7 @@
            </size>
           </property>
           <property name="toolTip">
-           <string>Select the background colour for visible whitespace</string>
+           <string>Select the background color for visible whitespace</string>
           </property>
           <property name="text">
            <string/>
@@ -1702,7 +1702,7 @@
            </size>
           </property>
           <property name="toolTip">
-           <string>Select the foreground colour for indentation guides</string>
+           <string>Select the foreground color for indentation guides</string>
           </property>
           <property name="text">
            <string/>
@@ -1725,7 +1725,7 @@
            </size>
           </property>
           <property name="toolTip">
-           <string>Select the background colour for indentation guides</string>
+           <string>Select the background color for indentation guides</string>
           </property>
           <property name="text">
            <string/>
@@ -1760,7 +1760,7 @@
       <item>
        <widget class="QGroupBox" name="groupBox_16">
         <property name="title">
-         <string>Marker Colours</string>
+         <string>Marker Colors</string>
         </property>
         <layout class="QGridLayout" name="gridLayout_9">
          <item row="0" column="0">
@@ -1779,7 +1779,7 @@
             </size>
            </property>
            <property name="toolTip">
-            <string>Select the colour for error markers</string>
+            <string>Select the color for error markers</string>
            </property>
            <property name="text">
             <string/>
@@ -1802,7 +1802,7 @@
             </size>
            </property>
            <property name="toolTip">
-            <string>Select the colour for warning markers</string>
+            <string>Select the color for warning markers</string>
            </property>
            <property name="text">
             <string/>
@@ -1825,7 +1825,7 @@
             </size>
            </property>
            <property name="toolTip">
-            <string>Select the colour for bookmark markers</string>
+            <string>Select the color for bookmark markers</string>
            </property>
            <property name="text">
             <string/>
@@ -1848,7 +1848,7 @@
             </size>
            </property>
            <property name="toolTip">
-            <string>Select the colour for breakpoint markers</string>
+            <string>Select the color for breakpoint markers</string>
            </property>
            <property name="text">
             <string/>
@@ -1871,7 +1871,7 @@
             </size>
            </property>
            <property name="toolTip">
-            <string>Select the colour for task markers</string>
+            <string>Select the color for task markers</string>
            </property>
            <property name="text">
             <string/>
@@ -1894,7 +1894,7 @@
             </size>
            </property>
            <property name="toolTip">
-            <string>Select the colour for change markers</string>
+            <string>Select the color for change markers</string>
            </property>
            <property name="text">
             <string/>
@@ -1917,7 +1917,7 @@
             </size>
            </property>
            <property name="toolTip">
-            <string>Select the colour for coverage markers</string>
+            <string>Select the color for coverage markers</string>
            </property>
            <property name="text">
             <string/>
@@ -1940,7 +1940,7 @@
             </size>
            </property>
            <property name="toolTip">
-            <string>Select the colour for the current line marker</string>
+            <string>Select the color for the current line marker</string>
            </property>
            <property name="text">
             <string/>
@@ -1963,7 +1963,7 @@
             </size>
            </property>
            <property name="toolTip">
-            <string>Select the colour for the search marker</string>
+            <string>Select the color for the search marker</string>
            </property>
            <property name="text">
             <string/>
@@ -1986,7 +1986,7 @@
             </size>
            </property>
            <property name="toolTip">
-            <string>Select the colour for the conflict marker line marker</string>
+            <string>Select the color for the conflict marker line marker</string>
            </property>
            <property name="text">
             <string/>
@@ -2009,7 +2009,7 @@
             </size>
            </property>
            <property name="toolTip">
-            <string>Select the background colour for the marker map</string>
+            <string>Select the background color for the marker map</string>
            </property>
            <property name="text">
             <string/>
--- a/eric6/Preferences/ConfigurationPages/GraphicsPage.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/Preferences/ConfigurationPages/GraphicsPage.py	Sat May 02 13:51:07 2020 +0200
@@ -32,12 +32,29 @@
         self.graphicsFont = Preferences.getGraphics("Font")
         self.graphicsFontSample.setFont(self.graphicsFont)
         
+        drawingMode = Preferences.getGraphics("DrawingMode")
+        if drawingMode == "black_white":
+            self.blackWhiteButton.setChecked(True)
+        elif drawingMode == "white_black":
+            self.whiteBlackButton.setChecked(True)
+        else:
+            self.automaticButton.setChecked(True)
+    
     def save(self):
         """
         Public slot to save the Printer configuration.
         """
         Preferences.setGraphics("Font", self.graphicsFont)
         
+        if self.blackWhiteButton.isChecked():
+            drawingMode = "black_white"
+        elif self.whiteBlackButton.isChecked():
+            drawingMode = "white_black"
+        else:
+            # default is automatic
+            drawingMode = "automatic"
+        Preferences.setGraphics("DrawingMode", drawingMode)
+    
     @pyqtSlot()
     def on_graphicsFontButton_clicked(self):
         """
--- a/eric6/Preferences/ConfigurationPages/GraphicsPage.ui	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/Preferences/ConfigurationPages/GraphicsPage.ui	Sat May 02 13:51:07 2020 +0200
@@ -1,7 +1,8 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
  <class>GraphicsPage</class>
- <widget class="QWidget" name="GraphicsPage" >
-  <property name="geometry" >
+ <widget class="QWidget" name="GraphicsPage">
+  <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
@@ -9,63 +10,123 @@
     <height>334</height>
    </rect>
   </property>
-  <layout class="QVBoxLayout" >
+  <layout class="QVBoxLayout" name="verticalLayout">
    <item>
-    <widget class="QLabel" name="headerLabel" >
-     <property name="text" >
-      <string>&lt;b>Configure graphics settings&lt;/b></string>
+    <widget class="QLabel" name="headerLabel">
+     <property name="text">
+      <string>&lt;b&gt;Configure graphics settings&lt;/b&gt;</string>
      </property>
     </widget>
    </item>
    <item>
-    <widget class="Line" name="line7" >
-     <property name="frameShape" >
+    <widget class="Line" name="line7">
+     <property name="frameShape">
       <enum>QFrame::HLine</enum>
      </property>
-     <property name="frameShadow" >
+     <property name="frameShadow">
       <enum>QFrame::Sunken</enum>
      </property>
-     <property name="orientation" >
+     <property name="orientation">
       <enum>Qt::Horizontal</enum>
      </property>
     </widget>
    </item>
    <item>
-    <layout class="QHBoxLayout" >
-     <item>
-      <widget class="QPushButton" name="graphicsFontButton" >
-       <property name="toolTip" >
-        <string>Press to select the font for the graphic items</string>
-       </property>
-       <property name="text" >
-        <string>Graphics Font</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QLineEdit" name="graphicsFontSample" >
-       <property name="focusPolicy" >
-        <enum>Qt::NoFocus</enum>
-       </property>
-       <property name="text" >
-        <string>Graphics Font</string>
-       </property>
-       <property name="alignment" >
-        <set>Qt::AlignHCenter</set>
-       </property>
-       <property name="readOnly" >
-        <bool>true</bool>
-       </property>
-      </widget>
-     </item>
-    </layout>
+    <widget class="QGroupBox" name="groupBox_2">
+     <property name="title">
+      <string>Font</string>
+     </property>
+     <layout class="QHBoxLayout" name="horizontalLayout">
+      <item>
+       <widget class="QPushButton" name="graphicsFontButton">
+        <property name="toolTip">
+         <string>Press to select the font for the graphic items</string>
+        </property>
+        <property name="text">
+         <string>Graphics Font</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QLineEdit" name="graphicsFontSample">
+        <property name="focusPolicy">
+         <enum>Qt::NoFocus</enum>
+        </property>
+        <property name="text">
+         <string>Graphics Font</string>
+        </property>
+        <property name="alignment">
+         <set>Qt::AlignHCenter</set>
+        </property>
+        <property name="readOnly">
+         <bool>true</bool>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item>
+    <widget class="QGroupBox" name="groupBox">
+     <property name="title">
+      <string>Drawing Mode</string>
+     </property>
+     <layout class="QHBoxLayout" name="horizontalLayout_2">
+      <item>
+       <widget class="QRadioButton" name="automaticButton">
+        <property name="toolTip">
+         <string>Select to determine the drawing mode automatically</string>
+        </property>
+        <property name="text">
+         <string>Automatic</string>
+        </property>
+        <property name="checked">
+         <bool>true</bool>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QRadioButton" name="blackWhiteButton">
+        <property name="toolTip">
+         <string>Select to draw black shapes on a white background</string>
+        </property>
+        <property name="text">
+         <string>Black On White</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QRadioButton" name="whiteBlackButton">
+        <property name="toolTip">
+         <string>Select to draw white shapes on a black background</string>
+        </property>
+        <property name="text">
+         <string>White On Black</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <spacer name="horizontalSpacer">
+        <property name="orientation">
+         <enum>Qt::Horizontal</enum>
+        </property>
+        <property name="sizeHint" stdset="0">
+         <size>
+          <width>53</width>
+          <height>20</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
+     </layout>
+    </widget>
    </item>
    <item>
     <spacer>
-     <property name="orientation" >
+     <property name="orientation">
       <enum>Qt::Vertical</enum>
      </property>
-     <property name="sizeHint" stdset="0" >
+     <property name="sizeHint" stdset="0">
       <size>
        <width>20</width>
        <height>40</height>
@@ -77,6 +138,8 @@
  </widget>
  <tabstops>
   <tabstop>graphicsFontButton</tabstop>
+  <tabstop>blackWhiteButton</tabstop>
+  <tabstop>whiteBlackButton</tabstop>
  </tabstops>
  <resources/>
  <connections/>
--- a/eric6/Preferences/ConfigurationPages/HexEditorPage.ui	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/Preferences/ConfigurationPages/HexEditorPage.ui	Sat May 02 13:51:07 2020 +0200
@@ -139,7 +139,7 @@
          </size>
         </property>
         <property name="toolTip">
-         <string>Select the foreground colour of the address area</string>
+         <string>Select the foreground color of the address area</string>
         </property>
         <property name="text">
          <string/>
@@ -162,7 +162,7 @@
          </size>
         </property>
         <property name="toolTip">
-         <string>Select the background colour of the address area</string>
+         <string>Select the background color of the address area</string>
         </property>
         <property name="text">
          <string/>
@@ -223,7 +223,7 @@
          </size>
         </property>
         <property name="toolTip">
-         <string>Select the foreground colour for highlighted data</string>
+         <string>Select the foreground color for highlighted data</string>
         </property>
         <property name="text">
          <string/>
@@ -246,7 +246,7 @@
          </size>
         </property>
         <property name="toolTip">
-         <string>Select the background colour for highlighted data</string>
+         <string>Select the background color for highlighted data</string>
         </property>
         <property name="text">
          <string/>
@@ -278,7 +278,7 @@
          </size>
         </property>
         <property name="toolTip">
-         <string>Select the foreground colour of the selection</string>
+         <string>Select the foreground color of the selection</string>
         </property>
         <property name="text">
          <string/>
@@ -301,7 +301,7 @@
          </size>
         </property>
         <property name="toolTip">
-         <string>Select the background colour of the selection</string>
+         <string>Select the background color of the selection</string>
         </property>
         <property name="text">
          <string/>
--- a/eric6/Preferences/ConfigurationPages/IconsPage.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/Preferences/ConfigurationPages/IconsPage.py	Sat May 02 13:51:07 2020 +0200
@@ -7,17 +7,21 @@
 Module implementing the Icons configuration page.
 """
 
+import os
 
 from PyQt5.QtCore import pyqtSlot
 from PyQt5.QtWidgets import QListWidgetItem
 
 from E5Gui.E5PathPicker import E5PathPickerModes
+from E5Gui.E5Application import e5App
 
 from .ConfigurationPageBase import ConfigurationPageBase
 from .Ui_IconsPage import Ui_IconsPage
 
 import Preferences
 
+from eric6config import getConfig
+
 
 class IconsPage(ConfigurationPageBase, Ui_IconsPage):
     """
@@ -34,6 +38,16 @@
         self.iconDirectoryPicker.setMode(E5PathPickerModes.DirectoryMode)
         
         # set initial values
+        defaultIconsPath = Preferences.getIcons("DefaultIconsPath")
+        if defaultIconsPath == "automatic":
+            self.defaultAutomaticButton.setChecked(True)
+        elif defaultIconsPath == "breeze-light":
+            self.defaultBreezeLightButton.setChecked(True)
+        elif defaultIconsPath == "breeze-dark":
+            self.defaultBreezeDarkButton.setChecked(True)
+        else:
+            self.defaultOxygenButton.setChecked(True)
+        
         dirList = Preferences.getIcons("Path")[:]
         for directory in dirList:
             if directory:
@@ -43,11 +57,30 @@
         """
         Public slot to save the Icons configuration.
         """
+        Preferences.setIcons("DefaultIconsPath",
+                             self.__getSelectedDefaultIconsPath())
+        
         dirList = []
         for i in range(self.iconDirectoryList.count()):
             dirList.append(self.iconDirectoryList.item(i).text())
         Preferences.setIcons("Path", dirList)
+    
+    def __getSelectedDefaultIconsPath(self):
+        """
+        Private method to determine the selected default icons path.
         
+        @return selected default icons path
+        @rtype str
+        """
+        if self.defaultAutomaticButton.isChecked():
+            return "automatic"
+        elif self.defaultBreezeLightButton.isChecked():
+            return "breeze-light"
+        elif self.defaultBreezeDarkButton.isChecked():
+            return "breeze-dark"
+        else:
+            return "oxygen"
+    
     def on_iconDirectoryList_currentRowChanged(self, row):
         """
         Private slot to handle the currentRowChanged signal of the icons
@@ -147,15 +180,37 @@
         Private slot to display a preview of an icons directory.
         """
         directory = self.iconDirectoryPicker.text()
-        if not directory:
-            itm = self.iconDirectoryList.currentItem()
-            if itm is not None:
-                directory = itm.text()
         if directory:
+            directories = [directory]
+        else:
+            directories = []
+            for row in range(self.iconDirectoryList.count()):
+                directories.append(self.iconDirectoryList.item(row).text())
+        if directories:
             from .IconsPreviewDialog import IconsPreviewDialog
-            dlg = IconsPreviewDialog(self, directory)
+            dlg = IconsPreviewDialog(directories, self)
             dlg.exec_()
     
+    @pyqtSlot()
+    def on_showDefaultIconsButton_clicked(self):
+        """
+        Private slot to display a preview of the selected default icons.
+        """
+        defaultIconsPath = self.__getSelectedDefaultIconsPath()
+        if defaultIconsPath == "automatic":
+            if e5App().usesDarkPalette():
+                defaultIconsPath = "breeze-dark"
+            else:
+                defaultIconsPath = "breeze-light"
+        
+        from .IconsPreviewDialog import IconsPreviewDialog
+        dlg = IconsPreviewDialog([
+            os.path.join(getConfig('ericIconDir'), defaultIconsPath),
+            os.path.join(getConfig('ericIconDir'), defaultIconsPath,
+                         "languages"),
+        ], self)
+        dlg.exec_()
+
 
 def create(dlg):
     """
--- a/eric6/Preferences/ConfigurationPages/IconsPage.ui	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/Preferences/ConfigurationPages/IconsPage.ui	Sat May 02 13:51:07 2020 +0200
@@ -6,19 +6,19 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>539</width>
-    <height>371</height>
+    <width>591</width>
+    <height>453</height>
    </rect>
   </property>
-  <layout class="QGridLayout" name="gridLayout">
-   <item row="0" column="0" colspan="2">
+  <layout class="QVBoxLayout" name="verticalLayout_2">
+   <item>
     <widget class="QLabel" name="headerLabel">
      <property name="text">
       <string>&lt;b&gt;Configure icon directories&lt;/b&gt;</string>
      </property>
     </widget>
    </item>
-   <item row="1" column="0" colspan="2">
+   <item>
     <widget class="Line" name="line10">
      <property name="frameShape">
       <enum>QFrame::HLine</enum>
@@ -31,130 +31,235 @@
      </property>
     </widget>
    </item>
-   <item row="2" column="0" colspan="2">
+   <item>
     <widget class="QLabel" name="TextLabel1_2_2_2_2">
      <property name="text">
       <string>&lt;font color=&quot;#FF0000&quot;&gt;&lt;b&gt;Note:&lt;/b&gt; These settings are activated at the next startup of the application.&lt;/font&gt;</string>
      </property>
     </widget>
    </item>
-   <item row="3" column="0">
-    <widget class="QListWidget" name="iconDirectoryList">
-     <property name="toolTip">
-      <string>List of icon directories</string>
+   <item>
+    <widget class="QGroupBox" name="groupBox_2">
+     <property name="title">
+      <string>Default Icons</string>
      </property>
-     <property name="alternatingRowColors">
-      <bool>true</bool>
-     </property>
+     <layout class="QVBoxLayout" name="verticalLayout">
+      <item>
+       <layout class="QHBoxLayout" name="horizontalLayout_3">
+        <item>
+         <widget class="QRadioButton" name="defaultAutomaticButton">
+          <property name="toolTip">
+           <string>Select to select between Breeze (dark) and Breeze (light) based on the window lightness</string>
+          </property>
+          <property name="text">
+           <string>Automatic</string>
+          </property>
+          <property name="checked">
+           <bool>true</bool>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QRadioButton" name="defaultBreezeLightButton">
+          <property name="toolTip">
+           <string>Select to use the Breeze vector icons for light window background</string>
+          </property>
+          <property name="text">
+           <string>Breeze (light)</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QRadioButton" name="defaultBreezeDarkButton">
+          <property name="toolTip">
+           <string>Select to use the Breeze vector icons for dark window background</string>
+          </property>
+          <property name="text">
+           <string>Breeze (dark)</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QRadioButton" name="defaultOxygenButton">
+          <property name="toolTip">
+           <string>Select to use the Oxygen pixmap icons</string>
+          </property>
+          <property name="text">
+           <string>Oxygen</string>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </item>
+      <item>
+       <layout class="QHBoxLayout" name="horizontalLayout_2">
+        <item>
+         <spacer name="horizontalSpacer">
+          <property name="orientation">
+           <enum>Qt::Horizontal</enum>
+          </property>
+          <property name="sizeHint" stdset="0">
+           <size>
+            <width>40</width>
+            <height>20</height>
+           </size>
+          </property>
+         </spacer>
+        </item>
+        <item>
+         <widget class="QPushButton" name="showDefaultIconsButton">
+          <property name="toolTip">
+           <string>Press to show a dialog with a preview of the selected default icon set</string>
+          </property>
+          <property name="text">
+           <string>Show</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <spacer name="horizontalSpacer_2">
+          <property name="orientation">
+           <enum>Qt::Horizontal</enum>
+          </property>
+          <property name="sizeHint" stdset="0">
+           <size>
+            <width>40</width>
+            <height>20</height>
+           </size>
+          </property>
+         </spacer>
+        </item>
+       </layout>
+      </item>
+     </layout>
     </widget>
    </item>
-   <item row="3" column="1">
-    <layout class="QVBoxLayout">
-     <item>
-      <spacer>
-       <property name="orientation">
-        <enum>Qt::Vertical</enum>
-       </property>
-       <property name="sizeType">
-        <enum>QSizePolicy::Expanding</enum>
-       </property>
-       <property name="sizeHint" stdset="0">
-        <size>
-         <width>20</width>
-         <height>209</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
-     <item>
-      <widget class="QPushButton" name="upButton">
-       <property name="enabled">
-        <bool>false</bool>
-       </property>
-       <property name="text">
-        <string>Up</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QPushButton" name="downButton">
-       <property name="enabled">
-        <bool>false</bool>
-       </property>
-       <property name="text">
-        <string>Down</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <spacer>
-       <property name="orientation">
-        <enum>Qt::Vertical</enum>
-       </property>
-       <property name="sizeType">
-        <enum>QSizePolicy::Expanding</enum>
-       </property>
-       <property name="sizeHint" stdset="0">
-        <size>
-         <width>20</width>
-         <height>170</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
-    </layout>
-   </item>
-   <item row="4" column="0">
-    <layout class="QHBoxLayout" name="horizontalLayout">
-     <item>
-      <widget class="QPushButton" name="deleteIconDirectoryButton">
-       <property name="enabled">
-        <bool>false</bool>
-       </property>
-       <property name="toolTip">
-        <string>Press to delete the selected directory from the list</string>
-       </property>
-       <property name="text">
-        <string>Delete</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QPushButton" name="addIconDirectoryButton">
-       <property name="enabled">
-        <bool>false</bool>
-       </property>
-       <property name="toolTip">
-        <string>Press to add the entered directory to the list</string>
-       </property>
-       <property name="text">
-        <string>Add</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="E5PathPicker" name="iconDirectoryPicker" native="true">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="focusPolicy">
-        <enum>Qt::StrongFocus</enum>
-       </property>
-      </widget>
-     </item>
-    </layout>
-   </item>
-   <item row="4" column="1">
-    <widget class="QPushButton" name="showIconsButton">
-     <property name="enabled">
-      <bool>false</bool>
+   <item>
+    <widget class="QGroupBox" name="groupBox">
+     <property name="title">
+      <string>Custom Icon Directories</string>
      </property>
-     <property name="text">
-      <string>Show</string>
-     </property>
+     <layout class="QGridLayout" name="gridLayout">
+      <item row="0" column="0">
+       <widget class="QListWidget" name="iconDirectoryList">
+        <property name="toolTip">
+         <string>List of icon directories</string>
+        </property>
+        <property name="alternatingRowColors">
+         <bool>true</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="1">
+       <layout class="QVBoxLayout">
+        <item>
+         <spacer>
+          <property name="orientation">
+           <enum>Qt::Vertical</enum>
+          </property>
+          <property name="sizeType">
+           <enum>QSizePolicy::Expanding</enum>
+          </property>
+          <property name="sizeHint" stdset="0">
+           <size>
+            <width>20</width>
+            <height>209</height>
+           </size>
+          </property>
+         </spacer>
+        </item>
+        <item>
+         <widget class="QPushButton" name="upButton">
+          <property name="enabled">
+           <bool>false</bool>
+          </property>
+          <property name="text">
+           <string>Up</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QPushButton" name="downButton">
+          <property name="enabled">
+           <bool>false</bool>
+          </property>
+          <property name="text">
+           <string>Down</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <spacer>
+          <property name="orientation">
+           <enum>Qt::Vertical</enum>
+          </property>
+          <property name="sizeType">
+           <enum>QSizePolicy::Expanding</enum>
+          </property>
+          <property name="sizeHint" stdset="0">
+           <size>
+            <width>20</width>
+            <height>170</height>
+           </size>
+          </property>
+         </spacer>
+        </item>
+       </layout>
+      </item>
+      <item row="1" column="0">
+       <layout class="QHBoxLayout" name="horizontalLayout">
+        <item>
+         <widget class="QPushButton" name="deleteIconDirectoryButton">
+          <property name="enabled">
+           <bool>false</bool>
+          </property>
+          <property name="toolTip">
+           <string>Press to delete the selected directory from the list</string>
+          </property>
+          <property name="text">
+           <string>Delete</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QPushButton" name="addIconDirectoryButton">
+          <property name="enabled">
+           <bool>false</bool>
+          </property>
+          <property name="toolTip">
+           <string>Press to add the entered directory to the list</string>
+          </property>
+          <property name="text">
+           <string>Add</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="E5PathPicker" name="iconDirectoryPicker" native="true">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="focusPolicy">
+           <enum>Qt::StrongFocus</enum>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </item>
+      <item row="1" column="1">
+       <widget class="QPushButton" name="showIconsButton">
+        <property name="enabled">
+         <bool>false</bool>
+        </property>
+        <property name="text">
+         <string>Show</string>
+        </property>
+       </widget>
+      </item>
+     </layout>
     </widget>
    </item>
   </layout>
@@ -168,13 +273,18 @@
   </customwidget>
  </customwidgets>
  <tabstops>
+  <tabstop>defaultAutomaticButton</tabstop>
+  <tabstop>defaultBreezeLightButton</tabstop>
+  <tabstop>defaultBreezeDarkButton</tabstop>
+  <tabstop>defaultOxygenButton</tabstop>
+  <tabstop>showDefaultIconsButton</tabstop>
+  <tabstop>iconDirectoryPicker</tabstop>
+  <tabstop>showIconsButton</tabstop>
+  <tabstop>addIconDirectoryButton</tabstop>
   <tabstop>iconDirectoryList</tabstop>
+  <tabstop>deleteIconDirectoryButton</tabstop>
   <tabstop>upButton</tabstop>
   <tabstop>downButton</tabstop>
-  <tabstop>deleteIconDirectoryButton</tabstop>
-  <tabstop>addIconDirectoryButton</tabstop>
-  <tabstop>iconDirectoryPicker</tabstop>
-  <tabstop>showIconsButton</tabstop>
  </tabstops>
  <resources/>
  <connections/>
--- a/eric6/Preferences/ConfigurationPages/IconsPreviewDialog.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/Preferences/ConfigurationPages/IconsPreviewDialog.py	Sat May 02 13:51:07 2020 +0200
@@ -10,9 +10,9 @@
 
 import os.path
 
-from PyQt5.QtGui import QIcon
+from PyQt5.QtCore import pyqtSlot, QDir
+from PyQt5.QtGui import QIcon, QPalette
 from PyQt5.QtWidgets import QListWidgetItem, QDialog
-from PyQt5.QtCore import QDir
 
 from .Ui_IconsPreviewDialog import Ui_IconsPreviewDialog
 
@@ -21,18 +21,69 @@
     """
     Class implementing a dialog to preview the contents of an icon directory.
     """
-    def __init__(self, parent, dirName):
+    def __init__(self, directories, parent=None):
         """
         Constructor
         
-        @param parent parent widget (QWidget)
-        @param dirName name of directory to show (string)
+        @param directories list of directories to be shown
+        @type list of str
+        @param parent parent widget
+        @type QWidget
         """
         super(IconsPreviewDialog, self).__init__(parent)
         self.setupUi(self)
         
+        palette = self.iconView.palette()
+        self.__baseBrush = palette.brush(QPalette.Base)
+        self.__textBrush = palette.brush(QPalette.Text)
+        self.__inverted = False
+        
+        self.directoryCombo.addItems(sorted(directories))
+    
+    @pyqtSlot(str)
+    def on_directoryCombo_currentTextChanged(self, dirName):
+        """
+        Private slot to show the icons of the selected icon directory.
+        
+        @param dirName selected icon directory
+        @type str
+        """
+        self.iconView.clear()
         directory = QDir(dirName)
         for icon in directory.entryList(["*.svg", "*.svgz", "*.png"]):
-            QListWidgetItem(
+            itm = QListWidgetItem(
                 QIcon(os.path.join(dirName, icon)),
                 icon, self.iconView)
+            if self.__inverted:
+                itm.setForeground(self.__baseBrush)
+            else:
+                itm.setForeground(self.__textBrush)
+    
+    @pyqtSlot(bool)
+    def on_invertButton_toggled(self, checked):
+        """
+        Private slot to show the icons on an inverted background.
+        
+        @param checked state of the button
+        @type bool
+        """
+        self.__inverted = checked
+        
+        palette = self.iconView.palette()
+        if self.__inverted:
+            palette.setBrush(QPalette.Base, self.__textBrush)
+            palette.setBrush(QPalette.Text, self.__baseBrush)
+        else:
+            palette.setBrush(QPalette.Base, self.__baseBrush)
+            palette.setBrush(QPalette.Text, self.__textBrush)
+        self.iconView.viewport().setPalette(palette)
+        
+        self.on_refreshButton_clicked()
+    
+    @pyqtSlot()
+    def on_refreshButton_clicked(self):
+        """
+        Private slot to refresh the view.
+        """
+        currentDirectory = self.directoryCombo.currentText()
+        self.on_directoryCombo_currentTextChanged(currentDirectory)
--- a/eric6/Preferences/ConfigurationPages/IconsPreviewDialog.ui	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/Preferences/ConfigurationPages/IconsPreviewDialog.ui	Sat May 02 13:51:07 2020 +0200
@@ -1,7 +1,8 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
  <class>IconsPreviewDialog</class>
- <widget class="QDialog" name="IconsPreviewDialog" >
-  <property name="geometry" >
+ <widget class="QDialog" name="IconsPreviewDialog">
+  <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
@@ -9,62 +10,132 @@
     <height>541</height>
    </rect>
   </property>
-  <property name="windowTitle" >
+  <property name="windowTitle">
    <string>Icons Preview</string>
   </property>
-  <property name="sizeGripEnabled" >
+  <property name="sizeGripEnabled">
    <bool>true</bool>
   </property>
-  <layout class="QVBoxLayout" >
+  <layout class="QVBoxLayout" name="verticalLayout">
    <item>
-    <widget class="QListWidget" name="iconView" >
-     <property name="movement" >
+    <layout class="QHBoxLayout" name="horizontalLayout">
+     <item>
+      <widget class="QLabel" name="label">
+       <property name="text">
+        <string>Directory:</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QComboBox" name="directoryCombo">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="toolTip">
+        <string>Select the icons directory to be shown</string>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <widget class="QListWidget" name="iconView">
+     <property name="selectionMode">
+      <enum>QAbstractItemView::ExtendedSelection</enum>
+     </property>
+     <property name="movement">
       <enum>QListView::Free</enum>
      </property>
-     <property name="flow" >
+     <property name="flow">
       <enum>QListView::LeftToRight</enum>
      </property>
-     <property name="gridSize" >
+     <property name="gridSize">
       <size>
        <width>100</width>
        <height>50</height>
       </size>
      </property>
-     <property name="viewMode" >
+     <property name="viewMode">
       <enum>QListView::IconMode</enum>
      </property>
     </widget>
    </item>
    <item>
-    <widget class="QDialogButtonBox" name="buttonBox" >
-     <property name="orientation" >
-      <enum>Qt::Horizontal</enum>
-     </property>
-     <property name="standardButtons" >
-      <set>QDialogButtonBox::Ok</set>
-     </property>
-    </widget>
+    <layout class="QHBoxLayout" name="horizontalLayout_2">
+     <item>
+      <widget class="QPushButton" name="invertButton">
+       <property name="toolTip">
+        <string>Select to invert the background color</string>
+       </property>
+       <property name="text">
+        <string>Invert Background</string>
+       </property>
+       <property name="checkable">
+        <bool>true</bool>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="refreshButton">
+       <property name="toolTip">
+        <string>Select to refresh the icons display</string>
+       </property>
+       <property name="text">
+        <string>Refresh</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <spacer name="horizontalSpacer">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item>
+      <widget class="QDialogButtonBox" name="buttonBox">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="standardButtons">
+        <set>QDialogButtonBox::Close</set>
+       </property>
+      </widget>
+     </item>
+    </layout>
    </item>
   </layout>
  </widget>
  <tabstops>
+  <tabstop>directoryCombo</tabstop>
   <tabstop>iconView</tabstop>
+  <tabstop>invertButton</tabstop>
+  <tabstop>refreshButton</tabstop>
  </tabstops>
  <resources/>
  <connections>
   <connection>
    <sender>buttonBox</sender>
-   <signal>accepted()</signal>
+   <signal>rejected()</signal>
    <receiver>IconsPreviewDialog</receiver>
-   <slot>accept()</slot>
+   <slot>reject()</slot>
    <hints>
-    <hint type="sourcelabel" >
-     <x>155</x>
-     <y>519</y>
+    <hint type="sourcelabel">
+     <x>482</x>
+     <y>520</y>
     </hint>
-    <hint type="destinationlabel" >
-     <x>161</x>
-     <y>538</y>
+    <hint type="destinationlabel">
+     <x>389</x>
+     <y>539</y>
     </hint>
    </hints>
   </connection>
--- a/eric6/Preferences/ConfigurationPages/IrcPage.ui	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/Preferences/ConfigurationPages/IrcPage.ui	Sat May 02 13:51:07 2020 +0200
@@ -99,7 +99,7 @@
    <item>
     <widget class="QGroupBox" name="coloursGroup">
      <property name="title">
-      <string>Colours</string>
+      <string>Colors</string>
      </property>
      <layout class="QGridLayout" name="gridLayout_2">
       <item row="0" column="0">
@@ -118,7 +118,7 @@
          </size>
         </property>
         <property name="toolTip">
-         <string>Select the colour for network messages</string>
+         <string>Select the color for network messages</string>
         </property>
         <property name="text">
          <string/>
@@ -141,7 +141,7 @@
          </size>
         </property>
         <property name="toolTip">
-         <string>Select the colour for nick names</string>
+         <string>Select the color for nick names</string>
         </property>
         <property name="text">
          <string/>
@@ -164,7 +164,7 @@
          </size>
         </property>
         <property name="toolTip">
-         <string>Select the colour for server messages</string>
+         <string>Select the color for server messages</string>
         </property>
         <property name="text">
          <string/>
@@ -187,7 +187,7 @@
          </size>
         </property>
         <property name="toolTip">
-         <string>Select the colour for own nick name</string>
+         <string>Select the color for own nick name</string>
         </property>
         <property name="text">
          <string/>
@@ -210,7 +210,7 @@
          </size>
         </property>
         <property name="toolTip">
-         <string>Select the colour for channel messages</string>
+         <string>Select the color for channel messages</string>
         </property>
         <property name="text">
          <string/>
@@ -233,7 +233,7 @@
          </size>
         </property>
         <property name="toolTip">
-         <string>Select the colour for join channel messages</string>
+         <string>Select the color for join channel messages</string>
         </property>
         <property name="text">
          <string/>
@@ -256,7 +256,7 @@
          </size>
         </property>
         <property name="toolTip">
-         <string>Select the colour for error messages</string>
+         <string>Select the color for error messages</string>
         </property>
         <property name="text">
          <string/>
@@ -279,7 +279,7 @@
          </size>
         </property>
         <property name="toolTip">
-         <string>Select the colour for leave channel messages</string>
+         <string>Select the color for leave channel messages</string>
         </property>
         <property name="text">
          <string/>
@@ -302,7 +302,7 @@
          </size>
         </property>
         <property name="toolTip">
-         <string>Select the colour for timestamps</string>
+         <string>Select the color for timestamps</string>
         </property>
         <property name="text">
          <string/>
@@ -325,7 +325,7 @@
          </size>
         </property>
         <property name="toolTip">
-         <string>Select the colour for channel info messages</string>
+         <string>Select the color for channel info messages</string>
         </property>
         <property name="text">
          <string/>
@@ -348,7 +348,7 @@
          </size>
         </property>
         <property name="toolTip">
-         <string>Select the colour for hyperlinks</string>
+         <string>Select the color for hyperlinks</string>
         </property>
         <property name="text">
          <string/>
@@ -361,7 +361,7 @@
    <item>
     <widget class="QGroupBox" name="textColoursGroup">
      <property name="toolTip">
-      <string>Enable to allow coloured text in IRC messages</string>
+      <string>Enable to allow colored text in IRC messages</string>
      </property>
      <property name="title">
       <string>Allow Colored Text in IRC Messages</string>
@@ -821,7 +821,7 @@
            </size>
           </property>
           <property name="toolTip">
-           <string>Select the foreground colour for the marker</string>
+           <string>Select the foreground color for the marker</string>
           </property>
           <property name="text">
            <string/>
@@ -844,7 +844,7 @@
            </size>
           </property>
           <property name="toolTip">
-           <string>Select the background colour for the marker</string>
+           <string>Select the background color for the marker</string>
           </property>
           <property name="text">
            <string/>
--- a/eric6/Preferences/ConfigurationPages/LogViewerPage.ui	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/Preferences/ConfigurationPages/LogViewerPage.ui	Sat May 02 13:51:07 2020 +0200
@@ -46,7 +46,7 @@
      <item>
       <widget class="QLabel" name="TextLabel3_2_2">
        <property name="text">
-        <string>Error Colour:</string>
+        <string>Error Color:</string>
        </property>
       </widget>
      </item>
@@ -59,7 +59,7 @@
         </size>
        </property>
        <property name="toolTip">
-        <string>Select the colour for text sent to stderr</string>
+        <string>Select the color for text sent to stderr</string>
        </property>
        <property name="text">
         <string/>
--- a/eric6/Preferences/ConfigurationPages/MicroPythonPage.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/Preferences/ConfigurationPages/MicroPythonPage.py	Sat May 02 13:51:07 2020 +0200
@@ -35,6 +35,31 @@
         
         self.colorSchemeComboBox.addItems(sorted(AnsiColorSchemes.keys()))
         
+        # populate the chart theme combobox
+        try:
+            from PyQt5.QtChart import QChart
+            
+            self.chartThemeComboBox.addItem(
+                self.tr("Automatic"), -1)
+            self.chartThemeComboBox.addItem(
+                self.tr("Light"), QChart.ChartThemeLight)
+            self.chartThemeComboBox.addItem(
+                self.tr("Dark"), QChart.ChartThemeDark)
+            self.chartThemeComboBox.addItem(
+                self.tr("Blue Cerulean"), QChart.ChartThemeBlueCerulean)
+            self.chartThemeComboBox.addItem(
+                self.tr("Brown Sand"), QChart.ChartThemeBrownSand)
+            self.chartThemeComboBox.addItem(
+                self.tr("Blue NCS"), QChart.ChartThemeBlueNcs)
+            self.chartThemeComboBox.addItem(
+                self.tr("High Contrast"), QChart.ChartThemeHighContrast)
+            self.chartThemeComboBox.addItem(
+                self.tr("Blue Icy"), QChart.ChartThemeBlueIcy)
+            self.chartThemeComboBox.addItem(
+                self.tr("Qt"), QChart.ChartThemeQt)
+        except ImportError:
+            self.chartThemeComboBox.setEnabled(False)
+        
         self.mpyCrossPicker.setMode(E5PathPickerModes.OpenFileMode)
         self.mpyCrossPicker.setFilters(self.tr("All Files (*)"))
         
@@ -42,37 +67,60 @@
         self.dfuUtilPathPicker.setFilters(self.tr("All Files (*)"))
         
         # set initial values
+        # serial link parameters
         self.timeoutSpinBox.setValue(
             Preferences.getMicroPython("SerialTimeout") / 1000)
         # converted to seconds
         self.syncTimeCheckBox.setChecked(
             Preferences.getMicroPython("SyncTimeAfterConnect"))
+        
+        # REPL Pane
         self.colorSchemeComboBox.setCurrentIndex(
             self.colorSchemeComboBox.findText(
                 Preferences.getMicroPython("ColorScheme")))
         self.replWrapCheckBox.setChecked(
             Preferences.getMicroPython("ReplLineWrap"))
+        
+        # Chart Pane
+        index = self.chartThemeComboBox.findData(
+            Preferences.getMicroPython("ChartColorTheme"))
+        if index < 0:
+            index = 0
+        self.chartThemeComboBox.setCurrentIndex(index)
+        
+        # MPY Cross Compiler
         self.mpyCrossPicker.setText(
             Preferences.getMicroPython("MpyCrossCompiler"))
+        
+        # PyBoard specifics
         self.dfuUtilPathPicker.setText(
             Preferences.getMicroPython("DfuUtilPath"))
+        
+        # firmware URL
         self.micropythonFirmwareUrlLineEdit.setText(
             Preferences.getMicroPython("MicroPythonFirmwareUrl"))
         self.circuitpythonFirmwareUrlLineEdit.setText(
             Preferences.getMicroPython("CircuitPythonFirmwareUrl"))
         self.microbitFirmwareUrlLineEdit.setText(
             Preferences.getMicroPython("MicrobitFirmwareUrl"))
+        self.calliopeFirmwareUrlLineEdit.setText(
+            Preferences.getMicroPython("CalliopeFirmwareUrl"))
+        
+        # documentation URL
         self.micropythonDocuUrlLineEdit.setText(
             Preferences.getMicroPython("MicroPythonDocuUrl"))
         self.circuitpythonDocuUrlLineEdit.setText(
             Preferences.getMicroPython("CircuitPythonDocuUrl"))
         self.microbitDocuUrlLineEdit.setText(
             Preferences.getMicroPython("MicrobitDocuUrl"))
+        self.calliopeDocuUrlLineEdit.setText(
+            Preferences.getMicroPython("CalliopeDocuUrl"))
     
     def save(self):
         """
         Public slot to save the MicroPython configuration.
         """
+        # serial link parameters
         Preferences.setMicroPython(
             "SerialTimeout",
             self.timeoutSpinBox.value() * 1000)
@@ -80,18 +128,31 @@
         Preferences.setMicroPython(
             "SyncTimeAfterConnect",
             self.syncTimeCheckBox.isChecked())
+        
+        # REPL Pane
         Preferences.setMicroPython(
             "ColorScheme",
             self.colorSchemeComboBox.currentText())
         Preferences.setMicroPython(
             "ReplLineWrap",
             self.replWrapCheckBox.isChecked())
+        
+        # Chart Pane
+        Preferences.setMicroPython(
+            "ChartColorTheme",
+            self.chartThemeComboBox.currentData())
+        
+        # MPY Cross Compiler
         Preferences.setMicroPython(
             "MpyCrossCompiler",
             self.mpyCrossPicker.text())
+        
+        # PyBoard specifics
         Preferences.setMicroPython(
             "DfuUtilPath",
             self.dfuUtilPathPicker.text())
+        
+        # firmware URL
         Preferences.setMicroPython(
             "MicroPythonFirmwareUrl",
             self.micropythonFirmwareUrlLineEdit.text())
@@ -102,6 +163,11 @@
             "MicrobitFirmwareUrl",
             self.microbitFirmwareUrlLineEdit.text())
         Preferences.setMicroPython(
+            "CalliopeFirmwareUrl",
+            self.calliopeFirmwareUrlLineEdit.text())
+        
+        # documentation URL
+        Preferences.setMicroPython(
             "MicroPythonDocuUrl",
             self.micropythonDocuUrlLineEdit.text())
         Preferences.setMicroPython(
@@ -110,6 +176,9 @@
         Preferences.setMicroPython(
             "MicrobitDocuUrl",
             self.microbitDocuUrlLineEdit.text())
+        Preferences.setMicroPython(
+            "CalliopeDocuUrl",
+            self.calliopeDocuUrlLineEdit.text())
 
 
 def create(dlg):
--- a/eric6/Preferences/ConfigurationPages/MicroPythonPage.ui	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/Preferences/ConfigurationPages/MicroPythonPage.ui	Sat May 02 13:51:07 2020 +0200
@@ -135,6 +135,35 @@
     </widget>
    </item>
    <item>
+    <widget class="QGroupBox" name="groupBox_7">
+     <property name="title">
+      <string>Chart Pane</string>
+     </property>
+     <layout class="QHBoxLayout" name="horizontalLayout_3">
+      <item>
+       <widget class="QLabel" name="label_11">
+        <property name="text">
+         <string>Color Theme:</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QComboBox" name="chartThemeComboBox">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="toolTip">
+         <string>Select the color scheme of the chart</string>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item>
     <widget class="QGroupBox" name="groupBox_3">
      <property name="title">
       <string>MPY Cross Compiler</string>
@@ -246,6 +275,20 @@
         </property>
        </widget>
       </item>
+      <item row="3" column="0">
+       <widget class="QLabel" name="label_13">
+        <property name="text">
+         <string>Calliope mini:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="3" column="1">
+       <widget class="E5ClearableLineEdit" name="calliopeFirmwareUrlLineEdit">
+        <property name="toolTip">
+         <string>Enter the URL for the Callope mini Firmware</string>
+        </property>
+       </widget>
+      </item>
      </layout>
     </widget>
    </item>
@@ -297,6 +340,20 @@
         </property>
        </widget>
       </item>
+      <item row="3" column="0">
+       <widget class="QLabel" name="label_12">
+        <property name="text">
+         <string>Calliope mini:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="3" column="1">
+       <widget class="E5ClearableLineEdit" name="calliopeDocuUrlLineEdit">
+        <property name="toolTip">
+         <string>Enter the URL for the Calliope mini MicroPython documentation</string>
+        </property>
+       </widget>
+      </item>
      </layout>
     </widget>
    </item>
@@ -333,14 +390,17 @@
   <tabstop>syncTimeCheckBox</tabstop>
   <tabstop>colorSchemeComboBox</tabstop>
   <tabstop>replWrapCheckBox</tabstop>
+  <tabstop>chartThemeComboBox</tabstop>
   <tabstop>mpyCrossPicker</tabstop>
   <tabstop>dfuUtilPathPicker</tabstop>
   <tabstop>micropythonFirmwareUrlLineEdit</tabstop>
   <tabstop>circuitpythonFirmwareUrlLineEdit</tabstop>
   <tabstop>microbitFirmwareUrlLineEdit</tabstop>
+  <tabstop>calliopeFirmwareUrlLineEdit</tabstop>
   <tabstop>micropythonDocuUrlLineEdit</tabstop>
   <tabstop>circuitpythonDocuUrlLineEdit</tabstop>
   <tabstop>microbitDocuUrlLineEdit</tabstop>
+  <tabstop>calliopeDocuUrlLineEdit</tabstop>
  </tabstops>
  <resources/>
  <connections/>
--- a/eric6/Preferences/ConfigurationPages/NotificationsPage.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/Preferences/ConfigurationPages/NotificationsPage.py	Sat May 02 13:51:07 2020 +0200
@@ -86,7 +86,7 @@
             self.__notification = NotificationWidget(
                 parent=self, setPosition=True)
             self.__notification.setPixmap(
-                UI.PixmapCache.getPixmap("notification48.png"))
+                UI.PixmapCache.getPixmap("notification48"))
             self.__notification.setHeading(self.tr("Visual Selection"))
             self.__notification.setText(
                 self.tr("Drag the notification window to"
--- a/eric6/Preferences/ConfigurationPages/PrinterPage.ui	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/Preferences/ConfigurationPages/PrinterPage.ui	Sat May 02 13:51:07 2020 +0200
@@ -46,7 +46,7 @@
      <item row="1" column="0">
       <widget class="QLabel" name="TextLabel2">
        <property name="text">
-        <string>Colour Mode:</string>
+        <string>Color Mode:</string>
        </property>
        <property name="alignment">
         <set>Qt::AlignTop</set>
@@ -74,7 +74,7 @@
         <item>
          <widget class="QRadioButton" name="printerColorButton">
           <property name="text">
-           <string>Colour</string>
+           <string>Color</string>
           </property>
          </widget>
         </item>
--- a/eric6/Preferences/ConfigurationPages/ProjectBrowserPage.ui	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/Preferences/ConfigurationPages/ProjectBrowserPage.ui	Sat May 02 13:51:07 2020 +0200
@@ -34,7 +34,7 @@
    <item>
     <widget class="QGroupBox" name="groupBox">
      <property name="title">
-      <string>Colours</string>
+      <string>Colors</string>
      </property>
      <layout class="QHBoxLayout" name="horizontalLayout">
       <item>
@@ -53,7 +53,7 @@
          </size>
         </property>
         <property name="toolTip">
-         <string>Select the colour for highlighted entries in the Others viewer.</string>
+         <string>Select the color for highlighted entries in the Others viewer.</string>
         </property>
         <property name="text">
          <string/>
--- a/eric6/Preferences/ConfigurationPages/TasksPage.ui	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/Preferences/ConfigurationPages/TasksPage.ui	Sat May 02 13:51:07 2020 +0200
@@ -102,7 +102,7 @@
    <item>
     <widget class="QGroupBox" name="groupBox_2">
      <property name="title">
-      <string>Tasks Background Colours</string>
+      <string>Tasks Background Colors</string>
      </property>
      <layout class="QGridLayout" name="gridLayout_2">
       <item row="0" column="0">
@@ -121,7 +121,7 @@
          </size>
         </property>
         <property name="toolTip">
-         <string>Select the background colour for these tasks.</string>
+         <string>Select the background color for these tasks.</string>
         </property>
         <property name="text">
          <string/>
@@ -157,7 +157,7 @@
          </size>
         </property>
         <property name="toolTip">
-         <string>Select the background colour for these tasks.</string>
+         <string>Select the background color for these tasks.</string>
         </property>
         <property name="text">
          <string/>
@@ -180,7 +180,7 @@
          </size>
         </property>
         <property name="toolTip">
-         <string>Select the background colour for these tasks.</string>
+         <string>Select the background color for these tasks.</string>
         </property>
         <property name="text">
          <string/>
@@ -203,7 +203,7 @@
          </size>
         </property>
         <property name="toolTip">
-         <string>Select the background colour for these tasks.</string>
+         <string>Select the background color for these tasks.</string>
         </property>
         <property name="text">
          <string/>
--- a/eric6/Preferences/ConfigurationPages/TrayStarterPage.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/Preferences/ConfigurationPages/TrayStarterPage.py	Sat May 02 13:51:07 2020 +0200
@@ -7,6 +7,7 @@
 Module implementing the tray starter configuration page.
 """
 
+import os
 
 from .ConfigurationPageBase import ConfigurationPageBase
 from .Ui_TrayStarterPage import Ui_TrayStarterPage
@@ -27,21 +28,22 @@
         self.setupUi(self)
         self.setObjectName("TrayStarterPage")
         
-        self.standardButton.setIcon(UI.PixmapCache.getIcon("erict.png"))
-        self.highContrastButton.setIcon(UI.PixmapCache.getIcon("erict-hc.png"))
-        self.blackWhiteButton.setIcon(UI.PixmapCache.getIcon("erict-bw.png"))
+        self.standardButton.setIcon(UI.PixmapCache.getIcon("erict"))
+        self.highContrastButton.setIcon(UI.PixmapCache.getIcon("erict-hc"))
+        self.blackWhiteButton.setIcon(UI.PixmapCache.getIcon("erict-bw"))
         self.blackWhiteInverseButton.setIcon(
-            UI.PixmapCache.getIcon("erict-bwi.png"))
+            UI.PixmapCache.getIcon("erict-bwi"))
         
         # set initial values
-        iconName = Preferences.getTrayStarter("TrayStarterIcon")
-        if iconName == "erict.png":
+        iconName = os.path.splitext(
+            Preferences.getTrayStarter("TrayStarterIcon"))[0]
+        if iconName == "erict":
             self.standardButton.setChecked(True)
-        elif iconName == "erict-hc.png":
+        elif iconName == "erict-hc":
             self.highContrastButton.setChecked(True)
-        elif iconName == "erict-bw.png":
+        elif iconName == "erict-bw":
             self.blackWhiteButton.setChecked(True)
-        elif iconName == "erict-bwi.png":
+        elif iconName == "erict-bwi":
             self.blackWhiteInverseButton.setChecked(True)
     
     def save(self):
@@ -49,13 +51,13 @@
         Public slot to save the Python configuration.
         """
         if self.standardButton.isChecked():
-            iconName = "erict.png"
+            iconName = "erict"
         elif self.highContrastButton.isChecked():
-            iconName = "erict-hc.png"
+            iconName = "erict-hc"
         elif self.blackWhiteButton.isChecked():
-            iconName = "erict-bw.png"
+            iconName = "erict-bw"
         elif self.blackWhiteInverseButton.isChecked():
-            iconName = "erict-bwi.png"
+            iconName = "erict-bwi"
         Preferences.setTrayStarter("TrayStarterIcon", iconName)
     
 
--- a/eric6/Preferences/ConfigurationPages/VcsPage.ui	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/Preferences/ConfigurationPages/VcsPage.ui	Sat May 02 13:51:07 2020 +0200
@@ -125,7 +125,7 @@
    <item>
     <widget class="QGroupBox" name="groupBox_3">
      <property name="title">
-      <string>Colours</string>
+      <string>Colors</string>
      </property>
      <layout class="QGridLayout" name="gridLayout">
       <item row="0" column="0">
@@ -144,7 +144,7 @@
          </size>
         </property>
         <property name="toolTip">
-         <string>Select the background colour for entries with VCS status &quot;added&quot;.</string>
+         <string>Select the background color for entries with VCS status &quot;added&quot;.</string>
         </property>
         <property name="text">
          <string/>
@@ -167,7 +167,7 @@
          </size>
         </property>
         <property name="toolTip">
-         <string>Select the background colour for entries with VCS status &quot;conflict&quot;.</string>
+         <string>Select the background color for entries with VCS status &quot;conflict&quot;.</string>
         </property>
         <property name="text">
          <string/>
@@ -203,7 +203,7 @@
          </size>
         </property>
         <property name="toolTip">
-         <string>Select the background colour for entries with VCS status &quot;modified&quot;.</string>
+         <string>Select the background color for entries with VCS status &quot;modified&quot;.</string>
         </property>
         <property name="text">
          <string/>
@@ -226,7 +226,7 @@
          </size>
         </property>
         <property name="toolTip">
-         <string>Select the background colour for entries with VCS status &quot;replaced&quot;.</string>
+         <string>Select the background color for entries with VCS status &quot;replaced&quot;.</string>
         </property>
         <property name="text">
          <string/>
@@ -249,7 +249,7 @@
          </size>
         </property>
         <property name="toolTip">
-         <string>Select the background colour for entries with VCS status &quot;needs update&quot;.</string>
+         <string>Select the background color for entries with VCS status &quot;needs update&quot;.</string>
         </property>
         <property name="text">
          <string/>
@@ -272,7 +272,7 @@
          </size>
         </property>
         <property name="toolTip">
-         <string>Select the background colour for entries with VCS status &quot;removed&quot;.</string>
+         <string>Select the background color for entries with VCS status &quot;removed&quot;.</string>
         </property>
         <property name="text">
          <string/>
--- a/eric6/Preferences/ConfigurationPages/WebBrowserAppearancePage.ui	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/Preferences/ConfigurationPages/WebBrowserAppearancePage.ui	Sat May 02 13:51:07 2020 +0200
@@ -276,13 +276,13 @@
    <item>
     <widget class="QGroupBox" name="groupBox_3">
      <property name="title">
-      <string>Colours</string>
+      <string>Colors</string>
      </property>
      <layout class="QGridLayout" name="gridLayout_2">
       <item row="0" column="0">
        <widget class="QLabel" name="textLabel1_3">
         <property name="text">
-         <string>Background colour of secure URLs:</string>
+         <string>Background color of secure URLs:</string>
         </property>
        </widget>
       </item>
@@ -295,7 +295,7 @@
          </size>
         </property>
         <property name="toolTip">
-         <string>Select the background colour for secure URLs.</string>
+         <string>Select the background color for secure URLs.</string>
         </property>
         <property name="text">
          <string/>
--- a/eric6/Preferences/ConfigurationPages/WebBrowserPage.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/Preferences/ConfigurationPages/WebBrowserPage.py	Sat May 02 13:51:07 2020 +0200
@@ -190,7 +190,7 @@
             ):
                 self.imageSearchComboBox.addItem(
                     UI.PixmapCache.getIcon(
-                        "{0}.png".format(engineName.lower())),
+                        "{0}".format(engineName.lower())),
                     engineName)
             index = self.imageSearchComboBox.findText(
                 Preferences.getWebBrowser("ImageSearchEngine"))
--- a/eric6/Preferences/__init__.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/Preferences/__init__.py	Sat May 02 13:51:07 2020 +0200
@@ -350,6 +350,8 @@
     
     iconsDefaults = {
         "Path": [],
+        "DefaultIconsPath": "automatic",
+        # automatic, breeze-dark, breeze-light, oxygen
     }
     
     # defaults for the cooperation settings
@@ -640,6 +642,8 @@
         "NonmatchingBrace": QColor(Qt.red),
         "NonmatchingBraceBack": QColor(Qt.white),
         "CallTipsBackground": QColor(Qt.white),
+        "CallTipsForeground": QColor("#7f7f7f"),
+        "CallTipsHighlight": QColor("#00007f"),
         "CaretForeground": QColor(Qt.black),
         "CaretLineBackground": QColor(Qt.white),
         "Edge": QColor(Qt.lightGray),
@@ -1316,7 +1320,11 @@
     
     # defaults for the printer settings
     graphicsDefaults = {
-        "Font": "SansSerif,10,-1,5,50,0,0,0,0,0"
+        "Font": "SansSerif,10,-1,5,50,0,0,0,0,0",
+        "DrawingMode": "automatic",
+        # automatic - determine mode depending upon desktop scheme
+        # black_white - black items on white background
+        # white_black - white items on black background
     }
     
     # defaults for the icon editor
@@ -1332,9 +1340,9 @@
     
     # defaults for tray starter
     trayStarterDefaults = {
-        "TrayStarterIcon": "erict.png",
-        # valid values are: erict.png, erict-hc.png,
-        #                   erict-bw.png, erict-bwi.png
+        "TrayStarterIcon": "erict",
+        # valid values are: erict, erict-hc,
+        #                   erict-bw, erict-bwi
     }
     
     # defaults for geometry
@@ -1462,17 +1470,25 @@
         "SyncTimeAfterConnect": True,
         "ShowHiddenLocal": True,
         "ShowHiddenDevice": True,
+        "ChartColorTheme": -1,          # -1 = automatic,
+                                        # QChart.ChartTheme otherwise
         "MpyCrossCompiler": "",         # path of the mpy-cross compiler
         "DfuUtilPath": "",              # path of the dfu-util flashing tool
+        # documentation URLs
         "MicroPythonDocuUrl":
             "https://docs.micropython.org/en/latest/",
         "CircuitPythonDocuUrl":
             "https://circuitpython.readthedocs.io/en/latest/",
         "MicrobitDocuUrl":
             "https://microbit-micropython.readthedocs.io/en/latest/",
-        "MicroPythonFirmwareUrl": "http://micropython.org/download",
-        "CircuitPythonFirmwareUrl": "https://circuitpython.org/downloads",
+        "CalliopeDocuUrl":
+            "https://github.com/calliope-mini/calliope-mini-micropython/", 
+        # MicroPython firmware URLs
+        "MicroPythonFirmwareUrl": "http://micropython.org/download/",
+        "CircuitPythonFirmwareUrl": "https://circuitpython.org/downloads/",
         "MicrobitFirmwareUrl": "https://microbit.org/guide/firmware/",
+        "CalliopeFirmwareUrl":
+            "https://github.com/calliope-mini/calliope-mini-micropython/", 
     }
     if Globals.isWindowsPlatform():
         microPythonDefaults["ColorScheme"] = "Windows 10"
@@ -1992,6 +2008,13 @@
     else:
         return prefClass.iconsDefaults[key]
     
+    if key in ["Path"]:
+        return toList(prefClass.settings.value(
+            "UI/Icons/" + key, prefClass.iconsDefaults[key]))
+    else:
+        return prefClass.settings.value(
+            "UI/Icons/" + key, prefClass.iconsDefaults[key])
+
 
 def setIcons(key, value, prefClass=Prefs):
     """
--- a/eric6/Project/DebuggerPropertiesDialog.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/Project/DebuggerPropertiesDialog.py	Sat May 02 13:51:07 2020 +0200
@@ -52,7 +52,7 @@
             QComboBox.AdjustToMinimumContentsLength)
         self.debugClientPicker.setPathsList(debugClientsHistory)
         self.debugClientClearHistoryButton.setIcon(
-            UI.PixmapCache.getIcon("editDelete.png"))
+            UI.PixmapCache.getIcon("editDelete"))
         
         venvManager = e5App().getObject("VirtualEnvManager")
         
--- a/eric6/Project/IdlCompilerOptionsDialog.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/Project/IdlCompilerOptionsDialog.py	Sat May 02 13:51:07 2020 +0200
@@ -47,17 +47,17 @@
         
         self.__project = project
         
-        self.idAddButton.setIcon(UI.PixmapCache.getIcon("plus.png"))
-        self.idDeleteButton.setIcon(UI.PixmapCache.getIcon("minus.png"))
-        self.idEditButton.setIcon(UI.PixmapCache.getIcon("edit.png"))
+        self.idAddButton.setIcon(UI.PixmapCache.getIcon("plus"))
+        self.idDeleteButton.setIcon(UI.PixmapCache.getIcon("minus"))
+        self.idEditButton.setIcon(UI.PixmapCache.getIcon("edit"))
         
-        self.dnAddButton.setIcon(UI.PixmapCache.getIcon("plus.png"))
-        self.dnDeleteButton.setIcon(UI.PixmapCache.getIcon("minus.png"))
-        self.dnEditButton.setIcon(UI.PixmapCache.getIcon("edit.png"))
+        self.dnAddButton.setIcon(UI.PixmapCache.getIcon("plus"))
+        self.dnDeleteButton.setIcon(UI.PixmapCache.getIcon("minus"))
+        self.dnEditButton.setIcon(UI.PixmapCache.getIcon("edit"))
         
-        self.unAddButton.setIcon(UI.PixmapCache.getIcon("plus.png"))
-        self.unDeleteButton.setIcon(UI.PixmapCache.getIcon("minus.png"))
-        self.unEditButton.setIcon(UI.PixmapCache.getIcon("edit.png"))
+        self.unAddButton.setIcon(UI.PixmapCache.getIcon("plus"))
+        self.unDeleteButton.setIcon(UI.PixmapCache.getIcon("minus"))
+        self.unEditButton.setIcon(UI.PixmapCache.getIcon("edit"))
         
         self.__populateIncludeDirectoriesList(includeDirectories)
         self.__populateDefineNamesList(definedNames)
--- a/eric6/Project/Project.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/Project/Project.py	Sat May 02 13:51:07 2020 +0200
@@ -711,6 +711,18 @@
         @return reference to the project browser model (ProjectBrowserModel)
         """
         return self.__model
+    
+    def startFileSystemMonitoring(self):
+        """
+        Public method to (re)start monitoring the project file system.
+        """
+        self.__model.startFileSystemMonitoring()
+    
+    def stopFileSystemMonitoring(self):
+        """
+        Public method to stop monitoring the project file system.
+        """
+        self.__model.stopFileSystemMonitoring()
         
     def getVcs(self):
         """
@@ -2017,8 +2029,9 @@
         """
         fn = self.getRelativePath(oldname)
         if os.path.dirname(oldname) == os.path.dirname(newname):
-            self.removeFile(oldname, False)
-            self.appendFile(newname, isSourceFile, False)
+            if self.__isInPdata(oldname):
+                self.removeFile(oldname, False)
+                self.appendFile(newname, isSourceFile, False)
             self.__model.renameItem(fn, newname)
         else:
             self.removeFile(oldname)
@@ -2125,11 +2138,15 @@
             else:
                 if newdn not in self.subdirs:
                     self.subdirs.append(newdn)
-        self.setDirty(True)
-        typeString = typeStrings[0]
-        del typeStrings[0]
-        self.__model.removeItem(olddn)
-        self.__model.addNewItem(typeString, newdn, typeStrings)
+        if typeStrings:
+            # the directory is controlled by the project
+            self.setDirty(True)
+            self.__model.removeItem(olddn)
+            typeString = typeStrings[0]
+            del typeStrings[0]
+            self.__model.addNewItem(typeString, newdn, typeStrings)
+        else:
+            self.__model.renameItem(olddn, self.getAbsolutePath(newdn))
         self.directoryRemoved.emit(olddn)
         
     def removeFile(self, fn, updateModel=True):
@@ -3721,7 +3738,25 @@
         @rtype str
         """
         return self.pdata["DESCRIPTION"]
-        
+    
+    def __isInPdata(self, fn):
+        """
+        Private method used to check, if the passed in filename is project
+        controlled..
+        
+        @param fn filename to be checked
+        @type str
+        @return flag indicating membership
+        @rtype bool
+        """
+        newfn = os.path.abspath(fn)
+        newfn = self.getRelativePath(newfn)
+        for group in ["SOURCES", "FORMS", "INTERFACES", "PROTOCOLS",
+                      "RESOURCES", "TRANSLATIONS", "OTHERS"]:
+            if newfn in self.pdata[group]:
+                return True
+        return False
+    
     def isProjectFile(self, fn):
         """
         Public method used to check, if the passed in filename belongs to the
@@ -3830,7 +3865,7 @@
         
         act = E5Action(
             self.tr('New project'),
-            UI.PixmapCache.getIcon("projectNew.png"),
+            UI.PixmapCache.getIcon("projectNew"),
             self.tr('&New...'), 0, 0,
             self.actGrp1, 'project_new')
         act.setStatusTip(self.tr('Generate a new project'))
@@ -3844,7 +3879,7 @@
 
         act = E5Action(
             self.tr('Open project'),
-            UI.PixmapCache.getIcon("projectOpen.png"),
+            UI.PixmapCache.getIcon("projectOpen"),
             self.tr('&Open...'), 0, 0,
             self.actGrp1, 'project_open')
         act.setStatusTip(self.tr('Open an existing project'))
@@ -3857,7 +3892,7 @@
 
         self.closeAct = E5Action(
             self.tr('Close project'),
-            UI.PixmapCache.getIcon("projectClose.png"),
+            UI.PixmapCache.getIcon("projectClose"),
             self.tr('&Close'), 0, 0, self, 'project_close')
         self.closeAct.setStatusTip(self.tr('Close the current project'))
         self.closeAct.setWhatsThis(self.tr(
@@ -3869,7 +3904,7 @@
 
         self.saveAct = E5Action(
             self.tr('Save project'),
-            UI.PixmapCache.getIcon("projectSave.png"),
+            UI.PixmapCache.getIcon("projectSave"),
             self.tr('&Save'), 0, 0, self, 'project_save')
         self.saveAct.setStatusTip(self.tr('Save the current project'))
         self.saveAct.setWhatsThis(self.tr(
@@ -3881,7 +3916,7 @@
 
         self.saveasAct = E5Action(
             self.tr('Save project as'),
-            UI.PixmapCache.getIcon("projectSaveAs.png"),
+            UI.PixmapCache.getIcon("projectSaveAs"),
             self.tr('Save &as...'), 0, 0, self, 'project_save_as')
         self.saveasAct.setStatusTip(self.tr(
             'Save the current project to a new file'))
@@ -3896,7 +3931,7 @@
         
         self.addFilesAct = E5Action(
             self.tr('Add files to project'),
-            UI.PixmapCache.getIcon("fileMisc.png"),
+            UI.PixmapCache.getIcon("fileMisc"),
             self.tr('Add &files...'), 0, 0,
             self.actGrp2, 'project_add_file')
         self.addFilesAct.setStatusTip(self.tr(
@@ -3912,7 +3947,7 @@
 
         self.addDirectoryAct = E5Action(
             self.tr('Add directory to project'),
-            UI.PixmapCache.getIcon("dirOpen.png"),
+            UI.PixmapCache.getIcon("dirOpen"),
             self.tr('Add directory...'), 0, 0,
             self.actGrp2, 'project_add_directory')
         self.addDirectoryAct.setStatusTip(
@@ -3927,7 +3962,7 @@
 
         self.addLanguageAct = E5Action(
             self.tr('Add translation to project'),
-            UI.PixmapCache.getIcon("linguist4.png"),
+            UI.PixmapCache.getIcon("linguist4"),
             self.tr('Add &translation...'), 0, 0,
             self.actGrp2, 'project_add_translation')
         self.addLanguageAct.setStatusTip(
@@ -3972,7 +4007,7 @@
         
         self.propsAct = E5Action(
             self.tr('Project properties'),
-            UI.PixmapCache.getIcon("projectProps.png"),
+            UI.PixmapCache.getIcon("projectProps"),
             self.tr('&Properties...'), 0, 0, self,
             'project_properties')
         self.propsAct.setStatusTip(self.tr('Show the project properties'))
@@ -3985,7 +4020,7 @@
 
         self.userPropsAct = E5Action(
             self.tr('User project properties'),
-            UI.PixmapCache.getIcon("projectUserProps.png"),
+            UI.PixmapCache.getIcon("projectUserProps"),
             self.tr('&User Properties...'), 0, 0, self,
             'project_user_properties')
         self.userPropsAct.setStatusTip(self.tr(
@@ -4222,7 +4257,7 @@
 
         self.pluginPkgListAct = E5Action(
             self.tr('Create Package List'),
-            UI.PixmapCache.getIcon("pluginArchiveList.png"),
+            UI.PixmapCache.getIcon("pluginArchiveList"),
             self.tr('Create &Package List'), 0, 0,
             self.pluginGrp, 'project_plugin_pkglist')
         self.pluginPkgListAct.setStatusTip(
@@ -4238,7 +4273,7 @@
 
         self.pluginArchiveAct = E5Action(
             self.tr('Create Plugin Archives'),
-            UI.PixmapCache.getIcon("pluginArchive.png"),
+            UI.PixmapCache.getIcon("pluginArchive"),
             self.tr('Create Plugin &Archives'), 0, 0,
             self.pluginGrp, 'project_plugin_archive')
         self.pluginArchiveAct.setStatusTip(
@@ -4255,7 +4290,7 @@
     
         self.pluginSArchiveAct = E5Action(
             self.tr('Create Plugin Archives (Snapshot)'),
-            UI.PixmapCache.getIcon("pluginArchiveSnapshot.png"),
+            UI.PixmapCache.getIcon("pluginArchiveSnapshot"),
             self.tr('Create Plugin Archives (&Snapshot)'), 0, 0,
             self.pluginGrp, 'project_plugin_sarchive')
         self.pluginSArchiveAct.setStatusTip(self.tr(
@@ -5483,7 +5518,7 @@
                               "created successfully.</p>")
         if self.ui.notificationsEnabled():
             self.ui.showNotification(
-                UI.PixmapCache.getPixmap("pluginArchive48.png"),
+                UI.PixmapCache.getPixmap("pluginArchive48"),
                 self.tr("Create Plugin Archive"),
                 message)
         else:
@@ -5751,7 +5786,7 @@
                 
                 if self.ui.notificationsEnabled() and not interactive:
                     self.ui.showNotification(
-                        UI.PixmapCache.getPixmap("makefile48.png"),
+                        UI.PixmapCache.getPixmap("makefile48"),
                         title,
                         message)
                 else:
--- a/eric6/Project/ProjectBrowser.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/Project/ProjectBrowser.py	Sat May 02 13:51:07 2020 +0200
@@ -46,7 +46,7 @@
         E5TabWidget.__init__(self, parent)
         self.project = project
         
-        self.setWindowIcon(UI.PixmapCache.getIcon("eric.png"))
+        self.setWindowIcon(UI.PixmapCache.getIcon("eric"))
         
         self.setUsesScrollButtons(True)
         
@@ -180,43 +180,43 @@
         if browserFlags & SourcesBrowserFlag:
             index = self.addTab(
                 self.psBrowser,
-                UI.PixmapCache.getIcon("projectSources.png"), '')
+                UI.PixmapCache.getIcon("projectSources"), '')
             self.setTabToolTip(index, self.psBrowser.windowTitle())
         
         if browserFlags & FormsBrowserFlag:
             index = self.addTab(
                 self.pfBrowser,
-                UI.PixmapCache.getIcon("projectForms.png"), '')
+                UI.PixmapCache.getIcon("projectForms"), '')
             self.setTabToolTip(index, self.pfBrowser.windowTitle())
         
         if browserFlags & ResourcesBrowserFlag:
             index = self.addTab(
                 self.prBrowser,
-                UI.PixmapCache.getIcon("projectResources.png"), '')
+                UI.PixmapCache.getIcon("projectResources"), '')
             self.setTabToolTip(index, self.prBrowser.windowTitle())
         
         if browserFlags & TranslationsBrowserFlag:
             index = self.addTab(
                 self.ptBrowser,
-                UI.PixmapCache.getIcon("projectTranslations.png"), '')
+                UI.PixmapCache.getIcon("projectTranslations"), '')
             self.setTabToolTip(index, self.ptBrowser.windowTitle())
         
         if browserFlags & InterfacesBrowserFlag:
             index = self.addTab(
                 self.piBrowser,
-                UI.PixmapCache.getIcon("projectInterfaces.png"), '')
+                UI.PixmapCache.getIcon("projectInterfaces"), '')
             self.setTabToolTip(index, self.piBrowser.windowTitle())
         
         if browserFlags & ProtocolsBrowserFlag:
             index = self.addTab(
                 self.ppBrowser,
-                UI.PixmapCache.getIcon("protobuf.png"), '')
+                UI.PixmapCache.getIcon("protobuf"), '')
             self.setTabToolTip(index, self.ppBrowser.windowTitle())
         
         if browserFlags & OthersBrowserFlag:
             index = self.addTab(
                 self.poBrowser,
-                UI.PixmapCache.getIcon("projectOthers.png"), '')
+                UI.PixmapCache.getIcon("projectOthers"), '')
             self.setTabToolTip(index, self.poBrowser.windowTitle())
         
         QApplication.processEvents()
@@ -281,26 +281,26 @@
         Private method to set the right icon for the sources browser tab.
         """
         if not self.project.isOpen():
-            icon = UI.PixmapCache.getIcon("projectSources.png")
+            icon = UI.PixmapCache.getIcon("projectSources")
         else:
             if self.project.getProjectLanguage() in [
                 "Python", "Python2", "Python3"
             ]:
                 if self.project.isMixedLanguageProject():
-                    icon = UI.PixmapCache.getIcon("projectSourcesPyMixed.png")
+                    icon = UI.PixmapCache.getIcon("projectSourcesPyMixed")
                 else:
-                    icon = UI.PixmapCache.getIcon("projectSourcesPy.png")
+                    icon = UI.PixmapCache.getIcon("projectSourcesPy")
             elif self.project.getProjectLanguage() == "MicroPython":
                 icon = UI.PixmapCache.getIcon("micropython")
             elif self.project.getProjectLanguage() == "Ruby":
                 if self.project.isMixedLanguageProject():
-                    icon = UI.PixmapCache.getIcon("projectSourcesRbMixed.png")
+                    icon = UI.PixmapCache.getIcon("projectSourcesRbMixed")
                 else:
-                    icon = UI.PixmapCache.getIcon("projectSourcesRb.png")
+                    icon = UI.PixmapCache.getIcon("projectSourcesRb")
             elif self.project.getProjectLanguage() == "JavaScript":
-                icon = UI.PixmapCache.getIcon("projectSourcesJavaScript.png")
+                icon = UI.PixmapCache.getIcon("projectSourcesJavaScript")
             else:
-                icon = UI.PixmapCache.getIcon("projectSources.png")
+                icon = UI.PixmapCache.getIcon("projectSources")
         self.setTabIcon(self.indexOf(self.psBrowser), icon)
         
     def handleEditorChanged(self, fn):
--- a/eric6/Project/ProjectBrowserModel.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/Project/ProjectBrowserModel.py	Sat May 02 13:51:07 2020 +0200
@@ -131,9 +131,9 @@
         self.type_ = ProjectBrowserItemSimpleDirectory
         if os.path.lexists(self._dirName) and os.path.islink(self._dirName):
             self.symlink = True
-            self.icon = UI.PixmapCache.getSymlinkIcon("dirClosed.png")
+            self.icon = UI.PixmapCache.getSymlinkIcon("dirClosed")
         else:
-            self.icon = UI.PixmapCache.getIcon("dirClosed.png")
+            self.icon = UI.PixmapCache.getIcon("dirClosed")
     
     def setName(self, dinfo, full=True):
         """
@@ -244,6 +244,7 @@
         self.project = parent
         
         self.watchedItems = {}
+        self.__watcherActive = True
         self.watcher = QFileSystemWatcher(self)
         self.watcher.directoryChanged.connect(self.directoryChanged)
         
@@ -589,7 +590,7 @@
             return
         
         index = self.createIndex(itm.row(), 0, itm)
-        itm.setName(newFilename)
+        itm.setName(newFilename, full=False)
         self.dataChanged.emit(index, index)
         self.repopulateItem(newFilename)
     
@@ -668,12 +669,27 @@
         
         return index
     
+    def startFileSystemMonitoring(self):
+        """
+        Public method to (re)start monitoring the project file system.
+        """
+        self.__watcherActive = True
+    
+    def stopFileSystemMonitoring(self):
+        """
+        Public method to stop monitoring the project file system.
+        """
+        self.__watcherActive = False
+        
     def directoryChanged(self, path):
         """
         Public slot to handle the directoryChanged signal of the watcher.
         
         @param path path of the directory (string)
         """
+        if not self.__watcherActive:
+            return
+        
         if path not in self.watchedItems:
             # just ignore the situation we don't have a reference to the item
             return
--- a/eric6/Project/ProjectFormsBrowser.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/Project/ProjectFormsBrowser.py	Sat May 02 13:51:07 2020 +0200
@@ -789,7 +789,7 @@
                                 " was successful."))
                 else:
                     ui.showNotification(
-                        UI.PixmapCache.getPixmap("designer48.png"),
+                        UI.PixmapCache.getPixmap("designer48"),
                         self.tr("Form Compilation"),
                         self.tr("The compilation of the form file"
                                 " was successful."))
@@ -804,7 +804,7 @@
                             "<p>Reason: {0}</p>").format(str(msg)))
                 else:
                     ui.showNotification(
-                        UI.PixmapCache.getPixmap("designer48.png"),
+                        UI.PixmapCache.getPixmap("designer48"),
                         self.tr("Form Compilation"),
                         self.tr(
                             "<p>The compilation of the form file failed.</p>"
@@ -817,7 +817,7 @@
                     self.tr("The compilation of the form file failed."))
             else:
                 ui.showNotification(
-                    UI.PixmapCache.getPixmap("designer48.png"),
+                    UI.PixmapCache.getPixmap("designer48"),
                     self.tr("Form Compilation"),
                     self.tr("The compilation of the form file failed."))
         self.compileProc = None
--- a/eric6/Project/ProjectInterfacesBrowser.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/Project/ProjectInterfacesBrowser.py	Sat May 02 13:51:07 2020 +0200
@@ -534,7 +534,7 @@
                         " successful."))
             else:
                 ui.showNotification(
-                    UI.PixmapCache.getPixmap("corba48.png"),
+                    UI.PixmapCache.getPixmap("corba48"),
                     self.tr("Interface Compilation"),
                     self.tr(
                         "The compilation of the interface file was"
@@ -548,7 +548,7 @@
                         "The compilation of the interface file failed."))
             else:
                 ui.showNotification(
-                    UI.PixmapCache.getPixmap("corba48.png"),
+                    UI.PixmapCache.getPixmap("corba48"),
                     self.tr("Interface Compilation"),
                     self.tr(
                         "The compilation of the interface file failed."))
--- a/eric6/Project/ProjectProtocolsBrowser.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/Project/ProjectProtocolsBrowser.py	Sat May 02 13:51:07 2020 +0200
@@ -557,9 +557,9 @@
                         " successful."))
             else:
                 if grpc:
-                    icon = UI.PixmapCache.getPixmap("gRPC48.png")
+                    icon = UI.PixmapCache.getPixmap("gRPC48")
                 else:
-                    icon = UI.PixmapCache.getPixmap("protobuf48.png")
+                    icon = UI.PixmapCache.getPixmap("protobuf48")
                 ui.showNotification(
                     icon,
                     self.tr("Protocol Compilation"),
@@ -575,9 +575,9 @@
                         "The compilation of the protocol file failed."))
             else:
                 if grpc:
-                    icon = UI.PixmapCache.getPixmap("gRPC48.png")
+                    icon = UI.PixmapCache.getPixmap("gRPC48")
                 else:
-                    icon = UI.PixmapCache.getPixmap("protobuf48.png")
+                    icon = UI.PixmapCache.getPixmap("protobuf48")
                 ui.showNotification(
                     icon,
                     self.tr("Protocol Compilation"),
--- a/eric6/Project/ProjectResourcesBrowser.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/Project/ProjectResourcesBrowser.py	Sat May 02 13:51:07 2020 +0200
@@ -616,7 +616,7 @@
                                 " was successful."))
                 else:
                     ui.showNotification(
-                        UI.PixmapCache.getPixmap("resourcesCompiler48.png"),
+                        UI.PixmapCache.getPixmap("resourcesCompiler48"),
                         self.tr("Resource Compilation"),
                         self.tr("The compilation of the resource file"
                                 " was successful."))
@@ -637,7 +637,7 @@
                         "The compilation of the resource file failed."))
             else:
                 ui.showNotification(
-                    UI.PixmapCache.getPixmap("resourcesCompiler48.png"),
+                    UI.PixmapCache.getPixmap("resourcesCompiler48"),
                     self.tr("Resource Compilation"),
                     self.tr(
                         "The compilation of the resource file failed."))
--- a/eric6/Project/ProjectSourcesBrowser.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/Project/ProjectSourcesBrowser.py	Sat May 02 13:51:07 2020 +0200
@@ -135,7 +135,7 @@
             self.__showApplicationDiagram)
         self.graphicsMenu.addSeparator()
         self.graphicsMenu.addAction(
-            UI.PixmapCache.getIcon("open.png"),
+            UI.PixmapCache.getIcon("open"),
             self.tr("Load Diagram..."), self.__loadDiagram)
         self.graphicsMenu.aboutToShow.connect(self.__showContextMenuGraphics)
         
@@ -305,7 +305,7 @@
             self.__showApplicationDiagram)
         self.graphicsMenu.addSeparator()
         self.graphicsMenu.addAction(
-            UI.PixmapCache.getIcon("fileOpen.png"),
+            UI.PixmapCache.getIcon("fileOpen"),
             self.tr("Load Diagram..."), self.__loadDiagram)
         
         self.sourceMenu.addSeparator()
--- a/eric6/Project/ProjectTranslationsBrowser.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/Project/ProjectTranslationsBrowser.py	Sat May 02 13:51:07 2020 +0200
@@ -939,7 +939,7 @@
             ui = e5App().getObject("UserInterface")
             if ui.notificationsEnabled():
                 ui.showNotification(
-                    UI.PixmapCache.getPixmap("linguist48.png"),
+                    UI.PixmapCache.getPixmap("linguist48"),
                     self.tr("Translation file generation"),
                     self.tr(
                         "The generation of the translation files (*.ts)"
@@ -1136,7 +1136,7 @@
             ui = e5App().getObject("UserInterface")
             if ui.notificationsEnabled():
                 ui.showNotification(
-                    UI.PixmapCache.getPixmap("linguist48.png"),
+                    UI.PixmapCache.getPixmap("linguist48"),
                     self.tr("Translation file release"),
                     self.tr("The release of the translation files (*.qm)"
                             " was successful."))
--- a/eric6/Project/PropertiesDialog.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/Project/PropertiesDialog.py	Sat May 02 13:51:07 2020 +0200
@@ -44,7 +44,7 @@
         self.dirPicker.setMode(E5PathPickerModes.DirectoryMode)
         self.mainscriptPicker.setMode(E5PathPickerModes.OpenFileMode)
         
-        self.makeButton.setIcon(UI.PixmapCache.getIcon("makefile.png"))
+        self.makeButton.setIcon(UI.PixmapCache.getIcon("makefile"))
         
         self.project = project
         self.newProject = new
--- a/eric6/PyUnit/UnittestDialog.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/PyUnit/UnittestDialog.py	Sat May 02 13:51:07 2020 +0200
@@ -120,7 +120,7 @@
         self.setWindowFlags(
             self.windowFlags() | Qt.WindowFlags(
                 Qt.WindowContextHelpButtonHint))
-        self.setWindowIcon(UI.PixmapCache.getIcon("eric.png"))
+        self.setWindowIcon(UI.PixmapCache.getIcon("eric"))
         self.setWindowTitle(self.tr("Unittest"))
         if dbs:
             self.ui = ui
--- a/eric6/QScintilla/Editor.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/QScintilla/Editor.py	Sat May 02 13:51:07 2020 +0200
@@ -288,25 +288,25 @@
             self.__createChangeMarkerPixmap(
                 "OnlineChangeTraceMarkerUnsaved"))
         self.breakpoint = self.markerDefine(
-            UI.PixmapCache.getPixmap("break.png"))
+            UI.PixmapCache.getPixmap("break"))
         self.cbreakpoint = self.markerDefine(
-            UI.PixmapCache.getPixmap("cBreak.png"))
+            UI.PixmapCache.getPixmap("cBreak"))
         self.tbreakpoint = self.markerDefine(
-            UI.PixmapCache.getPixmap("tBreak.png"))
+            UI.PixmapCache.getPixmap("tBreak"))
         self.tcbreakpoint = self.markerDefine(
-            UI.PixmapCache.getPixmap("tCBreak.png"))
+            UI.PixmapCache.getPixmap("tCBreak"))
         self.dbreakpoint = self.markerDefine(
-            UI.PixmapCache.getPixmap("breakDisabled.png"))
+            UI.PixmapCache.getPixmap("breakDisabled"))
         self.bookmark = self.markerDefine(
-            UI.PixmapCache.getPixmap("bookmark16.png"))
+            UI.PixmapCache.getPixmap("bookmark16"))
         self.syntaxerror = self.markerDefine(
-            UI.PixmapCache.getPixmap("syntaxError.png"))
+            UI.PixmapCache.getPixmap("syntaxError"))
         self.notcovered = self.markerDefine(
-            UI.PixmapCache.getPixmap("notcovered.png"))
+            UI.PixmapCache.getPixmap("notcovered"))
         self.taskmarker = self.markerDefine(
-            UI.PixmapCache.getPixmap("task.png"))
+            UI.PixmapCache.getPixmap("task"))
         self.warning = self.markerDefine(
-            UI.PixmapCache.getPixmap("warning.png"))
+            UI.PixmapCache.getPixmap("warning"))
         
         # define the line markers
         if Preferences.getEditor("LineMarkersBackground"):
@@ -315,9 +315,9 @@
             self.__setLineMarkerColours()
         else:
             self.currentline = self.markerDefine(
-                UI.PixmapCache.getPixmap("currentLineMarker.png"))
+                UI.PixmapCache.getPixmap("currentLineMarker"))
             self.errorline = self.markerDefine(
-                UI.PixmapCache.getPixmap("errorLineMarker.png"))
+                UI.PixmapCache.getPixmap("errorLineMarker"))
         
         self.breakpointMask = (
             (1 << self.breakpoint) |
@@ -557,35 +557,35 @@
         Private method to register images for autocompletion lists.
         """
         self.registerImage(self.ClassID,
-                           UI.PixmapCache.getPixmap("class.png"))
+                           UI.PixmapCache.getPixmap("class"))
         self.registerImage(self.ClassProtectedID,
-                           UI.PixmapCache.getPixmap("class_protected.png"))
+                           UI.PixmapCache.getPixmap("class_protected"))
         self.registerImage(self.ClassPrivateID,
-                           UI.PixmapCache.getPixmap("class_private.png"))
+                           UI.PixmapCache.getPixmap("class_private"))
         self.registerImage(self.MethodID,
-                           UI.PixmapCache.getPixmap("method.png"))
+                           UI.PixmapCache.getPixmap("method"))
         self.registerImage(self.MethodProtectedID,
-                           UI.PixmapCache.getPixmap("method_protected.png"))
+                           UI.PixmapCache.getPixmap("method_protected"))
         self.registerImage(self.MethodPrivateID,
-                           UI.PixmapCache.getPixmap("method_private.png"))
+                           UI.PixmapCache.getPixmap("method_private"))
         self.registerImage(self.AttributeID,
-                           UI.PixmapCache.getPixmap("attribute.png"))
+                           UI.PixmapCache.getPixmap("attribute"))
         self.registerImage(self.AttributeProtectedID,
-                           UI.PixmapCache.getPixmap("attribute_protected.png"))
+                           UI.PixmapCache.getPixmap("attribute_protected"))
         self.registerImage(self.AttributePrivateID,
-                           UI.PixmapCache.getPixmap("attribute_private.png"))
+                           UI.PixmapCache.getPixmap("attribute_private"))
         self.registerImage(self.EnumID,
-                           UI.PixmapCache.getPixmap("enum.png"))
+                           UI.PixmapCache.getPixmap("enum"))
         self.registerImage(self.KeywordsID,
-                           UI.PixmapCache.getPixmap("keywords.png"))
+                           UI.PixmapCache.getPixmap("keywords"))
         self.registerImage(self.ModuleID,
-                           UI.PixmapCache.getPixmap("module.png"))
+                           UI.PixmapCache.getPixmap("module"))
         
         self.registerImage(self.FromDocumentID,
-                           UI.PixmapCache.getPixmap("editor.png"))
+                           UI.PixmapCache.getPixmap("editor"))
         
         self.registerImage(self.TemplateImageID,
-                           UI.PixmapCache.getPixmap("templateViewer.png"))
+                           UI.PixmapCache.getPixmap("templateViewer"))
     
     def addClone(self, editor):
         """
@@ -777,23 +777,23 @@
         self.__menus["SpellLanguages"] = self.spellLanguagesMenu
         
         self.menuActs["Undo"] = self.menu.addAction(
-            UI.PixmapCache.getIcon("editUndo.png"),
+            UI.PixmapCache.getIcon("editUndo"),
             self.tr('Undo'), self.undo)
         self.menuActs["Redo"] = self.menu.addAction(
-            UI.PixmapCache.getIcon("editRedo.png"),
+            UI.PixmapCache.getIcon("editRedo"),
             self.tr('Redo'), self.redo)
         self.menuActs["Revert"] = self.menu.addAction(
             self.tr("Revert to last saved state"),
             self.revertToUnmodified)
         self.menu.addSeparator()
         self.menuActs["Cut"] = self.menu.addAction(
-            UI.PixmapCache.getIcon("editCut.png"),
+            UI.PixmapCache.getIcon("editCut"),
             self.tr('Cut'), self.cut)
         self.menuActs["Copy"] = self.menu.addAction(
-            UI.PixmapCache.getIcon("editCopy.png"),
+            UI.PixmapCache.getIcon("editCopy"),
             self.tr('Copy'), self.copy)
         self.menuActs["Paste"] = self.menu.addAction(
-            UI.PixmapCache.getIcon("editPaste.png"),
+            UI.PixmapCache.getIcon("editPaste"),
             self.tr('Paste'), self.paste)
         if not self.miniMenu:
             self.menuActs["ExecuteSelection"] = self.menu.addAction(
@@ -801,16 +801,16 @@
                 self.__executeSelection)
             self.menu.addSeparator()
             self.menu.addAction(
-                UI.PixmapCache.getIcon("editIndent.png"),
+                UI.PixmapCache.getIcon("editIndent"),
                 self.tr('Indent'), self.indentLineOrSelection)
             self.menu.addAction(
-                UI.PixmapCache.getIcon("editUnindent.png"),
+                UI.PixmapCache.getIcon("editUnindent"),
                 self.tr('Unindent'), self.unindentLineOrSelection)
             self.menuActs["Comment"] = self.menu.addAction(
-                UI.PixmapCache.getIcon("editComment.png"),
+                UI.PixmapCache.getIcon("editComment"),
                 self.tr('Comment'), self.commentLineOrSelection)
             self.menuActs["Uncomment"] = self.menu.addAction(
-                UI.PixmapCache.getIcon("editUncomment.png"),
+                UI.PixmapCache.getIcon("editUncomment"),
                 self.tr('Uncomment'), self.uncommentLineOrSelection)
             self.menuActs["StreamComment"] = self.menu.addAction(
                 self.tr('Stream Comment'),
@@ -828,10 +828,10 @@
             self.menuActs["ExecuteSelection"] = None
         self.menu.addSeparator()
         self.menuActs["SpellCheck"] = self.menu.addAction(
-            UI.PixmapCache.getIcon("spellchecking.png"),
+            UI.PixmapCache.getIcon("spellchecking"),
             self.tr('Check spelling...'), self.checkSpelling)
         self.menuActs["SpellCheckSelection"] = self.menu.addAction(
-            UI.PixmapCache.getIcon("spellchecking.png"),
+            UI.PixmapCache.getIcon("spellchecking"),
             self.tr('Check spelling of selection...'),
             self.__checkSpellingSelection)
         self.menuActs["SpellCheckRemove"] = self.menu.addAction(
@@ -888,27 +888,27 @@
         self.menuActs["Tools"] = self.menu.addMenu(self.toolsMenu)
         self.menu.addSeparator()
         self.menu.addAction(
-            UI.PixmapCache.getIcon("documentNewView.png"),
+            UI.PixmapCache.getIcon("documentNewView"),
             self.tr('New Document View'), self.__newView)
         self.menuActs["NewSplit"] = self.menu.addAction(
-            UI.PixmapCache.getIcon("splitVertical.png"),
+            UI.PixmapCache.getIcon("splitVertical"),
             self.tr('New Document View (with new split)'),
             self.__newViewNewSplit)
         self.menuActs["NewSplit"].setEnabled(self.vm.canSplit())
         self.menu.addAction(
-            UI.PixmapCache.getIcon("close.png"),
+            UI.PixmapCache.getIcon("close"),
             self.tr('Close'), self.__contextClose)
         self.menu.addSeparator()
         self.reopenEncodingMenu = self.__initContextMenuReopenWithEncoding()
         self.menuActs["Reopen"] = self.menu.addMenu(self.reopenEncodingMenu)
         self.menuActs["Save"] = self.menu.addAction(
-            UI.PixmapCache.getIcon("fileSave.png"),
+            UI.PixmapCache.getIcon("fileSave"),
             self.tr('Save'), self.__contextSave)
         self.menu.addAction(
-            UI.PixmapCache.getIcon("fileSaveAs.png"),
+            UI.PixmapCache.getIcon("fileSaveAs"),
             self.tr('Save As...'), self.__contextSaveAs)
         self.menu.addAction(
-            UI.PixmapCache.getIcon("fileSaveCopy.png"),
+            UI.PixmapCache.getIcon("fileSaveCopy"),
             self.tr('Save Copy...'), self.__contextSaveCopy)
         if not self.miniMenu:
             self.menu.addMenu(self.exportersMenu)
@@ -918,10 +918,10 @@
                 self.__contextOpenRejections)
             self.menu.addSeparator()
             self.menu.addAction(
-                UI.PixmapCache.getIcon("printPreview.png"),
+                UI.PixmapCache.getIcon("printPreview"),
                 self.tr("Print Preview"), self.printPreviewFile)
             self.menu.addAction(
-                UI.PixmapCache.getIcon("print.png"),
+                UI.PixmapCache.getIcon("print"),
                 self.tr('Print'), self.printFile)
         else:
             self.menuActs["OpenRejections"] = None
@@ -1024,7 +1024,7 @@
             self.__showApplicationDiagram)
         menu.addSeparator()
         menu.addAction(
-            UI.PixmapCache.getIcon("open.png"),
+            UI.PixmapCache.getIcon("open"),
             self.tr("Load Diagram..."), self.__loadDiagram)
         
         menu.aboutToShow.connect(self.__showContextMenuGraphics)
@@ -1041,7 +1041,7 @@
         
         self.languagesActGrp = QActionGroup(self)
         self.noLanguageAct = menu.addAction(
-            UI.PixmapCache.getIcon("fileText.png"),
+            UI.PixmapCache.getIcon("fileText"),
             self.tr("No Language"))
         self.noLanguageAct.setCheckable(True)
         self.noLanguageAct.setData("None")
@@ -1109,7 +1109,7 @@
         @return reference to the generated menu (QMenu)
         """
         menu = QMenu(self.tr("Re-Open With Encoding"))
-        menu.setIcon(UI.PixmapCache.getIcon("open.png"))
+        menu.setIcon(UI.PixmapCache.getIcon("open"))
         
         for encoding in sorted(Utilities.supportedCodecs):
             act = menu.addAction(encoding)
@@ -1131,21 +1131,21 @@
         
         self.eolActGrp = QActionGroup(self)
         
-        act = menu.addAction(UI.PixmapCache.getIcon("eolLinux.png"),
+        act = menu.addAction(UI.PixmapCache.getIcon("eolLinux"),
                              self.tr("Unix"))
         act.setCheckable(True)
         act.setData('\n')
         self.supportedEols['\n'] = act
         self.eolActGrp.addAction(act)
         
-        act = menu.addAction(UI.PixmapCache.getIcon("eolWindows.png"),
+        act = menu.addAction(UI.PixmapCache.getIcon("eolWindows"),
                              self.tr("Windows"))
         act.setCheckable(True)
         act.setData('\r\n')
         self.supportedEols['\r\n'] = act
         self.eolActGrp.addAction(act)
         
-        act = menu.addAction(UI.PixmapCache.getIcon("eolMac.png"),
+        act = menu.addAction(UI.PixmapCache.getIcon("eolMac"),
                              self.tr("Macintosh"))
         act.setCheckable(True)
         act.setData('\r')
@@ -1750,7 +1750,7 @@
             language = self.filetype
         
         if language.startswith("Pygments|"):
-            pyname = language.split("|", 1)[1]
+            pyname = language
             language = ""
         
         from . import Lexers
@@ -3737,7 +3737,7 @@
         self.__markerMap.update()
     
     ###########################################################################
-    ## Highlightinh marker handling methods below
+    ## Highlighting marker handling methods below
     ###########################################################################
     
     def setHighlight(self, startLine, startIndex, endLine, endIndex):
@@ -4343,10 +4343,10 @@
             self.__setLineMarkerColours()
         else:
             self.markerDefine(
-                UI.PixmapCache.getPixmap("currentLineMarker.png"),
+                UI.PixmapCache.getPixmap("currentLineMarker"),
                 self.currentline)
             self.markerDefine(
-                UI.PixmapCache.getPixmap("errorLineMarker.png"),
+                UI.PixmapCache.getPixmap("errorLineMarker"),
                 self.errorline)
         
         # set the text display
@@ -4720,6 +4720,10 @@
         """
         self.setCallTipsBackgroundColor(
             Preferences.getEditorColour("CallTipsBackground"))
+        self.setCallTipsForegroundColor(
+            Preferences.getEditorColour("CallTipsForeground"))
+        self.setCallTipsHighlightColor(
+            Preferences.getEditorColour("CallTipsHighlight"))
         self.setCallTipsVisible(Preferences.getEditor("CallTipsVisible"))
         calltipsStyle = Preferences.getEditor("CallTipsStyle")
         try:
@@ -5139,6 +5143,9 @@
                     line, col = self.getCursorPosition()
                 elif wLeft:
                     txt = txt[len(wLeft):]
+                
+                if txt[0] in "'\"":  # New in jedi 0.16: AC of dict keys
+                    txt = txt[1:]
             self.insert(txt)
             self.endUndoAction()
             self.setCursorPosition(line, col + len(txt))
@@ -5479,10 +5486,10 @@
         splitOrientation = self.vm.getSplitOrientation()
         if splitOrientation == Qt.Horizontal:
             self.menuActs["NewSplit"].setIcon(
-                UI.PixmapCache.getIcon("splitHorizontal.png"))
+                UI.PixmapCache.getIcon("splitHorizontal"))
         else:
             self.menuActs["NewSplit"].setIcon(
-                UI.PixmapCache.getIcon("splitVertical.png"))
+                UI.PixmapCache.getIcon("splitVertical"))
         
         self.menuActs["Tools"].setEnabled(not self.toolsMenu.isEmpty())
         
@@ -7137,7 +7144,12 @@
         @param evt reference to the event (QEvent)
         @return flag indiating that the event was handled (boolean)
         """
-        self.__markerMap.calculateGeometry()
+        try:
+            self.__markerMap.calculateGeometry()
+        except AttributeError:
+            # ignore this - there seems to be a runtime issue when the editor
+            # is created
+            pass
         return super(Editor, self).viewportEvent(evt)
     
     def __updateReadOnly(self, bForce=True):
@@ -7833,7 +7845,7 @@
         if suggestions:
             self.spellingMenu.addSeparator()
         self.spellingMenu.addAction(
-            UI.PixmapCache.getIcon("spellchecking.png"),
+            UI.PixmapCache.getIcon("spellchecking"),
             self.tr("Check spelling..."), self.__checkSpellingWord)
         self.spellingMenu.addAction(
             self.tr("Add to dictionary"), self.__addToSpellingDictionary)
--- a/eric6/QScintilla/EditorAssembly.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/QScintilla/EditorAssembly.py	Sat May 02 13:51:07 2020 +0200
@@ -129,12 +129,12 @@
                     items = {}
                     for cl in entry.classes.values():
                         if cl.isPrivate():
-                            icon = UI.PixmapCache.getIcon("class_private.png")
+                            icon = UI.PixmapCache.getIcon("class_private")
                         elif cl.isProtected():
                             icon = UI.PixmapCache.getIcon(
-                                "class_protected.png")
+                                "class_protected")
                         else:
-                            icon = UI.PixmapCache.getIcon("class.png")
+                            icon = UI.PixmapCache.getIcon("class")
                         items[cl.name] = (icon, cl.lineno, cl.endlineno)
                     for key in sorted(items.keys()):
                         itm = items[key]
@@ -151,15 +151,15 @@
                 items = {}
                 for meth in entry.methods.values():
                     if meth.modifier == Function.Static:
-                        icon = UI.PixmapCache.getIcon("method_static.png")
+                        icon = UI.PixmapCache.getIcon("method_static")
                     elif meth.modifier == Function.Class:
-                        icon = UI.PixmapCache.getIcon("method_class.png")
+                        icon = UI.PixmapCache.getIcon("method_class")
                     elif meth.isPrivate():
-                        icon = UI.PixmapCache.getIcon("method_private.png")
+                        icon = UI.PixmapCache.getIcon("method_private")
                     elif meth.isProtected():
-                        icon = UI.PixmapCache.getIcon("method_protected.png")
+                        icon = UI.PixmapCache.getIcon("method_protected")
                     else:
-                        icon = UI.PixmapCache.getIcon("method.png")
+                        icon = UI.PixmapCache.getIcon("method")
                     items[meth.name] = (icon, meth.lineno, meth.endlineno)
                 for key in sorted(items.keys()):
                     itm = items[key]
@@ -171,12 +171,12 @@
                 items = {}
                 for attr in entry.attributes.values():
                     if attr.isPrivate():
-                        icon = UI.PixmapCache.getIcon("attribute_private.png")
+                        icon = UI.PixmapCache.getIcon("attribute_private")
                     elif attr.isProtected():
                         icon = UI.PixmapCache.getIcon(
-                            "attribute_protected.png")
+                            "attribute_protected")
                     else:
-                        icon = UI.PixmapCache.getIcon("attribute.png")
+                        icon = UI.PixmapCache.getIcon("attribute")
                     items[attr.name] = (icon, attr.lineno)
                 for key in sorted(items.keys()):
                     itm = items[key]
@@ -184,7 +184,7 @@
                 
                 # step 2.3: add class attributes
                 items = {}
-                icon = UI.PixmapCache.getIcon("attribute_class.png")
+                icon = UI.PixmapCache.getIcon("attribute_class")
                 for glob in entry.globals.values():
                     items[glob.name] = (icon, glob.lineno)
                 for key in sorted(items.keys()):
@@ -247,7 +247,7 @@
                 # step 1: add modules
                 items = {}
                 for module in self.__module.modules.values():
-                    items[module.name] = (UI.PixmapCache.getIcon("module.png"),
+                    items[module.name] = (UI.PixmapCache.getIcon("module"),
                                           module.lineno, module.endlineno)
                 for key in sorted(items.keys()):
                     itm = items[key]
@@ -259,11 +259,11 @@
                 items = {}
                 for cl in self.__module.classes.values():
                     if cl.isPrivate():
-                        icon = UI.PixmapCache.getIcon("class_private.png")
+                        icon = UI.PixmapCache.getIcon("class_private")
                     elif cl.isProtected():
-                        icon = UI.PixmapCache.getIcon("class_protected.png")
+                        icon = UI.PixmapCache.getIcon("class_protected")
                     else:
-                        icon = UI.PixmapCache.getIcon("class.png")
+                        icon = UI.PixmapCache.getIcon("class")
                     items[cl.name] = (icon, cl.lineno, cl.endlineno)
                 for key in sorted(items.keys()):
                     itm = items[key]
@@ -275,11 +275,11 @@
                 items = {}
                 for func in self.__module.functions.values():
                     if func.isPrivate():
-                        icon = UI.PixmapCache.getIcon("method_private.png")
+                        icon = UI.PixmapCache.getIcon("method_private")
                     elif func.isProtected():
-                        icon = UI.PixmapCache.getIcon("method_protected.png")
+                        icon = UI.PixmapCache.getIcon("method_protected")
                     else:
-                        icon = UI.PixmapCache.getIcon("method.png")
+                        icon = UI.PixmapCache.getIcon("method")
                     items[func.name] = (icon, func.lineno, func.endlineno)
                 for key in sorted(items.keys()):
                     itm = items[key]
@@ -291,12 +291,12 @@
                 items = {}
                 for glob in self.__module.globals.values():
                     if glob.isPrivate():
-                        icon = UI.PixmapCache.getIcon("attribute_private.png")
+                        icon = UI.PixmapCache.getIcon("attribute_private")
                     elif glob.isProtected():
                         icon = UI.PixmapCache.getIcon(
-                            "attribute_protected.png")
+                            "attribute_protected")
                     else:
-                        icon = UI.PixmapCache.getIcon("attribute.png")
+                        icon = UI.PixmapCache.getIcon("attribute")
                     items[glob.name] = (icon, glob.lineno)
                 for key in sorted(items.keys()):
                     itm = items[key]
--- a/eric6/QScintilla/EditorButtonsWidget.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/QScintilla/EditorButtonsWidget.py	Sat May 02 13:51:07 2020 +0200
@@ -172,41 +172,41 @@
         self.__separators = []
         self.__headerMenu = QMenu()
         
-        self.__addButton("bold", "formatTextBold.png",
+        self.__addButton("bold", "formatTextBold",
                          self.tr("Bold"))
-        self.__addButton("italic", "formatTextItalic.png",
+        self.__addButton("italic", "formatTextItalic",
                          self.tr("Italic"))
-        self.__addButton("strikethrough", "formatTextStrikethrough.png",
+        self.__addButton("strikethrough", "formatTextStrikethrough",
                          self.tr("Strike Through"))
         self.__addSeparator()
-        self.__addButton("header1", "formatTextHeader1.png",
+        self.__addButton("header1", "formatTextHeader1",
                          self.tr("Header 1"))
-        self.__addButton("header2", "formatTextHeader2.png",
+        self.__addButton("header2", "formatTextHeader2",
                          self.tr("Header 2"))
-        self.__addButton("header3", "formatTextHeader3.png",
+        self.__addButton("header3", "formatTextHeader3",
                          self.tr("Header 3"))
-        button = self.__addButton("header", "formatTextHeader.png",
+        button = self.__addButton("header", "formatTextHeader",
                                   self.tr("Header"))
         button.setPopupMode(QToolButton.InstantPopup)
         button.setMenu(self.__headerMenu)
         self.__addSeparator()
-        self.__addButton("code", "formatTextInlineCode.png",
+        self.__addButton("code", "formatTextInlineCode",
                          self.tr("Inline Code"))
-        self.__addButton("codeBlock", "formatTextCodeBlock.png",
+        self.__addButton("codeBlock", "formatTextCodeBlock",
                          self.tr("Code Block"))
-        self.__addButton("quote", "formatTextQuote.png",
+        self.__addButton("quote", "formatTextQuote",
                          self.tr("Quote"))
         self.__addSeparator()
-        self.__addButton("hyperlink", "formatTextHyperlink.png",
+        self.__addButton("hyperlink", "formatTextHyperlink",
                          self.tr("Add Hyperlink"))
-        self.__addButton("line", "formatTextHorizontalLine.png",
+        self.__addButton("line", "formatTextHorizontalLine",
                          self.tr("Add Horizontal Line"))
-        self.__addButton("image", "formatTextImage.png",
+        self.__addButton("image", "formatTextImage",
                          self.tr("Add Image"))
         self.__addSeparator()
-        self.__addButton("bulletedList", "formatTextBulletedList.png",
+        self.__addButton("bulletedList", "formatTextBulletedList",
                          self.tr("Add Bulleted List"))
-        self.__addButton("numberedList", "formatTextNumberedList.png",
+        self.__addButton("numberedList", "formatTextNumberedList",
                          self.tr("Add Numbered List"))
         
         self.__headerMenu.triggered.connect(self.__headerMenuTriggered)
--- a/eric6/QScintilla/Exporters/ExporterHTML.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/QScintilla/Exporters/ExporterHTML.py	Sat May 02 13:51:07 2020 +0200
@@ -17,7 +17,7 @@
 
 from PyQt5.QtCore import Qt
 from PyQt5.QtGui import QCursor, QFontInfo
-from PyQt5.QtWidgets import QApplication
+from PyQt5.QtWidgets import QApplication, QInputDialog
 from PyQt5.Qsci import QsciScintilla
 
 from E5Gui import E5MessageBox
@@ -408,7 +408,25 @@
                 self.editor.getLanguage().lower() == "markdown"
             ):
                 # export markdown to HTML
-                html = self.__generateFromMarkdown()
+                colorSchemes = [
+                    self.tr("Light Background Color"),
+                    self.tr("Dark Background Color"),
+                ]
+                QApplication.restoreOverrideCursor()
+                colorScheme, ok = QInputDialog.getItem(
+                    None,
+                    self.tr("Markdown Export"),
+                    self.tr("Select color scheme:"),
+                    colorSchemes,
+                    0, False)
+                if ok:
+                    colorSchemeIndex = colorSchemes.index(colorScheme)
+                else:
+                    # light background as default
+                    colorSchemeIndex = 0
+                QApplication.setOverrideCursor(QCursor(Qt.WaitCursor))
+                QApplication.processEvents()
+                html = self.__generateFromMarkdown(colorSchemeIndex == 1)
             elif (
                 extension in Preferences.getEditor(
                     "PreviewRestFileNameExtensions") or
@@ -503,10 +521,13 @@
         sys.stderr = origStderr
         return html
     
-    def __generateFromMarkdown(self):
+    def __generateFromMarkdown(self, useDarkScheme):
         """
         Private method to convert Markdown text into HTML.
         
+        @param useDarkScheme flag indicating to export using a dark color
+            scheme
+        @type bool
         @return processed HTML
         @rtype str
         """
@@ -534,7 +555,7 @@
         
         mermaidNeeded = False
         if Preferences.getEditor("PreviewMarkdownMermaid"):
-            if MarkdownExtensions.MermaidRegex.search(text):
+            if MarkdownExtensions.MermaidRegexFullText.search(text):
                 extensions.append(MarkdownExtensions.MermaidExtension())
                 mermaidNeeded = True
         
@@ -592,12 +613,37 @@
                 " src='https://unpkg.com/mermaid@8/dist/mermaid.min.js'>\n"
                 "</script>\n"
             )
+            if useDarkScheme:
+                mermaid_initialize = (
+                    "<script>mermaid.initialize({"
+                    "theme: 'dark', "
+                    "startOnLoad:true"
+                    "});</script>"
+                )
+            else:
+                mermaid_initialize = (
+                    "<script>mermaid.initialize({"
+                    "theme: 'default', "
+                    "startOnLoad:true"
+                    "});</script>"
+                )
         else:
             mermaid = ""
+            mermaid_initialize = ""
         
         htmlFormat = Preferences.getEditor("PreviewMarkdownHTMLFormat").lower()
         body = markdown.markdown(text, extensions=extensions,
                                  output_format=htmlFormat)
+        if useDarkScheme:
+            style = (
+                PreviewerHTMLStyles.css_markdown_dark +
+                PreviewerHTMLStyles.css_pygments_dark
+            )
+        else:
+            style = (
+                PreviewerHTMLStyles.css_markdown_light +
+                PreviewerHTMLStyles.css_pygments_light
+            )
         
         if htmlFormat == "xhtml1":
             head = (
@@ -632,12 +678,8 @@
             '''</style>\n'''
             '''</head>\n'''
             '''<body>\n'''
-        ).format(
-            mathjax, mermaid,
-            PreviewerHTMLStyles.css_markdown +
-            PreviewerHTMLStyles.css_pygments
-        )
+        ).format(mathjax, mermaid, style)
         
         foot = '''\n</body>\n</html>\n'''
         
-        return head + body + foot
+        return head + body + mermaid_initialize + foot
--- a/eric6/QScintilla/Lexers/LexerPygments.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/QScintilla/Lexers/LexerPygments.py	Sat May 02 13:51:07 2020 +0200
@@ -85,8 +85,11 @@
     Token.Comment.Single: PYGMENTS_COMMENT,
     Token.Comment.Special: PYGMENTS_COMMENT,
     
+    Token.Escape: PYGMENTS_ESCAPE,
+    
     Token.Error: PYGMENTS_ERROR,
     
+    Token.Generic: PYGMENTS_DEFAULT,
     Token.Generic.Deleted: PYGMENTS_DELETED,
     Token.Generic.Emph: PYGMENTS_EMPHASIZE,
     Token.Generic.Error: PYGMENTS_GENERIC_ERROR,
@@ -97,7 +100,7 @@
     Token.Generic.Strong: PYGMENTS_STRONG,
     Token.Generic.Subheading: PYGMENTS_SUBHEADING,
     Token.Generic.Traceback: PYGMENTS_TRACEBACK,
-
+    
     Token.Keyword: PYGMENTS_KEYWORD,
     Token.Keyword.Constant: PYGMENTS_KEYWORD,
     Token.Keyword.Declaration: PYGMENTS_KEYWORD,
@@ -105,10 +108,10 @@
     Token.Keyword.Pseudo: PYGMENTS_PSEUDOKEYWORD,
     Token.Keyword.Reserved: PYGMENTS_RESERVEDKEYWORD,
     Token.Keyword.Type: PYGMENTS_TYPEKEYWORD,
-
+    
     Token.Literal: PYGMENTS_LITERAL,
     Token.Literal.Date: PYGMENTS_LITERAL,
-
+    
     Token.Name: PYGMENTS_DEFAULT,
     Token.Name.Attribute: PYGMENTS_ATTRIBUTE,
     Token.Name.Builtin: PYGMENTS_BUILTIN,
@@ -119,6 +122,7 @@
     Token.Name.Entity: PYGMENTS_ENTITY,
     Token.Name.Exception: PYGMENTS_EXCEPTION,
     Token.Name.Function: PYGMENTS_FUNCTION,
+    Token.Name.Function.Magic: PYGMENTS_FUNCTION,
     Token.Name.Label: PYGMENTS_LABEL,
     Token.Name.Namespace: PYGMENTS_NAMESPACE,
     Token.Name.Other: PYGMENTS_VARIABLE,
@@ -128,7 +132,8 @@
     Token.Name.Variable.Class: PYGMENTS_VARIABLE,
     Token.Name.Variable.Global: PYGMENTS_VARIABLE,
     Token.Name.Variable.Instance: PYGMENTS_VARIABLE,
-
+    Token.Name.Variable.Magic: PYGMENTS_VARIABLE,
+    
     Token.Number: PYGMENTS_NUMBER,
     Token.Number.Bin: PYGMENTS_NUMBER,
     Token.Number.Float: PYGMENTS_NUMBER,
@@ -136,15 +141,19 @@
     Token.Number.Integer: PYGMENTS_NUMBER,
     Token.Number.Integer.Long: PYGMENTS_NUMBER,
     Token.Number.Oct: PYGMENTS_NUMBER,
-
+    
     Token.Operator: PYGMENTS_OPERATOR,
     Token.Operator.Word: PYGMENTS_WORD,
-
+    
+    Token.Other: PYGMENTS_DEFAULT,
+    
     Token.Punctuation: PYGMENTS_PUNCTUATION,
-
+    
     Token.String: PYGMENTS_STRING,
+    Token.String.Affix: PYGMENTS_STRING,
     Token.String.Backtick: PYGMENTS_BACKTICKSTRING,
     Token.String.Char: PYGMENTS_CHAR,
+    Token.String.Delimiter: PYGMENTS_STRING,
     Token.String.Doc: PYGMENTS_DOCSTRING,
     Token.String.Double: PYGMENTS_DOUBLESTRING,
     Token.String.Escape: PYGMENTS_ESCAPE,
@@ -156,6 +165,8 @@
     Token.String.Symbol: PYGMENTS_SYMBOL,
     
     Token.Whitespace: PYGMENTS_WHITESPACE,
+    
+    Token.Text: PYGMENTS_DEFAULT,
 }
 
 #-----------------------------------------------------------------------------#
@@ -174,7 +185,12 @@
         """
         LexerContainer.__init__(self, parent)
         
-        self.__pygmentsName = name
+        if name.startswith("Pygments|"):
+            self.__forcedPygmentsName = True
+            self.__pygmentsName = name.replace("Pygments|", "")
+        else:
+            self.__pygmentsName = name
+            self.__forcedPygmentsName = True
         
         self.descriptions = {
             PYGMENTS_DEFAULT: self.tr("Default"),
@@ -302,7 +318,10 @@
         @return language of the lexer (string)
         """
         if self.__pygmentsName:
-            return self.__pygmentsName
+            if self.__forcedPygmentsName:
+                return "Guessed"
+            else:
+                return self.__pygmentsName
         else:
             return "Guessed"
     
--- a/eric6/QScintilla/Lexers/__init__.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/QScintilla/Lexers/__init__.py	Sat May 02 13:51:07 2020 +0200
@@ -84,94 +84,94 @@
     """
     supportedLanguages = {
         "Bash": [QCoreApplication.translate('Lexers', "Bash"), 'dummy.sh',
-                 "lexerBash.png"],
+                 "lexerBash"],
         "Batch": [QCoreApplication.translate('Lexers', "Batch"), 'dummy.bat',
-                  "lexerBatch.png"],
+                  "lexerBatch"],
         "C++": [QCoreApplication.translate('Lexers', "C/C++"), 'dummy.cpp',
-                "lexerCPP.png"],
+                "lexerCPP"],
         "C#": [QCoreApplication.translate('Lexers', "C#"), 'dummy.cs',
-               "lexerCsharp.png"],
+               "lexerCsharp"],
         "CMake": [QCoreApplication.translate('Lexers', "CMake"), 'dummy.cmake',
-                  "lexerCMake.png"],
+                  "lexerCMake"],
         "CSS": [QCoreApplication.translate('Lexers', "CSS"), 'dummy.css',
-                "lexerCSS.png"],
+                "lexerCSS"],
         "Cython": [QCoreApplication.translate('Lexers', "Cython"), 'dummy.pyx',
-                   "lexerCython.png"],
+                   "lexerCython"],
         "D": [QCoreApplication.translate('Lexers', "D"), 'dummy.d',
-              "lexerD.png"],
+              "lexerD"],
         "Diff": [QCoreApplication.translate('Lexers', "Diff"), 'dummy.diff',
-                 "lexerDiff.png"],
+                 "lexerDiff"],
         "Fortran": [QCoreApplication.translate('Lexers', "Fortran"),
-                    'dummy.f95', "lexerFortran.png"],
+                    'dummy.f95', "lexerFortran"],
         "Fortran77": [QCoreApplication.translate('Lexers', "Fortran77"),
-                      'dummy.f', "lexerFortran.png"],
+                      'dummy.f', "lexerFortran"],
         "HTML": [QCoreApplication.translate('Lexers', "HTML/PHP/XML"),
-                 'dummy.html', "lexerHTML.png"],
+                 'dummy.html', "lexerHTML"],
         "IDL": [QCoreApplication.translate('Lexers', "IDL"), 'dummy.idl',
-                "lexerIDL.png"],
+                "lexerIDL"],
         "Java": [QCoreApplication.translate('Lexers', "Java"), 'dummy.java',
-                 "lexerJava.png"],
+                 "lexerJava"],
         "JavaScript": [QCoreApplication.translate('Lexers', "JavaScript"),
-                       'dummy.js', "lexerJavaScript.png"],
+                       'dummy.js', "lexerJavaScript"],
         "Lua": [QCoreApplication.translate('Lexers', "Lua"), 'dummy.lua',
-                "lexerLua.png"],
+                "lexerLua"],
         "Makefile": [QCoreApplication.translate('Lexers', "Makefile"),
-                     'dummy.mak', "lexerMakefile.png"],
+                     'dummy.mak', "lexerMakefile"],
         "Matlab": [QCoreApplication.translate('Lexers', "Matlab"),
-                   'dummy.m.matlab', "lexerMatlab.png"],
+                   'dummy.m.matlab', "lexerMatlab"],
         "Octave": [QCoreApplication.translate('Lexers', "Octave"),
-                   'dummy.m.octave', "lexerOctave.png"],
+                   'dummy.m.octave', "lexerOctave"],
         "Pascal": [QCoreApplication.translate('Lexers', "Pascal"), 'dummy.pas',
-                   "lexerPascal.png"],
+                   "lexerPascal"],
         "Perl": [QCoreApplication.translate('Lexers', "Perl"), 'dummy.pl',
-                 "lexerPerl.png"],
+                 "lexerPerl"],
         "PostScript": [QCoreApplication.translate('Lexers', "PostScript"),
-                       'dummy.ps', "lexerPostscript.png"],
+                       'dummy.ps', "lexerPostscript"],
         "Povray": [QCoreApplication.translate('Lexers', "Povray"), 'dummy.pov',
-                   "lexerPOV.png"],
+                   "lexerPOV"],
         "Properties": [QCoreApplication.translate('Lexers', "Properties"),
-                       'dummy.ini', "lexerProperties.png"],
+                       'dummy.ini', "lexerProperties"],
         "Protocol": [QCoreApplication.translate('Lexers',
                                                 "Protocol (protobuf)"),
-                     'dummy.proto', "protobuf.png"],
+                     'dummy.proto', "protobuf"],
         "Python2": [QCoreApplication.translate('Lexers', "Python2"),
-                    'dummy.py', "lexerPython.png"],
+                    'dummy.py', "lexerPython"],
         "Python3": [QCoreApplication.translate('Lexers', "Python3"),
-                    'dummy.py', "lexerPython3.png"],
+                    'dummy.py', "lexerPython3"],
         "MicroPython": [QCoreApplication.translate('Lexers', "MicroPython"),
                         'dummy.py', "micropython"],
         "QSS": [QCoreApplication.translate('Lexers', "QSS"), 'dummy.qss',
-                "lexerCSS.png"],
+                "lexerCSS"],
         "Ruby": [QCoreApplication.translate('Lexers', "Ruby"), 'dummy.rb',
-                 "lexerRuby.png"],
+                 "lexerRuby"],
         "SQL": [QCoreApplication.translate('Lexers', "SQL"), 'dummy.sql',
-                "lexerSQL.png"],
+                "lexerSQL"],
         "TCL": [QCoreApplication.translate('Lexers', "TCL"), 'dummy.tcl',
-                "lexerTCL.png"],
+                "lexerTCL"],
         "TeX": [QCoreApplication.translate('Lexers', "TeX"), 'dummy.tex',
-                "lexerTeX.png"],
+                "lexerTeX"],
         "VHDL": [QCoreApplication.translate('Lexers', "VHDL"), 'dummy.vhd',
-                 "lexerVHDL.png"],
+                 "lexerVHDL"],
         "XML": [QCoreApplication.translate('Lexers', "XML"), 'dummy.xml',
-                "lexerXML.png"],
+                "lexerXML"],
         "YAML": [QCoreApplication.translate('Lexers', "YAML"), 'dummy.yml',
-                 "lexerYAML.png"],
+                 "lexerYAML"],
         "Gettext": [QCoreApplication.translate('Lexers', "Gettext"),
-                    'dummy.po', "lexerGettext.png"],
+                    'dummy.po', "lexerGettext"],
         "CoffeeScript": [QCoreApplication.translate('Lexers', "CoffeeScript"),
-                         'dummy.coffee', "lexerCoffeeScript.png"],
+                         'dummy.coffee', "lexerCoffeeScript"],
     }
     
     if QSCINTILLA_VERSION() >= 0x020a00:
         supportedLanguages["JSON"] = [
             QCoreApplication.translate('Lexers', "JSON"),
             'dummy.json',
-            "lexerJSON.png"
+            "lexerJSON"
         ]
         supportedLanguages["Markdown"] = [
             QCoreApplication.translate('Lexers', "Markdown"),
             'dummy.md',
-            "lexerMarkdown.png"
+            "lexerMarkdown"
         ]
     
     for name in LexerRegistry:
--- a/eric6/QScintilla/MiniEditor.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/QScintilla/MiniEditor.py	Sat May 02 13:51:07 2020 +0200
@@ -129,7 +129,7 @@
         super(MiniEditor, self).__init__(parent)
         if name is not None:
             self.setObjectName(name)
-        self.setWindowIcon(UI.PixmapCache.getIcon("editor.png"))
+        self.setWindowIcon(UI.PixmapCache.getIcon("editor"))
         
         self.setStyle(Preferences.getUI("Style"),
                       Preferences.getUI("StyleSheet"))
@@ -399,7 +399,7 @@
         """
         self.newAct = E5Action(
             self.tr('New'),
-            UI.PixmapCache.getIcon("new.png"),
+            UI.PixmapCache.getIcon("new"),
             self.tr('&New'),
             QKeySequence(self.tr("Ctrl+N", "File|New")),
             0, self, 'vm_file_new')
@@ -413,7 +413,7 @@
         
         self.openAct = E5Action(
             self.tr('Open'),
-            UI.PixmapCache.getIcon("open.png"),
+            UI.PixmapCache.getIcon("open"),
             self.tr('&Open...'),
             QKeySequence(self.tr("Ctrl+O", "File|Open")),
             0, self, 'vm_file_open')
@@ -427,7 +427,7 @@
         
         self.saveAct = E5Action(
             self.tr('Save'),
-            UI.PixmapCache.getIcon("fileSave.png"),
+            UI.PixmapCache.getIcon("fileSave"),
             self.tr('&Save'),
             QKeySequence(self.tr("Ctrl+S", "File|Save")),
             0, self, 'vm_file_save')
@@ -441,7 +441,7 @@
         
         self.saveAsAct = E5Action(
             self.tr('Save as'),
-            UI.PixmapCache.getIcon("fileSaveAs.png"),
+            UI.PixmapCache.getIcon("fileSaveAs"),
             self.tr('Save &as...'),
             QKeySequence(self.tr("Shift+Ctrl+S", "File|Save As")),
             0, self, 'vm_file_save_as')
@@ -457,7 +457,7 @@
         
         self.saveCopyAct = E5Action(
             self.tr('Save Copy'),
-            UI.PixmapCache.getIcon("fileSaveCopy.png"),
+            UI.PixmapCache.getIcon("fileSaveCopy"),
             self.tr('Save &Copy...'),
             0, 0, self, 'vm_file_save_copy')
         self.saveCopyAct.setStatusTip(self.tr(
@@ -472,7 +472,7 @@
         
         self.closeAct = E5Action(
             self.tr('Close'),
-            UI.PixmapCache.getIcon("close.png"),
+            UI.PixmapCache.getIcon("close"),
             self.tr('&Close'),
             QKeySequence(self.tr("Ctrl+W", "File|Close")),
             0, self, 'vm_file_close')
@@ -486,7 +486,7 @@
         
         self.printAct = E5Action(
             self.tr('Print'),
-            UI.PixmapCache.getIcon("print.png"),
+            UI.PixmapCache.getIcon("print"),
             self.tr('&Print'),
             QKeySequence(self.tr("Ctrl+P", "File|Print")),
             0, self, 'vm_file_print')
@@ -500,7 +500,7 @@
         
         self.printPreviewAct = E5Action(
             self.tr('Print Preview'),
-            UI.PixmapCache.getIcon("printPreview.png"),
+            UI.PixmapCache.getIcon("printPreview"),
             QCoreApplication.translate('ViewManager', 'Print Preview'),
             0, 0, self, 'vm_file_print_preview')
         self.printPreviewAct.setStatusTip(self.tr(
@@ -518,7 +518,7 @@
         """
         self.undoAct = E5Action(
             self.tr('Undo'),
-            UI.PixmapCache.getIcon("editUndo.png"),
+            UI.PixmapCache.getIcon("editUndo"),
             self.tr('&Undo'),
             QKeySequence(self.tr("Ctrl+Z", "Edit|Undo")),
             QKeySequence(self.tr("Alt+Backspace", "Edit|Undo")),
@@ -533,7 +533,7 @@
         
         self.redoAct = E5Action(
             self.tr('Redo'),
-            UI.PixmapCache.getIcon("editRedo.png"),
+            UI.PixmapCache.getIcon("editRedo"),
             self.tr('&Redo'),
             QKeySequence(self.tr("Ctrl+Shift+Z", "Edit|Redo")),
             0, self, 'vm_edit_redo')
@@ -547,7 +547,7 @@
         
         self.cutAct = E5Action(
             self.tr('Cut'),
-            UI.PixmapCache.getIcon("editCut.png"),
+            UI.PixmapCache.getIcon("editCut"),
             self.tr('Cu&t'),
             QKeySequence(self.tr("Ctrl+X", "Edit|Cut")),
             QKeySequence(self.tr("Shift+Del", "Edit|Cut")),
@@ -563,7 +563,7 @@
         
         self.copyAct = E5Action(
             self.tr('Copy'),
-            UI.PixmapCache.getIcon("editCopy.png"),
+            UI.PixmapCache.getIcon("editCopy"),
             self.tr('&Copy'),
             QKeySequence(self.tr("Ctrl+C", "Edit|Copy")),
             QKeySequence(self.tr("Ctrl+Ins", "Edit|Copy")),
@@ -579,7 +579,7 @@
         
         self.pasteAct = E5Action(
             self.tr('Paste'),
-            UI.PixmapCache.getIcon("editPaste.png"),
+            UI.PixmapCache.getIcon("editPaste"),
             self.tr('&Paste'),
             QKeySequence(self.tr("Ctrl+V", "Edit|Paste")),
             QKeySequence(self.tr("Shift+Ins", "Edit|Paste")),
@@ -596,7 +596,7 @@
         
         self.deleteAct = E5Action(
             self.tr('Clear'),
-            UI.PixmapCache.getIcon("editDelete.png"),
+            UI.PixmapCache.getIcon("editDelete"),
             self.tr('Cl&ear'),
             QKeySequence(self.tr("Alt+Shift+C", "Edit|Clear")),
             0,
@@ -1957,7 +1957,7 @@
         """
         self.searchAct = E5Action(
             QCoreApplication.translate('ViewManager', 'Search'),
-            UI.PixmapCache.getIcon("find.png"),
+            UI.PixmapCache.getIcon("find"),
             QCoreApplication.translate('ViewManager', '&Search...'),
             QKeySequence(QCoreApplication.translate(
                 'ViewManager', "Ctrl+F", "Search|Search")),
@@ -1977,7 +1977,7 @@
         
         self.searchNextAct = E5Action(
             QCoreApplication.translate('ViewManager', 'Search next'),
-            UI.PixmapCache.getIcon("findNext.png"),
+            UI.PixmapCache.getIcon("findNext"),
             QCoreApplication.translate('ViewManager', 'Search &next'),
             QKeySequence(QCoreApplication.translate(
                 'ViewManager', "F3", "Search|Search next")),
@@ -1997,7 +1997,7 @@
         
         self.searchPrevAct = E5Action(
             QCoreApplication.translate('ViewManager', 'Search previous'),
-            UI.PixmapCache.getIcon("findPrev.png"),
+            UI.PixmapCache.getIcon("findPrev"),
             QCoreApplication.translate('ViewManager', 'Search &previous'),
             QKeySequence(QCoreApplication.translate(
                 'ViewManager', "Shift+F3", "Search|Search previous")),
@@ -2018,7 +2018,7 @@
         self.searchClearMarkersAct = E5Action(
             QCoreApplication.translate('ViewManager',
                                        'Clear search markers'),
-            UI.PixmapCache.getIcon("findClear.png"),
+            UI.PixmapCache.getIcon("findClear"),
             QCoreApplication.translate('ViewManager', 'Clear search markers'),
             QKeySequence(QCoreApplication.translate(
                 'ViewManager', "Ctrl+3", "Search|Clear search markers")),
@@ -2057,7 +2057,7 @@
         self.replaceAndSearchAct = E5Action(
             QCoreApplication.translate(
                 'ViewManager', 'Replace and Search'),
-            UI.PixmapCache.getIcon("editReplaceSearch.png"),
+            UI.PixmapCache.getIcon("editReplaceSearch"),
             QCoreApplication.translate(
                 'ViewManager', 'Replace and Search'),
             QKeySequence(QCoreApplication.translate(
@@ -2081,7 +2081,7 @@
         self.replaceSelectionAct = E5Action(
             QCoreApplication.translate(
                 'ViewManager', 'Replace Occurrence'),
-            UI.PixmapCache.getIcon("editReplace.png"),
+            UI.PixmapCache.getIcon("editReplace"),
             QCoreApplication.translate(
                 'ViewManager', 'Replace Occurrence'),
             QKeySequence(QCoreApplication.translate(
@@ -2103,7 +2103,7 @@
         self.replaceAllAct = E5Action(
             QCoreApplication.translate(
                 'ViewManager', 'Replace All'),
-            UI.PixmapCache.getIcon("editReplaceAll.png"),
+            UI.PixmapCache.getIcon("editReplaceAll"),
             QCoreApplication.translate(
                 'ViewManager', 'Replace All'),
             QKeySequence(QCoreApplication.translate(
@@ -2153,7 +2153,7 @@
         
         self.whatsThisAct = E5Action(
             self.tr('What\'s This?'),
-            UI.PixmapCache.getIcon("whatsThis.png"),
+            UI.PixmapCache.getIcon("whatsThis"),
             self.tr('&What\'s This?'),
             QKeySequence(self.tr("Shift+F1", "Help|What's This?'")),
             0, self, 'help_help_whats_this')
--- a/eric6/QScintilla/SearchReplaceWidget.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/QScintilla/SearchReplaceWidget.py	Sat May 02 13:51:07 2020 +0200
@@ -127,19 +127,19 @@
         self.setWhatsThis(whatsThis)
         
         # set icons
-        self.ui.closeButton.setIcon(UI.PixmapCache.getIcon("close.png"))
+        self.ui.closeButton.setIcon(UI.PixmapCache.getIcon("close"))
         self.ui.findPrevButton.setIcon(
-            UI.PixmapCache.getIcon("1leftarrow.png"))
+            UI.PixmapCache.getIcon("1leftarrow"))
         self.ui.findNextButton.setIcon(
-            UI.PixmapCache.getIcon("1rightarrow.png"))
+            UI.PixmapCache.getIcon("1rightarrow"))
         
         if replace:
             self.ui.replaceButton.setIcon(
-                UI.PixmapCache.getIcon("editReplace.png"))
+                UI.PixmapCache.getIcon("editReplace"))
             self.ui.replaceSearchButton.setIcon(
-                UI.PixmapCache.getIcon("editReplaceSearch.png"))
+                UI.PixmapCache.getIcon("editReplaceSearch"))
             self.ui.replaceAllButton.setIcon(
-                UI.PixmapCache.getIcon("editReplaceAll.png"))
+                UI.PixmapCache.getIcon("editReplaceAll"))
         
         # set line edit completers
         self.ui.findtextCombo.setCompleter(None)
--- a/eric6/QScintilla/Shell.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/QScintilla/Shell.py	Sat May 02 13:51:07 2020 +0200
@@ -327,7 +327,7 @@
         self.__setAutoCompletion()
         self.__setCallTips()
         
-        self.setWindowIcon(UI.PixmapCache.getIcon("eric.png"))
+        self.setWindowIcon(UI.PixmapCache.getIcon("eric"))
         
         self.incrementalSearchString = ""
         self.incrementalSearchActive = False
@@ -581,6 +581,10 @@
         if Preferences.getShell("CallTipsEnabled"):
             self.setCallTipsBackgroundColor(
                 Preferences.getEditorColour("CallTipsBackground"))
+            self.setCallTipsForegroundColor(
+                Preferences.getEditorColour("CallTipsForeground"))
+            self.setCallTipsHighlightColor(
+                Preferences.getEditorColour("CallTipsHighlight"))
             self.setCallTipsVisible(Preferences.getEditor("CallTipsVisible"))
             calltipsStyle = Preferences.getEditor("CallTipsStyle")
             if calltipsStyle == QsciScintilla.CallTipsNoContext:
--- a/eric6/QScintilla/ShellWindow.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/QScintilla/ShellWindow.py	Sat May 02 13:51:07 2020 +0200
@@ -60,7 +60,7 @@
         super(ShellWindow, self).__init__(parent)
         if name is not None:
             self.setObjectName(name)
-        self.setWindowIcon(UI.PixmapCache.getIcon("shell.png"))
+        self.setWindowIcon(UI.PixmapCache.getIcon("shell"))
         self.setWindowTitle(self.tr("eric6 Shell"))
         
         self.setStyle(Preferences.getUI("Style"),
@@ -205,7 +205,7 @@
         """
         self.exitAct = E5Action(
             self.tr('Quit'),
-            UI.PixmapCache.getIcon("exit.png"),
+            UI.PixmapCache.getIcon("exit"),
             self.tr('&Quit'),
             QKeySequence(self.tr("Ctrl+Q", "File|Quit")),
             0, self, 'quit')
@@ -220,7 +220,7 @@
 
         self.newWindowAct = E5Action(
             self.tr('New Window'),
-            UI.PixmapCache.getIcon("newWindow.png"),
+            UI.PixmapCache.getIcon("newWindow"),
             self.tr('New &Window'),
             QKeySequence(self.tr("Ctrl+Shift+N", "File|New Window")),
             0, self, 'new_window')
@@ -235,7 +235,7 @@
 
         self.restartAct = E5Action(
             self.tr('Restart'),
-            UI.PixmapCache.getIcon("restart.png"),
+            UI.PixmapCache.getIcon("restart"),
             self.tr('Restart'),
             0, 0, self, 'shell_restart')
         self.restartAct.setStatusTip(self.tr(
@@ -249,7 +249,7 @@
 
         self.clearRestartAct = E5Action(
             self.tr('Restart and Clear'),
-            UI.PixmapCache.getIcon("restartDelete.png"),
+            UI.PixmapCache.getIcon("restartDelete"),
             self.tr('Restart and Clear'),
             Qt.Key_F4, 0, self, 'shell_clear_restart')
         self.clearRestartAct.setStatusTip(self.tr(
@@ -272,7 +272,7 @@
         
         self.cutAct = E5Action(
             QCoreApplication.translate('ViewManager', 'Cut'),
-            UI.PixmapCache.getIcon("editCut.png"),
+            UI.PixmapCache.getIcon("editCut"),
             QCoreApplication.translate('ViewManager', 'Cu&t'),
             QKeySequence(QCoreApplication.translate(
                 'ViewManager', "Ctrl+X", "Edit|Cut")),
@@ -292,7 +292,7 @@
         
         self.copyAct = E5Action(
             QCoreApplication.translate('ViewManager', 'Copy'),
-            UI.PixmapCache.getIcon("editCopy.png"),
+            UI.PixmapCache.getIcon("editCopy"),
             QCoreApplication.translate('ViewManager', '&Copy'),
             QKeySequence(QCoreApplication.translate(
                 'ViewManager', "Ctrl+C", "Edit|Copy")),
@@ -312,7 +312,7 @@
         
         self.pasteAct = E5Action(
             QCoreApplication.translate('ViewManager', 'Paste'),
-            UI.PixmapCache.getIcon("editPaste.png"),
+            UI.PixmapCache.getIcon("editPaste"),
             QCoreApplication.translate('ViewManager', '&Paste'),
             QKeySequence(QCoreApplication.translate(
                 'ViewManager', "Ctrl+V", "Edit|Paste")),
@@ -332,7 +332,7 @@
         
         self.clearAct = E5Action(
             QCoreApplication.translate('ViewManager', 'Clear'),
-            UI.PixmapCache.getIcon("editDelete.png"),
+            UI.PixmapCache.getIcon("editDelete"),
             QCoreApplication.translate('ViewManager', 'Clear'),
             QKeySequence(QCoreApplication.translate(
                 'ViewManager', "Alt+Shift+C", "Edit|Clear")),
@@ -740,7 +740,7 @@
         
         self.searchAct = E5Action(
             QCoreApplication.translate('ViewManager', 'Search'),
-            UI.PixmapCache.getIcon("find.png"),
+            UI.PixmapCache.getIcon("find"),
             QCoreApplication.translate('ViewManager', '&Search...'),
             QKeySequence(QCoreApplication.translate(
                 'ViewManager', "Ctrl+F", "Search|Search")),
@@ -761,7 +761,7 @@
         self.searchNextAct = E5Action(
             QCoreApplication.translate(
                 'ViewManager', 'Search next'),
-            UI.PixmapCache.getIcon("findNext.png"),
+            UI.PixmapCache.getIcon("findNext"),
             QCoreApplication.translate('ViewManager', 'Search &next'),
             QKeySequence(QCoreApplication.translate(
                 'ViewManager', "F3", "Search|Search next")),
@@ -782,7 +782,7 @@
         
         self.searchPrevAct = E5Action(
             QCoreApplication.translate('ViewManager', 'Search previous'),
-            UI.PixmapCache.getIcon("findPrev.png"),
+            UI.PixmapCache.getIcon("findPrev"),
             QCoreApplication.translate('ViewManager', 'Search &previous'),
             QKeySequence(QCoreApplication.translate(
                 'ViewManager', "Shift+F3", "Search|Search previous")),
@@ -810,7 +810,7 @@
         
         self.zoomInAct = E5Action(
             QCoreApplication.translate('ViewManager', 'Zoom in'),
-            UI.PixmapCache.getIcon("zoomIn.png"),
+            UI.PixmapCache.getIcon("zoomIn"),
             QCoreApplication.translate('ViewManager', 'Zoom &in'),
             QKeySequence(QCoreApplication.translate(
                 'ViewManager', "Ctrl++", "View|Zoom in")),
@@ -829,7 +829,7 @@
         
         self.zoomOutAct = E5Action(
             QCoreApplication.translate('ViewManager', 'Zoom out'),
-            UI.PixmapCache.getIcon("zoomOut.png"),
+            UI.PixmapCache.getIcon("zoomOut"),
             QCoreApplication.translate('ViewManager', 'Zoom &out'),
             QKeySequence(QCoreApplication.translate(
                 'ViewManager', "Ctrl+-", "View|Zoom out")),
@@ -848,7 +848,7 @@
         
         self.zoomResetAct = E5Action(
             QCoreApplication.translate('ViewManager', 'Zoom reset'),
-            UI.PixmapCache.getIcon("zoomReset.png"),
+            UI.PixmapCache.getIcon("zoomReset"),
             QCoreApplication.translate('ViewManager', 'Zoom &reset'),
             QKeySequence(QCoreApplication.translate(
                 'ViewManager', "Ctrl+0", "View|Zoom reset")),
@@ -867,7 +867,7 @@
         
         self.zoomToAct = E5Action(
             QCoreApplication.translate('ViewManager', 'Zoom'),
-            UI.PixmapCache.getIcon("zoomTo.png"),
+            UI.PixmapCache.getIcon("zoomTo"),
             QCoreApplication.translate('ViewManager', '&Zoom'),
             QKeySequence(QCoreApplication.translate(
                 'ViewManager', "Ctrl+#", "View|Zoom")),
@@ -891,7 +891,7 @@
         """
         self.showHistoryAct = E5Action(
             self.tr('Show History'),
-            UI.PixmapCache.getIcon("history.png"),
+            UI.PixmapCache.getIcon("history"),
             self.tr('&Show History...'),
             0, 0,
             self, 'shell_show_history')
@@ -901,7 +901,7 @@
         
         self.clearHistoryAct = E5Action(
             self.tr('Clear History'),
-            UI.PixmapCache.getIcon("historyClear.png"),
+            UI.PixmapCache.getIcon("historyClear"),
             self.tr('&Clear History...'),
             0, 0,
             self, 'shell_clear_history')
@@ -949,7 +949,7 @@
         
         self.whatsThisAct = E5Action(
             self.tr('What\'s This?'),
-            UI.PixmapCache.getIcon("whatsThis.png"),
+            UI.PixmapCache.getIcon("whatsThis"),
             self.tr('&What\'s This?'),
             QKeySequence(self.tr("Shift+F1", "Help|What's This?'")),
             0, self, 'help_help_whats_this')
@@ -1250,9 +1250,9 @@
         self.__statusBar.setSizeGripEnabled(True)
 
         self.__sbZoom = E5ZoomWidget(
-            UI.PixmapCache.getPixmap("zoomOut.png"),
-            UI.PixmapCache.getPixmap("zoomIn.png"),
-            UI.PixmapCache.getPixmap("zoomReset.png"),
+            UI.PixmapCache.getPixmap("zoomOut"),
+            UI.PixmapCache.getPixmap("zoomIn"),
+            UI.PixmapCache.getPixmap("zoomReset"),
             self.__statusBar)
         self.__statusBar.addPermanentWidget(self.__sbZoom)
         self.__sbZoom.setWhatsThis(self.tr(
--- a/eric6/Snapshot/SnapWidget.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/Snapshot/SnapWidget.py	Sat May 02 13:51:07 2020 +0200
@@ -45,11 +45,11 @@
         super(SnapWidget, self).__init__(parent)
         self.setupUi(self)
         
-        self.saveButton.setIcon(UI.PixmapCache.getIcon("fileSaveAs.png"))
-        self.takeButton.setIcon(UI.PixmapCache.getIcon("cameraPhoto.png"))
-        self.copyButton.setIcon(UI.PixmapCache.getIcon("editCopy.png"))
-        self.copyPreviewButton.setIcon(UI.PixmapCache.getIcon("editCopy.png"))
-        self.setWindowIcon(UI.PixmapCache.getIcon("ericSnap.png"))
+        self.saveButton.setIcon(UI.PixmapCache.getIcon("fileSaveAs"))
+        self.takeButton.setIcon(UI.PixmapCache.getIcon("cameraPhoto"))
+        self.copyButton.setIcon(UI.PixmapCache.getIcon("editCopy"))
+        self.copyPreviewButton.setIcon(UI.PixmapCache.getIcon("editCopy"))
+        self.setWindowIcon(UI.PixmapCache.getIcon("ericSnap"))
         
         if Globals.isWaylandSession():
             from .SnapshotWaylandGrabber import SnapshotWaylandGrabber
--- a/eric6/SqlBrowser/SqlBrowser.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/SqlBrowser/SqlBrowser.py	Sat May 02 13:51:07 2020 +0200
@@ -42,7 +42,7 @@
             connections = []
         
         self.setWindowTitle(self.tr("SQL Browser"))
-        self.setWindowIcon(UI.PixmapCache.getIcon("eric.png"))
+        self.setWindowIcon(UI.PixmapCache.getIcon("eric"))
         
         self.setStyle(Preferences.getUI("Style"),
                       Preferences.getUI("StyleSheet"))
@@ -101,7 +101,7 @@
         
         self.addConnectionAct = E5Action(
             self.tr('Add Connection'),
-            UI.PixmapCache.getIcon("databaseConnection.png"),
+            UI.PixmapCache.getIcon("databaseConnection"),
             self.tr('Add &Connection...'),
             0, 0, self, 'sql_file_add_connection')
         self.addConnectionAct.setStatusTip(self.tr(
@@ -117,7 +117,7 @@
         
         self.exitAct = E5Action(
             self.tr('Quit'),
-            UI.PixmapCache.getIcon("exit.png"),
+            UI.PixmapCache.getIcon("exit"),
             self.tr('&Quit'),
             QKeySequence(self.tr("Ctrl+Q", "File|Quit")),
             0, self, 'sql_file_quit')
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/eric6/Styles/BreezeDark.qss	Sat May 02 13:51:07 2020 +0200
@@ -0,0 +1,22 @@
+/* Breeze Dark theme for Eric6
+ *
+ * Theme Notes:
+ *  - This theme is designed to work on top of the Fusion client style.
+ */
+
+QCheckBox, QRadioButton {
+    background:#484848;
+}
+
+QProgressBar:horizontal {
+    padding: 1px;
+    text-align: center;
+}
+QProgressBar::chunk:horizontal {
+    background: #5cad39;
+}
+
+* { 
+    selection-background-color: #5cad39;
+    selection-color: #ffffff;
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/eric6/Styles/BreezeDark_NoSingleClick.qss	Sat May 02 13:51:07 2020 +0200
@@ -0,0 +1,24 @@
+/* Breeze Dark theme for Eric6
+ *
+ * Theme Notes:
+ *  - This theme is designed to work on top of the Fusion client style.
+ */
+
+QCheckBox, QRadioButton {
+    background:#484848;
+}
+
+QProgressBar:horizontal {
+    padding: 1px;
+    text-align: center;
+}
+QProgressBar::chunk:horizontal {
+    background: #5cad39;
+}
+
+* { 
+    selection-background-color: #5cad39;
+    selection-color: #ffffff;
+    
+    activate-on-singleclick: 0;
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/eric6/Styles/eric6_Dark-CSS.e6h	Sat May 02 13:51:07 2020 +0200
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE HighlightingStyles SYSTEM "HighlightingStyles-6.0.dtd">
+<!-- Eric6 highlighting styles -->
+<!-- Saved: 2020-04-11, 12:29:21-->
+<!-- Author: Detlev Offenbach <detlev@die-offenbachs.de> -->
+<HighlightingStyles version="6.0">
+  <Lexer name="CSS">
+    <Style style="0" substyle="-1" color="#ff7bc2" paper="#262626" font="Hack,9,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>Default</Description>
+    </Style>
+    <Style style="1" substyle="-1" color="#75ff98" paper="#262626" font="Hack,9,-1,5,75,0,0,0,0,0,Bold" eolfill="False">
+      <Description>Tag</Description>
+    </Style>
+    <Style style="2" substyle="-1" color="#ffffff" paper="#262626" font="Hack,9,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>Class selector</Description>
+    </Style>
+    <Style style="3" substyle="-1" color="#cc6363" paper="#262626" font="Hack,9,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>Pseudo-class</Description>
+    </Style>
+    <Style style="4" substyle="-1" color="#ffb45d" paper="#262626" font="Hack,9,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>Unknown pseudo-class</Description>
+    </Style>
+    <Style style="5" substyle="-1" color="#ffffff" paper="#262626" font="Hack,9,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>Operator</Description>
+    </Style>
+    <Style style="6" substyle="-1" color="#81a9ff" paper="#262626" font="Hack,9,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>CSS1 property</Description>
+    </Style>
+    <Style style="7" substyle="-1" color="#ff0000" paper="#262626" font="Hack,9,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>Unknown property</Description>
+    </Style>
+    <Style style="8" substyle="-1" color="#ff92bc" paper="#262626" font="Hack,9,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>Value</Description>
+    </Style>
+    <Style style="9" substyle="-1" color="#00b400" paper="#262626" font="Hack,9,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>Comment</Description>
+    </Style>
+    <Style style="10" substyle="-1" color="#00dada" paper="#262626" font="Hack,9,-1,5,50,1,0,0,0,0" eolfill="False">
+      <Description>ID selector</Description>
+    </Style>
+    <Style style="11" substyle="-1" color="#ff8000" paper="#262626" font="Hack,9,-1,5,75,0,0,0,0,0" eolfill="False">
+      <Description>Important</Description>
+    </Style>
+    <Style style="12" substyle="-1" color="#aaaa00" paper="#262626" font="Hack,9,-1,5,75,0,0,0,0,0" eolfill="False">
+      <Description>@-rule</Description>
+    </Style>
+    <Style style="13" substyle="-1" color="#ff00ff" paper="#262626" font="Hack,9,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>Double-quoted string</Description>
+    </Style>
+    <Style style="14" substyle="-1" color="#ff00ff" paper="#262626" font="Hack,9,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>Single-quoted string</Description>
+    </Style>
+    <Style style="15" substyle="-1" color="#00b7ff" paper="#262626" font="Hack,9,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>CSS2 property</Description>
+    </Style>
+    <Style style="16" substyle="-1" color="#ff7575" paper="#262626" font="Hack,9,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>Attribute</Description>
+    </Style>
+    <Style style="17" substyle="-1" color="#c8ffb3" paper="#262626" font="Hack,9,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>CSS3 property</Description>
+    </Style>
+    <Style style="18" substyle="-1" color="#ddd2c8" paper="#262626" font="Hack,9,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>Pseudo-element</Description>
+    </Style>
+    <Style style="19" substyle="-1" color="#ddd2c8" paper="#262626" font="Hack,9,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>Extended CSS property</Description>
+    </Style>
+    <Style style="20" substyle="-1" color="#ddd2c8" paper="#262626" font="Hack,9,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>Extended pseudo-class</Description>
+    </Style>
+    <Style style="21" substyle="-1" color="#ddd2c8" paper="#262626" font="Hack,9,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>Extended pseudo-element</Description>
+    </Style>
+    <Style style="22" substyle="-1" color="#c7c700" paper="#262626" font="Hack,9,-1,5,75,0,0,0,0,0" eolfill="False">
+      <Description>Media rule</Description>
+    </Style>
+    <Style style="23" substyle="-1" color="#ddd2c8" paper="#262626" font="Hack,9,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>Variable</Description>
+    </Style>
+  </Lexer>
+</HighlightingStyles>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/eric6/Styles/eric6_Dark-Cython.e6h	Sat May 02 13:51:07 2020 +0200
@@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE HighlightingStyles SYSTEM "HighlightingStyles-6.0.dtd">
+<!-- Eric6 highlighting styles -->
+<!-- Saved: 2020-04-05, 19:06:46-->
+<!-- Author: Detlev Offenbach <detlev@die-offenbachs.de> -->
+<HighlightingStyles version="6.0">
+  <Lexer name="Cython">
+    <Style style="0" substyle="-1" color="#ffffff" paper="#262626" font="Hack,10,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>Default</Description>
+    </Style>
+    <Style style="1" substyle="-1" color="#74cc66" paper="#262626" font="Hack,10,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>Comment</Description>
+    </Style>
+    <Style style="2" substyle="-1" color="#00c8c8" paper="#262626" font="Hack,10,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>Number</Description>
+    </Style>
+    <Style style="3" substyle="-1" color="#c354c3" paper="#262626" font="Hack,10,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>Double-quoted string</Description>
+    </Style>
+    <Style style="4" substyle="-1" color="#c354c3" paper="#262626" font="Hack,10,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>Single-quoted string</Description>
+    </Style>
+    <Style style="5" substyle="-1" color="#60a5ff" paper="#262626" font="Hack,10,-1,5,75,0,0,0,0,0" eolfill="False">
+      <Description>Keyword</Description>
+    </Style>
+    <Style style="6" substyle="-1" color="#dc5a5a" paper="#262626" font="Hack,10,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>Triple single-quoted string</Description>
+    </Style>
+    <Style style="7" substyle="-1" color="#dc5a5a" paper="#262626" font="Hack,10,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>Triple double-quoted string</Description>
+    </Style>
+    <Style style="8" substyle="-1" color="#00aaff" paper="#262626" font="Hack,10,-1,5,75,0,0,0,0,0" eolfill="False">
+      <Description>Class name</Description>
+    </Style>
+    <Style style="9" substyle="-1" color="#00d5d5" paper="#262626" font="Hack,10,-1,5,75,0,0,0,0,0" eolfill="False">
+      <Description>Function or method name</Description>
+    </Style>
+    <Style style="10" substyle="-1" color="#bab1a8" paper="#262626" font="Hack,10,-1,5,75,0,0,0,0,0" eolfill="False">
+      <Description>Operator</Description>
+    </Style>
+    <Style style="11" substyle="-1" color="#ffffff" paper="#262626" font="Hack,10,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>Identifier</Description>
+    </Style>
+    <Style style="12" substyle="-1" color="#27e534" paper="#262626" font="Hack,10,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>Comment block</Description>
+    </Style>
+    <Style style="13" substyle="-1" color="#bdbdbd" paper="#262626" font="Hack,10,-1,5,50,0,0,0,0,0" eolfill="True">
+      <Description>Unclosed string</Description>
+    </Style>
+    <Style style="14" substyle="-1" color="#71c6ff" paper="#262626" font="Hack,10,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>Highlighted identifier</Description>
+    </Style>
+    <Style style="15" substyle="-1" color="#e38c00" paper="#262626" font="Hack,10,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>Decorator</Description>
+    </Style>
+    <Style style="16" substyle="-1" color="#c354c3" paper="#262626" font="Hack,10,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>Double-quoted f-string</Description>
+    </Style>
+    <Style style="17" substyle="-1" color="#c354c3" paper="#262626" font="Hack,10,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>Single-quoted f-string</Description>
+    </Style>
+    <Style style="18" substyle="-1" color="#dc5a5a" paper="#262626" font="Hack,10,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>Triple single-quoted f-string</Description>
+    </Style>
+    <Style style="19" substyle="-1" color="#dc5a5a" paper="#262626" font="Hack,10,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>Triple double-quoted f-string</Description>
+    </Style>
+    <Style style="11" substyle="0" color="#dd9900" paper="#262626" font="Hack,10,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>Standard Library Modules</Description>
+      <Words>__main__ _dummy_thread _thread abc aifc argparse array ast asynchat asyncio
+ asyncore atexit audioop base64 bdb binascii binhex bisect builtins bz2
+ calendar cgi cgitb chunk cmath cmd code codecs codeop collections colorsys
+ compileall concurrent configparser contextlib copy copyreg crypt csv ctypes
+ curses datetime dbm decimal difflib dis distutils dummy_threading email
+ ensurepip enum errno faulthandler fcntl filecmp fileinput fnmatch formatter
+ fpectl fractions ftplib functools gc getopt getpass gettext glob grp gzip
+ hashlib heapq hmac html http http imaplib imghdr importlib inspect io
+ ipaddress itertools json keyword linecache locale logging lzma macpath
+ mailbox mailcap marshal math mimetypes mmap modulefinder msilib msvcrt
+ multiprocessing netrc nis nntplib numbers operator os ossaudiodev parser path
+ pathlib pdb pickle pickletools pipes pkgutil platform plistlib poplib posix
+ pprint pty pwd py_compile pyclbr queue quopri random re readline reprlib
+ resource rlcompleter runpy sched select selectors shelve shlex shutil signal
+ site smtpd smtplib sndhdr socket socketserver spwd sqlite3 ssl stat statistics
+ string stringprep struct subprocess sunau symbol symtable sys sysconfig syslog
+ tabnanny tarfile telnetlib tempfile termios textwrap threading time timeit
+ tkinter token tokenize trace traceback tracemalloc tty turtle types
+ unicodedata unittest urllib uu uuid venv warnings wave weakref webbrowser
+ winreg winsound wsgiref xdrlib xml xmlrpc zipfile zipimport zlib</Words>
+    </Style>
+    <Style style="11" substyle="1" color="#ee00aa" paper="#262626" font="Hack,10,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>__future__ Imports</Description>
+      <Words>__future__ with_statement unicode_literals print_function division
+ absolute_import generator_stop annotations</Words>
+    </Style>
+    <Style style="11" substyle="2" color="#41dd97" paper="#262626" font="Hack,10,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>PyQt5 Modules</Description>
+      <Words>PyQt5 Qsci Qt QtCore QtDBus QtDesigner QtGui QtHelp QtLocation QtMacExtras QtMultimedia QtMultimediaWidgets QtNetwork QtNetworkAuth QtNfc QtOpenGL QtPositioning QtPrintSupport QtQml QtQuick QtQuickWidgets QtRemoteObjects QtSensors QtSerialPort QtSql QtSvg QtTest QtWebChannel QtWebEngine QtWebEngineCore QtWebEngineWidgets QtWebSockets QtWidgets QtWinExtras QtX11Extras QtXml QtXmlPatterns sip QtWebKit QtWebKitWidgets</Words>
+    </Style>
+    <Style style="11" substyle="3" color="#dd0000" paper="#262626" font="Bitstream Vera Sans,9,-1,5,75,0,0,0,0,0" eolfill="False">
+      <Description>Cython Specifics</Description>
+      <Words>cython pyximport Cython __cinit__ __dealloc__</Words>
+    </Style>
+  </Lexer>
+</HighlightingStyles>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/eric6/Styles/eric6_Dark-Diff.e6h	Sat May 02 13:51:07 2020 +0200
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE HighlightingStyles SYSTEM "HighlightingStyles-6.0.dtd">
+<!-- Eric6 highlighting styles -->
+<!-- Saved: 2020-04-10, 15:17:13-->
+<!-- Author: Detlev Offenbach <detlev@die-offenbachs.de> -->
+<HighlightingStyles version="6.0">
+  <Lexer name="Diff">
+    <Style style="0" substyle="-1" color="#ffffff" paper="#262626" font="Bitstream Vera Sans Mono,9,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>Default</Description>
+    </Style>
+    <Style style="1" substyle="-1" color="#74cc66" paper="#262626" font="Bitstream Vera Sans Mono,9,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>Comment</Description>
+    </Style>
+    <Style style="2" substyle="-1" color="#ffff00" paper="#262626" font="Bitstream Vera Sans Mono,9,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>Command</Description>
+    </Style>
+    <Style style="3" substyle="-1" color="#78fdff" paper="#262626" font="Bitstream Vera Sans Mono,9,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>Header</Description>
+    </Style>
+    <Style style="4" substyle="-1" color="#ff3cfc" paper="#262626" font="Bitstream Vera Sans Mono,9,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>Position</Description>
+    </Style>
+    <Style style="5" substyle="-1" color="#ffb574" paper="#262626" font="Bitstream Vera Sans Mono,9,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>Removed line</Description>
+    </Style>
+    <Style style="6" substyle="-1" color="#89ff9b" paper="#262626" font="Bitstream Vera Sans Mono,9,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>Added line</Description>
+    </Style>
+    <Style style="7" substyle="-1" color="#e2e2e2" paper="#262626" font="Bitstream Vera Sans Mono,9,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>Changed line</Description>
+    </Style>
+    <Style style="8" substyle="-1" color="#89ff9b" paper="#262626" font="Bitstream Vera Sans,9,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>Added adding patch</Description>
+    </Style>
+    <Style style="9" substyle="-1" color="#89ff9b" paper="#262626" font="Bitstream Vera Sans,9,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>Removed adding patch</Description>
+    </Style>
+    <Style style="10" substyle="-1" color="#ffb574" paper="#262626" font="Bitstream Vera Sans,9,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>Added removing patch</Description>
+    </Style>
+    <Style style="11" substyle="-1" color="#ffb574" paper="#262626" font="Bitstream Vera Sans,9,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>Removed removing patch</Description>
+    </Style>
+  </Lexer>
+</HighlightingStyles>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/eric6/Styles/eric6_Dark-Gettext.e6h	Sat May 02 13:51:07 2020 +0200
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE HighlightingStyles SYSTEM "HighlightingStyles-6.0.dtd">
+<!-- Eric6 highlighting styles -->
+<!-- Saved: 2020-04-08, 18:11:52-->
+<!-- Author: Detlev Offenbach <detlev@die-offenbachs.de> -->
+<HighlightingStyles version="6.0">
+  <Lexer name="PO">
+    <Style style="0" substyle="-1" color="#d9cfc4" paper="#2e3436" font="Bitstream Vera Sans Mono,9,-1,5,50,0,0,0,0,0" eolfill="True">
+      <Description>Default</Description>
+    </Style>
+    <Style style="1" substyle="-1" color="#00d900" paper="#2e3436" font="Bitstream Vera Sans Mono,9,-1,5,50,0,0,0,0,0" eolfill="True">
+      <Description>Comment</Description>
+    </Style>
+    <Style style="2" substyle="-1" color="#00ced9" paper="#2e3436" font="Bitstream Vera Sans Mono,9,-1,5,75,0,0,0,0,0" eolfill="True">
+      <Description>Message identifier</Description>
+    </Style>
+    <Style style="3" substyle="-1" color="#d9cfc4" paper="#2e3436" font="Bitstream Vera Sans Mono,9,-1,5,50,0,0,0,0,0" eolfill="True">
+      <Description>Message identifier text</Description>
+    </Style>
+    <Style style="4" substyle="-1" color="#00ced9" paper="#2e3436" font="Bitstream Vera Sans Mono,9,-1,5,75,0,0,0,0,0" eolfill="True">
+      <Description>Message string</Description>
+    </Style>
+    <Style style="5" substyle="-1" color="#d9cfc4" paper="#2e3436" font="Bitstream Vera Sans Mono,9,-1,5,50,0,0,0,0,0" eolfill="True">
+      <Description>Message string text</Description>
+    </Style>
+    <Style style="6" substyle="-1" color="#00ced9" paper="#2e3436" font="Bitstream Vera Sans Mono,9,-1,5,75,0,0,0,0,0" eolfill="True">
+      <Description>Message context</Description>
+    </Style>
+    <Style style="7" substyle="-1" color="#d9cfc4" paper="#2e3436" font="Bitstream Vera Sans Mono,9,-1,5,50,0,0,0,0,0" eolfill="True">
+      <Description>Message context text</Description>
+    </Style>
+    <Style style="8" substyle="-1" color="#d9cfc4" paper="#2e3436" font="Bitstream Vera Sans Mono,9,-1,5,50,0,0,0,0,0" eolfill="True">
+      <Description>Fuzzy flag</Description>
+    </Style>
+    <Style style="9" substyle="-1" color="#00d900" paper="#2e3436" font="Bitstream Vera Sans Mono,9,-1,5,50,0,0,0,0,0" eolfill="True">
+      <Description>Programmer comment</Description>
+    </Style>
+    <Style style="10" substyle="-1" color="#d9cfc4" paper="#2e3436" font="Bitstream Vera Sans Mono,9,-1,5,50,0,0,0,0,0" eolfill="True">
+      <Description>Reference</Description>
+    </Style>
+    <Style style="11" substyle="-1" color="#d9cfc4" paper="#2e3436" font="Bitstream Vera Sans Mono,9,-1,5,50,0,0,0,0,0" eolfill="True">
+      <Description>Flags</Description>
+    </Style>
+    <Style style="12" substyle="-1" color="#ffaa00" paper="#2e3436" font="Bitstream Vera Sans Mono,9,-1,5,50,0,0,0,0,0" eolfill="True">
+      <Description>Message identifier text end-of-line</Description>
+    </Style>
+    <Style style="13" substyle="-1" color="#ffaa00" paper="#2e3436" font="Bitstream Vera Sans Mono,9,-1,5,50,0,0,0,0,0" eolfill="True">
+      <Description>Message string text end-of-line</Description>
+    </Style>
+    <Style style="14" substyle="-1" color="#ffaa00" paper="#2e3436" font="Bitstream Vera Sans Mono,9,-1,5,50,0,0,0,0,0" eolfill="True">
+      <Description>Message context text end-of-line</Description>
+    </Style>
+  </Lexer>
+</HighlightingStyles>
--- a/eric6/Styles/eric6_Dark-Guessed.e6h	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/Styles/eric6_Dark-Guessed.e6h	Sat May 02 13:51:07 2020 +0200
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE HighlightingStyles SYSTEM "HighlightingStyles-6.0.dtd">
 <!-- Eric6 highlighting styles -->
-<!-- Saved: 2020-03-31, 19:41:20-->
+<!-- Saved: 2020-04-05, 18:58:52-->
 <!-- Author: Detlev Offenbach <detlev@die-offenbachs.de> -->
 <HighlightingStyles version="6.0">
   <Lexer name="Guessed">
@@ -14,22 +14,22 @@
     <Style style="2" substyle="-1" color="#dd9900" paper="#262626" font="Noto Mono,9,-1,5,50,1,0,0,0,0" eolfill="False">
       <Description>Preprocessor</Description>
     </Style>
-    <Style style="3" substyle="-1" color="#60a5ff" paper="#262626" font="Noto Mono,9,-1,5,75,0,0,0,0,0" eolfill="False">
+    <Style style="3" substyle="-1" color="#b3efad" paper="#262626" font="Noto Mono,9,-1,5,75,0,0,0,0,0" eolfill="False">
       <Description>Keyword</Description>
     </Style>
-    <Style style="4" substyle="-1" color="#60a5ff" paper="#262626" font="Noto Mono,9,-1,5,50,0,0,0,0,0" eolfill="False">
+    <Style style="4" substyle="-1" color="#b3efad" paper="#262626" font="Noto Mono,9,-1,5,50,0,0,0,0,0" eolfill="False">
       <Description>Pseudo Keyword</Description>
     </Style>
-    <Style style="5" substyle="-1" color="#e55164" paper="#262626" font="Noto Mono,9,-1,5,50,0,0,0,0,0" eolfill="False">
+    <Style style="5" substyle="-1" color="#de77a0" paper="#262626" font="Noto Mono,9,-1,5,50,0,0,0,0,0" eolfill="False">
       <Description>Type Keyword</Description>
     </Style>
-    <Style style="6" substyle="-1" color="#989898" paper="#262626" font="Noto Mono,9,-1,5,75,0,0,0,0,0" eolfill="False">
+    <Style style="6" substyle="-1" color="#bab1a8" paper="#262626" font="Noto Mono,9,-1,5,75,0,0,0,0,0" eolfill="False">
       <Description>Operator</Description>
     </Style>
-    <Style style="7" substyle="-1" color="#d498ff" paper="#262626" font="Noto Mono,9,-1,5,75,0,0,0,0,0" eolfill="False">
+    <Style style="7" substyle="-1" color="#e19bff" paper="#262626" font="Noto Mono,9,-1,5,75,0,0,0,0,0" eolfill="False">
       <Description>Word</Description>
     </Style>
-    <Style style="8" substyle="-1" color="#6cc25f" paper="#262626" font="Noto Mono,9,-1,5,75,0,0,0,0,0" eolfill="False">
+    <Style style="8" substyle="-1" color="#b3efad" paper="#262626" font="Noto Mono,9,-1,5,75,0,0,0,0,0" eolfill="False">
       <Description>Builtin</Description>
     </Style>
     <Style style="9" substyle="-1" color="#00aaff" paper="#262626" font="Noto Mono,9,-1,5,75,0,0,0,0,0" eolfill="False">
@@ -41,34 +41,34 @@
     <Style style="11" substyle="-1" color="#00aaff" paper="#262626" font="Noto Mono,9,-1,5,75,0,0,0,0,0" eolfill="False">
       <Description>Namespace</Description>
     </Style>
-    <Style style="12" substyle="-1" color="#d26969" paper="#262626" font="Noto Mono,9,-1,5,75,0,0,0,0,0" eolfill="False">
+    <Style style="12" substyle="-1" color="#e75555" paper="#262626" font="Noto Mono,9,-1,5,75,0,0,0,0,0" eolfill="False">
       <Description>Exception</Description>
     </Style>
     <Style style="13" substyle="-1" color="#00aaff" paper="#262626" font="Noto Mono,9,-1,5,50,0,0,0,0,0" eolfill="False">
       <Description>Identifier</Description>
     </Style>
-    <Style style="14" substyle="-1" color="#dc5a5a" paper="#262626" font="Noto Mono,9,-1,5,50,0,0,0,0,0" eolfill="False">
+    <Style style="14" substyle="-1" color="#dd3131" paper="#262626" font="Noto Mono,9,-1,5,50,0,0,0,0,0" eolfill="False">
       <Description>Constant</Description>
     </Style>
-    <Style style="15" substyle="-1" color="#d1d846" paper="#262626" font="Noto Mono,9,-1,5,50,0,0,0,0,0" eolfill="False">
+    <Style style="15" substyle="-1" color="#e1e100" paper="#262626" font="Noto Mono,9,-1,5,50,0,0,0,0,0" eolfill="False">
       <Description>Label</Description>
     </Style>
-    <Style style="16" substyle="-1" color="#c5c5c5" paper="#262626" font="Noto Mono,9,-1,5,75,0,0,0,0,0" eolfill="False">
+    <Style style="16" substyle="-1" color="#dedede" paper="#262626" font="Noto Mono,9,-1,5,75,0,0,0,0,0" eolfill="False">
       <Description>Entity</Description>
     </Style>
-    <Style style="17" substyle="-1" color="#cceb42" paper="#262626" font="Noto Mono,9,-1,5,75,0,0,0,0,0" eolfill="False">
+    <Style style="17" substyle="-1" color="#b6d13b" paper="#262626" font="Noto Mono,9,-1,5,75,0,0,0,0,0" eolfill="False">
       <Description>Attribute</Description>
     </Style>
-    <Style style="18" substyle="-1" color="#00c500" paper="#262626" font="Noto Mono,9,-1,5,75,0,0,0,0,0" eolfill="False">
+    <Style style="18" substyle="-1" color="#b3efad" paper="#262626" font="Noto Mono,9,-1,5,75,0,0,0,0,0" eolfill="False">
       <Description>Tag</Description>
     </Style>
-    <Style style="19" substyle="-1" color="#ca73ff" paper="#262626" font="Noto Mono,9,-1,5,50,0,0,0,0,0" eolfill="False">
+    <Style style="19" substyle="-1" color="#e19bff" paper="#262626" font="Noto Mono,9,-1,5,50,0,0,0,0,0" eolfill="False">
       <Description>Decorator</Description>
     </Style>
-    <Style style="20" substyle="-1" color="#dc5a5a" paper="#262626" font="Noto Mono,9,-1,5,50,0,0,0,0,0" eolfill="False">
+    <Style style="20" substyle="-1" color="#f46b6b" paper="#262626" font="Noto Mono,9,-1,5,50,0,0,0,0,0" eolfill="False">
       <Description>String</Description>
     </Style>
-    <Style style="21" substyle="-1" color="#dc5a5a" paper="#262626" font="Noto Mono,9,-1,5,50,1,0,0,0,0" eolfill="False">
+    <Style style="21" substyle="-1" color="#f46b6b" paper="#262626" font="Noto Mono,9,-1,5,50,1,0,0,0,0" eolfill="False">
       <Description>Documentation string</Description>
     </Style>
     <Style style="22" substyle="-1" color="#bb6688" paper="#262626" font="Noto Mono,9,-1,5,75,0,0,0,0,0" eolfill="False">
@@ -80,43 +80,43 @@
     <Style style="24" substyle="-1" color="#bb6688" paper="#262626" font="Noto Mono,9,-1,5,50,0,0,0,0,0" eolfill="False">
       <Description>Regular expression</Description>
     </Style>
-    <Style style="25" substyle="-1" color="#8c92ea" paper="#262626" font="Noto Mono,9,-1,5,50,0,0,0,0,0" eolfill="False">
+    <Style style="25" substyle="-1" color="#00aaff" paper="#262626" font="Noto Mono,9,-1,5,50,0,0,0,0,0" eolfill="False">
       <Description>Symbol</Description>
     </Style>
-    <Style style="26" substyle="-1" color="#00c500" paper="#262626" font="Noto Mono,9,-1,5,50,0,0,0,0,0" eolfill="False">
+    <Style style="26" substyle="-1" color="#00d300" paper="#262626" font="Noto Mono,9,-1,5,50,0,0,0,0,0" eolfill="False">
       <Description>Other string</Description>
     </Style>
-    <Style style="27" substyle="-1" color="#c8c8c8" paper="#262626" font="Noto Mono,9,-1,5,50,0,0,0,0,0" eolfill="False">
+    <Style style="27" substyle="-1" color="#00c8c8" paper="#262626" font="Noto Mono,9,-1,5,50,0,0,0,0,0" eolfill="False">
       <Description>Number</Description>
     </Style>
-    <Style style="28" substyle="-1" color="#8c92ea" paper="#262626" font="Noto Mono,9,-1,5,75,0,0,0,0,0" eolfill="False">
+    <Style style="28" substyle="-1" color="#00aaff" paper="#262626" font="Noto Mono,9,-1,5,75,0,0,0,0,0" eolfill="False">
       <Description>Heading</Description>
     </Style>
-    <Style style="29" substyle="-1" color="#d15dc8" paper="#262626" font="Noto Mono,9,-1,5,75,0,0,0,0,0" eolfill="False">
+    <Style style="29" substyle="-1" color="#dd60dd" paper="#262626" font="Noto Mono,9,-1,5,75,0,0,0,0,0" eolfill="False">
       <Description>Subheading</Description>
     </Style>
-    <Style style="30" substyle="-1" color="#f80000" paper="#262626" font="Noto Mono,9,-1,5,50,0,0,0,0,0" eolfill="False">
+    <Style style="30" substyle="-1" color="#e30000" paper="#262626" font="Noto Mono,9,-1,5,50,0,0,0,0,0" eolfill="False">
       <Description>Deleted</Description>
     </Style>
-    <Style style="31" substyle="-1" color="#00a000" paper="#262626" font="Noto Mono,9,-1,5,50,0,0,0,0,0" eolfill="False">
+    <Style style="31" substyle="-1" color="#00dd00" paper="#262626" font="Noto Mono,9,-1,5,50,0,0,0,0,0" eolfill="False">
       <Description>Inserted</Description>
     </Style>
     <Style style="40" substyle="-1" color="#ff0000" paper="#262626" font="Noto Mono,9,-1,5,50,0,0,0,0,0" eolfill="False">
       <Description>Generic error</Description>
     </Style>
-    <Style style="41" substyle="-1" color="#ccc2b8" paper="#262626" font="Noto Mono,9,-1,5,50,1,0,0,0,0" eolfill="False">
+    <Style style="41" substyle="-1" color="#ded3c9" paper="#262626" font="Noto Mono,9,-1,5,50,1,0,0,0,0" eolfill="False">
       <Description>Emphasized text</Description>
     </Style>
-    <Style style="42" substyle="-1" color="#ccc2b8" paper="#262626" font="Noto Mono,9,-1,5,75,0,0,0,0,0" eolfill="False">
+    <Style style="42" substyle="-1" color="#ded3c9" paper="#262626" font="Noto Mono,9,-1,5,75,0,0,0,0,0" eolfill="False">
       <Description>Strong text</Description>
     </Style>
-    <Style style="43" substyle="-1" color="#7a9adf" paper="#262626" font="Noto Mono,9,-1,5,75,0,0,0,0,0" eolfill="False">
+    <Style style="43" substyle="-1" color="#00aaff" paper="#262626" font="Noto Mono,9,-1,5,75,0,0,0,0,0" eolfill="False">
       <Description>Prompt</Description>
     </Style>
-    <Style style="44" substyle="-1" color="#eeeeee" paper="#262626" font="Noto Mono,9,-1,5,50,0,0,0,0,0" eolfill="False">
+    <Style style="44" substyle="-1" color="#cccccc" paper="#262626" font="Noto Mono,9,-1,5,50,0,0,0,0,0" eolfill="False">
       <Description>Output</Description>
     </Style>
-    <Style style="45" substyle="-1" color="#7a9adf" paper="#262626" font="Noto Mono,9,-1,5,50,0,0,0,0,0" eolfill="False">
+    <Style style="45" substyle="-1" color="#6985ea" paper="#262626" font="Noto Mono,9,-1,5,50,0,0,0,0,0" eolfill="False">
       <Description>Traceback</Description>
     </Style>
     <Style style="46" substyle="-1" color="#ffffff" paper="#ff0000" font="Noto Mono,9,-1,5,75,0,0,0,0,0" eolfill="False">
@@ -125,37 +125,37 @@
     <Style style="47" substyle="-1" color="#007f00" paper="#a8ffa8" font="Noto Mono,9,-1,5,50,0,0,0,0,0" eolfill="True">
       <Description>Comment block</Description>
     </Style>
-    <Style style="48" substyle="-1" color="#00a0e0" paper="#ffffff" font="Noto Mono,9,-1,5,50,0,0,0,0,0" eolfill="False">
+    <Style style="48" substyle="-1" color="#26b5e0" paper="#262626" font="Noto Mono,9,-1,5,50,0,0,0,0,0" eolfill="False">
       <Description>Property</Description>
     </Style>
-    <Style style="49" substyle="-1" color="#7f007f" paper="#ffffff" font="Noto Mono,9,-1,5,50,0,0,0,0,0" eolfill="False">
+    <Style style="49" substyle="-1" color="#e476eb" paper="#262626" font="Noto Mono,9,-1,5,50,0,0,0,0,0" eolfill="False">
       <Description>Character</Description>
     </Style>
     <Style style="50" substyle="-1" color="#7f007f" paper="#ddd0dd" font="Noto Mono,9,-1,5,50,0,0,0,0,0" eolfill="True">
       <Description>Here document</Description>
     </Style>
-    <Style style="51" substyle="-1" color="#000000" paper="#ffffff" font="Noto Mono,9,-1,5,50,0,0,0,0,0" eolfill="False">
+    <Style style="51" substyle="-1" color="#ffffff" paper="#262626" font="Noto Mono,9,-1,5,50,0,0,0,0,0" eolfill="False">
       <Description>Punctuation</Description>
     </Style>
-    <Style style="52" substyle="-1" color="#00c000" paper="#ffffff" font="Noto Mono,9,-1,5,50,0,0,0,0,0" eolfill="False">
+    <Style style="52" substyle="-1" color="#00c000" paper="#262626" font="Noto Mono,9,-1,5,50,0,0,0,0,0" eolfill="False">
       <Description>Hashbang</Description>
     </Style>
-    <Style style="53" substyle="-1" color="#a90d91" paper="#ffffff" font="Noto Mono,9,-1,5,50,0,0,0,0,0" eolfill="False">
+    <Style style="53" substyle="-1" color="#da10bc" paper="#262626" font="Noto Mono,9,-1,5,50,0,0,0,0,0" eolfill="False">
       <Description>Reserved Keyword</Description>
     </Style>
-    <Style style="54" substyle="-1" color="#1c01ce" paper="#ffffff" font="Noto Mono,9,-1,5,50,0,0,0,0,0" eolfill="False">
+    <Style style="54" substyle="-1" color="#00aaff" paper="#262626" font="Noto Mono,9,-1,5,50,0,0,0,0,0" eolfill="False">
       <Description>Literal</Description>
     </Style>
-    <Style style="55" substyle="-1" color="#7f007f" paper="#ffffff" font="Noto Mono,9,-1,5,50,0,0,0,0,0" eolfill="False">
+    <Style style="55" substyle="-1" color="#c582f8" paper="#262626" font="Noto Mono,9,-1,5,50,0,0,0,0,0" eolfill="False">
       <Description>Double quoted string</Description>
     </Style>
-    <Style style="56" substyle="-1" color="#7f007f" paper="#ffffff" font="Noto Mono,9,-1,5,50,0,0,0,0,0" eolfill="False">
+    <Style style="56" substyle="-1" color="#c582f8" paper="#262626" font="Noto Mono,9,-1,5,50,0,0,0,0,0" eolfill="False">
       <Description>Single quoted string</Description>
     </Style>
     <Style style="57" substyle="-1" color="#ffff00" paper="#a08080" font="Noto Mono,9,-1,5,50,0,0,0,0,0" eolfill="True">
       <Description>Backtick string</Description>
     </Style>
-    <Style style="58" substyle="-1" color="#bbbbbb" paper="#ffffff" font="Noto Mono,9,-1,5,50,0,0,0,0,0" eolfill="False">
+    <Style style="58" substyle="-1" color="#bbbbbb" paper="#262626" font="Noto Mono,9,-1,5,50,0,0,0,0,0" eolfill="False">
       <Description>Whitespace</Description>
     </Style>
   </Lexer>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/eric6/Styles/eric6_Dark-HTML.e6h	Sat May 02 13:51:07 2020 +0200
@@ -0,0 +1,336 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE HighlightingStyles SYSTEM "HighlightingStyles-6.0.dtd">
+<!-- Eric6 highlighting styles -->
+<!-- Saved: 2020-04-08, 18:12:20-->
+<!-- Author: Detlev Offenbach <detlev@die-offenbachs.de> -->
+<HighlightingStyles version="6.0">
+  <Lexer name="HTML">
+    <Style style="0" substyle="-1" color="#ffffff" paper="#262626" font="Liberation Mono,9,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>HTML default</Description>
+    </Style>
+    <Style style="1" substyle="-1" color="#989dff" paper="#262626" font="Liberation Mono,9,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>Tag</Description>
+    </Style>
+    <Style style="2" substyle="-1" color="#ff4e51" paper="#262626" font="Liberation Mono,9,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>Unknown tag</Description>
+    </Style>
+    <Style style="3" substyle="-1" color="#00eeee" paper="#262626" font="Liberation Mono,9,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>Attribute</Description>
+    </Style>
+    <Style style="4" substyle="-1" color="#ff6a6c" paper="#262626" font="Liberation Mono,9,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>Unknown attribute</Description>
+    </Style>
+    <Style style="5" substyle="-1" color="#00e2e2" paper="#262626" font="Liberation Mono,9,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>HTML number</Description>
+    </Style>
+    <Style style="6" substyle="-1" color="#ff00ff" paper="#262626" font="Liberation Mono,9,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>HTML double-quoted string</Description>
+    </Style>
+    <Style style="7" substyle="-1" color="#ff00ff" paper="#262626" font="Liberation Mono,9,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>HTML single-quoted string</Description>
+    </Style>
+    <Style style="8" substyle="-1" color="#ff00ff" paper="#262626" font="Liberation Mono,9,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>Other text in a tag</Description>
+    </Style>
+    <Style style="9" substyle="-1" color="#ffff00" paper="#262626" font="Liberation Mono,9,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>HTML comment</Description>
+    </Style>
+    <Style style="10" substyle="-1" color="#ff00ff" paper="#262626" font="Liberation Mono,9,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>Entity</Description>
+    </Style>
+    <Style style="11" substyle="-1" color="#00d5ff" paper="#262626" font="Liberation Mono,9,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>End of a tag</Description>
+    </Style>
+    <Style style="12" substyle="-1" color="#73b2ff" paper="#262626" font="Liberation Mono,9,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>Start of an XML fragment</Description>
+    </Style>
+    <Style style="13" substyle="-1" color="#73b2ff" paper="#262626" font="Liberation Mono,9,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>End of an XML fragment</Description>
+    </Style>
+    <Style style="14" substyle="-1" color="#8fe5ff" paper="#262626" font="Liberation Mono,9,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>Script tag</Description>
+    </Style>
+    <Style style="15" substyle="-1" color="#000000" paper="#ffff00" font="Liberation Mono,9,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>Start of an ASP fragment with @</Description>
+    </Style>
+    <Style style="16" substyle="-1" color="#000000" paper="#ffdf00" font="Liberation Mono,9,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>Start of an ASP fragment</Description>
+    </Style>
+    <Style style="17" substyle="-1" color="#000000" paper="#ffdf00" font="Liberation Mono,9,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>CDATA</Description>
+    </Style>
+    <Style style="18" substyle="-1" color="#0000ff" paper="#ffefbf" font="Liberation Mono,9,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>Start of a PHP fragment</Description>
+    </Style>
+    <Style style="19" substyle="-1" color="#ff00ff" paper="#ffefff" font="Liberation Mono,9,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>Unquoted HTML value</Description>
+    </Style>
+    <Style style="20" substyle="-1" color="#ffffff" paper="#262626" font="Liberation Mono,9,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>ASP X-Code comment</Description>
+    </Style>
+    <Style style="21" substyle="-1" color="#000080" paper="#efefff" font="Liberation Mono,9,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>SGML default</Description>
+    </Style>
+    <Style style="22" substyle="-1" color="#000080" paper="#efefff" font="Liberation Mono,9,-1,5,75,0,0,0,0,0" eolfill="False">
+      <Description>SGML command</Description>
+    </Style>
+    <Style style="23" substyle="-1" color="#006600" paper="#efefff" font="Liberation Mono,9,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>First parameter of an SGML command</Description>
+    </Style>
+    <Style style="24" substyle="-1" color="#800000" paper="#efefff" font="Liberation Mono,9,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>SGML double-quoted string</Description>
+    </Style>
+    <Style style="25" substyle="-1" color="#993300" paper="#efefff" font="Liberation Mono,9,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>SGML single-quoted string</Description>
+    </Style>
+    <Style style="26" substyle="-1" color="#800000" paper="#ff6666" font="Liberation Mono,9,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>SGML error</Description>
+    </Style>
+    <Style style="27" substyle="-1" color="#3366ff" paper="#efefff" font="Liberation Mono,9,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>SGML special entity</Description>
+    </Style>
+    <Style style="29" substyle="-1" color="#808000" paper="#efefff" font="Liberation Mono,9,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>SGML comment</Description>
+    </Style>
+    <Style style="30" substyle="-1" color="#ffffff" paper="#262626" font="Liberation Mono,9,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>First parameter comment of an SGML command</Description>
+    </Style>
+    <Style style="31" substyle="-1" color="#000066" paper="#cccce0" font="Liberation Mono,9,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>SGML block default</Description>
+    </Style>
+    <Style style="40" substyle="-1" color="#ffff00" paper="#262626" font="Liberation Mono,9,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>Start of a JavaScript fragment</Description>
+    </Style>
+    <Style style="41" substyle="-1" color="#000000" paper="#f0f0ff" font="Liberation Mono,9,-1,5,75,0,0,0,0,0" eolfill="True">
+      <Description>JavaScript default</Description>
+    </Style>
+    <Style style="42" substyle="-1" color="#007f00" paper="#f0f0ff" font="Liberation Mono,9,-1,5,50,0,0,0,0,0" eolfill="True">
+      <Description>JavaScript comment</Description>
+    </Style>
+    <Style style="43" substyle="-1" color="#007f00" paper="#f0f0ff" font="Liberation Mono,9,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>JavaScript line comment</Description>
+    </Style>
+    <Style style="44" substyle="-1" color="#3f703f" paper="#f0f0ff" font="Liberation Mono,9,-1,5,75,0,0,0,0,0" eolfill="True">
+      <Description>JavaDoc style JavaScript comment</Description>
+    </Style>
+    <Style style="45" substyle="-1" color="#007f7f" paper="#f0f0ff" font="Liberation Mono,9,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>JavaScript number</Description>
+    </Style>
+    <Style style="46" substyle="-1" color="#000000" paper="#f0f0ff" font="Liberation Mono,9,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>JavaScript word</Description>
+    </Style>
+    <Style style="47" substyle="-1" color="#00007f" paper="#f0f0ff" font="Liberation Mono,9,-1,5,75,0,0,0,0,0" eolfill="False">
+      <Description>JavaScript keyword</Description>
+    </Style>
+    <Style style="48" substyle="-1" color="#7f007f" paper="#f0f0ff" font="Liberation Mono,9,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>JavaScript double-quoted string</Description>
+    </Style>
+    <Style style="49" substyle="-1" color="#7f007f" paper="#f0f0ff" font="Liberation Mono,9,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>JavaScript single-quoted string</Description>
+    </Style>
+    <Style style="50" substyle="-1" color="#000000" paper="#f0f0ff" font="Liberation Mono,9,-1,5,75,0,0,0,0,0" eolfill="False">
+      <Description>JavaScript symbol</Description>
+    </Style>
+    <Style style="51" substyle="-1" color="#000000" paper="#bfbbb0" font="Liberation Mono,9,-1,5,50,0,0,0,0,0" eolfill="True">
+      <Description>JavaScript unclosed string</Description>
+    </Style>
+    <Style style="52" substyle="-1" color="#000000" paper="#ffbbb0" font="Liberation Mono,9,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>JavaScript regular expression</Description>
+    </Style>
+    <Style style="55" substyle="-1" color="#ffffff" paper="#262626" font="Liberation Mono,9,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>Start of an ASP JavaScript fragment</Description>
+    </Style>
+    <Style style="56" substyle="-1" color="#000000" paper="#dfdf7f" font="Liberation Mono,9,-1,5,75,0,0,0,0,0" eolfill="True">
+      <Description>ASP JavaScript default</Description>
+    </Style>
+    <Style style="57" substyle="-1" color="#007f00" paper="#dfdf7f" font="Liberation Mono,9,-1,5,50,0,0,0,0,0" eolfill="True">
+      <Description>ASP JavaScript comment</Description>
+    </Style>
+    <Style style="58" substyle="-1" color="#007f00" paper="#dfdf7f" font="Liberation Mono,9,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>ASP JavaScript line comment</Description>
+    </Style>
+    <Style style="59" substyle="-1" color="#7f7f7f" paper="#dfdf7f" font="Liberation Mono,9,-1,5,75,0,0,0,0,0" eolfill="True">
+      <Description>JavaDoc style ASP JavaScript comment</Description>
+    </Style>
+    <Style style="60" substyle="-1" color="#007f7f" paper="#dfdf7f" font="Liberation Mono,9,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>ASP JavaScript number</Description>
+    </Style>
+    <Style style="61" substyle="-1" color="#000000" paper="#dfdf7f" font="Liberation Mono,9,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>ASP JavaScript word</Description>
+    </Style>
+    <Style style="62" substyle="-1" color="#00007f" paper="#dfdf7f" font="Liberation Mono,9,-1,5,75,0,0,0,0,0" eolfill="False">
+      <Description>ASP JavaScript keyword</Description>
+    </Style>
+    <Style style="63" substyle="-1" color="#7f007f" paper="#dfdf7f" font="Liberation Mono,9,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>ASP JavaScript double-quoted string</Description>
+    </Style>
+    <Style style="64" substyle="-1" color="#7f007f" paper="#dfdf7f" font="Liberation Mono,9,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>ASP JavaScript single-quoted string</Description>
+    </Style>
+    <Style style="65" substyle="-1" color="#000000" paper="#dfdf7f" font="Liberation Mono,9,-1,5,75,0,0,0,0,0" eolfill="False">
+      <Description>ASP JavaScript symbol</Description>
+    </Style>
+    <Style style="66" substyle="-1" color="#000000" paper="#bfbbb0" font="Liberation Mono,9,-1,5,50,0,0,0,0,0" eolfill="True">
+      <Description>ASP JavaScript unclosed string</Description>
+    </Style>
+    <Style style="67" substyle="-1" color="#000000" paper="#ffbbb0" font="Liberation Mono,9,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>ASP JavaScript regular expression</Description>
+    </Style>
+    <Style style="70" substyle="-1" color="#ffffff" paper="#262626" font="Liberation Mono,9,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>Start of a VBScript fragment</Description>
+    </Style>
+    <Style style="71" substyle="-1" color="#000000" paper="#efefff" font="Liberation Mono,9,-1,5,50,0,0,0,0,0" eolfill="True">
+      <Description>VBScript default</Description>
+    </Style>
+    <Style style="72" substyle="-1" color="#008000" paper="#efefff" font="Liberation Mono,9,-1,5,50,0,0,0,0,0" eolfill="True">
+      <Description>VBScript comment</Description>
+    </Style>
+    <Style style="73" substyle="-1" color="#008080" paper="#efefff" font="Liberation Mono,9,-1,5,50,0,0,0,0,0" eolfill="True">
+      <Description>VBScript number</Description>
+    </Style>
+    <Style style="74" substyle="-1" color="#000080" paper="#efefff" font="Liberation Mono,9,-1,5,75,0,0,0,0,0" eolfill="True">
+      <Description>VBScript keyword</Description>
+    </Style>
+    <Style style="75" substyle="-1" color="#800080" paper="#efefff" font="Liberation Mono,9,-1,5,50,0,0,0,0,0" eolfill="True">
+      <Description>VBScript string</Description>
+    </Style>
+    <Style style="76" substyle="-1" color="#000080" paper="#efefff" font="Liberation Mono,9,-1,5,50,0,0,0,0,0" eolfill="True">
+      <Description>VBScript identifier</Description>
+    </Style>
+    <Style style="77" substyle="-1" color="#000080" paper="#7f7fff" font="Liberation Mono,9,-1,5,50,0,0,0,0,0" eolfill="True">
+      <Description>VBScript unclosed string</Description>
+    </Style>
+    <Style style="80" substyle="-1" color="#ffffff" paper="#262626" font="Liberation Mono,9,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>Start of an ASP VBScript fragment</Description>
+    </Style>
+    <Style style="81" substyle="-1" color="#000000" paper="#cfcfef" font="Liberation Mono,9,-1,5,50,0,0,0,0,0" eolfill="True">
+      <Description>ASP VBScript default</Description>
+    </Style>
+    <Style style="82" substyle="-1" color="#008000" paper="#cfcfef" font="Liberation Mono,9,-1,5,50,0,0,0,0,0" eolfill="True">
+      <Description>ASP VBScript comment</Description>
+    </Style>
+    <Style style="83" substyle="-1" color="#008080" paper="#cfcfef" font="Liberation Mono,9,-1,5,50,0,0,0,0,0" eolfill="True">
+      <Description>ASP VBScript number</Description>
+    </Style>
+    <Style style="84" substyle="-1" color="#000080" paper="#cfcfef" font="Liberation Mono,9,-1,5,75,0,0,0,0,0" eolfill="True">
+      <Description>ASP VBScript keyword</Description>
+    </Style>
+    <Style style="85" substyle="-1" color="#800080" paper="#cfcfef" font="Liberation Mono,9,-1,5,50,0,0,0,0,0" eolfill="True">
+      <Description>ASP VBScript string</Description>
+    </Style>
+    <Style style="86" substyle="-1" color="#000080" paper="#cfcfef" font="Liberation Mono,9,-1,5,50,0,0,0,0,0" eolfill="True">
+      <Description>ASP VBScript identifier</Description>
+    </Style>
+    <Style style="87" substyle="-1" color="#000080" paper="#7f7fff" font="Liberation Mono,9,-1,5,50,0,0,0,0,0" eolfill="True">
+      <Description>ASP VBScript unclosed string</Description>
+    </Style>
+    <Style style="90" substyle="-1" color="#808080" paper="#ffffff" font="Liberation Mono,9,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>Start of a Python fragment</Description>
+    </Style>
+    <Style style="91" substyle="-1" color="#808080" paper="#efffef" font="Liberation Mono,9,-1,5,50,0,0,0,0,0" eolfill="True">
+      <Description>Python default</Description>
+    </Style>
+    <Style style="92" substyle="-1" color="#007f00" paper="#efffef" font="Liberation Mono,9,-1,5,50,0,0,0,0,0" eolfill="True">
+      <Description>Python comment</Description>
+    </Style>
+    <Style style="93" substyle="-1" color="#007f7f" paper="#efffef" font="Liberation Mono,9,-1,5,50,0,0,0,0,0" eolfill="True">
+      <Description>Python number</Description>
+    </Style>
+    <Style style="94" substyle="-1" color="#7f007f" paper="#efffef" font="Liberation Mono,9,-1,5,50,0,0,0,0,0" eolfill="True">
+      <Description>Python double-quoted string</Description>
+    </Style>
+    <Style style="95" substyle="-1" color="#7f007f" paper="#efffef" font="Liberation Mono,9,-1,5,50,0,0,0,0,0" eolfill="True">
+      <Description>Python single-quoted string</Description>
+    </Style>
+    <Style style="96" substyle="-1" color="#00007f" paper="#efffef" font="Liberation Mono,9,-1,5,75,0,0,0,0,0" eolfill="True">
+      <Description>Python keyword</Description>
+    </Style>
+    <Style style="97" substyle="-1" color="#7f0000" paper="#efffef" font="Liberation Mono,9,-1,5,50,0,0,0,0,0" eolfill="True">
+      <Description>Python triple single-quoted string</Description>
+    </Style>
+    <Style style="98" substyle="-1" color="#7f0000" paper="#efffef" font="Liberation Mono,9,-1,5,50,0,0,0,0,0" eolfill="True">
+      <Description>Python triple double-quoted string</Description>
+    </Style>
+    <Style style="99" substyle="-1" color="#0000ff" paper="#efffef" font="Liberation Mono,9,-1,5,75,0,0,0,0,0" eolfill="True">
+      <Description>Python class name</Description>
+    </Style>
+    <Style style="100" substyle="-1" color="#007f7f" paper="#efffef" font="Liberation Mono,9,-1,5,75,0,0,0,0,0" eolfill="True">
+      <Description>Python function or method name</Description>
+    </Style>
+    <Style style="101" substyle="-1" color="#000000" paper="#efffef" font="Liberation Mono,9,-1,5,75,0,0,0,0,0" eolfill="True">
+      <Description>Python operator</Description>
+    </Style>
+    <Style style="102" substyle="-1" color="#000000" paper="#efffef" font="Liberation Mono,9,-1,5,50,0,0,0,0,0" eolfill="True">
+      <Description>Python identifier</Description>
+    </Style>
+    <Style style="105" substyle="-1" color="#808080" paper="#ffffff" font="Liberation Mono,9,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>Start of an ASP Python fragment</Description>
+    </Style>
+    <Style style="106" substyle="-1" color="#808080" paper="#cfefcf" font="Liberation Mono,9,-1,5,50,0,0,0,0,0" eolfill="True">
+      <Description>ASP Python default</Description>
+    </Style>
+    <Style style="107" substyle="-1" color="#007f00" paper="#cfefcf" font="Liberation Mono,9,-1,5,50,0,0,0,0,0" eolfill="True">
+      <Description>ASP Python comment</Description>
+    </Style>
+    <Style style="108" substyle="-1" color="#007f7f" paper="#cfefcf" font="Liberation Mono,9,-1,5,50,0,0,0,0,0" eolfill="True">
+      <Description>ASP Python number</Description>
+    </Style>
+    <Style style="109" substyle="-1" color="#7f007f" paper="#cfefcf" font="Liberation Mono,9,-1,5,50,0,0,0,0,0" eolfill="True">
+      <Description>ASP Python double-quoted string</Description>
+    </Style>
+    <Style style="110" substyle="-1" color="#7f007f" paper="#cfefcf" font="Liberation Mono,9,-1,5,50,0,0,0,0,0" eolfill="True">
+      <Description>ASP Python single-quoted string</Description>
+    </Style>
+    <Style style="111" substyle="-1" color="#00007f" paper="#cfefcf" font="Liberation Mono,9,-1,5,75,0,0,0,0,0" eolfill="True">
+      <Description>ASP Python keyword</Description>
+    </Style>
+    <Style style="112" substyle="-1" color="#7f0000" paper="#cfefcf" font="Liberation Mono,9,-1,5,50,0,0,0,0,0" eolfill="True">
+      <Description>ASP Python triple single-quoted string</Description>
+    </Style>
+    <Style style="113" substyle="-1" color="#7f0000" paper="#cfefcf" font="Liberation Mono,9,-1,5,50,0,0,0,0,0" eolfill="True">
+      <Description>ASP Python triple double-quoted string</Description>
+    </Style>
+    <Style style="114" substyle="-1" color="#0000ff" paper="#cfefcf" font="Liberation Mono,9,-1,5,75,0,0,0,0,0" eolfill="True">
+      <Description>ASP Python class name</Description>
+    </Style>
+    <Style style="115" substyle="-1" color="#007f7f" paper="#cfefcf" font="Liberation Mono,9,-1,5,75,0,0,0,0,0" eolfill="True">
+      <Description>ASP Python function or method name</Description>
+    </Style>
+    <Style style="116" substyle="-1" color="#000000" paper="#cfefcf" font="Liberation Mono,9,-1,5,75,0,0,0,0,0" eolfill="True">
+      <Description>ASP Python operator</Description>
+    </Style>
+    <Style style="117" substyle="-1" color="#000000" paper="#cfefcf" font="Liberation Mono,9,-1,5,50,0,0,0,0,0" eolfill="True">
+      <Description>ASP Python identifier</Description>
+    </Style>
+    <Style style="118" substyle="-1" color="#000033" paper="#fff8f8" font="Liberation Mono,9,-1,5,50,0,0,0,0,0" eolfill="True">
+      <Description>PHP default</Description>
+    </Style>
+    <Style style="119" substyle="-1" color="#007f00" paper="#fff8f8" font="Liberation Mono,9,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>PHP double-quoted string</Description>
+    </Style>
+    <Style style="120" substyle="-1" color="#009f00" paper="#fff8f8" font="Liberation Mono,9,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>PHP single-quoted string</Description>
+    </Style>
+    <Style style="121" substyle="-1" color="#7f007f" paper="#fff8f8" font="Liberation Mono,9,-1,5,50,1,0,0,0,0" eolfill="False">
+      <Description>PHP keyword</Description>
+    </Style>
+    <Style style="122" substyle="-1" color="#cc9900" paper="#fff8f8" font="Liberation Mono,9,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>PHP number</Description>
+    </Style>
+    <Style style="123" substyle="-1" color="#00007f" paper="#fff8f8" font="Liberation Mono,9,-1,5,50,1,0,0,0,0" eolfill="False">
+      <Description>PHP variable</Description>
+    </Style>
+    <Style style="124" substyle="-1" color="#999999" paper="#fff8f8" font="Liberation Mono,9,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>PHP comment</Description>
+    </Style>
+    <Style style="125" substyle="-1" color="#666666" paper="#fff8f8" font="Liberation Mono,9,-1,5,50,1,0,0,0,0" eolfill="False">
+      <Description>PHP line comment</Description>
+    </Style>
+    <Style style="126" substyle="-1" color="#00007f" paper="#fff8f8" font="Liberation Mono,9,-1,5,50,1,0,0,0,0" eolfill="False">
+      <Description>PHP double-quoted variable</Description>
+    </Style>
+    <Style style="127" substyle="-1" color="#000000" paper="#fff8f8" font="Liberation Mono,9,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>PHP operator</Description>
+    </Style>
+  </Lexer>
+</HighlightingStyles>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/eric6/Styles/eric6_Dark-JSON.e6h	Sat May 02 13:51:07 2020 +0200
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE HighlightingStyles SYSTEM "HighlightingStyles-6.0.dtd">
+<!-- Eric6 highlighting styles -->
+<!-- Saved: 2020-04-10, 15:13:14-->
+<!-- Author: Detlev Offenbach <detlev@die-offenbachs.de> -->
+<HighlightingStyles version="6.0">
+  <Lexer name="JSON">
+    <Style style="0" substyle="-1" color="#ffffff" paper="#262626" font="Hack,10,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>Default</Description>
+    </Style>
+    <Style style="1" substyle="-1" color="#00ffff" paper="#262626" font="Hack,10,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>Number</Description>
+    </Style>
+    <Style style="2" substyle="-1" color="#fd6262" paper="#262626" font="Hack,10,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>String</Description>
+    </Style>
+    <Style style="3" substyle="-1" color="#ffffff" paper="#ff0000" font="Hack,10,-1,5,50,0,0,0,0,0" eolfill="True">
+      <Description>Unclosed string</Description>
+    </Style>
+    <Style style="4" substyle="-1" color="#c387ff" paper="#262626" font="Hack,10,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>Property</Description>
+    </Style>
+    <Style style="5" substyle="-1" color="#12ff49" paper="#262626" font="Hack,10,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>Escape sequence</Description>
+    </Style>
+    <Style style="6" substyle="-1" color="#38fff9" paper="#262626" font="Hack,10,-1,5,50,1,0,0,0,0" eolfill="False">
+      <Description>Line comment</Description>
+    </Style>
+    <Style style="7" substyle="-1" color="#38fff9" paper="#262626" font="Hack,10,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>Block comment</Description>
+    </Style>
+    <Style style="8" substyle="-1" color="#3dfebb" paper="#262626" font="Hack,10,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>Operator</Description>
+    </Style>
+    <Style style="9" substyle="-1" color="#ffaa7f" paper="#262626" font="Hack,10,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>IRI</Description>
+    </Style>
+    <Style style="10" substyle="-1" color="#ff57f1" paper="#262626" font="Hack,10,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>JSON-LD compact IRI</Description>
+    </Style>
+    <Style style="11" substyle="-1" color="#0dffcf" paper="#262626" font="Hack,10,-1,5,75,0,0,0,0,0" eolfill="False">
+      <Description>JSON keyword</Description>
+    </Style>
+    <Style style="12" substyle="-1" color="#ff7369" paper="#262626" font="Hack,10,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>JSON-LD keyword</Description>
+    </Style>
+    <Style style="13" substyle="-1" color="#ffffff" paper="#ff0000" font="Hack,10,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>Parsing error</Description>
+    </Style>
+  </Lexer>
+</HighlightingStyles>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/eric6/Styles/eric6_Dark-Markdown.e6h	Sat May 02 13:51:07 2020 +0200
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE HighlightingStyles SYSTEM "HighlightingStyles-6.0.dtd">
+<!-- Eric6 highlighting styles -->
+<!-- Saved: 2020-04-05, 18:46:43-->
+<!-- Author: Detlev Offenbach <detlev@die-offenbachs.de> -->
+<HighlightingStyles version="6.0">
+  <Lexer name="Markdown">
+    <Style style="0" substyle="-1" color="#ffffff" paper="#262626" font="Hack,10,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>Default</Description>
+    </Style>
+    <Style style="1" substyle="-1" color="#ea95ff" paper="#262626" font="Hack,10,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>Special</Description>
+    </Style>
+    <Style style="2" substyle="-1" color="#4c99e5" paper="#262626" font="Hack,10,-1,5,75,0,0,0,0,0" eolfill="False">
+      <Description>Strong emphasis using double asterisks</Description>
+    </Style>
+    <Style style="3" substyle="-1" color="#4c99e5" paper="#262626" font="Hack,10,-1,5,75,0,0,0,0,0" eolfill="False">
+      <Description>Strong emphasis using double underscores</Description>
+    </Style>
+    <Style style="4" substyle="-1" color="#ed81f0" paper="#262626" font="Hack,10,-1,5,50,1,0,0,0,0" eolfill="False">
+      <Description>Emphasis using single asterisks</Description>
+    </Style>
+    <Style style="5" substyle="-1" color="#ed81f0" paper="#262626" font="Hack,10,-1,5,50,1,0,0,0,0" eolfill="False">
+      <Description>Emphasis using single underscores</Description>
+    </Style>
+    <Style style="6" substyle="-1" color="#ffcc55" paper="#262626" font="Hack,10,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>Level 1 header</Description>
+    </Style>
+    <Style style="7" substyle="-1" color="#ddbb55" paper="#262626" font="Hack,10,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>Level 2 header</Description>
+    </Style>
+    <Style style="8" substyle="-1" color="#bb9955" paper="#262626" font="Hack,10,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>Level 3 header</Description>
+    </Style>
+    <Style style="9" substyle="-1" color="#998855" paper="#262626" font="Hack,10,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>Level 4 header</Description>
+    </Style>
+    <Style style="10" substyle="-1" color="#777055" paper="#262626" font="Hack,10,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>Level 5 header</Description>
+    </Style>
+    <Style style="11" substyle="-1" color="#666055" paper="#262626" font="Hack,10,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>Level 6 header</Description>
+    </Style>
+    <Style style="12" substyle="-1" color="#000000" paper="#eeeeaa" font="Hack,10,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>Pre-char</Description>
+    </Style>
+    <Style style="13" substyle="-1" color="#825d00" paper="#ded8c3" font="Hack,10,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>Unordered list item</Description>
+    </Style>
+    <Style style="14" substyle="-1" color="#000070" paper="#b8c3e1" font="Hack,10,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>Ordered list item</Description>
+    </Style>
+    <Style style="15" substyle="-1" color="#006600" paper="#cbdccb" font="Hack,10,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>Block quote</Description>
+    </Style>
+    <Style style="16" substyle="-1" color="#dddd00" paper="#aa0000" font="Hack,10,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>Strike out</Description>
+    </Style>
+    <Style style="17" substyle="-1" color="#1f1c1b" paper="#e7d1c9" font="Hack,10,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>Horizontal rule</Description>
+    </Style>
+    <Style style="18" substyle="-1" color="#8287eb" paper="#474747" font="Hack,10,-1,5,50,0,1,0,0,0" eolfill="False">
+      <Description>Link</Description>
+    </Style>
+    <Style style="19" substyle="-1" color="#ffd5ff" paper="#707870" font="Hack,10,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>Code between backticks</Description>
+    </Style>
+    <Style style="20" substyle="-1" color="#ffd5ff" paper="#707870" font="Hack,10,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>Code between double backticks</Description>
+    </Style>
+    <Style style="21" substyle="-1" color="#93cdff" paper="#56626b" font="Hack,10,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>Code block</Description>
+    </Style>
+  </Lexer>
+</HighlightingStyles>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/eric6/Styles/eric6_Dark-Povray.e6h	Sat May 02 13:51:07 2020 +0200
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE HighlightingStyles SYSTEM "HighlightingStyles-6.0.dtd">
+<!-- Eric6 highlighting styles -->
+<!-- Saved: 2020-04-08, 18:14:45-->
+<!-- Author: Detlev Offenbach <detlev@die-offenbachs.de> -->
+<HighlightingStyles version="6.0">
+  <Lexer name="POV">
+    <Style style="0" substyle="-1" color="#ff0080" paper="#2e3436" font="Bitstream Vera Sans,9,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>Default</Description>
+    </Style>
+    <Style style="1" substyle="-1" color="#91fe8f" paper="#2e3436" font="Bitstream Vera Serif,9,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>Comment</Description>
+    </Style>
+    <Style style="2" substyle="-1" color="#91fe8f" paper="#2e3436" font="Bitstream Vera Serif,9,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>Comment line</Description>
+    </Style>
+    <Style style="3" substyle="-1" color="#6beeee" paper="#2e3436" font="Bitstream Vera Sans,9,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>Number</Description>
+    </Style>
+    <Style style="4" substyle="-1" color="#ffffff" paper="#2e3436" font="Bitstream Vera Sans,9,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>Operator</Description>
+    </Style>
+    <Style style="5" substyle="-1" color="#ffffff" paper="#2e3436" font="Bitstream Vera Sans,9,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>Identifier</Description>
+    </Style>
+    <Style style="6" substyle="-1" color="#e274e5" paper="#2e3436" font="Bitstream Vera Sans,9,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>String</Description>
+    </Style>
+    <Style style="7" substyle="-1" color="#000000" paper="#e0c0e0" font="Bitstream Vera Sans,9,-1,5,75,0,0,0,0,0" eolfill="True">
+      <Description>Unclosed string</Description>
+    </Style>
+    <Style style="8" substyle="-1" color="#fefe00" paper="#2e3436" font="Bitstream Vera Sans,9,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>Directive</Description>
+    </Style>
+    <Style style="9" substyle="-1" color="#ff8040" paper="#2e3436" font="Bitstream Vera Serif,9,-1,5,50,1,0,0,0,0" eolfill="False">
+      <Description>Bad directive</Description>
+    </Style>
+    <Style style="10" substyle="-1" color="#00007f" paper="#ffd0d0" font="Bitstream Vera Sans,9,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>Objects, CSG and appearance</Description>
+    </Style>
+    <Style style="11" substyle="-1" color="#00007f" paper="#ffffd0" font="Bitstream Vera Sans,9,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>Types, modifiers and items</Description>
+    </Style>
+    <Style style="12" substyle="-1" color="#00007f" paper="#ffffff" font="Bitstream Vera Sans,9,-1,5,75,0,0,0,0,0" eolfill="False">
+      <Description>Predefined identifiers</Description>
+    </Style>
+    <Style style="13" substyle="-1" color="#00007f" paper="#d0d0ff" font="Bitstream Vera Sans,9,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>Predefined functions</Description>
+    </Style>
+    <Style style="14" substyle="-1" color="#00007f" paper="#d0ffd0" font="Bitstream Vera Sans,9,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>User defined 1</Description>
+    </Style>
+    <Style style="15" substyle="-1" color="#00007f" paper="#d0d0d0" font="Bitstream Vera Sans,9,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>User defined 2</Description>
+    </Style>
+    <Style style="16" substyle="-1" color="#00007f" paper="#e0e0e0" font="Bitstream Vera Sans,9,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>User defined 3</Description>
+    </Style>
+  </Lexer>
+</HighlightingStyles>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/eric6/Styles/eric6_Dark-Properties.e6h	Sat May 02 13:51:07 2020 +0200
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE HighlightingStyles SYSTEM "HighlightingStyles-6.0.dtd">
+<!-- Eric6 highlighting styles -->
+<!-- Saved: 2020-04-05, 18:47:06-->
+<!-- Author: Detlev Offenbach <detlev@die-offenbachs.de> -->
+<HighlightingStyles version="6.0">
+  <Lexer name="Properties">
+    <Style style="0" substyle="-1" color="#ffffff" paper="#262626" font="Droid Sans Mono,9,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>Default</Description>
+    </Style>
+    <Style style="1" substyle="-1" color="#74cc66" paper="#262626" font="Droid Sans Mono,9,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>Comment</Description>
+    </Style>
+    <Style style="2" substyle="-1" color="#ec8aef" paper="#393d3d" font="Droid Sans Mono,9,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>Section</Description>
+    </Style>
+    <Style style="3" substyle="-1" color="#e38c00" paper="#262626" font="Droid Sans Mono,9,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>Assignment</Description>
+    </Style>
+    <Style style="4" substyle="-1" color="#d5d66c" paper="#262626" font="Droid Sans Mono,9,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>Default value</Description>
+    </Style>
+    <Style style="5" substyle="-1" color="#141312" paper="#262626" font="Droid Sans Mono,9,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>Key</Description>
+    </Style>
+  </Lexer>
+</HighlightingStyles>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/eric6/Styles/eric6_Dark-QSS.e6h	Sat May 02 13:51:07 2020 +0200
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE HighlightingStyles SYSTEM "HighlightingStyles-6.0.dtd">
+<!-- Eric6 highlighting styles -->
+<!-- Saved: 2020-04-11, 12:29:21-->
+<!-- Author: Detlev Offenbach <detlev@die-offenbachs.de> -->
+<HighlightingStyles version="6.0">
+  <Lexer name="QSS">
+    <Style style="0" substyle="-1" color="#ff7bc2" paper="#262626" font="Hack,9,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>Default</Description>
+    </Style>
+    <Style style="1" substyle="-1" color="#75ff98" paper="#262626" font="Hack,9,-1,5,75,0,0,0,0,0,Bold" eolfill="False">
+      <Description>Tag</Description>
+    </Style>
+    <Style style="2" substyle="-1" color="#ffffff" paper="#262626" font="Hack,9,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>Class selector</Description>
+    </Style>
+    <Style style="3" substyle="-1" color="#cc6363" paper="#262626" font="Hack,9,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>Pseudo-class</Description>
+    </Style>
+    <Style style="4" substyle="-1" color="#ffb45d" paper="#262626" font="Hack,9,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>Unknown pseudo-class</Description>
+    </Style>
+    <Style style="5" substyle="-1" color="#ffffff" paper="#262626" font="Hack,9,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>Operator</Description>
+    </Style>
+    <Style style="6" substyle="-1" color="#81a9ff" paper="#262626" font="Hack,9,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>CSS1 property</Description>
+    </Style>
+    <Style style="7" substyle="-1" color="#ff0000" paper="#262626" font="Hack,9,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>Unknown property</Description>
+    </Style>
+    <Style style="8" substyle="-1" color="#ff92bc" paper="#262626" font="Hack,9,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>Value</Description>
+    </Style>
+    <Style style="9" substyle="-1" color="#00b400" paper="#262626" font="Hack,9,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>Comment</Description>
+    </Style>
+    <Style style="10" substyle="-1" color="#00dada" paper="#262626" font="Hack,9,-1,5,50,1,0,0,0,0" eolfill="False">
+      <Description>ID selector</Description>
+    </Style>
+    <Style style="11" substyle="-1" color="#ff8000" paper="#262626" font="Hack,9,-1,5,75,0,0,0,0,0" eolfill="False">
+      <Description>Important</Description>
+    </Style>
+    <Style style="12" substyle="-1" color="#aaaa00" paper="#262626" font="Hack,9,-1,5,75,0,0,0,0,0" eolfill="False">
+      <Description>@-rule</Description>
+    </Style>
+    <Style style="13" substyle="-1" color="#ff00ff" paper="#262626" font="Hack,9,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>Double-quoted string</Description>
+    </Style>
+    <Style style="14" substyle="-1" color="#ff00ff" paper="#262626" font="Hack,9,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>Single-quoted string</Description>
+    </Style>
+    <Style style="15" substyle="-1" color="#00b7ff" paper="#262626" font="Hack,9,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>CSS2 property</Description>
+    </Style>
+    <Style style="16" substyle="-1" color="#ff7575" paper="#262626" font="Hack,9,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>Attribute</Description>
+    </Style>
+    <Style style="17" substyle="-1" color="#c8ffb3" paper="#262626" font="Hack,9,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>CSS3 property</Description>
+    </Style>
+    <Style style="18" substyle="-1" color="#ddd2c8" paper="#262626" font="Hack,9,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>Pseudo-element</Description>
+    </Style>
+    <Style style="19" substyle="-1" color="#ddd2c8" paper="#262626" font="Hack,9,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>Extended CSS property</Description>
+    </Style>
+    <Style style="20" substyle="-1" color="#ddd2c8" paper="#262626" font="Hack,9,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>Extended pseudo-class</Description>
+    </Style>
+    <Style style="21" substyle="-1" color="#ddd2c8" paper="#262626" font="Hack,9,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>Extended pseudo-element</Description>
+    </Style>
+    <Style style="22" substyle="-1" color="#c7c700" paper="#262626" font="Hack,9,-1,5,75,0,0,0,0,0" eolfill="False">
+      <Description>Media rule</Description>
+    </Style>
+    <Style style="23" substyle="-1" color="#ddd2c8" paper="#262626" font="Hack,9,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>Variable</Description>
+    </Style>
+  </Lexer>
+</HighlightingStyles>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/eric6/Styles/eric6_Dark-XML.e6h	Sat May 02 13:51:07 2020 +0200
@@ -0,0 +1,336 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE HighlightingStyles SYSTEM "HighlightingStyles-6.0.dtd">
+<!-- Eric6 highlighting styles -->
+<!-- Saved: 2020-04-08, 18:25:39-->
+<!-- Author: Detlev Offenbach <detlev@die-offenbachs.de> -->
+<HighlightingStyles version="6.0">
+  <Lexer name="XML">
+    <Style style="0" substyle="-1" color="#ffffff" paper="#262626" font="DejaVu Sans Mono,10,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>HTML default</Description>
+    </Style>
+    <Style style="1" substyle="-1" color="#989dff" paper="#262626" font="DejaVu Sans Mono,10,-1,5,75,0,0,0,0,0" eolfill="False">
+      <Description>Tag</Description>
+    </Style>
+    <Style style="2" substyle="-1" color="#000080" paper="#262626" font="DejaVu Sans Mono,10,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>Unknown tag</Description>
+    </Style>
+    <Style style="3" substyle="-1" color="#00eeee" paper="#262626" font="DejaVu Sans Mono,10,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>Attribute</Description>
+    </Style>
+    <Style style="4" substyle="-1" color="#ff6a6c" paper="#262626" font="DejaVu Sans Mono,10,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>Unknown attribute</Description>
+    </Style>
+    <Style style="5" substyle="-1" color="#00e2e2" paper="#262626" font="DejaVu Sans Mono,10,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>HTML number</Description>
+    </Style>
+    <Style style="6" substyle="-1" color="#ff00ff" paper="#262626" font="DejaVu Sans Mono,10,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>HTML double-quoted string</Description>
+    </Style>
+    <Style style="7" substyle="-1" color="#ff00ff" paper="#262626" font="DejaVu Sans Mono,10,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>HTML single-quoted string</Description>
+    </Style>
+    <Style style="8" substyle="-1" color="#ff00ff" paper="#262626" font="DejaVu Sans Mono,10,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>Other text in a tag</Description>
+    </Style>
+    <Style style="9" substyle="-1" color="#ffff00" paper="#262626" font="DejaVu Sans Mono,10,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>HTML comment</Description>
+    </Style>
+    <Style style="10" substyle="-1" color="#ff00ff" paper="#262626" font="DejaVu Sans Mono,10,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>Entity</Description>
+    </Style>
+    <Style style="11" substyle="-1" color="#00d5ff" paper="#262626" font="DejaVu Sans Mono,10,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>End of a tag</Description>
+    </Style>
+    <Style style="12" substyle="-1" color="#73b2ff" paper="#262626" font="DejaVu Sans Mono,10,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>Start of an XML fragment</Description>
+    </Style>
+    <Style style="13" substyle="-1" color="#73b2ff" paper="#262626" font="DejaVu Sans Mono,10,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>End of an XML fragment</Description>
+    </Style>
+    <Style style="14" substyle="-1" color="#8fe5ff" paper="#262626" font="DejaVu Sans Mono,10,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>Script tag</Description>
+    </Style>
+    <Style style="15" substyle="-1" color="#eed6b9" paper="#262626" font="DejaVu Sans Mono,10,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>Start of an ASP fragment with @</Description>
+    </Style>
+    <Style style="16" substyle="-1" color="#eed6b9" paper="#262626" font="DejaVu Sans Mono,10,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>Start of an ASP fragment</Description>
+    </Style>
+    <Style style="17" substyle="-1" color="#000000" paper="#ffdf00" font="DejaVu Sans Mono,10,-1,5,50,0,0,0,0,0" eolfill="True">
+      <Description>CDATA</Description>
+    </Style>
+    <Style style="18" substyle="-1" color="#800000" paper="#ffffff" font="DejaVu Sans Mono,10,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>Start of a PHP fragment</Description>
+    </Style>
+    <Style style="19" substyle="-1" color="#608060" paper="#ffffff" font="DejaVu Sans Mono,10,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>Unquoted HTML value</Description>
+    </Style>
+    <Style style="20" substyle="-1" color="#eed6b9" paper="#262626" font="DejaVu Sans Mono,10,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>ASP X-Code comment</Description>
+    </Style>
+    <Style style="21" substyle="-1" color="#000080" paper="#efefff" font="DejaVu Sans Mono,10,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>SGML default</Description>
+    </Style>
+    <Style style="22" substyle="-1" color="#000080" paper="#efefff" font="DejaVu Sans Mono,10,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>SGML command</Description>
+    </Style>
+    <Style style="23" substyle="-1" color="#006600" paper="#efefff" font="DejaVu Sans Mono,10,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>First parameter of an SGML command</Description>
+    </Style>
+    <Style style="24" substyle="-1" color="#800000" paper="#efefff" font="DejaVu Sans Mono,10,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>SGML double-quoted string</Description>
+    </Style>
+    <Style style="25" substyle="-1" color="#993300" paper="#efefff" font="DejaVu Sans Mono,10,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>SGML single-quoted string</Description>
+    </Style>
+    <Style style="26" substyle="-1" color="#800000" paper="#ff6666" font="DejaVu Sans Mono,10,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>SGML error</Description>
+    </Style>
+    <Style style="27" substyle="-1" color="#3366ff" paper="#efefff" font="DejaVu Sans Mono,10,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>SGML special entity</Description>
+    </Style>
+    <Style style="29" substyle="-1" color="#808000" paper="#efefff" font="DejaVu Sans Mono,10,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>SGML comment</Description>
+    </Style>
+    <Style style="30" substyle="-1" color="#eed6b9" paper="#262626" font="DejaVu Sans Mono,10,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>First parameter comment of an SGML command</Description>
+    </Style>
+    <Style style="31" substyle="-1" color="#000066" paper="#cccce0" font="DejaVu Sans Mono,10,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>SGML block default</Description>
+    </Style>
+    <Style style="40" substyle="-1" color="#eed6b9" paper="#262626" font="DejaVu Sans Mono,10,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>Start of a JavaScript fragment</Description>
+    </Style>
+    <Style style="41" substyle="-1" color="#eed6b9" paper="#262626" font="DejaVu Sans Mono,10,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>JavaScript default</Description>
+    </Style>
+    <Style style="42" substyle="-1" color="#eed6b9" paper="#262626" font="DejaVu Sans Mono,10,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>JavaScript comment</Description>
+    </Style>
+    <Style style="43" substyle="-1" color="#eed6b9" paper="#262626" font="DejaVu Sans Mono,10,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>JavaScript line comment</Description>
+    </Style>
+    <Style style="44" substyle="-1" color="#eed6b9" paper="#262626" font="DejaVu Sans Mono,10,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>JavaDoc style JavaScript comment</Description>
+    </Style>
+    <Style style="45" substyle="-1" color="#eed6b9" paper="#262626" font="DejaVu Sans Mono,10,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>JavaScript number</Description>
+    </Style>
+    <Style style="46" substyle="-1" color="#eed6b9" paper="#262626" font="DejaVu Sans Mono,10,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>JavaScript word</Description>
+    </Style>
+    <Style style="47" substyle="-1" color="#eed6b9" paper="#262626" font="DejaVu Sans Mono,10,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>JavaScript keyword</Description>
+    </Style>
+    <Style style="48" substyle="-1" color="#eed6b9" paper="#262626" font="DejaVu Sans Mono,10,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>JavaScript double-quoted string</Description>
+    </Style>
+    <Style style="49" substyle="-1" color="#eed6b9" paper="#262626" font="DejaVu Sans Mono,10,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>JavaScript single-quoted string</Description>
+    </Style>
+    <Style style="50" substyle="-1" color="#eed6b9" paper="#262626" font="DejaVu Sans Mono,10,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>JavaScript symbol</Description>
+    </Style>
+    <Style style="51" substyle="-1" color="#eed6b9" paper="#262626" font="DejaVu Sans Mono,10,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>JavaScript unclosed string</Description>
+    </Style>
+    <Style style="52" substyle="-1" color="#eed6b9" paper="#262626" font="DejaVu Sans Mono,10,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>JavaScript regular expression</Description>
+    </Style>
+    <Style style="55" substyle="-1" color="#eed6b9" paper="#262626" font="DejaVu Sans Mono,10,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>Start of an ASP JavaScript fragment</Description>
+    </Style>
+    <Style style="56" substyle="-1" color="#eed6b9" paper="#262626" font="DejaVu Sans Mono,10,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>ASP JavaScript default</Description>
+    </Style>
+    <Style style="57" substyle="-1" color="#eed6b9" paper="#262626" font="DejaVu Sans Mono,10,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>ASP JavaScript comment</Description>
+    </Style>
+    <Style style="58" substyle="-1" color="#eed6b9" paper="#262626" font="DejaVu Sans Mono,10,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>ASP JavaScript line comment</Description>
+    </Style>
+    <Style style="59" substyle="-1" color="#eed6b9" paper="#262626" font="DejaVu Sans Mono,10,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>JavaDoc style ASP JavaScript comment</Description>
+    </Style>
+    <Style style="60" substyle="-1" color="#eed6b9" paper="#262626" font="DejaVu Sans Mono,10,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>ASP JavaScript number</Description>
+    </Style>
+    <Style style="61" substyle="-1" color="#eed6b9" paper="#262626" font="DejaVu Sans Mono,10,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>ASP JavaScript word</Description>
+    </Style>
+    <Style style="62" substyle="-1" color="#eed6b9" paper="#262626" font="DejaVu Sans Mono,10,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>ASP JavaScript keyword</Description>
+    </Style>
+    <Style style="63" substyle="-1" color="#eed6b9" paper="#262626" font="DejaVu Sans Mono,10,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>ASP JavaScript double-quoted string</Description>
+    </Style>
+    <Style style="64" substyle="-1" color="#eed6b9" paper="#262626" font="DejaVu Sans Mono,10,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>ASP JavaScript single-quoted string</Description>
+    </Style>
+    <Style style="65" substyle="-1" color="#eed6b9" paper="#262626" font="DejaVu Sans Mono,10,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>ASP JavaScript symbol</Description>
+    </Style>
+    <Style style="66" substyle="-1" color="#eed6b9" paper="#262626" font="DejaVu Sans Mono,10,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>ASP JavaScript unclosed string</Description>
+    </Style>
+    <Style style="67" substyle="-1" color="#eed6b9" paper="#262626" font="DejaVu Sans Mono,10,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>ASP JavaScript regular expression</Description>
+    </Style>
+    <Style style="70" substyle="-1" color="#eed6b9" paper="#262626" font="DejaVu Sans Mono,10,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>Start of a VBScript fragment</Description>
+    </Style>
+    <Style style="71" substyle="-1" color="#eed6b9" paper="#262626" font="DejaVu Sans Mono,10,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>VBScript default</Description>
+    </Style>
+    <Style style="72" substyle="-1" color="#eed6b9" paper="#262626" font="DejaVu Sans Mono,10,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>VBScript comment</Description>
+    </Style>
+    <Style style="73" substyle="-1" color="#eed6b9" paper="#262626" font="DejaVu Sans Mono,10,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>VBScript number</Description>
+    </Style>
+    <Style style="74" substyle="-1" color="#eed6b9" paper="#262626" font="DejaVu Sans Mono,10,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>VBScript keyword</Description>
+    </Style>
+    <Style style="75" substyle="-1" color="#eed6b9" paper="#262626" font="DejaVu Sans Mono,10,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>VBScript string</Description>
+    </Style>
+    <Style style="76" substyle="-1" color="#eed6b9" paper="#262626" font="DejaVu Sans Mono,10,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>VBScript identifier</Description>
+    </Style>
+    <Style style="77" substyle="-1" color="#eed6b9" paper="#262626" font="DejaVu Sans Mono,10,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>VBScript unclosed string</Description>
+    </Style>
+    <Style style="80" substyle="-1" color="#eed6b9" paper="#262626" font="DejaVu Sans Mono,10,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>Start of an ASP VBScript fragment</Description>
+    </Style>
+    <Style style="81" substyle="-1" color="#eed6b9" paper="#262626" font="DejaVu Sans Mono,10,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>ASP VBScript default</Description>
+    </Style>
+    <Style style="82" substyle="-1" color="#eed6b9" paper="#262626" font="DejaVu Sans Mono,10,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>ASP VBScript comment</Description>
+    </Style>
+    <Style style="83" substyle="-1" color="#eed6b9" paper="#262626" font="DejaVu Sans Mono,10,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>ASP VBScript number</Description>
+    </Style>
+    <Style style="84" substyle="-1" color="#eed6b9" paper="#262626" font="DejaVu Sans Mono,10,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>ASP VBScript keyword</Description>
+    </Style>
+    <Style style="85" substyle="-1" color="#eed6b9" paper="#262626" font="DejaVu Sans Mono,10,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>ASP VBScript string</Description>
+    </Style>
+    <Style style="86" substyle="-1" color="#eed6b9" paper="#262626" font="DejaVu Sans Mono,10,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>ASP VBScript identifier</Description>
+    </Style>
+    <Style style="87" substyle="-1" color="#eed6b9" paper="#262626" font="DejaVu Sans Mono,10,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>ASP VBScript unclosed string</Description>
+    </Style>
+    <Style style="90" substyle="-1" color="#eed6b9" paper="#262626" font="DejaVu Sans Mono,10,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>Start of a Python fragment</Description>
+    </Style>
+    <Style style="91" substyle="-1" color="#eed6b9" paper="#262626" font="DejaVu Sans Mono,10,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>Python default</Description>
+    </Style>
+    <Style style="92" substyle="-1" color="#eed6b9" paper="#262626" font="DejaVu Sans Mono,10,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>Python comment</Description>
+    </Style>
+    <Style style="93" substyle="-1" color="#eed6b9" paper="#262626" font="DejaVu Sans Mono,10,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>Python number</Description>
+    </Style>
+    <Style style="94" substyle="-1" color="#eed6b9" paper="#262626" font="DejaVu Sans Mono,10,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>Python double-quoted string</Description>
+    </Style>
+    <Style style="95" substyle="-1" color="#eed6b9" paper="#262626" font="DejaVu Sans Mono,10,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>Python single-quoted string</Description>
+    </Style>
+    <Style style="96" substyle="-1" color="#eed6b9" paper="#262626" font="DejaVu Sans Mono,10,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>Python keyword</Description>
+    </Style>
+    <Style style="97" substyle="-1" color="#eed6b9" paper="#262626" font="DejaVu Sans Mono,10,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>Python triple single-quoted string</Description>
+    </Style>
+    <Style style="98" substyle="-1" color="#eed6b9" paper="#262626" font="DejaVu Sans Mono,10,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>Python triple double-quoted string</Description>
+    </Style>
+    <Style style="99" substyle="-1" color="#eed6b9" paper="#262626" font="DejaVu Sans Mono,10,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>Python class name</Description>
+    </Style>
+    <Style style="100" substyle="-1" color="#eed6b9" paper="#262626" font="DejaVu Sans Mono,10,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>Python function or method name</Description>
+    </Style>
+    <Style style="101" substyle="-1" color="#eed6b9" paper="#262626" font="DejaVu Sans Mono,10,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>Python operator</Description>
+    </Style>
+    <Style style="102" substyle="-1" color="#eed6b9" paper="#262626" font="DejaVu Sans Mono,10,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>Python identifier</Description>
+    </Style>
+    <Style style="105" substyle="-1" color="#eed6b9" paper="#262626" font="DejaVu Sans Mono,10,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>Start of an ASP Python fragment</Description>
+    </Style>
+    <Style style="106" substyle="-1" color="#eed6b9" paper="#262626" font="DejaVu Sans Mono,10,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>ASP Python default</Description>
+    </Style>
+    <Style style="107" substyle="-1" color="#eed6b9" paper="#262626" font="DejaVu Sans Mono,10,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>ASP Python comment</Description>
+    </Style>
+    <Style style="108" substyle="-1" color="#eed6b9" paper="#262626" font="DejaVu Sans Mono,10,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>ASP Python number</Description>
+    </Style>
+    <Style style="109" substyle="-1" color="#eed6b9" paper="#262626" font="DejaVu Sans Mono,10,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>ASP Python double-quoted string</Description>
+    </Style>
+    <Style style="110" substyle="-1" color="#eed6b9" paper="#262626" font="DejaVu Sans Mono,10,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>ASP Python single-quoted string</Description>
+    </Style>
+    <Style style="111" substyle="-1" color="#eed6b9" paper="#262626" font="DejaVu Sans Mono,10,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>ASP Python keyword</Description>
+    </Style>
+    <Style style="112" substyle="-1" color="#eed6b9" paper="#262626" font="DejaVu Sans Mono,10,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>ASP Python triple single-quoted string</Description>
+    </Style>
+    <Style style="113" substyle="-1" color="#eed6b9" paper="#262626" font="DejaVu Sans Mono,10,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>ASP Python triple double-quoted string</Description>
+    </Style>
+    <Style style="114" substyle="-1" color="#eed6b9" paper="#262626" font="DejaVu Sans Mono,10,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>ASP Python class name</Description>
+    </Style>
+    <Style style="115" substyle="-1" color="#eed6b9" paper="#262626" font="DejaVu Sans Mono,10,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>ASP Python function or method name</Description>
+    </Style>
+    <Style style="116" substyle="-1" color="#eed6b9" paper="#262626" font="DejaVu Sans Mono,10,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>ASP Python operator</Description>
+    </Style>
+    <Style style="117" substyle="-1" color="#eed6b9" paper="#262626" font="DejaVu Sans Mono,10,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>ASP Python identifier</Description>
+    </Style>
+    <Style style="118" substyle="-1" color="#eed6b9" paper="#262626" font="DejaVu Sans Mono,10,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>PHP default</Description>
+    </Style>
+    <Style style="119" substyle="-1" color="#eed6b9" paper="#262626" font="DejaVu Sans Mono,10,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>PHP double-quoted string</Description>
+    </Style>
+    <Style style="120" substyle="-1" color="#eed6b9" paper="#262626" font="DejaVu Sans Mono,10,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>PHP single-quoted string</Description>
+    </Style>
+    <Style style="121" substyle="-1" color="#eed6b9" paper="#262626" font="DejaVu Sans Mono,10,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>PHP keyword</Description>
+    </Style>
+    <Style style="122" substyle="-1" color="#eed6b9" paper="#262626" font="DejaVu Sans Mono,10,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>PHP number</Description>
+    </Style>
+    <Style style="123" substyle="-1" color="#eed6b9" paper="#262626" font="DejaVu Sans Mono,10,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>PHP variable</Description>
+    </Style>
+    <Style style="124" substyle="-1" color="#eed6b9" paper="#262626" font="DejaVu Sans Mono,10,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>PHP comment</Description>
+    </Style>
+    <Style style="125" substyle="-1" color="#eed6b9" paper="#262626" font="DejaVu Sans Mono,10,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>PHP line comment</Description>
+    </Style>
+    <Style style="126" substyle="-1" color="#eed6b9" paper="#262626" font="DejaVu Sans Mono,10,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>PHP double-quoted variable</Description>
+    </Style>
+    <Style style="127" substyle="-1" color="#eed6b9" paper="#262626" font="DejaVu Sans Mono,10,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>PHP operator</Description>
+    </Style>
+  </Lexer>
+</HighlightingStyles>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/eric6/Styles/eric6_Dark-YAML.e6h	Sat May 02 13:51:07 2020 +0200
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE HighlightingStyles SYSTEM "HighlightingStyles-6.0.dtd">
+<!-- Eric6 highlighting styles -->
+<!-- Saved: 2020-04-17, 19:29:41-->
+<!-- Author: Detlev Offenbach <detlev@die-offenbachs.de> -->
+<HighlightingStyles version="6.0">
+  <Lexer name="YAML">
+    <Style style="0" substyle="-1" color="#ffffff" paper="#262626" font="Hack,10,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>Default</Description>
+    </Style>
+    <Style style="1" substyle="-1" color="#74cc66" paper="#262626" font="Hack,10,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>Comment</Description>
+    </Style>
+    <Style style="2" substyle="-1" color="#00aaff" paper="#262626" font="Hack,10,-1,5,75,0,0,0,0,0" eolfill="False">
+      <Description>Identifier</Description>
+    </Style>
+    <Style style="3" substyle="-1" color="#c354c3" paper="#262626" font="Hack,10,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>Keyword</Description>
+    </Style>
+    <Style style="4" substyle="-1" color="#dc5a5a" paper="#262626" font="Hack,10,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>Number</Description>
+    </Style>
+    <Style style="5" substyle="-1" color="#00f4f4" paper="#262626" font="Hack,10,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>Reference</Description>
+    </Style>
+    <Style style="6" substyle="-1" color="#ffffff" paper="#000088" font="Hack,10,-1,5,75,0,0,0,0,0" eolfill="True">
+      <Description>Document delimiter</Description>
+    </Style>
+    <Style style="7" substyle="-1" color="#9d9fff" paper="#262626" font="Hack,10,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>Text block marker</Description>
+    </Style>
+    <Style style="8" substyle="-1" color="#ffffff" paper="#ff0000" font="Hack,10,-1,5,75,1,0,0,0,0" eolfill="True">
+      <Description>Syntax error marker</Description>
+    </Style>
+    <Style style="9" substyle="-1" color="#f4efc5" paper="#262626" font="Hack,10,-1,5,50,0,0,0,0,0" eolfill="False">
+      <Description>Operator</Description>
+    </Style>
+  </Lexer>
+</HighlightingStyles>
--- a/eric6/Tasks/Task.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/Tasks/Task.py	Sat May 02 13:51:07 2020 +0200
@@ -81,10 +81,10 @@
         self.setData(4, Qt.DisplayRole, self.lineno or "")
         
         if self.completed:
-            self.setIcon(0, UI.PixmapCache.getIcon("taskCompleted.png"))
+            self.setIcon(0, UI.PixmapCache.getIcon("taskCompleted"))
             strikeOut = True
         else:
-            self.setIcon(0, UI.PixmapCache.getIcon("empty.png"))
+            self.setIcon(0, UI.PixmapCache.getIcon("empty"))
             strikeOut = False
         for column in range(2, 5):
             f = self.font(column)
@@ -92,22 +92,22 @@
             self.setFont(column, f)
         
         if self.priority == 1:
-            self.setIcon(1, UI.PixmapCache.getIcon("empty.png"))
+            self.setIcon(1, UI.PixmapCache.getIcon("empty"))
         elif self.priority == 0:
-            self.setIcon(1, UI.PixmapCache.getIcon("taskPrioHigh.png"))
+            self.setIcon(1, UI.PixmapCache.getIcon("taskPrioHigh"))
         elif self.priority == 2:
-            self.setIcon(1, UI.PixmapCache.getIcon("taskPrioLow.png"))
+            self.setIcon(1, UI.PixmapCache.getIcon("taskPrioLow"))
         else:
-            self.setIcon(1, UI.PixmapCache.getIcon("empty.png"))
+            self.setIcon(1, UI.PixmapCache.getIcon("empty"))
         
         if self.taskType == Task.TypeFixme:
-            self.setIcon(2, UI.PixmapCache.getIcon("taskFixme.png"))
+            self.setIcon(2, UI.PixmapCache.getIcon("taskFixme"))
         elif self.taskType == Task.TypeWarning:
-            self.setIcon(2, UI.PixmapCache.getIcon("taskWarning.png"))
+            self.setIcon(2, UI.PixmapCache.getIcon("taskWarning"))
         elif self.taskType == Task.TypeTodo:
-            self.setIcon(2, UI.PixmapCache.getIcon("taskTodo.png"))
+            self.setIcon(2, UI.PixmapCache.getIcon("taskTodo"))
         else:
-            self.setIcon(2, UI.PixmapCache.getIcon("taskNote.png"))
+            self.setIcon(2, UI.PixmapCache.getIcon("taskNote"))
         
         self.colorizeTask()
         self.setTextAlignment(4, Qt.AlignRight)
@@ -167,13 +167,13 @@
             self.priority = 1
         
         if self.priority == 1:
-            self.setIcon(1, UI.PixmapCache.getIcon("empty.png"))
+            self.setIcon(1, UI.PixmapCache.getIcon("empty"))
         elif self.priority == 0:
-            self.setIcon(1, UI.PixmapCache.getIcon("taskPrioHigh.png"))
+            self.setIcon(1, UI.PixmapCache.getIcon("taskPrioHigh"))
         elif self.priority == 2:
-            self.setIcon(1, UI.PixmapCache.getIcon("taskPrioLow.png"))
+            self.setIcon(1, UI.PixmapCache.getIcon("taskPrioLow"))
         else:
-            self.setIcon(1, UI.PixmapCache.getIcon("empty.png"))
+            self.setIcon(1, UI.PixmapCache.getIcon("empty"))
     
     def setCompleted(self, completed):
         """
@@ -183,10 +183,10 @@
         """
         self.completed = completed
         if self.completed:
-            self.setIcon(0, UI.PixmapCache.getIcon("taskCompleted.png"))
+            self.setIcon(0, UI.PixmapCache.getIcon("taskCompleted"))
             strikeOut = True
         else:
-            self.setIcon(0, UI.PixmapCache.getIcon("empty.png"))
+            self.setIcon(0, UI.PixmapCache.getIcon("empty"))
             strikeOut = False
         for column in range(2, 5):
             f = self.font(column)
--- a/eric6/Tasks/TaskViewer.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/Tasks/TaskViewer.py	Sat May 02 13:51:07 2020 +0200
@@ -60,9 +60,9 @@
             ["", "", self.tr("Summary"), self.tr("Filename"),
              self.tr("Line"), ""])
         self.__headerItem.setIcon(
-            0, UI.PixmapCache.getIcon("taskCompleted.png"))
+            0, UI.PixmapCache.getIcon("taskCompleted"))
         self.__headerItem.setIcon(
-            1, UI.PixmapCache.getIcon("taskPriority.png"))
+            1, UI.PixmapCache.getIcon("taskPriority"))
         self.setHeaderItem(self.__headerItem)
         
         self.header().setSortIndicator(2, Qt.AscendingOrder)
@@ -168,7 +168,7 @@
         self.customContextMenuRequested.connect(self.__showContextMenu)
         self.itemActivated.connect(self.__taskItemActivated)
         
-        self.setWindowIcon(UI.PixmapCache.getIcon("eric.png"))
+        self.setWindowIcon(UI.PixmapCache.getIcon("eric"))
         
         self.__generateTopLevelItems()
     
--- a/eric6/Templates/TemplateViewer.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/Templates/TemplateViewer.py	Sat May 02 13:51:07 2020 +0200
@@ -437,7 +437,7 @@
         self.customContextMenuRequested.connect(self.__showContextMenu)
         self.itemActivated.connect(self.__templateItemActivated)
         
-        self.setWindowIcon(UI.PixmapCache.getIcon("eric.png"))
+        self.setWindowIcon(UI.PixmapCache.getIcon("eric"))
         
     def __resort(self):
         """
--- a/eric6/ThirdParty/Pygments/pygments/AUTHORS	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/ThirdParty/Pygments/pygments/AUTHORS	Sat May 02 13:51:07 2020 +0200
@@ -7,7 +7,8 @@
 
 * Sam Aaron -- Ioke lexer
 * Ali Afshar -- image formatter
-* Thomas Aglassinger -- Easytrieve, JCL, Rexx and Transact-SQL lexers
+* Thomas Aglassinger -- Easytrieve, JCL, Rexx, Transact-SQL and VBScript
+  lexers
 * Muthiah Annamalai -- Ezhil lexer
 * Kumar Appaiah -- Debian control lexer
 * Andreas Amann -- AppleScript lexer
@@ -31,8 +32,10 @@
 * Sébastien Bigaret -- QVT Operational lexer
 * Jarrett Billingsley -- MiniD lexer
 * Adam Blinkinsop -- Haskell, Redcode lexers
+* Stéphane Blondon -- SGF and Sieve lexers
 * Frits van Bommel -- assembler lexers
 * Pierre Bourdon -- bugfixes
+* Martijn Braam -- Kernel log lexer
 * Matthias Bussonnier -- ANSI style handling for terminal-256 formatter
 * chebee7i -- Python traceback lexer improvements
 * Hiram Chirino -- Scaml and Jade lexers
@@ -59,13 +62,16 @@
 * Carlos Galdino -- Elixir and Elixir Console lexers
 * Michael Galloy -- IDL lexer
 * Naveen Garg -- Autohotkey lexer
+* Simon Garnotel -- FreeFem++ lexer
 * Laurent Gautier -- R/S lexer
 * Alex Gaynor -- PyPy log lexer
 * Richard Gerkin -- Igor Pro lexer
 * Alain Gilbert -- TypeScript lexer
 * Alex Gilding -- BlitzBasic lexer
+* GitHub, Inc -- DASM16, Augeas, TOML, and Slash lexers
 * Bertrand Goetzmann -- Groovy lexer
 * Krzysiek Goj -- Scala lexer
+* Rostyslav Golda -- FloScript lexer
 * Andrey Golovizin -- BibTeX lexers
 * Matt Good -- Genshi, Cheetah lexers
 * Michał Górny -- vim modeline support
@@ -99,6 +105,7 @@
 * Dennis Kaarsemaker -- sources.list lexer
 * Dmitri Kabak -- Inferno Limbo lexer
 * Igor Kalnitsky -- vhdl lexer
+* Colin Kennedy - USD lexer
 * Alexander Kit -- MaskJS lexer
 * Pekka Klärck -- Robot Framework lexer
 * Gerwin Klein -- Isabelle lexer
@@ -130,6 +137,7 @@
 * Stephen McKamey -- Duel/JBST lexer
 * Brian McKenna -- F# lexer
 * Charles McLaughlin -- Puppet lexer
+* Kurt McKee -- Tera Term macro lexer
 * Lukas Meuser -- BBCode formatter, Lua lexer
 * Cat Miller -- Pig lexer
 * Paul Miller -- LiveScript lexer
@@ -158,6 +166,7 @@
 * Clément Prévost -- UrbiScript lexer
 * Tanner Prynn -- cmdline -x option and loading lexers from files
 * Oleh Prypin -- Crystal lexer (based on Ruby lexer)
+* Xidorn Quan -- Web IDL lexer
 * Elias Rabel -- Fortran fixed form lexer
 * raichoo -- Idris lexer
 * Kashif Rasul -- CUDA lexer
@@ -187,7 +196,7 @@
 * Alexander Smishlajev -- Visual FoxPro lexer
 * Steve Spigarelli -- XQuery lexer
 * Jerome St-Louis -- eC lexer
-* Camil Staps -- Clean and NuSMV lexers
+* Camil Staps -- Clean and NuSMV lexers; Solarized style
 * James Strachan -- Kotlin lexer
 * Tom Stuart -- Treetop lexer
 * Colin Sullivan -- SuperCollider lexer
--- a/eric6/ThirdParty/Pygments/pygments/CHANGES	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/ThirdParty/Pygments/pygments/CHANGES	Sat May 02 13:51:07 2020 +0200
@@ -1,10 +1,235 @@
 Pygments changelog
 ==================
 
-Issue numbers refer to the tracker at
-<https://bitbucket.org/birkenfeld/pygments-main/issues>,
+Since 2.5.0, issue numbers refer to the tracker at
+<https://github.com/pygments/pygments/issues>,
 pull request numbers to the requests at
-<https://bitbucket.org/birkenfeld/pygments-main/pull-requests/merged>.
+<https://github.com/pygments/pygments/pulls>.
+
+
+Version 2.6.1
+-------------
+(released March 8, 2020)
+
+- This release fixes a packaging issue. No functional changes.
+
+Version 2.6
+-----------
+(released March 8, 2020)
+
+- Running Pygments on Python 2.x is no longer supported.
+  (The Python 2 lexer still exists.)
+
+- Added lexers:
+
+  * Linux kernel logs (PR#1310)
+  * LLVM MIR (PR#1361)
+  * MiniScript (PR#1397)
+  * Mosel (PR#1287, PR#1326)
+  * Parsing Expression Grammar (PR#1336)
+  * ReasonML (PR#1386)
+  * Ride (PR#1319, PR#1321)
+  * Sieve (PR#1257)
+  * USD (PR#1290)
+  * WebIDL (PR#1309)
+
+- Updated lexers:
+
+  * Apache2 (PR#1378)
+  * Chapel (PR#1357)
+  * CSound (PR#1383)
+  * D (PR#1375, PR#1362)
+  * Idris (PR#1360)
+  * Perl6/Raku lexer (PR#1344)
+  * Python3 (PR#1382, PR#1385)
+  * Rust: Updated lexer to cover more builtins (mostly macros) and miscellaneous
+  new syntax (PR#1320)
+  * SQL: Add temporal support keywords (PR#1402)
+
+- The 256-color/true-color terminal formatters now support the italic attribute
+  in styles (PR#1288)
+- Support HTTP 2/3 header (PR#1308)
+- Support missing reason in HTTP header (PR#1322)
+- Boogie/Silver: support line continuations and triggers, move contract keywords
+  to separate category (PR#1299)
+- GAS: support C-style comments (PR#1291)
+- Fix names in S lexer (PR#1330, PR#1333)
+- Fix numeric literals in Ada (PR#1334)
+- Recognize ``.mjs`` files as Javascript (PR#1392)
+- Recognize ``.eex`` files as Elixir (PR#1387)
+- Fix ``re.MULTILINE`` usage (PR#1388)
+- Recognize ``pipenv`` and ``poetry`` dependency & lock files (PR#1376)
+- Improve font search on Windows (#1247)
+- Remove unused script block (#1401)
+
+Version 2.5.2
+-------------
+(released November 29, 2019)
+
+- Fix incompatibility with some setuptools versions (PR#1316)
+
+- Fix lexing of ReST field lists (PR#1279)
+- Fix lexing of Matlab keywords as field names (PR#1282)
+- Recognize double-quoted strings in Matlab (PR#1278)
+- Avoid slow backtracking in Vim lexer (PR#1312)
+- Fix Scala highlighting of types (PR#1315)
+- Highlight field lists more consistently in ReST (PR#1279)
+- Fix highlighting Matlab keywords in field names (PR#1282)
+- Recognize Matlab double quoted strings (PR#1278)
+- Add some Terraform keywords
+- Update Modelica lexer to 3.4
+- Update Crystal examples
+
+
+Version 2.5.1
+-------------
+(released November 26, 2019)
+
+- This release fixes a packaging issue. No functional changes.
+
+
+Version 2.5.0
+-------------
+(released November 26, 2019)
+
+- Added lexers:
+
+  * Email (PR#1246)
+  * Erlang, Elixir shells (PR#823, #1521)
+  * Notmuch (PR#1264)
+  * `Scdoc <https://git.sr.ht/~sircmpwn/scdoc>`_ (PR#1268)
+  * `Solidity <https://solidity.readthedocs.io/>`_ (#1214)
+  * `Zeek <https://www.zeek.org>`_ (new name for Bro) (PR#1269)
+  * `Zig <https://ziglang.org/>`_ (PR#820)
+
+- Updated lexers:
+
+  * Apache2 Configuration (PR#1251)
+  * Bash sessions (#1253)
+  * CSound (PR#1250)
+  * Dart
+  * Dockerfile
+  * Emacs Lisp
+  * Handlebars (PR#773)
+  * Java (#1101, #987)
+  * Logtalk (PR#1261)
+  * Matlab (PR#1271)
+  * Praat (PR#1277)
+  * Python3 (PR#1255, PR#1400)
+  * Ruby
+  * YAML (#1528)
+  * Velocity
+
+- Added styles:
+
+  * Inkpot (PR#1276)
+
+- The ``PythonLexer`` class is now an alias for the former ``Python3Lexer``.
+  The old ``PythonLexer`` is available as ``Python2Lexer``.  Same change has
+  been done for the ``PythonTracebackLexer``.  The ``python3`` option for
+  the ``PythonConsoleLexer`` is now true by default.
+
+- Bump ``NasmLexer`` priority over ``TasmLexer`` for ``.asm`` files
+  (fixes #1326)
+- Default font in the ``ImageFormatter`` has been updated (#928, PR#1245)
+- Test suite switched to py.test, removed nose dependency (#1490)
+- Reduce ``TeraTerm`` lexer score -- it used to match nearly all languages
+  (#1256)
+- Treat ``Skylark``/``Starlark`` files as Python files (PR#1259)
+- Image formatter: actually respect ``line_number_separator`` option
+
+- Add LICENSE file to wheel builds
+- Agda: fix lambda highlighting
+- Dart: support ``@`` annotations
+- Dockerfile: accept ``FROM ... AS`` syntax
+- Emacs Lisp: add more string functions
+- GAS: accept registers in directive arguments
+- Java: make structural punctuation (braces, parens, colon, comma) ``Punctuation``, not ``Operator`` (#987)
+- Java: support ``var`` contextual keyword (#1101)
+- Matlab: Fix recognition of ``function`` keyword (PR#1271)
+- Python: recognize ``.jy`` filenames (#976)
+- Python: recognize ``f`` string prefix (#1156)
+- Ruby: support squiggly heredocs
+- Shell sessions: recognize Virtualenv prompt (PR#1266)
+- Velocity: support silent reference syntax
+
+
+Version 2.4.2
+-------------
+(released May 28, 2019)
+
+- Fix encoding error when guessing lexer with given ``encoding`` option
+  (#1438)
+
+
+Version 2.4.1
+-------------
+(released May 24, 2019)
+
+- Updated lexers:
+
+  * Coq (#1430)
+  * MSDOS Session (PR#734)
+  * NASM (#1517)
+  * Objective-C (PR#813, #1508)
+  * Prolog (#1511)
+  * TypeScript (#1515)
+
+- Support CSS variables in stylesheets (PR#814, #1356)
+- Fix F# lexer name (PR#709)
+- Fix ``TerminalFormatter`` using bold for bright text (#1480)
+
+
+Version 2.4.0
+-------------
+(released May 8, 2019)
+
+- Added lexers:
+
+  * Augeas (PR#807)
+  * BBC Basic (PR#806)
+  * Boa (PR#756)
+  * Charm++ CI (PR#788)
+  * DASM16 (PR#807)
+  * FloScript (PR#750)
+  * FreeFem++ (PR#785)
+  * Hspec (PR#790)
+  * Pony (PR#627)
+  * SGF (PR#780)
+  * Slash (PR#807)
+  * Slurm (PR#760)
+  * Tera Term Language (PR#749)
+  * TOML (PR#807)
+  * Unicon (PR#731)
+  * VBScript (PR#673)
+
+- Updated lexers:
+
+  * Apache2 (PR#766)
+  * Cypher (PR#746)
+  * LLVM (PR#792)
+  * Makefiles (PR#766)
+  * PHP (#1482)
+  * Rust
+  * SQL (PR#672)
+  * Stan (PR#774)
+  * Stata (PR#800)
+  * Terraform (PR#787)
+  * YAML
+
+- Add solarized style (PR#708)
+- Add support for Markdown reference-style links (PR#753)
+- Add license information to generated HTML/CSS files (#1496)
+- Change ANSI color names (PR#777)
+- Fix catastrophic backtracking in the bash lexer (#1494)
+- Fix documentation failing to build using Sphinx 2.0 (#1501)
+- Fix incorrect links in the Lisp and R lexer documentation (PR#775)
+- Fix rare unicode errors on Python 2.7 (PR#798, #1492)
+- Fix lexers popping from an empty stack (#1506)
+- TypoScript uses ``.typoscript`` now (#1498)
+- Updated Trove classifiers and ``pip`` requirements (PR#799)
+
+
 
 Version 2.3.1
 -------------
@@ -30,6 +255,7 @@
 - Fix invalid string escape sequences
 - Fix `FutureWarning` introduced by regex changes in Python 3.7
 
+
 Version 2.3.0
 -------------
 (released Nov 25, 2018)
@@ -613,7 +839,7 @@
 
 - Support ``application/javascript`` as a JavaScript mime type (#504).
 
-- Support `Offload <http://offload.codeplay.com>`_ C++ Extensions as
+- Support `Offload <https://offload.codeplay.com/>`_ C++ Extensions as
   keywords in the C++ lexer (#484).
 
 - Escape more characters in LaTeX output (#505).
--- a/eric6/ThirdParty/Pygments/pygments/LICENSE	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/ThirdParty/Pygments/pygments/LICENSE	Sat May 02 13:51:07 2020 +0200
@@ -1,4 +1,4 @@
-Copyright (c) 2006-2017 by the respective authors (see AUTHORS file).
+Copyright (c) 2006-2019 by the respective authors (see AUTHORS file).
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
--- a/eric6/ThirdParty/Pygments/pygments/PKG-INFO	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/ThirdParty/Pygments/pygments/PKG-INFO	Sat May 02 13:51:07 2020 +0200
@@ -1,28 +1,29 @@
-Metadata-Version: 1.1
+Metadata-Version: 1.2
 Name: Pygments
-Version: 2.3.1
+Version: 2.6.1
 Summary: Pygments is a syntax highlighting package written in Python.
-Home-page: http://pygments.org/
+Home-page: https://pygments.org/
 Author: Georg Brandl
 Author-email: georg@python.org
 License: BSD License
-Description: Pygments
-            ~~~~~~~~
+Description: 
+        Pygments
+        ~~~~~~~~
         
-            Pygments is a syntax highlighting package written in Python.
-        
-            It is a generic syntax highlighter suitable for use in code hosting, forums,
-            wikis or other applications that need to prettify source code.  Highlights
-            are:
+        Pygments is a syntax highlighting package written in Python.
         
-            * a wide range of over 300 languages and other text formats is supported
-            * special attention is paid to details, increasing quality by a fair amount
-            * support for new languages and formats are added easily
-            * a number of output formats, presently HTML, LaTeX, RTF, SVG, all image       formats that PIL supports and ANSI sequences
-            * it is usable as a command-line tool and as a library
+        It is a generic syntax highlighter suitable for use in code hosting, forums,
+        wikis or other applications that need to prettify source code.  Highlights
+        are:
         
-            :copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS.
-            :license: BSD, see LICENSE for details.
+        * a wide range of over 500 languages and other text formats is supported
+        * special attention is paid to details, increasing quality by a fair amount
+        * support for new languages and formats are added easily
+        * a number of output formats, presently HTML, LaTeX, RTF, SVG, all image     formats that PIL supports and ANSI sequences
+        * it is usable as a command-line tool and as a library
+        
+        :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
+        :license: BSD, see LICENSE for details.
         
 Keywords: syntax highlighting
 Platform: any
@@ -32,8 +33,14 @@
 Classifier: Intended Audience :: System Administrators
 Classifier: Development Status :: 6 - Mature
 Classifier: Programming Language :: Python
-Classifier: Programming Language :: Python :: 2
 Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3.5
+Classifier: Programming Language :: Python :: 3.6
+Classifier: Programming Language :: Python :: 3.7
+Classifier: Programming Language :: Python :: 3.8
+Classifier: Programming Language :: Python :: Implementation :: CPython
+Classifier: Programming Language :: Python :: Implementation :: PyPy
 Classifier: Operating System :: OS Independent
 Classifier: Topic :: Text Processing :: Filters
 Classifier: Topic :: Utilities
+Requires-Python: >=3.5
--- a/eric6/ThirdParty/Pygments/pygments/__init__.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/ThirdParty/Pygments/pygments/__init__.py	Sat May 02 13:51:07 2020 +0200
@@ -17,19 +17,18 @@
     * it is usable as a command-line tool and as a library
     * ... and it highlights even Brainfuck!
 
-    The `Pygments tip`_ is installable with ``easy_install Pygments==dev``.
+    The `Pygments master branch`_ is installable with ``easy_install Pygments==dev``.
 
-    .. _Pygments tip:
-       http://bitbucket.org/birkenfeld/pygments-main/get/tip.zip#egg=Pygments-dev
+    .. _Pygments master branch:
+       https://github.com/pygments/pygments/archive/master.zip#egg=Pygments-dev
 
-    :copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 import sys
+from io import StringIO, BytesIO
 
-from pygments.util import StringIO, BytesIO
-
-__version__ = '2.3.1'
+__version__ = '2.6.1'
 __docformat__ = 'restructuredtext'
 
 __all__ = ['lex', 'format', 'highlight']
@@ -84,7 +83,3 @@
     """
     return format(lex(code, lexer), formatter, outfile)
 
-
-if __name__ == '__main__':  # pragma: no cover
-    from pygments.cmdline import main
-    sys.exit(main(sys.argv))
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/eric6/ThirdParty/Pygments/pygments/__main__.py	Sat May 02 13:51:07 2020 +0200
@@ -0,0 +1,18 @@
+# -*- coding: utf-8 -*-
+"""
+    pygments.__main__
+    ~~~~~~~~~~~~~~~~~
+
+    Main entry point for ``python -m pygments``.
+
+    :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
+    :license: BSD, see LICENSE for details.
+"""
+
+import sys
+import pygments.cmdline
+
+try:
+    sys.exit(pygments.cmdline.main(sys.argv))
+except KeyboardInterrupt:
+    sys.exit(1)
--- a/eric6/ThirdParty/Pygments/pygments/cmdline.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/ThirdParty/Pygments/pygments/cmdline.py	Sat May 02 13:51:07 2020 +0200
@@ -5,12 +5,10 @@
 
     Command line interface.
 
-    :copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
-from __future__ import print_function
-
 import os
 import sys
 import getopt
@@ -18,7 +16,8 @@
 
 from pygments import __version__, highlight
 from pygments.util import ClassNotFound, OptionError, docstring_headline, \
-    guess_decode, guess_decode_from_terminal, terminal_encoding
+    guess_decode, guess_decode_from_terminal, terminal_encoding, \
+    UnclosingTextIOWrapper
 from pygments.lexers import get_all_lexers, get_lexer_by_name, guess_lexer, \
     load_lexer_from_file, get_lexer_for_filename, find_lexer_class_for_filename
 from pygments.lexers.special import TextLexer
@@ -233,7 +232,7 @@
         return 0
 
     if opts.pop('-V', None) is not None:
-        print('Pygments version %s, (c) 2006-2017 by Georg Brandl.' % __version__)
+        print('Pygments version %s, (c) 2006-2019 by Georg Brandl.' % __version__)
         return 0
 
     # handle ``pygmentize -L``
@@ -338,8 +337,17 @@
         # custom lexer, located relative to user's cwd
         if allow_custom_lexer_formatter and '.py' in lexername:
             try:
+                filename = None
+                name = None
                 if ':' in lexername:
                     filename, name = lexername.rsplit(':', 1)
+
+                    if '.py' in name:
+                        # This can happen on Windows: If the lexername is
+                        # C:\lexer.py -- return to normal load path in that case
+                        name = None
+
+                if filename and name:
                     lexer = load_lexer_from_file(filename, name,
                                                  **parsed_opts)
                 else:
@@ -397,11 +405,7 @@
     elif '-s' not in opts:  # treat stdin as full file (-s support is later)
         # read code from terminal, always in binary mode since we want to
         # decode ourselves and be tolerant with it
-        if sys.version_info > (3,):
-            # Python 3: we have to use .buffer to get a binary stream
-            code = sys.stdin.buffer.read()
-        else:
-            code = sys.stdin.read()
+        code = sys.stdin.buffer.read()  # use .buffer to get a binary stream
         if not inencoding:
             code, inencoding = guess_decode_from_terminal(code, sys.stdin)
             # else the lexer will do the decoding
@@ -432,10 +436,18 @@
         # custom formatter, located relative to user's cwd
         if allow_custom_lexer_formatter and '.py' in fmter:
             try:
+                filename = None
+                name = None
                 if ':' in fmter:
-                    file, fmtername = fmter.rsplit(':', 1)
-                    fmter = load_formatter_from_file(file, fmtername,
-                                                     **parsed_opts)
+                    # Same logic as above for custom lexer
+                    filename, name = fmter.rsplit(':', 1)
+
+                    if '.py' in name:
+                        name = None
+
+                if filename and name:
+                    fmter = load_formatter_from_file(filename, name,
+                                    **parsed_opts)
                 else:
                     fmter = load_formatter_from_file(fmter, **parsed_opts)
             except ClassNotFound as err:
@@ -466,11 +478,7 @@
                 fmter = Terminal256Formatter(**parsed_opts)
             else:
                 fmter = TerminalFormatter(**parsed_opts)
-        if sys.version_info > (3,):
-            # Python 3: we have to use .buffer to get a binary stream
-            outfile = sys.stdout.buffer
-        else:
-            outfile = sys.stdout
+        outfile = sys.stdout.buffer
 
     # determine output encoding if not explicitly selected
     if not outencoding:
@@ -485,10 +493,8 @@
     if not outfn and sys.platform in ('win32', 'cygwin') and \
        fmter.name in ('Terminal', 'Terminal256'):  # pragma: no cover
         # unfortunately colorama doesn't support binary streams on Py3
-        if sys.version_info > (3,):
-            from pygments.util import UnclosingTextIOWrapper
-            outfile = UnclosingTextIOWrapper(outfile, encoding=fmter.encoding)
-            fmter.encoding = None
+        outfile = UnclosingTextIOWrapper(outfile, encoding=fmter.encoding)
+        fmter.encoding = None
         try:
             import colorama.initialise
         except ImportError:
@@ -515,11 +521,7 @@
         # line by line processing of stdin (eg: for 'tail -f')...
         try:
             while 1:
-                if sys.version_info > (3,):
-                    # Python 3: we have to use .buffer to get a binary stream
-                    line = sys.stdin.buffer.readline()
-                else:
-                    line = sys.stdin.readline()
+                line = sys.stdin.buffer.readline()
                 if not line:
                     break
                 if not inencoding:
@@ -554,7 +556,7 @@
                   file=sys.stderr)
             print('Please report the whole traceback to the issue tracker at',
                   file=sys.stderr)
-            print('<https://bitbucket.org/birkenfeld/pygments-main/issues>.',
+            print('<https://github.com/pygments/pygments/issues>.',
                   file=sys.stderr)
             print('*' * 65, file=sys.stderr)
             print(file=sys.stderr)
--- a/eric6/ThirdParty/Pygments/pygments/console.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/ThirdParty/Pygments/pygments/console.py	Sat May 02 13:51:07 2020 +0200
@@ -5,7 +5,7 @@
 
     Format colored console output.
 
-    :copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -22,22 +22,19 @@
 codes["blink"] = esc + "05m"
 codes["overline"] = esc + "06m"
 
-dark_colors = ["black", "darkred", "darkgreen", "brown", "darkblue",
-               "purple", "teal", "lightgray"]
-light_colors = ["darkgray", "red", "green", "yellow", "blue",
-                "fuchsia", "turquoise", "white"]
+dark_colors = ["black", "red", "green", "yellow", "blue",
+               "magenta", "cyan", "gray"]
+light_colors = ["brightblack", "brightred", "brightgreen", "brightyellow", "brightblue",
+                "brightmagenta", "brightcyan", "white"]
 
 x = 30
 for d, l in zip(dark_colors, light_colors):
     codes[d] = esc + "%im" % x
-    codes[l] = esc + "%i;01m" % x
+    codes[l] = esc + "%im" % (60 + x)
     x += 1
 
 del d, l, x
 
-codes["darkteal"] = codes["turquoise"]
-codes["darkyellow"] = codes["brown"]
-codes["fuscia"] = codes["fuchsia"]
 codes["white"] = codes["bold"]
 
 
--- a/eric6/ThirdParty/Pygments/pygments/filter.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/ThirdParty/Pygments/pygments/filter.py	Sat May 02 13:51:07 2020 +0200
@@ -5,7 +5,7 @@
 
     Module that implements the default filter.
 
-    :copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -40,7 +40,7 @@
     })
 
 
-class Filter(object):
+class Filter:
     """
     Default filter. Subclass this class or use the `simplefilter`
     decorator to create own filters.
--- a/eric6/ThirdParty/Pygments/pygments/filters/__init__.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/ThirdParty/Pygments/pygments/filters/__init__.py	Sat May 02 13:51:07 2020 +0200
@@ -6,7 +6,7 @@
     Module containing filter lookup functions and default
     filters.
 
-    :copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -16,7 +16,7 @@
     string_to_tokentype
 from pygments.filter import Filter
 from pygments.util import get_list_opt, get_int_opt, get_bool_opt, \
-     get_choice_opt, ClassNotFound, OptionError, text_type, string_types
+    get_choice_opt, ClassNotFound, OptionError
 from pygments.plugin import find_plugin_filters
 
 
@@ -113,7 +113,7 @@
         Filter.__init__(self, **options)
         case = get_choice_opt(options, 'case',
                               ['lower', 'upper', 'capitalize'], 'lower')
-        self.convert = getattr(text_type, case)
+        self.convert = getattr(str, case)
 
     def filter(self, lexer, stream):
         for ttype, value in stream:
@@ -233,7 +233,7 @@
                               ('tabs',     u'»'),
                               ('newlines', u'¶')]:
             opt = options.get(name, False)
-            if isinstance(opt, string_types) and len(opt) == 1:
+            if isinstance(opt, str) and len(opt) == 1:
                 setattr(self, name, opt)
             else:
                 setattr(self, name, (opt and default or ''))
@@ -250,6 +250,7 @@
             tabs = self.tabs or u'\t'
             newlines = self.newlines or u'\n'
             regex = re.compile(r'\s')
+
             def replacefunc(wschar):
                 if wschar == ' ':
                     return spaces
@@ -302,7 +303,7 @@
 
     def filter(self, lexer, stream):
         n = self.n
-        left = n # How many characters left to gobble.
+        left = n  # How many characters left to gobble.
         for ttype, value in stream:
             # Remove ``left`` tokens from first line, ``n`` from all others.
             parts = value.split('\n')
--- a/eric6/ThirdParty/Pygments/pygments/formatter.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/ThirdParty/Pygments/pygments/formatter.py	Sat May 02 13:51:07 2020 +0200
@@ -5,25 +5,25 @@
 
     Base formatter class.
 
-    :copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
 import codecs
 
-from pygments.util import get_bool_opt, string_types
+from pygments.util import get_bool_opt
 from pygments.styles import get_style_by_name
 
 __all__ = ['Formatter']
 
 
 def _lookup_style(style):
-    if isinstance(style, string_types):
+    if isinstance(style, str):
         return get_style_by_name(style)
     return style
 
 
-class Formatter(object):
+class Formatter:
     """
     Converts a token stream to text.
 
--- a/eric6/ThirdParty/Pygments/pygments/formatters/__init__.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/ThirdParty/Pygments/pygments/formatters/__init__.py	Sat May 02 13:51:07 2020 +0200
@@ -5,7 +5,7 @@
 
     Pygments formatters.
 
-    :copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -17,7 +17,7 @@
 
 from pygments.formatters._mapping import FORMATTERS
 from pygments.plugin import find_plugin_formatters
-from pygments.util import ClassNotFound, itervalues
+from pygments.util import ClassNotFound
 
 __all__ = ['get_formatter_by_name', 'get_formatter_for_filename',
            'get_all_formatters', 'load_formatter_from_file'] + list(FORMATTERS)
@@ -45,7 +45,7 @@
 def get_all_formatters():
     """Return a generator for all formatter classes."""
     # NB: this returns formatter classes, not info like get_all_lexers().
-    for info in itervalues(FORMATTERS):
+    for info in FORMATTERS.values():
         if info[1] not in _formatter_cache:
             _load_formatters(info[0])
         yield _formatter_cache[info[1]]
@@ -58,7 +58,7 @@
 
     Returns None if not found.
     """
-    for module_name, name, aliases, _, _ in itervalues(FORMATTERS):
+    for module_name, name, aliases, _, _ in FORMATTERS.values():
         if alias in aliases:
             if name not in _formatter_cache:
                 _load_formatters(module_name)
@@ -98,7 +98,8 @@
     try:
         # This empty dict will contain the namespace for the exec'd file
         custom_namespace = {}
-        exec(open(filename, 'rb').read(), custom_namespace)
+        with open(filename, 'rb') as f:
+            exec(f.read(), custom_namespace)
         # Retrieve the class `formattername` from that namespace
         if formattername not in custom_namespace:
             raise ClassNotFound('no valid %s class found in %s' %
@@ -107,8 +108,8 @@
         # And finally instantiate it with the options
         return formatter_class(**options)
     except IOError as err:
-        raise ClassNotFound('cannot read %s' % filename)
-    except ClassNotFound as err:
+        raise ClassNotFound('cannot read %s: %s' % (filename, err))
+    except ClassNotFound:
         raise
     except Exception as err:
         raise ClassNotFound('error when loading custom formatter: %s' % err)
@@ -120,7 +121,7 @@
     Raises ClassNotFound if not found.
     """
     fn = basename(fn)
-    for modname, name, _, filenames, _ in itervalues(FORMATTERS):
+    for modname, name, _, filenames, _ in FORMATTERS.values():
         for filename in filenames:
             if _fn_matches(fn, filename):
                 if name not in _formatter_cache:
--- a/eric6/ThirdParty/Pygments/pygments/formatters/_mapping.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/ThirdParty/Pygments/pygments/formatters/_mapping.py	Sat May 02 13:51:07 2020 +0200
@@ -9,12 +9,10 @@
 
     Do not alter the FORMATTERS dictionary by hand.
 
-    :copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
-from __future__ import print_function
-
 FORMATTERS = {
     'BBCodeFormatter': ('pygments.formatters.bbcode', 'BBCode', ('bbcode', 'bb'), (), 'Format tokens with BBcodes. These formatting codes are used by many bulletin boards, so you can highlight your sourcecode with pygments before posting it there.'),
     'BmpImageFormatter': ('pygments.formatters.img', 'img_bmp', ('bmp', 'bitmap'), ('*.bmp',), 'Create a bitmap image from source code. This uses the Python Imaging Library to generate a pixmap from the source code.'),
@@ -34,7 +32,6 @@
     'TestcaseFormatter': ('pygments.formatters.other', 'Testcase', ('testcase',), (), 'Format tokens as appropriate for a new testcase.')
 }
 
-
 if __name__ == '__main__':  # pragma: no cover
     import sys
     import os
--- a/eric6/ThirdParty/Pygments/pygments/formatters/bbcode.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/ThirdParty/Pygments/pygments/formatters/bbcode.py	Sat May 02 13:51:07 2020 +0200
@@ -5,7 +5,7 @@
 
     BBcode formatter.
 
-    :copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
--- a/eric6/ThirdParty/Pygments/pygments/formatters/html.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/ThirdParty/Pygments/pygments/formatters/html.py	Sat May 02 13:51:07 2020 +0200
@@ -5,20 +5,18 @@
 
     Formatter for HTML output.
 
-    :copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
-from __future__ import print_function
-
 import os
 import sys
 import os.path
+from io import StringIO
 
 from pygments.formatter import Formatter
 from pygments.token import Token, Text, STANDARD_TYPES
-from pygments.util import get_bool_opt, get_int_opt, get_list_opt, \
-    StringIO, string_types, iteritems
+from pygments.util import get_bool_opt, get_int_opt, get_list_opt
 
 try:
     import ctags
@@ -42,6 +40,13 @@
     return text.translate(table)
 
 
+def webify(color):
+    if color.startswith('calc') or color.startswith('var'):
+        return color
+    else:
+        return '#' + color
+
+
 def _get_ttype_class(ttype):
     fname = STANDARD_TYPES.get(ttype)
     if fname:
@@ -55,6 +60,11 @@
 
 
 CSSFILE_TEMPLATE = '''\
+/*
+generated by Pygments <https://pygments.org/>
+Copyright 2006-2019 by the Pygments team.
+Licensed under the BSD license, see LICENSE for details.
+*/
 td.linenos { background-color: #f0f0f0; padding-right: 10px; }
 span.lineno { background-color: #f0f0f0; padding: 0 5px 0 5px; }
 pre { line-height: 125%%; }
@@ -64,7 +74,11 @@
 DOC_HEADER = '''\
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN"
    "http://www.w3.org/TR/html4/strict.dtd">
-
+<!--
+generated by Pygments <https://pygments.org/>
+Copyright 2006-2019 by the Pygments team.
+Licensed under the BSD license, see LICENSE for details.
+-->
 <html>
 <head>
   <title>%(title)s</title>
@@ -322,11 +336,17 @@
         .. versionadded:: 1.6
 
     `filename`
-        A string used to generate a filename when rendering <pre> blocks,
+        A string used to generate a filename when rendering ``<pre>`` blocks,
         for example if displaying source code.
 
         .. versionadded:: 2.1
 
+    `wrapcode`
+        Wrap the code inside ``<pre>`` blocks using ``<code>``, as recommended
+        by the HTML5 specification.
+
+        .. versionadded:: 2.4
+
 
     **Subclassing the HTML formatter**
 
@@ -395,6 +415,7 @@
         self.tagsfile = self._decodeifneeded(options.get('tagsfile', ''))
         self.tagurlformat = self._decodeifneeded(options.get('tagurlformat', ''))
         self.filename = self._decodeifneeded(options.get('filename', ''))
+        self.wrapcode = get_bool_opt(options, 'wrapcode', False)
 
         if self.tagsfile:
             if not ctags:
@@ -414,7 +435,7 @@
         self.linenostep = abs(get_int_opt(options, 'linenostep', 1))
         self.linenospecial = abs(get_int_opt(options, 'linenospecial', 0))
         self.nobackground = get_bool_opt(options, 'nobackground', False)
-        self.lineseparator = options.get('lineseparator', '\n')
+        self.lineseparator = options.get('lineseparator', u'\n')
         self.lineanchors = options.get('lineanchors', '')
         self.linespans = options.get('linespans', '')
         self.anchorlinenos = options.get('anchorlinenos', False)
@@ -451,7 +472,7 @@
             name = self._get_css_class(ttype)
             style = ''
             if ndef['color']:
-                style += 'color: #%s; ' % ndef['color']
+                style += 'color: %s; ' % webify(ndef['color'])
             if ndef['bold']:
                 style += 'font-weight: bold; '
             if ndef['italic']:
@@ -459,9 +480,9 @@
             if ndef['underline']:
                 style += 'text-decoration: underline; '
             if ndef['bgcolor']:
-                style += 'background-color: #%s; ' % ndef['bgcolor']
+                style += 'background-color: %s; ' % webify(ndef['bgcolor'])
             if ndef['border']:
-                style += 'border: 1px solid #%s; ' % ndef['border']
+                style += 'border: 1px solid %s; ' % webify(ndef['border'])
             if style:
                 t2c[ttype] = name
                 # save len(ttype) to enable ordering the styles by
@@ -476,7 +497,7 @@
         """
         if arg is None:
             arg = ('cssclass' in self.options and '.'+self.cssclass or '')
-        if isinstance(arg, string_types):
+        if isinstance(arg, str):
             args = [arg]
         else:
             args = list(arg)
@@ -490,7 +511,7 @@
             return ', '.join(tmp)
 
         styles = [(level, ttype, cls, style)
-                  for cls, (style, ttype, level) in iteritems(self.class2style)
+                  for cls, (style, ttype, level) in self.class2style.items()
                   if cls and style]
         styles.sort()
         lines = ['%s { %s } /* %s */' % (prefix(cls), style, repr(ttype)[6:])
@@ -535,10 +556,9 @@
             # write CSS file only if noclobber_cssfile isn't given as an option.
             try:
                 if not os.path.exists(cssfilename) or not self.noclobber_cssfile:
-                    cf = open(cssfilename, "w")
-                    cf.write(CSSFILE_TEMPLATE %
-                             {'styledefs': self.get_style_defs('body')})
-                    cf.close()
+                    with open(cssfilename, "w") as cf:
+                        cf.write(CSSFILE_TEMPLATE %
+                                 {'styledefs': self.get_style_defs('body')})
             except IOError as err:
                 err.strerror = 'Error writing CSS file: ' + err.strerror
                 raise
@@ -709,6 +729,12 @@
             yield tup
         yield 0, '</pre>'
 
+    def _wrap_code(self, inner):
+        yield 0, '<code>'
+        for tup in inner:
+            yield tup
+        yield 0, '</code>'
+
     def _format_lines(self, tokensource):
         """
         Just format the tokens, without any wrapping tags.
@@ -815,7 +841,10 @@
         individual lines, in custom generators. See docstring
         for `format`. Can be overridden.
         """
-        return self._wrap_div(self._wrap_pre(source))
+        if self.wrapcode:
+            return self._wrap_div(self._wrap_pre(self._wrap_code(source)))
+        else:
+            return self._wrap_div(self._wrap_pre(source))
 
     def format_unencoded(self, tokensource, outfile):
         """
--- a/eric6/ThirdParty/Pygments/pygments/formatters/img.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/ThirdParty/Pygments/pygments/formatters/img.py	Sat May 02 13:51:07 2020 +0200
@@ -5,7 +5,7 @@
 
     Formatter for Pixmap output.
 
-    :copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -14,7 +14,7 @@
 
 from pygments.formatter import Formatter
 from pygments.util import get_bool_opt, get_int_opt, get_list_opt, \
-    get_choice_opt, xrange
+    get_choice_opt
 
 import subprocess
 
@@ -46,9 +46,9 @@
 }
 
 # A sane default for modern systems
-DEFAULT_FONT_NAME_NIX = 'Bitstream Vera Sans Mono'
+DEFAULT_FONT_NAME_NIX = 'DejaVu Sans Mono'
 DEFAULT_FONT_NAME_WIN = 'Courier New'
-DEFAULT_FONT_NAME_MAC = 'Courier New'
+DEFAULT_FONT_NAME_MAC = 'Menlo'
 
 
 class PilNotAvailable(ImportError):
@@ -59,7 +59,7 @@
     """When there are no usable fonts specified"""
 
 
-class FontManager(object):
+class FontManager:
     """
     Manages a set of fonts: normal, italic, bold, etc...
     """
@@ -125,8 +125,8 @@
         for font_dir in (os.path.join(os.getenv("HOME"), 'Library/Fonts/'),
                          '/Library/Fonts/', '/System/Library/Fonts/'):
             font_map.update(
-                ((os.path.splitext(f)[0].lower(), os.path.join(font_dir, f))
-                    for f in os.listdir(font_dir) if f.lower().endswith('ttf')))
+                (os.path.splitext(f)[0].lower(), os.path.join(font_dir, f))
+                for f in os.listdir(font_dir) if f.lower().endswith('ttf'))
 
         for name in STYLES['NORMAL']:
             path = self._get_mac_font_path(font_map, self.font_name, name)
@@ -164,31 +164,43 @@
             return None
 
     def _create_win(self):
-        try:
-            key = _winreg.OpenKey(
-                _winreg.HKEY_LOCAL_MACHINE,
-                r'Software\Microsoft\Windows NT\CurrentVersion\Fonts')
-        except EnvironmentError:
+        lookuperror = None
+        keynames = [ (_winreg.HKEY_CURRENT_USER, r'Software\Microsoft\Windows NT\CurrentVersion\Fonts'),
+                     (_winreg.HKEY_CURRENT_USER, r'Software\Microsoft\Windows\CurrentVersion\Fonts'),
+                     (_winreg.HKEY_LOCAL_MACHINE, r'Software\Microsoft\Windows NT\CurrentVersion\Fonts'),
+                     (_winreg.HKEY_LOCAL_MACHINE, r'Software\Microsoft\Windows\CurrentVersion\Fonts') ]
+        for keyname in keynames:
             try:
-                key = _winreg.OpenKey(
-                    _winreg.HKEY_LOCAL_MACHINE,
-                    r'Software\Microsoft\Windows\CurrentVersion\Fonts')
+                key = _winreg.OpenKey(*keyname)
+                try:
+                    path = self._lookup_win(key, self.font_name, STYLES['NORMAL'], True)
+                    self.fonts['NORMAL'] = ImageFont.truetype(path, self.font_size)
+                    for style in ('ITALIC', 'BOLD', 'BOLDITALIC'):
+                        path = self._lookup_win(key, self.font_name, STYLES[style])
+                        if path:
+                            self.fonts[style] = ImageFont.truetype(path, self.font_size)
+                        else:
+                            if style == 'BOLDITALIC':
+                                self.fonts[style] = self.fonts['BOLD']
+                            else:
+                                self.fonts[style] = self.fonts['NORMAL']
+                    return
+                except FontNotFound as err:
+                    lookuperror = err
+                finally:
+                    _winreg.CloseKey(key)
             except EnvironmentError:
-                raise FontNotFound('Can\'t open Windows font registry key')
-        try:
-            path = self._lookup_win(key, self.font_name, STYLES['NORMAL'], True)
-            self.fonts['NORMAL'] = ImageFont.truetype(path, self.font_size)
-            for style in ('ITALIC', 'BOLD', 'BOLDITALIC'):
-                path = self._lookup_win(key, self.font_name, STYLES[style])
-                if path:
-                    self.fonts[style] = ImageFont.truetype(path, self.font_size)
-                else:
-                    if style == 'BOLDITALIC':
-                        self.fonts[style] = self.fonts['BOLD']
-                    else:
-                        self.fonts[style] = self.fonts['NORMAL']
-        finally:
-            _winreg.CloseKey(key)
+                pass
+        else:
+            # If we get here, we checked all registry keys and had no luck
+            # We can be in one of two situations now:
+            # * All key lookups failed. In this case lookuperror is None and we
+            #   will raise a generic error
+            # * At least one lookup failed with a FontNotFound error. In this
+            #   case, we will raise that as a more specific error
+            if lookuperror:
+                raise lookuperror
+            raise FontNotFound('Can\'t open Windows font registry key')
 
     def get_char_size(self):
         """
@@ -237,7 +249,8 @@
         bold and italic fonts will be generated.  This really should be a
         monospace font to look sane.
 
-        Default: "Bitstream Vera Sans Mono" on Windows, Courier New on \\*nix
+        Default: "Courier New" on Windows, "Menlo" on Mac OS, and
+                 "DejaVu Sans Mono" on \\*nix
 
     `font_size`
         The font size in points to be used.
@@ -503,7 +516,7 @@
         """
         if not self.line_numbers:
             return
-        for p in xrange(self.maxlineno):
+        for p in range(self.maxlineno):
             n = p + self.line_number_start
             if (n % self.line_number_step) == 0:
                 self._draw_linenumber(p, n)
@@ -521,7 +534,8 @@
         rectw = self.image_pad + self.line_number_width - self.line_number_pad
         draw.rectangle([(0, 0), (rectw, recth)],
                        fill=self.line_number_bg)
-        draw.line([(rectw, 0), (rectw, recth)], fill=self.line_number_fg)
+        if self.line_number_separator:
+            draw.line([(rectw, 0), (rectw, recth)], fill=self.line_number_fg)
         del draw
 
     def format(self, tokensource, outfile):
--- a/eric6/ThirdParty/Pygments/pygments/formatters/irc.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/ThirdParty/Pygments/pygments/formatters/irc.py	Sat May 02 13:51:07 2020 +0200
@@ -5,7 +5,7 @@
 
     Formatter for IRC output
 
-    :copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -25,55 +25,55 @@
 IRC_COLORS = {
     Token:              ('',            ''),
 
-    Whitespace:         ('lightgray',   'darkgray'),
-    Comment:            ('lightgray',   'darkgray'),
-    Comment.Preproc:    ('teal',        'turquoise'),
-    Keyword:            ('darkblue',    'blue'),
-    Keyword.Type:       ('teal',        'turquoise'),
-    Operator.Word:      ('purple',      'fuchsia'),
-    Name.Builtin:       ('teal',        'turquoise'),
-    Name.Function:      ('darkgreen',   'green'),
-    Name.Namespace:     ('_teal_',      '_turquoise_'),
-    Name.Class:         ('_darkgreen_', '_green_'),
-    Name.Exception:     ('teal',        'turquoise'),
-    Name.Decorator:     ('darkgray',    'lightgray'),
-    Name.Variable:      ('darkred',     'red'),
-    Name.Constant:      ('darkred',     'red'),
-    Name.Attribute:     ('teal',        'turquoise'),
-    Name.Tag:           ('blue',        'blue'),
-    String:             ('brown',       'brown'),
-    Number:             ('darkblue',    'blue'),
+    Whitespace:         ('gray',   'brightblack'),
+    Comment:            ('gray',   'brightblack'),
+    Comment.Preproc:    ('cyan',        'brightcyan'),
+    Keyword:            ('blue',    'brightblue'),
+    Keyword.Type:       ('cyan',        'brightcyan'),
+    Operator.Word:      ('magenta',      'brightcyan'),
+    Name.Builtin:       ('cyan',        'brightcyan'),
+    Name.Function:      ('green',   'brightgreen'),
+    Name.Namespace:     ('_cyan_',      '_brightcyan_'),
+    Name.Class:         ('_green_', '_brightgreen_'),
+    Name.Exception:     ('cyan',        'brightcyan'),
+    Name.Decorator:     ('brightblack',    'gray'),
+    Name.Variable:      ('red',     'brightred'),
+    Name.Constant:      ('red',     'brightred'),
+    Name.Attribute:     ('cyan',        'brightcyan'),
+    Name.Tag:           ('brightblue',        'brightblue'),
+    String:             ('yellow',       'yellow'),
+    Number:             ('blue',    'brightblue'),
 
-    Generic.Deleted:    ('red',        'red'),
-    Generic.Inserted:   ('darkgreen',  'green'),
+    Generic.Deleted:    ('brightred',        'brightred'),
+    Generic.Inserted:   ('green',  'brightgreen'),
     Generic.Heading:    ('**',         '**'),
-    Generic.Subheading: ('*purple*',   '*fuchsia*'),
-    Generic.Error:      ('red',        'red'),
+    Generic.Subheading: ('*magenta*',   '*brightmagenta*'),
+    Generic.Error:      ('brightred',        'brightred'),
 
-    Error:              ('_red_',      '_red_'),
+    Error:              ('_brightred_',      '_brightred_'),
 }
 
 
 IRC_COLOR_MAP = {
     'white': 0,
     'black': 1,
-    'darkblue': 2,
-    'green': 3,
-    'red': 4,
-    'brown': 5,
-    'purple': 6,
+    'blue': 2,
+    'brightgreen': 3,
+    'brightred': 4,
+    'yellow': 5,
+    'magenta': 6,
     'orange': 7,
-    'darkgreen': 7, #compat w/ ansi
-    'yellow': 8,
+    'green': 7, #compat w/ ansi
+    'brightyellow': 8,
     'lightgreen': 9,
-    'turquoise': 9, # compat w/ ansi
-    'teal': 10,
+    'brightcyan': 9, # compat w/ ansi
+    'cyan': 10,
     'lightblue': 11,
-    'darkred': 11, # compat w/ ansi
-    'blue': 12,
-    'fuchsia': 13,
-    'darkgray': 14,
-    'lightgray': 15,
+    'red': 11, # compat w/ ansi
+    'brightblue': 12,
+    'brightmagenta': 13,
+    'brightblack': 14,
+    'gray': 15,
 }
 
 def ircformat(color, text):
--- a/eric6/ThirdParty/Pygments/pygments/formatters/latex.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/ThirdParty/Pygments/pygments/formatters/latex.py	Sat May 02 13:51:07 2020 +0200
@@ -5,17 +5,16 @@
 
     Formatter for LaTeX fancyvrb output.
 
-    :copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
-from __future__ import division
+from io import StringIO
 
 from pygments.formatter import Formatter
 from pygments.lexer import Lexer
 from pygments.token import Token, STANDARD_TYPES
-from pygments.util import get_bool_opt, get_int_opt, StringIO, xrange, \
-    iteritems
+from pygments.util import get_bool_opt, get_int_opt
 
 
 __all__ = ['LatexFormatter']
@@ -322,7 +321,7 @@
         """
         cp = self.commandprefix
         styles = []
-        for name, definition in iteritems(self.cmd2def):
+        for name, definition in self.cmd2def.items():
             styles.append(r'\expandafter\def\csname %s@tok@%s\endcsname{%s}' %
                           (cp, name, definition))
         return STYLE_TEMPLATE % {'cp': self.commandprefix,
@@ -354,7 +353,7 @@
                 if self.texcomments:
                     # Try to guess comment starting lexeme and escape it ...
                     start = value[0:1]
-                    for i in xrange(1, len(value)):
+                    for i in range(1, len(value)):
                         if start[0] != value[i]:
                             break
                         start += value[i]
--- a/eric6/ThirdParty/Pygments/pygments/formatters/other.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/ThirdParty/Pygments/pygments/formatters/other.py	Sat May 02 13:51:07 2020 +0200
@@ -5,12 +5,12 @@
 
     Other formatters: NullFormatter, RawTokenFormatter.
 
-    :copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
 from pygments.formatter import Formatter
-from pygments.util import OptionError, get_choice_opt
+from pygments.util import get_choice_opt
 from pygments.token import Token
 from pygments.console import colorize
 
@@ -87,14 +87,17 @@
         if self.compress == 'gz':
             import gzip
             outfile = gzip.GzipFile('', 'wb', 9, outfile)
+
             def write(text):
                 outfile.write(text.encode())
             flush = outfile.flush
         elif self.compress == 'bz2':
             import bz2
             compressor = bz2.BZ2Compressor(9)
+
             def write(text):
                 outfile.write(compressor.compress(text.encode()))
+
             def flush():
                 outfile.write(compressor.flush())
                 outfile.flush()
@@ -115,14 +118,15 @@
                 write("%s\t%r\n" % (ttype, value))
         flush()
 
+
 TESTCASE_BEFORE = u'''\
-    def testNeedsName(self):
+    def testNeedsName(lexer):
         fragment = %r
         tokens = [
 '''
 TESTCASE_AFTER = u'''\
         ]
-        self.assertEqual(tokens, list(self.lexer.get_tokens(fragment)))
+        assert list(lexer.get_tokens(fragment)) == tokens
 '''
 
 
--- a/eric6/ThirdParty/Pygments/pygments/formatters/rtf.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/ThirdParty/Pygments/pygments/formatters/rtf.py	Sat May 02 13:51:07 2020 +0200
@@ -5,7 +5,7 @@
 
     A formatter that generates RTF files.
 
-    :copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -35,7 +35,7 @@
         ``'default'``).
 
     `fontface`
-        The used font famliy, for example ``Bitstream Vera Sans``. Defaults to
+        The used font family, for example ``Bitstream Vera Sans``. Defaults to
         some generic font which is supposed to have fixed width.
 
     `fontsize`
@@ -70,7 +70,7 @@
                    .replace(u'}', u'\\}')
 
     def _escape_text(self, text):
-        # empty strings, should give a small performance improvment
+        # empty strings, should give a small performance improvement
         if not text:
             return u''
 
--- a/eric6/ThirdParty/Pygments/pygments/formatters/svg.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/ThirdParty/Pygments/pygments/formatters/svg.py	Sat May 02 13:51:07 2020 +0200
@@ -5,11 +5,12 @@
 
     Formatter for SVG output.
 
-    :copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
 from pygments.formatter import Formatter
+from pygments.token import Comment
 from pygments.util import get_bool_opt, get_int_opt
 
 __all__ = ['SvgFormatter']
@@ -52,6 +53,19 @@
         The value to give the wrapping ``<g>`` element's ``font-size``
         attribute, defaults to ``"14px"``.
 
+    `linenos`
+        If ``True``, add line numbers (default: ``False``).
+
+    `linenostart`
+        The line number for the first line (default: ``1``).
+
+    `linenostep`
+        If set to a number n > 1, only every nth line number is printed.
+        
+    `linenowidth`
+        Maximum width devoted to line numbers (default: ``3*ystep``, sufficient
+        for up to 4-digit line numbers. Increase width for longer code blocks).  
+        
     `xoffset`
         Starting offset in X direction, defaults to ``0``.
 
@@ -92,6 +106,10 @@
         self.yoffset = get_int_opt(options, 'yoffset', int_fs)
         self.ystep = get_int_opt(options, 'ystep', int_fs + 5)
         self.spacehack = get_bool_opt(options, 'spacehack', True)
+        self.linenos = get_bool_opt(options,'linenos',False)
+        self.linenostart = get_int_opt(options,'linenostart',1)
+        self.linenostep = get_int_opt(options,'linenostep',1)
+        self.linenowidth = get_int_opt(options,'linenowidth', 3*self.ystep)
         self._stylecache = {}
 
     def format_unencoded(self, tokensource, outfile):
@@ -115,7 +133,19 @@
             outfile.write('<svg xmlns="http://www.w3.org/2000/svg">\n')
             outfile.write('<g font-family="%s" font-size="%s">\n' %
                           (self.fontfamily, self.fontsize))
-        outfile.write('<text x="%s" y="%s" xml:space="preserve">' % (x, y))
+        
+        counter = self.linenostart 
+        counter_step = self.linenostep
+        counter_style = self._get_style(Comment)
+        line_x = x
+        
+        if self.linenos:
+            if counter % counter_step == 0:
+                outfile.write('<text x="%s" y="%s" %s text-anchor="end">%s</text>' % (x+self.linenowidth,y,counter_style,counter))
+            line_x += self.linenowidth + self.ystep
+            counter += 1
+
+        outfile.write('<text x="%s" y="%s" xml:space="preserve">' % (line_x, y))
         for ttype, value in tokensource:
             style = self._get_style(ttype)
             tspan = style and '<tspan' + style + '>' or ''
@@ -127,8 +157,12 @@
             for part in parts[:-1]:
                 outfile.write(tspan + part + tspanend)
                 y += self.ystep
-                outfile.write('</text>\n<text x="%s" y="%s" '
-                              'xml:space="preserve">' % (x, y))
+                outfile.write('</text>\n')
+                if self.linenos and counter % counter_step == 0:
+                    outfile.write('<text x="%s" y="%s" text-anchor="end" %s>%s</text>' % (x+self.linenowidth,y,counter_style,counter))
+                
+                counter += 1
+                outfile.write('<text x="%s" y="%s" ' 'xml:space="preserve">' % (line_x,y))
             outfile.write(tspan + parts[-1] + tspanend)
         outfile.write('</text>')
 
--- a/eric6/ThirdParty/Pygments/pygments/formatters/terminal.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/ThirdParty/Pygments/pygments/formatters/terminal.py	Sat May 02 13:51:07 2020 +0200
@@ -5,7 +5,7 @@
 
     Formatter for terminal output with ANSI sequences.
 
-    :copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -26,33 +26,33 @@
 TERMINAL_COLORS = {
     Token:              ('',            ''),
 
-    Whitespace:         ('lightgray',   'darkgray'),
-    Comment:            ('lightgray',   'darkgray'),
-    Comment.Preproc:    ('teal',        'turquoise'),
-    Keyword:            ('darkblue',    'blue'),
-    Keyword.Type:       ('teal',        'turquoise'),
-    Operator.Word:      ('purple',      'fuchsia'),
-    Name.Builtin:       ('teal',        'turquoise'),
-    Name.Function:      ('darkgreen',   'green'),
-    Name.Namespace:     ('_teal_',      '_turquoise_'),
-    Name.Class:         ('_darkgreen_', '_green_'),
-    Name.Exception:     ('teal',        'turquoise'),
-    Name.Decorator:     ('darkgray',    'lightgray'),
-    Name.Variable:      ('darkred',     'red'),
-    Name.Constant:      ('darkred',     'red'),
-    Name.Attribute:     ('teal',        'turquoise'),
-    Name.Tag:           ('blue',        'blue'),
-    String:             ('brown',       'brown'),
-    Number:             ('darkblue',    'blue'),
+    Whitespace:         ('gray',   'brightblack'),
+    Comment:            ('gray',   'brightblack'),
+    Comment.Preproc:    ('cyan',        'brightcyan'),
+    Keyword:            ('blue',    'brightblue'),
+    Keyword.Type:       ('cyan',        'brightcyan'),
+    Operator.Word:      ('magenta',      'brightmagenta'),
+    Name.Builtin:       ('cyan',        'brightcyan'),
+    Name.Function:      ('green',   'brightgreen'),
+    Name.Namespace:     ('_cyan_',      '_brightcyan_'),
+    Name.Class:         ('_green_', '_brightgreen_'),
+    Name.Exception:     ('cyan',        'brightcyan'),
+    Name.Decorator:     ('brightblack',    'gray'),
+    Name.Variable:      ('red',     'brightred'),
+    Name.Constant:      ('red',     'brightred'),
+    Name.Attribute:     ('cyan',        'brightcyan'),
+    Name.Tag:           ('brightblue',        'brightblue'),
+    String:             ('yellow',       'yellow'),
+    Number:             ('blue',    'brightblue'),
 
-    Generic.Deleted:    ('red',        'red'),
-    Generic.Inserted:   ('darkgreen',  'green'),
+    Generic.Deleted:    ('brightred',        'brightred'),
+    Generic.Inserted:   ('green',  'brightgreen'),
     Generic.Heading:    ('**',         '**'),
-    Generic.Subheading: ('*purple*',   '*fuchsia*'),
+    Generic.Subheading: ('*magenta*',   '*brightmagenta*'),
     Generic.Prompt:     ('**',         '**'),
-    Generic.Error:      ('red',        'red'),
+    Generic.Error:      ('brightred',        'brightred'),
 
-    Error:              ('_red_',      '_red_'),
+    Error:              ('_brightred_',      '_brightred_'),
 }
 
 
@@ -92,12 +92,6 @@
         self._lineno = 0
 
     def format(self, tokensource, outfile):
-        # hack: if the output is a terminal and has an encoding set,
-        # use that to avoid unicode encode problems
-        if not self.encoding and hasattr(outfile, "encoding") and \
-           hasattr(outfile, "isatty") and outfile.isatty() and \
-           sys.version_info < (3,):
-            self.encoding = outfile.encoding
         return Formatter.format(self, tokensource, outfile)
 
     def _write_lineno(self, outfile):
--- a/eric6/ThirdParty/Pygments/pygments/formatters/terminal256.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/ThirdParty/Pygments/pygments/formatters/terminal256.py	Sat May 02 13:51:07 2020 +0200
@@ -11,7 +11,7 @@
 
     Formatter version 1.
 
-    :copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -35,11 +35,12 @@
 
 
 class EscapeSequence:
-    def __init__(self, fg=None, bg=None, bold=False, underline=False):
+    def __init__(self, fg=None, bg=None, bold=False, underline=False, italic=False):
         self.fg = fg
         self.bg = bg
         self.bold = bold
         self.underline = underline
+        self.italic = italic
 
     def escape(self, attrs):
         if len(attrs):
@@ -50,7 +51,7 @@
         attrs = []
         if self.fg is not None:
             if self.fg in ansicolors:
-                esc = codes[self.fg[5:]]
+                esc = codes[self.fg.replace('ansi','')]
                 if ';01m' in esc:
                     self.bold = True
                 # extract fg color code.
@@ -59,7 +60,7 @@
                 attrs.extend(("38", "5", "%i" % self.fg))
         if self.bg is not None:
             if self.bg in ansicolors:
-                esc = codes[self.bg[5:]]
+                esc = codes[self.bg.replace('ansi','')]
                 # extract fg color code, add 10 for bg.
                 attrs.append(str(int(esc[2:4])+10))
             else:
@@ -68,6 +69,8 @@
             attrs.append("01")
         if self.underline:
             attrs.append("04")
+        if self.italic:
+            attrs.append("03")
         return self.escape(attrs)
 
     def true_color_string(self):
@@ -80,6 +83,8 @@
             attrs.append("01")
         if self.underline:
             attrs.append("04")
+        if self.italic:
+            attrs.append("03")
         return self.escape(attrs)
 
     def reset_string(self):
@@ -88,7 +93,7 @@
             attrs.append("39")
         if self.bg is not None:
             attrs.append("49")
-        if self.bold or self.underline:
+        if self.bold or self.underline or self.italic:
             attrs.append("00")
         return self.escape(attrs)
 
@@ -110,6 +115,12 @@
        `Terminal256Formatter` will map these to non extended foreground color.
        See :ref:`AnsiTerminalStyle` for more information.
 
+    .. versionchanged:: 2.4
+       The ANSI color names have been updated with names that are easier to
+       understand and align with colornames of other projects and terminals.
+       See :ref:`this table <new-ansi-color-names>` for more information.
+
+
     Options accepted:
 
     `style`
@@ -129,6 +140,7 @@
 
         self.usebold = 'nobold' not in options
         self.useunderline = 'nounderline' not in options
+        self.useitalic = 'noitalic' not in options
 
         self._build_color_table()  # build an RGB-to-256 color conversion table
         self._setup_styles()  # convert selected style's colors to term. colors
@@ -189,7 +201,7 @@
     def _color_index(self, color):
         index = self.best_match.get(color, None)
         if color in ansicolors:
-            # strip the `#ansi` part and look up code
+            # strip the `ansi/#ansi` part and look up code
             index = color
             self.best_match[color] = index
         if index is None:
@@ -221,16 +233,12 @@
                 escape.bold = True
             if self.useunderline and ndef['underline']:
                 escape.underline = True
+            if self.useitalic and ndef['italic']:
+                escape.italic = True
             self.style_string[str(ttype)] = (escape.color_string(),
                                              escape.reset_string())
 
     def format(self, tokensource, outfile):
-        # hack: if the output is a terminal and has an encoding set,
-        # use that to avoid unicode encode problems
-        if not self.encoding and hasattr(outfile, "encoding") and \
-           hasattr(outfile, "isatty") and outfile.isatty() and \
-           sys.version_info < (3,):
-            self.encoding = outfile.encoding
         return Formatter.format(self, tokensource, outfile)
 
     def format_unencoded(self, tokensource, outfile):
@@ -305,5 +313,7 @@
                 escape.bold = True
             if self.useunderline and ndef['underline']:
                 escape.underline = True
+            if self.useitalic and ndef['italic']:
+                escape.italic = True
             self.style_string[str(ttype)] = (escape.true_color_string(),
                                              escape.reset_string())
--- a/eric6/ThirdParty/Pygments/pygments/lexer.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/ThirdParty/Pygments/pygments/lexer.py	Sat May 02 13:51:07 2020 +0200
@@ -5,12 +5,10 @@
 
     Base lexer classes.
 
-    :copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
-from __future__ import print_function
-
 import re
 import sys
 import time
@@ -19,7 +17,7 @@
 from pygments.filters import get_filter_by_name
 from pygments.token import Error, Text, Other, _TokenType
 from pygments.util import get_bool_opt, get_int_opt, get_list_opt, \
-    make_analysator, text_type, add_metaclass, iteritems, Future, guess_decode
+    make_analysator, Future, guess_decode
 from pygments.regexopt import regex_opt
 
 __all__ = ['Lexer', 'RegexLexer', 'ExtendedRegexLexer', 'DelegatingLexer',
@@ -48,8 +46,7 @@
         return type.__new__(mcs, name, bases, d)
 
 
-@add_metaclass(LexerMeta)
-class Lexer(object):
+class Lexer(metaclass=LexerMeta):
     """
     Lexer for a specific language.
 
@@ -145,7 +142,7 @@
         Also preprocess the text, i.e. expand tabs and strip it if
         wanted and applies registered filters.
         """
-        if not isinstance(text, text_type):
+        if not isinstance(text, str):
             if self.encoding == 'guess':
                 text, _ = guess_decode(text)
             elif self.encoding == 'chardet':
@@ -252,7 +249,7 @@
     pass
 
 
-class _inherit(object):
+class _inherit:
     """
     Indicates the a state should inherit from its superclass.
     """
@@ -275,7 +272,7 @@
         pass
 
 
-class _PseudoMatch(object):
+class _PseudoMatch:
     """
     A pseudo match object constructed from a string.
     """
@@ -328,11 +325,12 @@
     return callback
 
 
-class _This(object):
+class _This:
     """
     Special singleton used for indicating the caller class.
     Used by ``using``.
     """
+
 this = _This()
 
 
@@ -536,7 +534,7 @@
         for c in cls.__mro__:
             toks = c.__dict__.get('tokens', {})
 
-            for state, items in iteritems(toks):
+            for state, items in toks.items():
                 curitems = tokens.get(state)
                 if curitems is None:
                     # N.b. because this is assigned by reference, sufficiently
@@ -582,8 +580,7 @@
         return type.__call__(cls, *args, **kwds)
 
 
-@add_metaclass(RegexLexerMeta)
-class RegexLexer(Lexer):
+class RegexLexer(Lexer, metaclass=RegexLexerMeta):
     """
     Base for simple stateful regular expression-based lexers.
     Simplifies the lexing process so that you need only
@@ -639,14 +636,20 @@
                         if isinstance(new_state, tuple):
                             for state in new_state:
                                 if state == '#pop':
-                                    statestack.pop()
+                                    if len(statestack) > 1:
+                                        statestack.pop()
                                 elif state == '#push':
                                     statestack.append(statestack[-1])
                                 else:
                                     statestack.append(state)
                         elif isinstance(new_state, int):
-                            # pop
-                            del statestack[new_state:]
+                            # pop, but keep at least one state on the stack
+                            # (random code leading to unexpected pops should
+                            # not allow exceptions)
+                            if abs(new_state) >= len(statestack):
+                                del statestack[1:]
+                            else:
+                                del statestack[new_state:]
                         elif new_state == '#push':
                             statestack.append(statestack[-1])
                         else:
@@ -670,7 +673,7 @@
                     break
 
 
-class LexerContext(object):
+class LexerContext:
     """
     A helper object that holds lexer position data.
     """
@@ -724,14 +727,18 @@
                         if isinstance(new_state, tuple):
                             for state in new_state:
                                 if state == '#pop':
-                                    ctx.stack.pop()
+                                    if len(ctx.stack) > 1:
+                                        ctx.stack.pop()
                                 elif state == '#push':
                                     ctx.stack.append(ctx.stack[-1])
                                 else:
                                     ctx.stack.append(state)
                         elif isinstance(new_state, int):
-                            # pop
-                            del ctx.stack[new_state:]
+                            # see RegexLexer for why this check is made
+                            if abs(new_state) >= len(ctx.stack):
+                                del ctx.state[1:]
+                            else:
+                                del ctx.stack[new_state:]
                         elif new_state == '#push':
                             ctx.stack.append(ctx.stack[-1])
                         else:
@@ -840,8 +847,7 @@
         return match_func
 
 
-@add_metaclass(ProfilingRegexLexerMeta)
-class ProfilingRegexLexer(RegexLexer):
+class ProfilingRegexLexer(RegexLexer, metaclass=ProfilingRegexLexerMeta):
     """Drop-in replacement for RegexLexer that does profiling of its regexes."""
 
     _prof_data = []
--- a/eric6/ThirdParty/Pygments/pygments/lexers/__init__.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/ThirdParty/Pygments/pygments/lexers/__init__.py	Sat May 02 13:51:07 2020 +0200
@@ -5,7 +5,7 @@
 
     Pygments lexers.
 
-    :copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -18,11 +18,15 @@
 from pygments.lexers._mapping import LEXERS
 from pygments.modeline import get_filetype_from_buffer
 from pygments.plugin import find_plugin_lexers
-from pygments.util import ClassNotFound, itervalues, guess_decode
+from pygments.util import ClassNotFound, guess_decode
 
+COMPAT = {
+    'Python3Lexer': 'PythonLexer',
+    'Python3TracebackLexer': 'PythonTracebackLexer',
+}
 
 __all__ = ['get_lexer_by_name', 'get_lexer_for_filename', 'find_lexer_class',
-           'guess_lexer', 'load_lexer_from_file'] + list(LEXERS)
+           'guess_lexer', 'load_lexer_from_file'] + list(LEXERS) + list(COMPAT)
 
 _lexer_cache = {}
 _pattern_cache = {}
@@ -48,7 +52,7 @@
     """Return a generator of tuples in the form ``(name, aliases,
     filenames, mimetypes)`` of all know lexers.
     """
-    for item in itervalues(LEXERS):
+    for item in LEXERS.values():
         yield item[1:]
     for lexer in find_plugin_lexers():
         yield lexer.name, lexer.aliases, lexer.filenames, lexer.mimetypes
@@ -62,7 +66,7 @@
     if name in _lexer_cache:
         return _lexer_cache[name]
     # lookup builtin lexers
-    for module_name, lname, aliases, _, _ in itervalues(LEXERS):
+    for module_name, lname, aliases, _, _ in LEXERS.values():
         if name == lname:
             _load_lexers(module_name)
             return _lexer_cache[name]
@@ -82,7 +86,7 @@
     if not _alias:
         raise ClassNotFound('no lexer for alias %r found' % _alias)
     # lookup builtin lexers
-    for module_name, name, aliases, _, _ in itervalues(LEXERS):
+    for module_name, name, aliases, _, _ in LEXERS.values():
         if _alias.lower() in aliases:
             if name not in _lexer_cache:
                 _load_lexers(module_name)
@@ -103,7 +107,7 @@
         raise ClassNotFound('no lexer for alias %r found' % _alias)
 
     # lookup builtin lexers
-    for module_name, name, aliases, _, _ in itervalues(LEXERS):
+    for module_name, name, aliases, _, _ in LEXERS.values():
         if _alias.lower() in aliases:
             if name not in _lexer_cache:
                 _load_lexers(module_name)
@@ -133,7 +137,8 @@
     try:
         # This empty dict will contain the namespace for the exec'd file
         custom_namespace = {}
-        exec(open(filename, 'rb').read(), custom_namespace)
+        with open(filename, 'rb') as f:
+            exec(f.read(), custom_namespace)
         # Retrieve the class `lexername` from that namespace
         if lexername not in custom_namespace:
             raise ClassNotFound('no valid %s class found in %s' %
@@ -142,8 +147,8 @@
         # And finally instantiate it with the options
         return lexer_class(**options)
     except IOError as err:
-        raise ClassNotFound('cannot read %s' % filename)
-    except ClassNotFound as err:
+        raise ClassNotFound('cannot read %s: %s' % (filename, err))
+    except ClassNotFound:
         raise
     except Exception as err:
         raise ClassNotFound('error when loading custom lexer: %s' % err)
@@ -159,7 +164,7 @@
     """
     matches = []
     fn = basename(_fn)
-    for modname, name, _, filenames, _ in itervalues(LEXERS):
+    for modname, name, _, filenames, _ in LEXERS.values():
         for filename in filenames:
             if _fn_matches(fn, filename):
                 if name not in _lexer_cache:
@@ -170,7 +175,7 @@
             if _fn_matches(fn, filename):
                 matches.append((cls, filename))
 
-    if sys.version_info > (3,) and isinstance(code, bytes):
+    if isinstance(code, bytes):
         # decode it, since all analyse_text functions expect unicode
         code = guess_decode(code)
 
@@ -211,7 +216,7 @@
 
     Raises ClassNotFound if not found.
     """
-    for modname, name, _, _, mimetypes in itervalues(LEXERS):
+    for modname, name, _, _, mimetypes in LEXERS.values():
         if _mime in mimetypes:
             if name not in _lexer_cache:
                 _load_lexers(modname)
@@ -288,6 +293,13 @@
 def guess_lexer(_text, **options):
     """Guess a lexer by strong distinctions in the text (eg, shebang)."""
 
+    if not isinstance(_text, str):
+        inencoding = options.get('inencoding', options.get('encoding'))
+        if inencoding:
+            _text = _text.decode(inencoding or 'utf8')
+        else:
+            _text, _ = guess_decode(_text)
+
     # try to get a vim modeline first
     ft = get_filetype_from_buffer(_text)
 
@@ -319,6 +331,8 @@
             cls = _lexer_cache[info[1]]
             setattr(self, name, cls)
             return cls
+        if name in COMPAT:
+            return getattr(self, COMPAT[name])
         raise AttributeError(name)
 
 
--- a/eric6/ThirdParty/Pygments/pygments/lexers/_asy_builtins.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/ThirdParty/Pygments/pygments/lexers/_asy_builtins.py	Sat May 02 13:51:07 2020 +0200
@@ -10,11 +10,11 @@
     TODO: perl/python script in Asymptote SVN similar to asy-list.pl but only
     for function and variable names.
 
-    :copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
-ASYFUNCNAME = set((
+ASYFUNCNAME = {
     'AND',
     'Arc',
     'ArcArrow',
@@ -1038,9 +1038,9 @@
     'ztick',
     'ztick3',
     'ztrans'
-))
+}
 
-ASYVARNAME = set((
+ASYVARNAME = {
     'AliceBlue',
     'Align',
     'Allow',
@@ -1642,4 +1642,4 @@
     'ylabelwidth',
     'zerotickfuzz',
     'zerowinding'
-))
+}
--- a/eric6/ThirdParty/Pygments/pygments/lexers/_cl_builtins.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/ThirdParty/Pygments/pygments/lexers/_cl_builtins.py	Sat May 02 13:51:07 2020 +0200
@@ -5,11 +5,11 @@
 
     ANSI Common Lisp builtins.
 
-    :copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
-BUILTIN_FUNCTIONS = set((  # 638 functions
+BUILTIN_FUNCTIONS = {  # 638 functions
     '<', '<=', '=', '>', '>=', '-', '/', '/=', '*', '+', '1-', '1+',
     'abort', 'abs', 'acons', 'acos', 'acosh', 'add-method', 'adjoin',
     'adjustable-array-p', 'adjust-array', 'allocate-instance',
@@ -157,17 +157,17 @@
     'wild-pathname-p', 'write', 'write-byte', 'write-char', 'write-line',
     'write-sequence', 'write-string', 'write-to-string', 'yes-or-no-p',
     'y-or-n-p', 'zerop',
-))
+}
 
-SPECIAL_FORMS = set((
+SPECIAL_FORMS = {
     'block', 'catch', 'declare', 'eval-when', 'flet', 'function', 'go', 'if',
     'labels', 'lambda', 'let', 'let*', 'load-time-value', 'locally', 'macrolet',
     'multiple-value-call', 'multiple-value-prog1', 'progn', 'progv', 'quote',
     'return-from', 'setq', 'symbol-macrolet', 'tagbody', 'the', 'throw',
     'unwind-protect',
-))
+}
 
-MACROS = set((
+MACROS = {
     'and', 'assert', 'call-method', 'case', 'ccase', 'check-type', 'cond',
     'ctypecase', 'decf', 'declaim', 'defclass', 'defconstant', 'defgeneric',
     'define-compiler-macro', 'define-condition', 'define-method-combination',
@@ -188,19 +188,19 @@
     'with-input-from-string', 'with-open-file', 'with-open-stream',
     'with-output-to-string', 'with-package-iterator', 'with-simple-restart',
     'with-slots', 'with-standard-io-syntax',
-))
+}
 
-LAMBDA_LIST_KEYWORDS = set((
+LAMBDA_LIST_KEYWORDS = {
     '&allow-other-keys', '&aux', '&body', '&environment', '&key', '&optional',
     '&rest', '&whole',
-))
+}
 
-DECLARATIONS = set((
+DECLARATIONS = {
     'dynamic-extent', 'ignore', 'optimize', 'ftype', 'inline', 'special',
     'ignorable', 'notinline', 'type',
-))
+}
 
-BUILTIN_TYPES = set((
+BUILTIN_TYPES = {
     'atom', 'boolean', 'base-char', 'base-string', 'bignum', 'bit',
     'compiled-function', 'extended-char', 'fixnum', 'keyword', 'nil',
     'signed-byte', 'short-float', 'single-float', 'double-float', 'long-float',
@@ -217,9 +217,9 @@
     'simple-type-error', 'simple-warning', 'stream-error', 'storage-condition',
     'style-warning', 'type-error', 'unbound-variable', 'unbound-slot',
     'undefined-function', 'warning',
-))
+}
 
-BUILTIN_CLASSES = set((
+BUILTIN_CLASSES = {
     'array', 'broadcast-stream', 'bit-vector', 'built-in-class', 'character',
     'class', 'complex', 'concatenated-stream', 'cons', 'echo-stream',
     'file-stream', 'float', 'function', 'generic-function', 'hash-table',
@@ -229,4 +229,4 @@
     'standard-generic-function', 'standard-method', 'standard-object',
     'string-stream', 'stream', 'string', 'structure-class', 'structure-object',
     'symbol', 'synonym-stream', 't', 'two-way-stream', 'vector',
-))
+}
--- a/eric6/ThirdParty/Pygments/pygments/lexers/_cocoa_builtins.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/ThirdParty/Pygments/pygments/lexers/_cocoa_builtins.py	Sat May 02 13:51:07 2020 +0200
@@ -8,15 +8,13 @@
 
     File may be also used as standalone generator for aboves.
 
-    :copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
-from __future__ import print_function
-
-COCOA_INTERFACES = set(['UITableViewCell', 'HKCorrelationQuery', 'NSURLSessionDataTask', 'PHFetchOptions', 'NSLinguisticTagger', 'NSStream', 'AVAudioUnitDelay', 'GCMotion', 'SKPhysicsWorld', 'NSString', 'CMAttitude', 'AVAudioEnvironmentDistanceAttenuationParameters', 'HKStatisticsCollection', 'SCNPlane', 'CBPeer', 'JSContext', 'SCNTransaction', 'SCNTorus', 'AVAudioUnitEffect', 'UICollectionReusableView', 'MTLSamplerDescriptor', 'AVAssetReaderSampleReferenceOutput', 'AVMutableCompositionTrack', 'GKLeaderboard', 'NSFetchedResultsController', 'SKRange', 'MKTileOverlayRenderer', 'MIDINetworkSession', 'UIVisualEffectView', 'CIWarpKernel', 'PKObject', 'MKRoute', 'MPVolumeView', 'UIPrintInfo', 'SCNText', 'ADClient', 'PKPayment', 'AVMutableAudioMix', 'GLKEffectPropertyLight', 'WKScriptMessage', 'AVMIDIPlayer', 'PHCollectionListChangeRequest', 'UICollectionViewLayout', 'NSMutableCharacterSet', 'SKPaymentTransaction', 'NEOnDemandRuleConnect', 'NSShadow', 'SCNView', 'NSURLSessionConfiguration', 'MTLVertexAttributeDescriptor', 'CBCharacteristic', 'HKQuantityType', 'CKLocationSortDescriptor', 'NEVPNIKEv2SecurityAssociationParameters', 'CMStepCounter', 'NSNetService', 'AVAssetWriterInputMetadataAdaptor', 'UICollectionView', 'UIViewPrintFormatter', 'SCNLevelOfDetail', 'CAShapeLayer', 'MCPeerID', 'MPRatingCommand', 'WKNavigation', 'NSDictionary', 'NSFileVersion', 'CMGyroData', 'AVAudioUnitDistortion', 'CKFetchRecordsOperation', 'SKPhysicsJointSpring', 'SCNHitTestResult', 'AVAudioTime', 'CIFilter', 'UIView', 'SCNConstraint', 'CAPropertyAnimation', 'MKMapItem', 'MPRemoteCommandCenter', 'PKPaymentSummaryItem', 'UICollectionViewFlowLayoutInvalidationContext', 'UIInputViewController', 'PKPass', 'SCNPhysicsBehavior', 'MTLRenderPassColorAttachmentDescriptor', 'MKPolygonRenderer', 'CKNotification', 'JSValue', 'PHCollectionList', 'CLGeocoder', 'NSByteCountFormatter', 'AVCaptureScreenInput', 'MPFeedbackCommand', 'CAAnimation', 'MKOverlayPathView', 'UIActionSheet', 'UIMotionEffectGroup', 'NSLengthFormatter', 'UIBarItem', 'SKProduct', 'AVAssetExportSession', 'NSKeyedUnarchiver', 'NSMutableSet', 'SCNPyramid', 'PHAssetCollection', 'MKMapView', 'HMHomeManager', 'CATransition', 'MTLCompileOptions', 'UIVibrancyEffect', 'CLCircularRegion', 'MKTileOverlay', 'SCNShape', 'ACAccountCredential', 'SKPhysicsJointLimit', 'MKMapSnapshotter', 'AVMediaSelectionGroup', 'NSIndexSet', 'CBPeripheralManager', 'CKRecordZone', 'AVAudioRecorder', 'NSURL', 'CBCentral', 'NSNumber', 'AVAudioOutputNode', 'MTLVertexAttributeDescriptorArray', 'MKETAResponse', 'SKTransition', 'SSReadingList', 'HKSourceQuery', 'UITableViewRowAction', 'UITableView', 'SCNParticlePropertyController', 'AVCaptureStillImageOutput', 'GCController', 'AVAudioPlayerNode', 'AVAudioSessionPortDescription', 'NSHTTPURLResponse', 'NEOnDemandRuleEvaluateConnection', 'SKEffectNode', 'HKQuantity', 'GCControllerElement', 'AVPlayerItemAccessLogEvent', 'SCNBox', 'NSExtensionContext', 'MKOverlayRenderer', 'SCNPhysicsVehicle', 'NSDecimalNumber', 'EKReminder', 'MKPolylineView', 'CKQuery', 'AVAudioMixerNode', 'GKAchievementDescription', 'EKParticipant', 'NSBlockOperation', 'UIActivityItemProvider', 'CLLocation', 'NSBatchUpdateRequest', 'PHContentEditingOutput', 'PHObjectChangeDetails', 'HKWorkoutType', 'MPMoviePlayerController', 'AVAudioFormat', 'HMTrigger', 'MTLRenderPassDepthAttachmentDescriptor', 'SCNRenderer', 'GKScore', 'UISplitViewController', 'HKSource', 'NSURLConnection', 'ABUnknownPersonViewController', 'SCNTechnique', 'UIMenuController', 'NSEvent', 'SKTextureAtlas', 'NSKeyedArchiver', 'GKLeaderboardSet', 'NSSimpleCString', 'AVAudioPCMBuffer', 'CBATTRequest', 'GKMatchRequest', 'AVMetadataObject', 'SKProductsRequest', 'UIAlertView', 'NSIncrementalStore', 'MFMailComposeViewController', 'SCNFloor', 'NSSortDescriptor', 'CKFetchNotificationChangesOperation', 'MPMovieAccessLog', 'NSManagedObjectContext', 'AVAudioUnitGenerator', 'WKBackForwardList', 'SKMutableTexture', 'AVCaptureAudioDataOutput', 'ACAccount', 'AVMetadataItem', 'MPRatingCommandEvent', 'AVCaptureDeviceInputSource', 'CLLocationManager', 'MPRemoteCommand', 'AVCaptureSession', 'UIStepper', 'UIRefreshControl', 'NEEvaluateConnectionRule', 'CKModifyRecordsOperation', 'UICollectionViewTransitionLayout', 'CBCentralManager', 'NSPurgeableData', 'PKShippingMethod', 'SLComposeViewController', 'NSHashTable', 'MKUserTrackingBarButtonItem', 'UILexiconEntry', 'CMMotionActivity', 'SKAction', 'SKShader', 'AVPlayerItemOutput', 'MTLRenderPassAttachmentDescriptor', 'UIDocumentInteractionController', 'UIDynamicItemBehavior', 'NSMutableDictionary', 'UILabel', 'AVCaptureInputPort', 'NSExpression', 'CAInterAppAudioTransportView', 'SKMutablePayment', 'UIImage', 'PHCachingImageManager', 'SCNTransformConstraint', 'HKCorrelationType', 'UIColor', 'SCNGeometrySource', 'AVCaptureAutoExposureBracketedStillImageSettings', 'UIPopoverBackgroundView', 'UIToolbar', 'NSNotificationCenter', 'UICollectionViewLayoutAttributes', 'AVAssetReaderOutputMetadataAdaptor', 'NSEntityMigrationPolicy', 'HMUser', 'NSLocale', 'NSURLSession', 'SCNCamera', 'NSTimeZone', 'UIManagedDocument', 'AVMutableVideoCompositionLayerInstruction', 'AVAssetTrackGroup', 'NSInvocationOperation', 'ALAssetRepresentation', 'AVQueuePlayer', 'HMServiceGroup', 'UIPasteboard', 'PHContentEditingInput', 'NSLayoutManager', 'EKCalendarChooser', 'EKObject', 'CATiledLayer', 'GLKReflectionMapEffect', 'NSManagedObjectID', 'NSEnergyFormatter', 'SLRequest', 'HMCharacteristic', 'AVPlayerLayer', 'MTLRenderPassDescriptor', 'SKPayment', 'NSPointerArray', 'AVAudioMix', 'SCNLight', 'MCAdvertiserAssistant', 'MKMapSnapshotOptions', 'HKCategorySample', 'AVAudioEnvironmentReverbParameters', 'SCNMorpher', 'AVTimedMetadataGroup', 'CBMutableCharacteristic', 'NSFetchRequest', 'UIDevice', 'NSManagedObject', 'NKAssetDownload', 'AVOutputSettingsAssistant', 'SKPhysicsJointPin', 'UITabBar', 'UITextInputMode', 'NSFetchRequestExpression', 'HMActionSet', 'CTSubscriber', 'PHAssetChangeRequest', 'NSPersistentStoreRequest', 'UITabBarController', 'HKQuantitySample', 'AVPlayerItem', 'AVSynchronizedLayer', 'MKDirectionsRequest', 'NSMetadataItem', 'UIPresentationController', 'UINavigationItem', 'PHFetchResultChangeDetails', 'PHImageManager', 'AVCaptureManualExposureBracketedStillImageSettings', 'UIStoryboardPopoverSegue', 'SCNLookAtConstraint', 'UIGravityBehavior', 'UIWindow', 'CBMutableDescriptor', 'NEOnDemandRuleDisconnect', 'UIBezierPath', 'UINavigationController', 'ABPeoplePickerNavigationController', 'EKSource', 'AVAssetWriterInput', 'AVPlayerItemTrack', 'GLKEffectPropertyTexture', 'NSHTTPCookie', 'NSURLResponse', 'SKPaymentQueue', 'NSAssertionHandler', 'MKReverseGeocoder', 'GCControllerAxisInput', 'NSArray', 'NSOrthography', 'NSURLSessionUploadTask', 'NSCharacterSet', 'AVMutableVideoCompositionInstruction', 'AVAssetReaderOutput', 'EAGLContext', 'WKFrameInfo', 'CMPedometer', 'MyClass', 'CKModifyBadgeOperation', 'AVCaptureAudioFileOutput', 'SKEmitterNode', 'NSMachPort', 'AVVideoCompositionCoreAnimationTool', 'PHCollection', 'SCNPhysicsWorld', 'NSURLRequest', 'CMAccelerometerData', 'NSNetServiceBrowser', 'CLFloor', 'AVAsynchronousVideoCompositionRequest', 'SCNGeometry', 'SCNIKConstraint', 'CIKernel', 'CAGradientLayer', 'HKCharacteristicType', 'NSFormatter', 'SCNAction', 'CATransaction', 'CBUUID', 'UIStoryboard', 'MPMediaLibrary', 'UITapGestureRecognizer', 'MPMediaItemArtwork', 'NSURLSessionTask', 'AVAudioUnit', 'MCBrowserViewController', 'UIFontDescriptor', 'NSRelationshipDescription', 'HKSample', 'WKWebView', 'NSMutableAttributedString', 'NSPersistentStoreAsynchronousResult', 'MPNowPlayingInfoCenter', 'MKLocalSearch', 'EAAccessory', 'HKCorrelation', 'CATextLayer', 'NSNotificationQueue', 'UINib', 'GLKTextureLoader', 'HKObjectType', 'NSValue', 'NSMutableIndexSet', 'SKPhysicsContact', 'NSProgress', 'AVPlayerViewController', 'CAScrollLayer', 'GKSavedGame', 'NSTextCheckingResult', 'PHObjectPlaceholder', 'SKConstraint', 'EKEventEditViewController', 'NSEntityDescription', 'NSURLCredentialStorage', 'UIApplication', 'SKDownload', 'SCNNode', 'MKLocalSearchRequest', 'SKScene', 'UISearchDisplayController', 'NEOnDemandRule', 'MTLRenderPassStencilAttachmentDescriptor', 'CAReplicatorLayer', 'UIPrintPageRenderer', 'EKCalendarItem', 'NSUUID', 'EAAccessoryManager', 'NEOnDemandRuleIgnore', 'SKRegion', 'AVAssetResourceLoader', 'EAWiFiUnconfiguredAccessoryBrowser', 'NSUserActivity', 'CTCall', 'UIPrinterPickerController', 'CIVector', 'UINavigationBar', 'UIPanGestureRecognizer', 'MPMediaQuery', 'ABNewPersonViewController', 'CKRecordZoneID', 'HKAnchoredObjectQuery', 'CKFetchRecordZonesOperation', 'UIStoryboardSegue', 'ACAccountType', 'GKSession', 'SKVideoNode', 'PHChange', 'SKReceiptRefreshRequest', 'GCExtendedGamepadSnapshot', 'MPSeekCommandEvent', 'GCExtendedGamepad', 'CAValueFunction', 'SCNCylinder', 'NSNotification', 'NSBatchUpdateResult', 'PKPushCredentials', 'SCNPhysicsSliderJoint', 'AVCaptureDeviceFormat', 'AVPlayerItemErrorLog', 'NSMapTable', 'NSSet', 'CMMotionManager', 'GKVoiceChatService', 'UIPageControl', 'UILexicon', 'MTLArrayType', 'AVAudioUnitReverb', 'MKGeodesicPolyline', 'AVMutableComposition', 'NSLayoutConstraint', 'UIPrinter', 'NSOrderedSet', 'CBAttribute', 'PKPushPayload', 'NSIncrementalStoreNode', 'EKEventStore', 'MPRemoteCommandEvent', 'UISlider', 'UIBlurEffect', 'CKAsset', 'AVCaptureInput', 'AVAudioEngine', 'MTLVertexDescriptor', 'SKPhysicsBody', 'NSOperation', 'PKPaymentPass', 'UIImageAsset', 'MKMapCamera', 'SKProductsResponse', 'GLKEffectPropertyMaterial', 'AVCaptureDevice', 'CTCallCenter', 'CABTMIDILocalPeripheralViewController', 'NEVPNManager', 'HKQuery', 'SCNPhysicsContact', 'CBMutableService', 'AVSampleBufferDisplayLayer', 'SCNSceneSource', 'SKLightNode', 'CKDiscoveredUserInfo', 'NSMutableArray', 'MTLDepthStencilDescriptor', 'MTLArgument', 'NSMassFormatter', 'CIRectangleFeature', 'PKPushRegistry', 'NEVPNConnection', 'MCNearbyServiceBrowser', 'NSOperationQueue', 'MKPolylineRenderer', 'HKWorkout', 'NSValueTransformer', 'UICollectionViewFlowLayout', 'MPChangePlaybackRateCommandEvent', 'NSEntityMapping', 'SKTexture', 'NSMergePolicy', 'UITextInputStringTokenizer', 'NSRecursiveLock', 'AVAsset', 'NSUndoManager', 'AVAudioUnitSampler', 'NSItemProvider', 'SKUniform', 'MPMediaPickerController', 'CKOperation', 'MTLRenderPipelineDescriptor', 'EAWiFiUnconfiguredAccessory', 'NSFileCoordinator', 'SKRequest', 'NSFileHandle', 'NSConditionLock', 'UISegmentedControl', 'NSManagedObjectModel', 'UITabBarItem', 'SCNCone', 'MPMediaItem', 'SCNMaterial', 'EKRecurrenceRule', 'UIEvent', 'UITouch', 'UIPrintInteractionController', 'CMDeviceMotion', 'NEVPNProtocol', 'NSCompoundPredicate', 'HKHealthStore', 'MKMultiPoint', 'HKSampleType', 'UIPrintFormatter', 'AVAudioUnitEQFilterParameters', 'SKView', 'NSConstantString', 'UIPopoverController', 'CKDatabase', 'AVMetadataFaceObject', 'UIAccelerometer', 'EKEventViewController', 'CMAltitudeData', 'MTLStencilDescriptor', 'UISwipeGestureRecognizer', 'NSPort', 'MKCircleRenderer', 'AVCompositionTrack', 'NSAsynchronousFetchRequest', 'NSUbiquitousKeyValueStore', 'NSMetadataQueryResultGroup', 'AVAssetResourceLoadingDataRequest', 'UITableViewHeaderFooterView', 'CKNotificationID', 'AVAudioSession', 'HKUnit', 'NSNull', 'NSPersistentStoreResult', 'MKCircleView', 'AVAudioChannelLayout', 'NEVPNProtocolIKEv2', 'WKProcessPool', 'UIAttachmentBehavior', 'CLBeacon', 'NSInputStream', 'NSURLCache', 'GKPlayer', 'NSMappingModel', 'CIQRCodeFeature', 'AVMutableVideoComposition', 'PHFetchResult', 'NSAttributeDescription', 'AVPlayer', 'MKAnnotationView', 'PKPaymentRequest', 'NSTimer', 'CBDescriptor', 'MKOverlayView', 'AVAudioUnitTimePitch', 'NSSaveChangesRequest', 'UIReferenceLibraryViewController', 'SKPhysicsJointFixed', 'UILocalizedIndexedCollation', 'UIInterpolatingMotionEffect', 'UIDocumentPickerViewController', 'AVAssetWriter', 'NSBundle', 'SKStoreProductViewController', 'GLKViewController', 'NSMetadataQueryAttributeValueTuple', 'GKTurnBasedMatch', 'AVAudioFile', 'UIActivity', 'NSPipe', 'MKShape', 'NSMergeConflict', 'CIImage', 'HKObject', 'UIRotationGestureRecognizer', 'AVPlayerItemLegibleOutput', 'AVAssetImageGenerator', 'GCControllerButtonInput', 'CKMarkNotificationsReadOperation', 'CKSubscription', 'MPTimedMetadata', 'NKIssue', 'UIScreenMode', 'HMAccessoryBrowser', 'GKTurnBasedEventHandler', 'UIWebView', 'MKPolyline', 'JSVirtualMachine', 'AVAssetReader', 'NSAttributedString', 'GKMatchmakerViewController', 'NSCountedSet', 'UIButton', 'WKNavigationResponse', 'GKLocalPlayer', 'MPMovieErrorLog', 'AVSpeechUtterance', 'HKStatistics', 'UILocalNotification', 'HKBiologicalSexObject', 'AVURLAsset', 'CBPeripheral', 'NSDateComponentsFormatter', 'SKSpriteNode', 'UIAccessibilityElement', 'AVAssetWriterInputGroup', 'HMZone', 'AVAssetReaderAudioMixOutput', 'NSEnumerator', 'UIDocument', 'MKLocalSearchResponse', 'UISimpleTextPrintFormatter', 'PHPhotoLibrary', 'CBService', 'UIDocumentMenuViewController', 'MCSession', 'QLPreviewController', 'CAMediaTimingFunction', 'UITextPosition', 'ASIdentifierManager', 'AVAssetResourceLoadingRequest', 'SLComposeServiceViewController', 'UIPinchGestureRecognizer', 'PHObject', 'NSExtensionItem', 'HKSampleQuery', 'MTLRenderPipelineColorAttachmentDescriptorArray', 'MKRouteStep', 'SCNCapsule', 'NSMetadataQuery', 'AVAssetResourceLoadingContentInformationRequest', 'UITraitCollection', 'CTCarrier', 'NSFileSecurity', 'UIAcceleration', 'UIMotionEffect', 'MTLRenderPipelineReflection', 'CLHeading', 'CLVisit', 'MKDirectionsResponse', 'HMAccessory', 'MTLStructType', 'UITextView', 'CMMagnetometerData', 'UICollisionBehavior', 'UIProgressView', 'CKServerChangeToken', 'UISearchBar', 'MKPlacemark', 'AVCaptureConnection', 'NSPropertyMapping', 'ALAssetsFilter', 'SK3DNode', 'AVPlayerItemErrorLogEvent', 'NSJSONSerialization', 'AVAssetReaderVideoCompositionOutput', 'ABPersonViewController', 'CIDetector', 'GKTurnBasedMatchmakerViewController', 'MPMediaItemCollection', 'SCNSphere', 'NSCondition', 'NSURLCredential', 'MIDINetworkConnection', 'NSFileProviderExtension', 'NSDecimalNumberHandler', 'NSAtomicStoreCacheNode', 'NSAtomicStore', 'EKAlarm', 'CKNotificationInfo', 'AVAudioUnitEQ', 'UIPercentDrivenInteractiveTransition', 'MKPolygon', 'AVAssetTrackSegment', 'MTLVertexAttribute', 'NSExpressionDescription', 'HKStatisticsCollectionQuery', 'NSURLAuthenticationChallenge', 'NSDirectoryEnumerator', 'MKDistanceFormatter', 'UIAlertAction', 'NSPropertyListSerialization', 'GKPeerPickerController', 'UIUserNotificationSettings', 'UITableViewController', 'GKNotificationBanner', 'MKPointAnnotation', 'MTLRenderPassColorAttachmentDescriptorArray', 'NSCache', 'SKPhysicsJoint', 'NSXMLParser', 'UIViewController', 'PKPaymentToken', 'MFMessageComposeViewController', 'AVAudioInputNode', 'NSDataDetector', 'CABTMIDICentralViewController', 'AVAudioUnitMIDIInstrument', 'AVCaptureVideoPreviewLayer', 'AVAssetWriterInputPassDescription', 'MPChangePlaybackRateCommand', 'NSURLComponents', 'CAMetalLayer', 'UISnapBehavior', 'AVMetadataMachineReadableCodeObject', 'CKDiscoverUserInfosOperation', 'NSTextAttachment', 'NSException', 'UIMenuItem', 'CMMotionActivityManager', 'SCNGeometryElement', 'NCWidgetController', 'CAEmitterLayer', 'MKUserLocation', 'UIImagePickerController', 'CIFeature', 'AVCaptureDeviceInput', 'ALAsset', 'NSURLSessionDownloadTask', 'SCNPhysicsHingeJoint', 'MPMoviePlayerViewController', 'NSMutableOrderedSet', 'SCNMaterialProperty', 'UIFont', 'AVCaptureVideoDataOutput', 'NSCachedURLResponse', 'ALAssetsLibrary', 'NSInvocation', 'UILongPressGestureRecognizer', 'NSTextStorage', 'WKWebViewConfiguration', 'CIFaceFeature', 'MKMapSnapshot', 'GLKEffectPropertyFog', 'AVComposition', 'CKDiscoverAllContactsOperation', 'AVAudioMixInputParameters', 'CAEmitterBehavior', 'PKPassLibrary', 'UIMutableUserNotificationCategory', 'NSLock', 'NEVPNProtocolIPSec', 'ADBannerView', 'UIDocumentPickerExtensionViewController', 'UIActivityIndicatorView', 'AVPlayerMediaSelectionCriteria', 'CALayer', 'UIAccessibilityCustomAction', 'UIBarButtonItem', 'AVAudioSessionRouteDescription', 'CLBeaconRegion', 'HKBloodTypeObject', 'MTLVertexBufferLayoutDescriptorArray', 'CABasicAnimation', 'AVVideoCompositionInstruction', 'AVMutableTimedMetadataGroup', 'EKRecurrenceEnd', 'NSTextContainer', 'TWTweetComposeViewController', 'PKPaymentAuthorizationViewController', 'UIScrollView', 'WKNavigationAction', 'AVPlayerItemMetadataOutput', 'EKRecurrenceDayOfWeek', 'NSNumberFormatter', 'MTLComputePipelineReflection', 'UIScreen', 'CLRegion', 'NSProcessInfo', 'GLKTextureInfo', 'SCNSkinner', 'AVCaptureMetadataOutput', 'SCNAnimationEvent', 'NSTextTab', 'JSManagedValue', 'NSDate', 'UITextChecker', 'WKBackForwardListItem', 'NSData', 'NSParagraphStyle', 'AVMutableMetadataItem', 'EKCalendar', 'HKWorkoutEvent', 'NSMutableURLRequest', 'UIVideoEditorController', 'HMTimerTrigger', 'AVAudioUnitVarispeed', 'UIDynamicAnimator', 'AVCompositionTrackSegment', 'GCGamepadSnapshot', 'MPMediaEntity', 'GLKSkyboxEffect', 'UISwitch', 'EKStructuredLocation', 'UIGestureRecognizer', 'NSProxy', 'GLKBaseEffect', 'UIPushBehavior', 'GKScoreChallenge', 'NSCoder', 'MPMediaPlaylist', 'NSDateComponents', 'WKUserScript', 'EKEvent', 'NSDateFormatter', 'NSAsynchronousFetchResult', 'AVAssetWriterInputPixelBufferAdaptor', 'UIVisualEffect', 'UICollectionViewCell', 'UITextField', 'CLPlacemark', 'MPPlayableContentManager', 'AVCaptureOutput', 'HMCharacteristicWriteAction', 'CKModifySubscriptionsOperation', 'NSPropertyDescription', 'GCGamepad', 'UIMarkupTextPrintFormatter', 'SCNTube', 'NSPersistentStoreCoordinator', 'AVAudioEnvironmentNode', 'GKMatchmaker', 'CIContext', 'NSThread', 'SLComposeSheetConfigurationItem', 'SKPhysicsJointSliding', 'NSPredicate', 'GKVoiceChat', 'SKCropNode', 'AVCaptureAudioPreviewOutput', 'NSStringDrawingContext', 'GKGameCenterViewController', 'UIPrintPaper', 'SCNPhysicsBallSocketJoint', 'UICollectionViewLayoutInvalidationContext', 'GLKEffectPropertyTransform', 'AVAudioIONode', 'UIDatePicker', 'MKDirections', 'ALAssetsGroup', 'CKRecordZoneNotification', 'SCNScene', 'MPMovieAccessLogEvent', 'CKFetchSubscriptionsOperation', 'CAEmitterCell', 'AVAudioUnitTimeEffect', 'HMCharacteristicMetadata', 'MKPinAnnotationView', 'UIPickerView', 'UIImageView', 'UIUserNotificationCategory', 'SCNPhysicsVehicleWheel', 'HKCategoryType', 'MPMediaQuerySection', 'GKFriendRequestComposeViewController', 'NSError', 'MTLRenderPipelineColorAttachmentDescriptor', 'SCNPhysicsShape', 'UISearchController', 'SCNPhysicsBody', 'CTSubscriberInfo', 'AVPlayerItemAccessLog', 'MPMediaPropertyPredicate', 'CMLogItem', 'NSAutoreleasePool', 'NSSocketPort', 'AVAssetReaderTrackOutput', 'SKNode', 'UIMutableUserNotificationAction', 'SCNProgram', 'AVSpeechSynthesisVoice', 'CMAltimeter', 'AVCaptureAudioChannel', 'GKTurnBasedExchangeReply', 'AVVideoCompositionLayerInstruction', 'AVSpeechSynthesizer', 'GKChallengeEventHandler', 'AVCaptureFileOutput', 'UIControl', 'SCNPhysicsField', 'CKReference', 'LAContext', 'CKRecordID', 'ADInterstitialAd', 'AVAudioSessionDataSourceDescription', 'AVAudioBuffer', 'CIColorKernel', 'GCControllerDirectionPad', 'NSFileManager', 'AVMutableAudioMixInputParameters', 'UIScreenEdgePanGestureRecognizer', 'CAKeyframeAnimation', 'CKQueryNotification', 'PHAdjustmentData', 'EASession', 'AVAssetResourceRenewalRequest', 'UIInputView', 'NSFileWrapper', 'UIResponder', 'NSPointerFunctions', 'UIKeyCommand', 'NSHTTPCookieStorage', 'AVMediaSelectionOption', 'NSRunLoop', 'NSFileAccessIntent', 'CAAnimationGroup', 'MKCircle', 'UIAlertController', 'NSMigrationManager', 'NSDateIntervalFormatter', 'UICollectionViewUpdateItem', 'CKDatabaseOperation', 'PHImageRequestOptions', 'SKReachConstraints', 'CKRecord', 'CAInterAppAudioSwitcherView', 'WKWindowFeatures', 'GKInvite', 'NSMutableData', 'PHAssetCollectionChangeRequest', 'NSMutableParagraphStyle', 'UIDynamicBehavior', 'GLKEffectProperty', 'CKFetchRecordChangesOperation', 'SKShapeNode', 'MPMovieErrorLogEvent', 'MKPolygonView', 'MPContentItem', 'HMAction', 'NSScanner', 'GKAchievementChallenge', 'AVAudioPlayer', 'CKContainer', 'AVVideoComposition', 'NKLibrary', 'NSPersistentStore', 'AVCaptureMovieFileOutput', 'HMRoom', 'GKChallenge', 'UITextRange', 'NSURLProtectionSpace', 'ACAccountStore', 'MPSkipIntervalCommand', 'NSComparisonPredicate', 'HMHome', 'PHVideoRequestOptions', 'NSOutputStream', 'MPSkipIntervalCommandEvent', 'PKAddPassesViewController', 'UITextSelectionRect', 'CTTelephonyNetworkInfo', 'AVTextStyleRule', 'NSFetchedPropertyDescription', 'UIPageViewController', 'CATransformLayer', 'UICollectionViewController', 'AVAudioNode', 'MCNearbyServiceAdvertiser', 'NSObject', 'PHAsset', 'GKLeaderboardViewController', 'CKQueryCursor', 'MPMusicPlayerController', 'MKOverlayPathRenderer', 'CMPedometerData', 'HMService', 'SKFieldNode', 'GKAchievement', 'WKUserContentController', 'AVAssetTrack', 'TWRequest', 'SKLabelNode', 'AVCaptureBracketedStillImageSettings', 'MIDINetworkHost', 'MPMediaPredicate', 'AVFrameRateRange', 'MTLTextureDescriptor', 'MTLVertexBufferLayoutDescriptor', 'MPFeedbackCommandEvent', 'UIUserNotificationAction', 'HKStatisticsQuery', 'SCNParticleSystem', 'NSIndexPath', 'AVVideoCompositionRenderContext', 'CADisplayLink', 'HKObserverQuery', 'UIPopoverPresentationController', 'CKQueryOperation', 'CAEAGLLayer', 'NSMutableString', 'NSMessagePort', 'NSURLQueryItem', 'MTLStructMember', 'AVAudioSessionChannelDescription', 'GLKView', 'UIActivityViewController', 'GKAchievementViewController', 'GKTurnBasedParticipant', 'NSURLProtocol', 'NSUserDefaults', 'NSCalendar', 'SKKeyframeSequence', 'AVMetadataItemFilter', 'CKModifyRecordZonesOperation', 'WKPreferences', 'NSMethodSignature', 'NSRegularExpression', 'EAGLSharegroup', 'AVPlayerItemVideoOutput', 'PHContentEditingInputRequestOptions', 'GKMatch', 'CIColor', 'UIDictationPhrase'])
-COCOA_PROTOCOLS = set(['SKStoreProductViewControllerDelegate', 'AVVideoCompositionInstruction', 'AVAudioSessionDelegate', 'GKMatchDelegate', 'NSFileManagerDelegate', 'UILayoutSupport', 'NSCopying', 'UIPrintInteractionControllerDelegate', 'QLPreviewControllerDataSource', 'SKProductsRequestDelegate', 'NSTextStorageDelegate', 'MCBrowserViewControllerDelegate', 'MTLComputeCommandEncoder', 'SCNSceneExportDelegate', 'UISearchResultsUpdating', 'MFMailComposeViewControllerDelegate', 'MTLBlitCommandEncoder', 'NSDecimalNumberBehaviors', 'PHContentEditingController', 'NSMutableCopying', 'UIActionSheetDelegate', 'UIViewControllerTransitioningDelegate', 'UIAlertViewDelegate', 'AVAudioPlayerDelegate', 'MKReverseGeocoderDelegate', 'NSCoding', 'UITextInputTokenizer', 'GKFriendRequestComposeViewControllerDelegate', 'UIActivityItemSource', 'NSCacheDelegate', 'UIAdaptivePresentationControllerDelegate', 'GKAchievementViewControllerDelegate', 'UIViewControllerTransitionCoordinator', 'EKEventEditViewDelegate', 'NSURLConnectionDelegate', 'UITableViewDelegate', 'GKPeerPickerControllerDelegate', 'UIGuidedAccessRestrictionDelegate', 'AVSpeechSynthesizerDelegate', 'AVAudio3DMixing', 'AVPlayerItemLegibleOutputPushDelegate', 'ADInterstitialAdDelegate', 'HMAccessoryBrowserDelegate', 'AVAssetResourceLoaderDelegate', 'UITabBarControllerDelegate', 'CKRecordValue', 'SKPaymentTransactionObserver', 'AVCaptureAudioDataOutputSampleBufferDelegate', 'UIInputViewAudioFeedback', 'GKChallengeListener', 'SKSceneDelegate', 'UIPickerViewDelegate', 'UIWebViewDelegate', 'UIApplicationDelegate', 'GKInviteEventListener', 'MPMediaPlayback', 'MyClassJavaScriptMethods', 'AVAsynchronousKeyValueLoading', 'QLPreviewItem', 'SCNBoundingVolume', 'NSPortDelegate', 'UIContentContainer', 'SCNNodeRendererDelegate', 'SKRequestDelegate', 'SKPhysicsContactDelegate', 'HMAccessoryDelegate', 'UIPageViewControllerDataSource', 'SCNSceneRendererDelegate', 'SCNPhysicsContactDelegate', 'MKMapViewDelegate', 'AVPlayerItemOutputPushDelegate', 'UICollectionViewDelegate', 'UIImagePickerControllerDelegate', 'MTLRenderCommandEncoder', 'PKPaymentAuthorizationViewControllerDelegate', 'UIToolbarDelegate', 'WKUIDelegate', 'SCNActionable', 'NSURLConnectionDataDelegate', 'MKOverlay', 'CBCentralManagerDelegate', 'JSExport', 'NSTextLayoutOrientationProvider', 'UIPickerViewDataSource', 'PKPushRegistryDelegate', 'UIViewControllerTransitionCoordinatorContext', 'NSLayoutManagerDelegate', 'MTLLibrary', 'NSFetchedResultsControllerDelegate', 'ABPeoplePickerNavigationControllerDelegate', 'MTLResource', 'NSDiscardableContent', 'UITextFieldDelegate', 'MTLBuffer', 'MTLSamplerState', 'GKGameCenterControllerDelegate', 'MPMediaPickerControllerDelegate', 'UISplitViewControllerDelegate', 'UIAppearance', 'UIPickerViewAccessibilityDelegate', 'UITraitEnvironment', 'UIScrollViewAccessibilityDelegate', 'ADBannerViewDelegate', 'MPPlayableContentDataSource', 'MTLComputePipelineState', 'NSURLSessionDelegate', 'MTLCommandBuffer', 'NSXMLParserDelegate', 'UIViewControllerRestoration', 'UISearchBarDelegate', 'UIBarPositioning', 'CBPeripheralDelegate', 'UISearchDisplayDelegate', 'CAAction', 'PKAddPassesViewControllerDelegate', 'MCNearbyServiceAdvertiserDelegate', 'MTLDepthStencilState', 'GKTurnBasedMatchmakerViewControllerDelegate', 'MPPlayableContentDelegate', 'AVCaptureVideoDataOutputSampleBufferDelegate', 'UIAppearanceContainer', 'UIStateRestoring', 'UITextDocumentProxy', 'MTLDrawable', 'NSURLSessionTaskDelegate', 'NSFilePresenter', 'AVAudioStereoMixing', 'UIViewControllerContextTransitioning', 'UITextInput', 'CBPeripheralManagerDelegate', 'UITextInputDelegate', 'NSFastEnumeration', 'NSURLAuthenticationChallengeSender', 'SCNProgramDelegate', 'AVVideoCompositing', 'SCNAnimatable', 'NSSecureCoding', 'MCAdvertiserAssistantDelegate', 'GKLocalPlayerListener', 'GLKNamedEffect', 'UIPopoverControllerDelegate', 'AVCaptureMetadataOutputObjectsDelegate', 'NSExtensionRequestHandling', 'UITextSelecting', 'UIPrinterPickerControllerDelegate', 'NCWidgetProviding', 'MTLCommandEncoder', 'NSURLProtocolClient', 'MFMessageComposeViewControllerDelegate', 'UIVideoEditorControllerDelegate', 'WKNavigationDelegate', 'GKSavedGameListener', 'UITableViewDataSource', 'MTLFunction', 'EKCalendarChooserDelegate', 'NSUserActivityDelegate', 'UICollisionBehaviorDelegate', 'NSStreamDelegate', 'MCNearbyServiceBrowserDelegate', 'HMHomeDelegate', 'UINavigationControllerDelegate', 'MCSessionDelegate', 'UIDocumentPickerDelegate', 'UIViewControllerInteractiveTransitioning', 'GKTurnBasedEventListener', 'SCNSceneRenderer', 'MTLTexture', 'GLKViewDelegate', 'EAAccessoryDelegate', 'WKScriptMessageHandler', 'PHPhotoLibraryChangeObserver', 'NSKeyedUnarchiverDelegate', 'AVPlayerItemMetadataOutputPushDelegate', 'NSMachPortDelegate', 'SCNShadable', 'UIPopoverBackgroundViewMethods', 'UIDocumentMenuDelegate', 'UIBarPositioningDelegate', 'ABPersonViewControllerDelegate', 'NSNetServiceBrowserDelegate', 'EKEventViewDelegate', 'UIScrollViewDelegate', 'NSURLConnectionDownloadDelegate', 'UIGestureRecognizerDelegate', 'UINavigationBarDelegate', 'AVAudioMixing', 'NSFetchedResultsSectionInfo', 'UIDocumentInteractionControllerDelegate', 'MTLParallelRenderCommandEncoder', 'QLPreviewControllerDelegate', 'UIAccessibilityReadingContent', 'ABUnknownPersonViewControllerDelegate', 'GLKViewControllerDelegate', 'UICollectionViewDelegateFlowLayout', 'UIPopoverPresentationControllerDelegate', 'UIDynamicAnimatorDelegate', 'NSTextAttachmentContainer', 'MKAnnotation', 'UIAccessibilityIdentification', 'UICoordinateSpace', 'ABNewPersonViewControllerDelegate', 'MTLDevice', 'CAMediaTiming', 'AVCaptureFileOutputRecordingDelegate', 'HMHomeManagerDelegate', 'UITextViewDelegate', 'UITabBarDelegate', 'GKLeaderboardViewControllerDelegate', 'UISearchControllerDelegate', 'EAWiFiUnconfiguredAccessoryBrowserDelegate', 'UITextInputTraits', 'MTLRenderPipelineState', 'GKVoiceChatClient', 'UIKeyInput', 'UICollectionViewDataSource', 'SCNTechniqueSupport', 'NSLocking', 'AVCaptureFileOutputDelegate', 'GKChallengeEventHandlerDelegate', 'UIObjectRestoration', 'CIFilterConstructor', 'AVPlayerItemOutputPullDelegate', 'EAGLDrawable', 'AVVideoCompositionValidationHandling', 'UIViewControllerAnimatedTransitioning', 'NSURLSessionDownloadDelegate', 'UIAccelerometerDelegate', 'UIPageViewControllerDelegate', 'MTLCommandQueue', 'UIDataSourceModelAssociation', 'AVAudioRecorderDelegate', 'GKSessionDelegate', 'NSKeyedArchiverDelegate', 'CAMetalDrawable', 'UIDynamicItem', 'CLLocationManagerDelegate', 'NSMetadataQueryDelegate', 'NSNetServiceDelegate', 'GKMatchmakerViewControllerDelegate', 'NSURLSessionDataDelegate'])
-COCOA_PRIMITIVES = set(['ROTAHeader', '__CFBundle', 'MortSubtable', 'AudioFilePacketTableInfo', 'CGPDFOperatorTable', 'KerxStateEntry', 'ExtendedTempoEvent', 'CTParagraphStyleSetting', 'OpaqueMIDIPort', '_GLKMatrix3', '_GLKMatrix2', '_GLKMatrix4', 'ExtendedControlEvent', 'CAFAudioDescription', 'OpaqueCMBlockBuffer', 'CGTextDrawingMode', 'EKErrorCode', 'gss_buffer_desc_struct', 'AudioUnitParameterInfo', '__SCPreferences', '__CTFrame', '__CTLine', 'AudioFile_SMPTE_Time', 'gss_krb5_lucid_context_v1', 'OpaqueJSValue', 'TrakTableEntry', 'AudioFramePacketTranslation', 'CGImageSource', 'OpaqueJSPropertyNameAccumulator', 'JustPCGlyphRepeatAddAction', '__CFBinaryHeap', 'OpaqueMIDIThruConnection', 'opaqueCMBufferQueue', 'OpaqueMusicSequence', 'MortRearrangementSubtable', 'MixerDistanceParams', 'MorxSubtable', 'MIDIObjectPropertyChangeNotification', 'SFNTLookupSegment', 'CGImageMetadataErrors', 'CGPath', 'OpaqueMIDIEndpoint', 'AudioComponentPlugInInterface', 'gss_ctx_id_t_desc_struct', 'sfntFontFeatureSetting', 'OpaqueJSContextGroup', '__SCNetworkConnection', 'AudioUnitParameterValueTranslation', 'CGImageMetadataType', 'CGPattern', 'AudioFileTypeAndFormatID', 'CGContext', 'AUNodeInteraction', 'SFNTLookupTable', 'JustPCDecompositionAction', 'KerxControlPointHeader', 'AudioStreamPacketDescription', 'KernSubtableHeader', '__SecCertificate', 'AUMIDIOutputCallbackStruct', 'MIDIMetaEvent', 'AudioQueueChannelAssignment', 'AnchorPoint', 'JustTable', '__CFNetService', 'CF_BRIDGED_TYPE', 'gss_krb5_lucid_key', 'CGPDFDictionary', 'KerxSubtableHeader', 'CAF_UUID_ChunkHeader', 'gss_krb5_cfx_keydata', 'OpaqueJSClass', 'CGGradient', 'OpaqueMIDISetup', 'JustPostcompTable', '__CTParagraphStyle', 'AudioUnitParameterHistoryInfo', 'OpaqueJSContext', 'CGShading', 'MIDIThruConnectionParams', 'BslnFormat0Part', 'SFNTLookupSingle', '__CFHost', '__SecRandom', '__CTFontDescriptor', '_NSRange', 'sfntDirectory', 'AudioQueueLevelMeterState', 'CAFPositionPeak', 'PropLookupSegment', '__CVOpenGLESTextureCache', 'sfntInstance', '_GLKQuaternion', 'AnkrTable', '__SCNetworkProtocol', 'CAFFileHeader', 'KerxOrderedListHeader', 'CGBlendMode', 'STXEntryOne', 'CAFRegion', 'SFNTLookupTrimmedArrayHeader', 'SCNMatrix4', 'KerxControlPointEntry', 'OpaqueMusicTrack', '_GLKVector4', 'gss_OID_set_desc_struct', 'OpaqueMusicPlayer', '_CFHTTPAuthentication', 'CGAffineTransform', 'CAFMarkerChunk', 'AUHostIdentifier', 'ROTAGlyphEntry', 'BslnTable', 'gss_krb5_lucid_context_version', '_GLKMatrixStack', 'CGImage', 'KernStateEntry', 'SFNTLookupSingleHeader', 'MortLigatureSubtable', 'CAFUMIDChunk', 'SMPTETime', 'CAFDataChunk', 'CGPDFStream', 'AudioFileRegionList', 'STEntryTwo', 'SFNTLookupBinarySearchHeader', 'OpbdTable', '__CTGlyphInfo', 'BslnFormat2Part', 'KerxIndexArrayHeader', 'TrakTable', 'KerxKerningPair', '__CFBitVector', 'KernVersion0SubtableHeader', 'OpaqueAudioComponentInstance', 'AudioChannelLayout', '__CFUUID', 'MIDISysexSendRequest', '__CFNumberFormatter', 'CGImageSourceStatus', 'AudioFileMarkerList', 'AUSamplerBankPresetData', 'CGDataProvider', 'AudioFormatInfo', '__SecIdentity', 'sfntCMapExtendedSubHeader', 'MIDIChannelMessage', 'KernOffsetTable', 'CGColorSpaceModel', 'MFMailComposeErrorCode', 'CGFunction', '__SecTrust', 'AVAudio3DAngularOrientation', 'CGFontPostScriptFormat', 'KernStateHeader', 'AudioUnitCocoaViewInfo', 'CGDataConsumer', 'OpaqueMIDIDevice', 'KernVersion0Header', 'AnchorPointTable', 'CGImageDestination', 'CAFInstrumentChunk', 'AudioUnitMeterClipping', 'MorxChain', '__CTFontCollection', 'STEntryOne', 'STXEntryTwo', 'ExtendedNoteOnEvent', 'CGColorRenderingIntent', 'KerxSimpleArrayHeader', 'MorxTable', '_GLKVector3', '_GLKVector2', 'MortTable', 'CGPDFBox', 'AudioUnitParameterValueFromString', '__CFSocket', 'ALCdevice_struct', 'MIDINoteMessage', 'sfntFeatureHeader', 'CGRect', '__SCNetworkInterface', '__CFTree', 'MusicEventUserData', 'TrakTableData', 'GCQuaternion', 'MortContextualSubtable', '__CTRun', 'AudioUnitFrequencyResponseBin', 'MortChain', 'MorxInsertionSubtable', 'CGImageMetadata', 'gss_auth_identity', 'AudioUnitMIDIControlMapping', 'CAFChunkHeader', 'CGImagePropertyOrientation', 'CGPDFScanner', 'OpaqueMusicEventIterator', 'sfntDescriptorHeader', 'AudioUnitNodeConnection', 'OpaqueMIDIDeviceList', 'ExtendedAudioFormatInfo', 'BslnFormat1Part', 'sfntFontDescriptor', 'KernSimpleArrayHeader', '__CFRunLoopObserver', 'CGPatternTiling', 'MIDINotification', 'MorxLigatureSubtable', 'MessageComposeResult', 'MIDIThruConnectionEndpoint', 'MusicDeviceStdNoteParams', 'opaqueCMSimpleQueue', 'ALCcontext_struct', 'OpaqueAudioQueue', 'PropLookupSingle', 'CGInterpolationQuality', 'CGColor', 'AudioOutputUnitStartAtTimeParams', 'gss_name_t_desc_struct', 'CGFunctionCallbacks', 'CAFPacketTableHeader', 'AudioChannelDescription', 'sfntFeatureName', 'MorxContextualSubtable', 'CVSMPTETime', 'AudioValueRange', 'CGTextEncoding', 'AudioStreamBasicDescription', 'AUNodeRenderCallback', 'AudioPanningInfo', 'KerxOrderedListEntry', '__CFAllocator', 'OpaqueJSPropertyNameArray', '__SCDynamicStore', 'OpaqueMIDIEntity', '__CTRubyAnnotation', 'SCNVector4', 'CFHostClientContext', 'CFNetServiceClientContext', 'AudioUnitPresetMAS_SettingData', 'opaqueCMBufferQueueTriggerToken', 'AudioUnitProperty', 'CAFRegionChunk', 'CGPDFString', '__GLsync', '__CFStringTokenizer', 'JustWidthDeltaEntry', 'sfntVariationAxis', '__CFNetDiagnostic', 'CAFOverviewSample', 'sfntCMapEncoding', 'CGVector', '__SCNetworkService', 'opaqueCMSampleBuffer', 'AUHostVersionIdentifier', 'AudioBalanceFade', 'sfntFontRunFeature', 'KerxCoordinateAction', 'sfntCMapSubHeader', 'CVPlanarPixelBufferInfo', 'AUNumVersion', 'AUSamplerInstrumentData', 'AUPreset', '__CTRunDelegate', 'OpaqueAudioQueueProcessingTap', 'KerxTableHeader', '_NSZone', 'OpaqueExtAudioFile', '__CFRunLoopSource', '__CVMetalTextureCache', 'KerxAnchorPointAction', 'OpaqueJSString', 'AudioQueueParameterEvent', '__CFHTTPMessage', 'OpaqueCMClock', 'ScheduledAudioFileRegion', 'STEntryZero', 'AVAudio3DPoint', 'gss_channel_bindings_struct', 'sfntVariationHeader', 'AUChannelInfo', 'UIOffset', 'GLKEffectPropertyPrv', 'KerxStateHeader', 'CGLineJoin', 'CGPDFDocument', '__CFBag', 'KernOrderedListHeader', '__SCNetworkSet', '__SecKey', 'MIDIObjectAddRemoveNotification', 'AudioUnitParameter', 'JustPCActionSubrecord', 'AudioComponentDescription', 'AudioUnitParameterValueName', 'AudioUnitParameterEvent', 'KerxControlPointAction', 'AudioTimeStamp', 'KernKerningPair', 'gss_buffer_set_desc_struct', 'MortFeatureEntry', 'FontVariation', 'CAFStringID', 'LcarCaretClassEntry', 'AudioUnitParameterStringFromValue', 'ACErrorCode', 'ALMXGlyphEntry', 'LtagTable', '__CTTypesetter', 'AuthorizationOpaqueRef', 'UIEdgeInsets', 'CGPathElement', 'CAFMarker', 'KernTableHeader', 'NoteParamsControlValue', 'SSLContext', 'gss_cred_id_t_desc_struct', 'AudioUnitParameterNameInfo', 'CGDataConsumerCallbacks', 'ALMXHeader', 'CGLineCap', 'MIDIControlTransform', 'CGPDFArray', '__SecPolicy', 'AudioConverterPrimeInfo', '__CTTextTab', '__CFNetServiceMonitor', 'AUInputSamplesInOutputCallbackStruct', '__CTFramesetter', 'CGPDFDataFormat', 'STHeader', 'CVPlanarPixelBufferInfo_YCbCrPlanar', 'MIDIValueMap', 'JustDirectionTable', '__SCBondStatus', 'SFNTLookupSegmentHeader', 'OpaqueCMMemoryPool', 'CGPathDrawingMode', 'CGFont', '__SCNetworkReachability', 'AudioClassDescription', 'CGPoint', 'AVAudio3DVectorOrientation', 'CAFStrings', '__CFNetServiceBrowser', 'opaqueMTAudioProcessingTap', 'sfntNameRecord', 'CGPDFPage', 'CGLayer', 'ComponentInstanceRecord', 'CAFInfoStrings', 'HostCallbackInfo', 'MusicDeviceNoteParams', 'OpaqueVTCompressionSession', 'KernIndexArrayHeader', 'CVPlanarPixelBufferInfo_YCbCrBiPlanar', 'MusicTrackLoopInfo', 'opaqueCMFormatDescription', 'STClassTable', 'sfntDirectoryEntry', 'OpaqueCMTimebase', 'CGDataProviderDirectCallbacks', 'MIDIPacketList', 'CAFOverviewChunk', 'MIDIPacket', 'ScheduledAudioSlice', 'CGDataProviderSequentialCallbacks', 'AudioBuffer', 'MorxRearrangementSubtable', 'CGPatternCallbacks', 'AUDistanceAttenuationData', 'MIDIIOErrorNotification', 'CGPDFContentStream', 'IUnknownVTbl', 'MIDITransform', 'MortInsertionSubtable', 'CABarBeatTime', 'AudioBufferList', '__CVBuffer', 'AURenderCallbackStruct', 'STXEntryZero', 'JustPCDuctilityAction', 'OpaqueAudioQueueTimeline', 'VTDecompressionOutputCallbackRecord', 'OpaqueMIDIClient', '__CFPlugInInstance', 'AudioQueueBuffer', '__CFFileDescriptor', 'AudioUnitConnection', '_GKTurnBasedExchangeStatus', 'LcarCaretTable', 'CVPlanarComponentInfo', 'JustWidthDeltaGroup', 'OpaqueAudioComponent', 'ParameterEvent', '__CVPixelBufferPool', '__CTFont', 'CGColorSpace', 'CGSize', 'AUDependentParameter', 'MIDIDriverInterface', 'gss_krb5_rfc1964_keydata', '__CFDateFormatter', 'LtagStringRange', 'OpaqueVTDecompressionSession', 'gss_iov_buffer_desc_struct', 'AUPresetEvent', 'PropTable', 'KernOrderedListEntry', 'CF_BRIDGED_MUTABLE_TYPE', 'gss_OID_desc_struct', 'AudioUnitPresetMAS_Settings', 'AudioFileMarker', 'JustPCConditionalAddAction', 'BslnFormat3Part', '__CFNotificationCenter', 'MortSwashSubtable', 'AUParameterMIDIMapping', 'SCNVector3', 'OpaqueAudioConverter', 'MIDIRawData', 'sfntNameHeader', '__CFRunLoop', 'MFMailComposeResult', 'CATransform3D', 'OpbdSideValues', 'CAF_SMPTE_Time', '__SecAccessControl', 'JustPCAction', 'OpaqueVTFrameSilo', 'OpaqueVTMultiPassStorage', 'CGPathElementType', 'AudioFormatListItem', 'AudioUnitExternalBuffer', 'AudioFileRegion', 'AudioValueTranslation', 'CGImageMetadataTag', 'CAFPeakChunk', 'AudioBytePacketTranslation', 'sfntCMapHeader', '__CFURLEnumerator', 'STXHeader', 'CGPDFObjectType', 'SFNTLookupArrayHeader'])
+COCOA_INTERFACES = {'UITableViewCell', 'HKCorrelationQuery', 'NSURLSessionDataTask', 'PHFetchOptions', 'NSLinguisticTagger', 'NSStream', 'AVAudioUnitDelay', 'GCMotion', 'SKPhysicsWorld', 'NSString', 'CMAttitude', 'AVAudioEnvironmentDistanceAttenuationParameters', 'HKStatisticsCollection', 'SCNPlane', 'CBPeer', 'JSContext', 'SCNTransaction', 'SCNTorus', 'AVAudioUnitEffect', 'UICollectionReusableView', 'MTLSamplerDescriptor', 'AVAssetReaderSampleReferenceOutput', 'AVMutableCompositionTrack', 'GKLeaderboard', 'NSFetchedResultsController', 'SKRange', 'MKTileOverlayRenderer', 'MIDINetworkSession', 'UIVisualEffectView', 'CIWarpKernel', 'PKObject', 'MKRoute', 'MPVolumeView', 'UIPrintInfo', 'SCNText', 'ADClient', 'PKPayment', 'AVMutableAudioMix', 'GLKEffectPropertyLight', 'WKScriptMessage', 'AVMIDIPlayer', 'PHCollectionListChangeRequest', 'UICollectionViewLayout', 'NSMutableCharacterSet', 'SKPaymentTransaction', 'NEOnDemandRuleConnect', 'NSShadow', 'SCNView', 'NSURLSessionConfiguration', 'MTLVertexAttributeDescriptor', 'CBCharacteristic', 'HKQuantityType', 'CKLocationSortDescriptor', 'NEVPNIKEv2SecurityAssociationParameters', 'CMStepCounter', 'NSNetService', 'AVAssetWriterInputMetadataAdaptor', 'UICollectionView', 'UIViewPrintFormatter', 'SCNLevelOfDetail', 'CAShapeLayer', 'MCPeerID', 'MPRatingCommand', 'WKNavigation', 'NSDictionary', 'NSFileVersion', 'CMGyroData', 'AVAudioUnitDistortion', 'CKFetchRecordsOperation', 'SKPhysicsJointSpring', 'SCNHitTestResult', 'AVAudioTime', 'CIFilter', 'UIView', 'SCNConstraint', 'CAPropertyAnimation', 'MKMapItem', 'MPRemoteCommandCenter', 'PKPaymentSummaryItem', 'UICollectionViewFlowLayoutInvalidationContext', 'UIInputViewController', 'PKPass', 'SCNPhysicsBehavior', 'MTLRenderPassColorAttachmentDescriptor', 'MKPolygonRenderer', 'CKNotification', 'JSValue', 'PHCollectionList', 'CLGeocoder', 'NSByteCountFormatter', 'AVCaptureScreenInput', 'MPFeedbackCommand', 'CAAnimation', 'MKOverlayPathView', 'UIActionSheet', 'UIMotionEffectGroup', 'NSLengthFormatter', 'UIBarItem', 'SKProduct', 'AVAssetExportSession', 'NSKeyedUnarchiver', 'NSMutableSet', 'SCNPyramid', 'PHAssetCollection', 'MKMapView', 'HMHomeManager', 'CATransition', 'MTLCompileOptions', 'UIVibrancyEffect', 'CLCircularRegion', 'MKTileOverlay', 'SCNShape', 'ACAccountCredential', 'SKPhysicsJointLimit', 'MKMapSnapshotter', 'AVMediaSelectionGroup', 'NSIndexSet', 'CBPeripheralManager', 'CKRecordZone', 'AVAudioRecorder', 'NSURL', 'CBCentral', 'NSNumber', 'AVAudioOutputNode', 'MTLVertexAttributeDescriptorArray', 'MKETAResponse', 'SKTransition', 'SSReadingList', 'HKSourceQuery', 'UITableViewRowAction', 'UITableView', 'SCNParticlePropertyController', 'AVCaptureStillImageOutput', 'GCController', 'AVAudioPlayerNode', 'AVAudioSessionPortDescription', 'NSHTTPURLResponse', 'NEOnDemandRuleEvaluateConnection', 'SKEffectNode', 'HKQuantity', 'GCControllerElement', 'AVPlayerItemAccessLogEvent', 'SCNBox', 'NSExtensionContext', 'MKOverlayRenderer', 'SCNPhysicsVehicle', 'NSDecimalNumber', 'EKReminder', 'MKPolylineView', 'CKQuery', 'AVAudioMixerNode', 'GKAchievementDescription', 'EKParticipant', 'NSBlockOperation', 'UIActivityItemProvider', 'CLLocation', 'NSBatchUpdateRequest', 'PHContentEditingOutput', 'PHObjectChangeDetails', 'HKWorkoutType', 'MPMoviePlayerController', 'AVAudioFormat', 'HMTrigger', 'MTLRenderPassDepthAttachmentDescriptor', 'SCNRenderer', 'GKScore', 'UISplitViewController', 'HKSource', 'NSURLConnection', 'ABUnknownPersonViewController', 'SCNTechnique', 'UIMenuController', 'NSEvent', 'SKTextureAtlas', 'NSKeyedArchiver', 'GKLeaderboardSet', 'NSSimpleCString', 'AVAudioPCMBuffer', 'CBATTRequest', 'GKMatchRequest', 'AVMetadataObject', 'SKProductsRequest', 'UIAlertView', 'NSIncrementalStore', 'MFMailComposeViewController', 'SCNFloor', 'NSSortDescriptor', 'CKFetchNotificationChangesOperation', 'MPMovieAccessLog', 'NSManagedObjectContext', 'AVAudioUnitGenerator', 'WKBackForwardList', 'SKMutableTexture', 'AVCaptureAudioDataOutput', 'ACAccount', 'AVMetadataItem', 'MPRatingCommandEvent', 'AVCaptureDeviceInputSource', 'CLLocationManager', 'MPRemoteCommand', 'AVCaptureSession', 'UIStepper', 'UIRefreshControl', 'NEEvaluateConnectionRule', 'CKModifyRecordsOperation', 'UICollectionViewTransitionLayout', 'CBCentralManager', 'NSPurgeableData', 'PKShippingMethod', 'SLComposeViewController', 'NSHashTable', 'MKUserTrackingBarButtonItem', 'UILexiconEntry', 'CMMotionActivity', 'SKAction', 'SKShader', 'AVPlayerItemOutput', 'MTLRenderPassAttachmentDescriptor', 'UIDocumentInteractionController', 'UIDynamicItemBehavior', 'NSMutableDictionary', 'UILabel', 'AVCaptureInputPort', 'NSExpression', 'CAInterAppAudioTransportView', 'SKMutablePayment', 'UIImage', 'PHCachingImageManager', 'SCNTransformConstraint', 'HKCorrelationType', 'UIColor', 'SCNGeometrySource', 'AVCaptureAutoExposureBracketedStillImageSettings', 'UIPopoverBackgroundView', 'UIToolbar', 'NSNotificationCenter', 'UICollectionViewLayoutAttributes', 'AVAssetReaderOutputMetadataAdaptor', 'NSEntityMigrationPolicy', 'HMUser', 'NSLocale', 'NSURLSession', 'SCNCamera', 'NSTimeZone', 'UIManagedDocument', 'AVMutableVideoCompositionLayerInstruction', 'AVAssetTrackGroup', 'NSInvocationOperation', 'ALAssetRepresentation', 'AVQueuePlayer', 'HMServiceGroup', 'UIPasteboard', 'PHContentEditingInput', 'NSLayoutManager', 'EKCalendarChooser', 'EKObject', 'CATiledLayer', 'GLKReflectionMapEffect', 'NSManagedObjectID', 'NSEnergyFormatter', 'SLRequest', 'HMCharacteristic', 'AVPlayerLayer', 'MTLRenderPassDescriptor', 'SKPayment', 'NSPointerArray', 'AVAudioMix', 'SCNLight', 'MCAdvertiserAssistant', 'MKMapSnapshotOptions', 'HKCategorySample', 'AVAudioEnvironmentReverbParameters', 'SCNMorpher', 'AVTimedMetadataGroup', 'CBMutableCharacteristic', 'NSFetchRequest', 'UIDevice', 'NSManagedObject', 'NKAssetDownload', 'AVOutputSettingsAssistant', 'SKPhysicsJointPin', 'UITabBar', 'UITextInputMode', 'NSFetchRequestExpression', 'HMActionSet', 'CTSubscriber', 'PHAssetChangeRequest', 'NSPersistentStoreRequest', 'UITabBarController', 'HKQuantitySample', 'AVPlayerItem', 'AVSynchronizedLayer', 'MKDirectionsRequest', 'NSMetadataItem', 'UIPresentationController', 'UINavigationItem', 'PHFetchResultChangeDetails', 'PHImageManager', 'AVCaptureManualExposureBracketedStillImageSettings', 'UIStoryboardPopoverSegue', 'SCNLookAtConstraint', 'UIGravityBehavior', 'UIWindow', 'CBMutableDescriptor', 'NEOnDemandRuleDisconnect', 'UIBezierPath', 'UINavigationController', 'ABPeoplePickerNavigationController', 'EKSource', 'AVAssetWriterInput', 'AVPlayerItemTrack', 'GLKEffectPropertyTexture', 'NSHTTPCookie', 'NSURLResponse', 'SKPaymentQueue', 'NSAssertionHandler', 'MKReverseGeocoder', 'GCControllerAxisInput', 'NSArray', 'NSOrthography', 'NSURLSessionUploadTask', 'NSCharacterSet', 'AVMutableVideoCompositionInstruction', 'AVAssetReaderOutput', 'EAGLContext', 'WKFrameInfo', 'CMPedometer', 'MyClass', 'CKModifyBadgeOperation', 'AVCaptureAudioFileOutput', 'SKEmitterNode', 'NSMachPort', 'AVVideoCompositionCoreAnimationTool', 'PHCollection', 'SCNPhysicsWorld', 'NSURLRequest', 'CMAccelerometerData', 'NSNetServiceBrowser', 'CLFloor', 'AVAsynchronousVideoCompositionRequest', 'SCNGeometry', 'SCNIKConstraint', 'CIKernel', 'CAGradientLayer', 'HKCharacteristicType', 'NSFormatter', 'SCNAction', 'CATransaction', 'CBUUID', 'UIStoryboard', 'MPMediaLibrary', 'UITapGestureRecognizer', 'MPMediaItemArtwork', 'NSURLSessionTask', 'AVAudioUnit', 'MCBrowserViewController', 'UIFontDescriptor', 'NSRelationshipDescription', 'HKSample', 'WKWebView', 'NSMutableAttributedString', 'NSPersistentStoreAsynchronousResult', 'MPNowPlayingInfoCenter', 'MKLocalSearch', 'EAAccessory', 'HKCorrelation', 'CATextLayer', 'NSNotificationQueue', 'UINib', 'GLKTextureLoader', 'HKObjectType', 'NSValue', 'NSMutableIndexSet', 'SKPhysicsContact', 'NSProgress', 'AVPlayerViewController', 'CAScrollLayer', 'GKSavedGame', 'NSTextCheckingResult', 'PHObjectPlaceholder', 'SKConstraint', 'EKEventEditViewController', 'NSEntityDescription', 'NSURLCredentialStorage', 'UIApplication', 'SKDownload', 'SCNNode', 'MKLocalSearchRequest', 'SKScene', 'UISearchDisplayController', 'NEOnDemandRule', 'MTLRenderPassStencilAttachmentDescriptor', 'CAReplicatorLayer', 'UIPrintPageRenderer', 'EKCalendarItem', 'NSUUID', 'EAAccessoryManager', 'NEOnDemandRuleIgnore', 'SKRegion', 'AVAssetResourceLoader', 'EAWiFiUnconfiguredAccessoryBrowser', 'NSUserActivity', 'CTCall', 'UIPrinterPickerController', 'CIVector', 'UINavigationBar', 'UIPanGestureRecognizer', 'MPMediaQuery', 'ABNewPersonViewController', 'CKRecordZoneID', 'HKAnchoredObjectQuery', 'CKFetchRecordZonesOperation', 'UIStoryboardSegue', 'ACAccountType', 'GKSession', 'SKVideoNode', 'PHChange', 'SKReceiptRefreshRequest', 'GCExtendedGamepadSnapshot', 'MPSeekCommandEvent', 'GCExtendedGamepad', 'CAValueFunction', 'SCNCylinder', 'NSNotification', 'NSBatchUpdateResult', 'PKPushCredentials', 'SCNPhysicsSliderJoint', 'AVCaptureDeviceFormat', 'AVPlayerItemErrorLog', 'NSMapTable', 'NSSet', 'CMMotionManager', 'GKVoiceChatService', 'UIPageControl', 'UILexicon', 'MTLArrayType', 'AVAudioUnitReverb', 'MKGeodesicPolyline', 'AVMutableComposition', 'NSLayoutConstraint', 'UIPrinter', 'NSOrderedSet', 'CBAttribute', 'PKPushPayload', 'NSIncrementalStoreNode', 'EKEventStore', 'MPRemoteCommandEvent', 'UISlider', 'UIBlurEffect', 'CKAsset', 'AVCaptureInput', 'AVAudioEngine', 'MTLVertexDescriptor', 'SKPhysicsBody', 'NSOperation', 'PKPaymentPass', 'UIImageAsset', 'MKMapCamera', 'SKProductsResponse', 'GLKEffectPropertyMaterial', 'AVCaptureDevice', 'CTCallCenter', 'CABTMIDILocalPeripheralViewController', 'NEVPNManager', 'HKQuery', 'SCNPhysicsContact', 'CBMutableService', 'AVSampleBufferDisplayLayer', 'SCNSceneSource', 'SKLightNode', 'CKDiscoveredUserInfo', 'NSMutableArray', 'MTLDepthStencilDescriptor', 'MTLArgument', 'NSMassFormatter', 'CIRectangleFeature', 'PKPushRegistry', 'NEVPNConnection', 'MCNearbyServiceBrowser', 'NSOperationQueue', 'MKPolylineRenderer', 'HKWorkout', 'NSValueTransformer', 'UICollectionViewFlowLayout', 'MPChangePlaybackRateCommandEvent', 'NSEntityMapping', 'SKTexture', 'NSMergePolicy', 'UITextInputStringTokenizer', 'NSRecursiveLock', 'AVAsset', 'NSUndoManager', 'AVAudioUnitSampler', 'NSItemProvider', 'SKUniform', 'MPMediaPickerController', 'CKOperation', 'MTLRenderPipelineDescriptor', 'EAWiFiUnconfiguredAccessory', 'NSFileCoordinator', 'SKRequest', 'NSFileHandle', 'NSConditionLock', 'UISegmentedControl', 'NSManagedObjectModel', 'UITabBarItem', 'SCNCone', 'MPMediaItem', 'SCNMaterial', 'EKRecurrenceRule', 'UIEvent', 'UITouch', 'UIPrintInteractionController', 'CMDeviceMotion', 'NEVPNProtocol', 'NSCompoundPredicate', 'HKHealthStore', 'MKMultiPoint', 'HKSampleType', 'UIPrintFormatter', 'AVAudioUnitEQFilterParameters', 'SKView', 'NSConstantString', 'UIPopoverController', 'CKDatabase', 'AVMetadataFaceObject', 'UIAccelerometer', 'EKEventViewController', 'CMAltitudeData', 'MTLStencilDescriptor', 'UISwipeGestureRecognizer', 'NSPort', 'MKCircleRenderer', 'AVCompositionTrack', 'NSAsynchronousFetchRequest', 'NSUbiquitousKeyValueStore', 'NSMetadataQueryResultGroup', 'AVAssetResourceLoadingDataRequest', 'UITableViewHeaderFooterView', 'CKNotificationID', 'AVAudioSession', 'HKUnit', 'NSNull', 'NSPersistentStoreResult', 'MKCircleView', 'AVAudioChannelLayout', 'NEVPNProtocolIKEv2', 'WKProcessPool', 'UIAttachmentBehavior', 'CLBeacon', 'NSInputStream', 'NSURLCache', 'GKPlayer', 'NSMappingModel', 'CIQRCodeFeature', 'AVMutableVideoComposition', 'PHFetchResult', 'NSAttributeDescription', 'AVPlayer', 'MKAnnotationView', 'PKPaymentRequest', 'NSTimer', 'CBDescriptor', 'MKOverlayView', 'AVAudioUnitTimePitch', 'NSSaveChangesRequest', 'UIReferenceLibraryViewController', 'SKPhysicsJointFixed', 'UILocalizedIndexedCollation', 'UIInterpolatingMotionEffect', 'UIDocumentPickerViewController', 'AVAssetWriter', 'NSBundle', 'SKStoreProductViewController', 'GLKViewController', 'NSMetadataQueryAttributeValueTuple', 'GKTurnBasedMatch', 'AVAudioFile', 'UIActivity', 'NSPipe', 'MKShape', 'NSMergeConflict', 'CIImage', 'HKObject', 'UIRotationGestureRecognizer', 'AVPlayerItemLegibleOutput', 'AVAssetImageGenerator', 'GCControllerButtonInput', 'CKMarkNotificationsReadOperation', 'CKSubscription', 'MPTimedMetadata', 'NKIssue', 'UIScreenMode', 'HMAccessoryBrowser', 'GKTurnBasedEventHandler', 'UIWebView', 'MKPolyline', 'JSVirtualMachine', 'AVAssetReader', 'NSAttributedString', 'GKMatchmakerViewController', 'NSCountedSet', 'UIButton', 'WKNavigationResponse', 'GKLocalPlayer', 'MPMovieErrorLog', 'AVSpeechUtterance', 'HKStatistics', 'UILocalNotification', 'HKBiologicalSexObject', 'AVURLAsset', 'CBPeripheral', 'NSDateComponentsFormatter', 'SKSpriteNode', 'UIAccessibilityElement', 'AVAssetWriterInputGroup', 'HMZone', 'AVAssetReaderAudioMixOutput', 'NSEnumerator', 'UIDocument', 'MKLocalSearchResponse', 'UISimpleTextPrintFormatter', 'PHPhotoLibrary', 'CBService', 'UIDocumentMenuViewController', 'MCSession', 'QLPreviewController', 'CAMediaTimingFunction', 'UITextPosition', 'ASIdentifierManager', 'AVAssetResourceLoadingRequest', 'SLComposeServiceViewController', 'UIPinchGestureRecognizer', 'PHObject', 'NSExtensionItem', 'HKSampleQuery', 'MTLRenderPipelineColorAttachmentDescriptorArray', 'MKRouteStep', 'SCNCapsule', 'NSMetadataQuery', 'AVAssetResourceLoadingContentInformationRequest', 'UITraitCollection', 'CTCarrier', 'NSFileSecurity', 'UIAcceleration', 'UIMotionEffect', 'MTLRenderPipelineReflection', 'CLHeading', 'CLVisit', 'MKDirectionsResponse', 'HMAccessory', 'MTLStructType', 'UITextView', 'CMMagnetometerData', 'UICollisionBehavior', 'UIProgressView', 'CKServerChangeToken', 'UISearchBar', 'MKPlacemark', 'AVCaptureConnection', 'NSPropertyMapping', 'ALAssetsFilter', 'SK3DNode', 'AVPlayerItemErrorLogEvent', 'NSJSONSerialization', 'AVAssetReaderVideoCompositionOutput', 'ABPersonViewController', 'CIDetector', 'GKTurnBasedMatchmakerViewController', 'MPMediaItemCollection', 'SCNSphere', 'NSCondition', 'NSURLCredential', 'MIDINetworkConnection', 'NSFileProviderExtension', 'NSDecimalNumberHandler', 'NSAtomicStoreCacheNode', 'NSAtomicStore', 'EKAlarm', 'CKNotificationInfo', 'AVAudioUnitEQ', 'UIPercentDrivenInteractiveTransition', 'MKPolygon', 'AVAssetTrackSegment', 'MTLVertexAttribute', 'NSExpressionDescription', 'HKStatisticsCollectionQuery', 'NSURLAuthenticationChallenge', 'NSDirectoryEnumerator', 'MKDistanceFormatter', 'UIAlertAction', 'NSPropertyListSerialization', 'GKPeerPickerController', 'UIUserNotificationSettings', 'UITableViewController', 'GKNotificationBanner', 'MKPointAnnotation', 'MTLRenderPassColorAttachmentDescriptorArray', 'NSCache', 'SKPhysicsJoint', 'NSXMLParser', 'UIViewController', 'PKPaymentToken', 'MFMessageComposeViewController', 'AVAudioInputNode', 'NSDataDetector', 'CABTMIDICentralViewController', 'AVAudioUnitMIDIInstrument', 'AVCaptureVideoPreviewLayer', 'AVAssetWriterInputPassDescription', 'MPChangePlaybackRateCommand', 'NSURLComponents', 'CAMetalLayer', 'UISnapBehavior', 'AVMetadataMachineReadableCodeObject', 'CKDiscoverUserInfosOperation', 'NSTextAttachment', 'NSException', 'UIMenuItem', 'CMMotionActivityManager', 'SCNGeometryElement', 'NCWidgetController', 'CAEmitterLayer', 'MKUserLocation', 'UIImagePickerController', 'CIFeature', 'AVCaptureDeviceInput', 'ALAsset', 'NSURLSessionDownloadTask', 'SCNPhysicsHingeJoint', 'MPMoviePlayerViewController', 'NSMutableOrderedSet', 'SCNMaterialProperty', 'UIFont', 'AVCaptureVideoDataOutput', 'NSCachedURLResponse', 'ALAssetsLibrary', 'NSInvocation', 'UILongPressGestureRecognizer', 'NSTextStorage', 'WKWebViewConfiguration', 'CIFaceFeature', 'MKMapSnapshot', 'GLKEffectPropertyFog', 'AVComposition', 'CKDiscoverAllContactsOperation', 'AVAudioMixInputParameters', 'CAEmitterBehavior', 'PKPassLibrary', 'UIMutableUserNotificationCategory', 'NSLock', 'NEVPNProtocolIPSec', 'ADBannerView', 'UIDocumentPickerExtensionViewController', 'UIActivityIndicatorView', 'AVPlayerMediaSelectionCriteria', 'CALayer', 'UIAccessibilityCustomAction', 'UIBarButtonItem', 'AVAudioSessionRouteDescription', 'CLBeaconRegion', 'HKBloodTypeObject', 'MTLVertexBufferLayoutDescriptorArray', 'CABasicAnimation', 'AVVideoCompositionInstruction', 'AVMutableTimedMetadataGroup', 'EKRecurrenceEnd', 'NSTextContainer', 'TWTweetComposeViewController', 'PKPaymentAuthorizationViewController', 'UIScrollView', 'WKNavigationAction', 'AVPlayerItemMetadataOutput', 'EKRecurrenceDayOfWeek', 'NSNumberFormatter', 'MTLComputePipelineReflection', 'UIScreen', 'CLRegion', 'NSProcessInfo', 'GLKTextureInfo', 'SCNSkinner', 'AVCaptureMetadataOutput', 'SCNAnimationEvent', 'NSTextTab', 'JSManagedValue', 'NSDate', 'UITextChecker', 'WKBackForwardListItem', 'NSData', 'NSParagraphStyle', 'AVMutableMetadataItem', 'EKCalendar', 'HKWorkoutEvent', 'NSMutableURLRequest', 'UIVideoEditorController', 'HMTimerTrigger', 'AVAudioUnitVarispeed', 'UIDynamicAnimator', 'AVCompositionTrackSegment', 'GCGamepadSnapshot', 'MPMediaEntity', 'GLKSkyboxEffect', 'UISwitch', 'EKStructuredLocation', 'UIGestureRecognizer', 'NSProxy', 'GLKBaseEffect', 'UIPushBehavior', 'GKScoreChallenge', 'NSCoder', 'MPMediaPlaylist', 'NSDateComponents', 'WKUserScript', 'EKEvent', 'NSDateFormatter', 'NSAsynchronousFetchResult', 'AVAssetWriterInputPixelBufferAdaptor', 'UIVisualEffect', 'UICollectionViewCell', 'UITextField', 'CLPlacemark', 'MPPlayableContentManager', 'AVCaptureOutput', 'HMCharacteristicWriteAction', 'CKModifySubscriptionsOperation', 'NSPropertyDescription', 'GCGamepad', 'UIMarkupTextPrintFormatter', 'SCNTube', 'NSPersistentStoreCoordinator', 'AVAudioEnvironmentNode', 'GKMatchmaker', 'CIContext', 'NSThread', 'SLComposeSheetConfigurationItem', 'SKPhysicsJointSliding', 'NSPredicate', 'GKVoiceChat', 'SKCropNode', 'AVCaptureAudioPreviewOutput', 'NSStringDrawingContext', 'GKGameCenterViewController', 'UIPrintPaper', 'SCNPhysicsBallSocketJoint', 'UICollectionViewLayoutInvalidationContext', 'GLKEffectPropertyTransform', 'AVAudioIONode', 'UIDatePicker', 'MKDirections', 'ALAssetsGroup', 'CKRecordZoneNotification', 'SCNScene', 'MPMovieAccessLogEvent', 'CKFetchSubscriptionsOperation', 'CAEmitterCell', 'AVAudioUnitTimeEffect', 'HMCharacteristicMetadata', 'MKPinAnnotationView', 'UIPickerView', 'UIImageView', 'UIUserNotificationCategory', 'SCNPhysicsVehicleWheel', 'HKCategoryType', 'MPMediaQuerySection', 'GKFriendRequestComposeViewController', 'NSError', 'MTLRenderPipelineColorAttachmentDescriptor', 'SCNPhysicsShape', 'UISearchController', 'SCNPhysicsBody', 'CTSubscriberInfo', 'AVPlayerItemAccessLog', 'MPMediaPropertyPredicate', 'CMLogItem', 'NSAutoreleasePool', 'NSSocketPort', 'AVAssetReaderTrackOutput', 'SKNode', 'UIMutableUserNotificationAction', 'SCNProgram', 'AVSpeechSynthesisVoice', 'CMAltimeter', 'AVCaptureAudioChannel', 'GKTurnBasedExchangeReply', 'AVVideoCompositionLayerInstruction', 'AVSpeechSynthesizer', 'GKChallengeEventHandler', 'AVCaptureFileOutput', 'UIControl', 'SCNPhysicsField', 'CKReference', 'LAContext', 'CKRecordID', 'ADInterstitialAd', 'AVAudioSessionDataSourceDescription', 'AVAudioBuffer', 'CIColorKernel', 'GCControllerDirectionPad', 'NSFileManager', 'AVMutableAudioMixInputParameters', 'UIScreenEdgePanGestureRecognizer', 'CAKeyframeAnimation', 'CKQueryNotification', 'PHAdjustmentData', 'EASession', 'AVAssetResourceRenewalRequest', 'UIInputView', 'NSFileWrapper', 'UIResponder', 'NSPointerFunctions', 'UIKeyCommand', 'NSHTTPCookieStorage', 'AVMediaSelectionOption', 'NSRunLoop', 'NSFileAccessIntent', 'CAAnimationGroup', 'MKCircle', 'UIAlertController', 'NSMigrationManager', 'NSDateIntervalFormatter', 'UICollectionViewUpdateItem', 'CKDatabaseOperation', 'PHImageRequestOptions', 'SKReachConstraints', 'CKRecord', 'CAInterAppAudioSwitcherView', 'WKWindowFeatures', 'GKInvite', 'NSMutableData', 'PHAssetCollectionChangeRequest', 'NSMutableParagraphStyle', 'UIDynamicBehavior', 'GLKEffectProperty', 'CKFetchRecordChangesOperation', 'SKShapeNode', 'MPMovieErrorLogEvent', 'MKPolygonView', 'MPContentItem', 'HMAction', 'NSScanner', 'GKAchievementChallenge', 'AVAudioPlayer', 'CKContainer', 'AVVideoComposition', 'NKLibrary', 'NSPersistentStore', 'AVCaptureMovieFileOutput', 'HMRoom', 'GKChallenge', 'UITextRange', 'NSURLProtectionSpace', 'ACAccountStore', 'MPSkipIntervalCommand', 'NSComparisonPredicate', 'HMHome', 'PHVideoRequestOptions', 'NSOutputStream', 'MPSkipIntervalCommandEvent', 'PKAddPassesViewController', 'UITextSelectionRect', 'CTTelephonyNetworkInfo', 'AVTextStyleRule', 'NSFetchedPropertyDescription', 'UIPageViewController', 'CATransformLayer', 'UICollectionViewController', 'AVAudioNode', 'MCNearbyServiceAdvertiser', 'NSObject', 'PHAsset', 'GKLeaderboardViewController', 'CKQueryCursor', 'MPMusicPlayerController', 'MKOverlayPathRenderer', 'CMPedometerData', 'HMService', 'SKFieldNode', 'GKAchievement', 'WKUserContentController', 'AVAssetTrack', 'TWRequest', 'SKLabelNode', 'AVCaptureBracketedStillImageSettings', 'MIDINetworkHost', 'MPMediaPredicate', 'AVFrameRateRange', 'MTLTextureDescriptor', 'MTLVertexBufferLayoutDescriptor', 'MPFeedbackCommandEvent', 'UIUserNotificationAction', 'HKStatisticsQuery', 'SCNParticleSystem', 'NSIndexPath', 'AVVideoCompositionRenderContext', 'CADisplayLink', 'HKObserverQuery', 'UIPopoverPresentationController', 'CKQueryOperation', 'CAEAGLLayer', 'NSMutableString', 'NSMessagePort', 'NSURLQueryItem', 'MTLStructMember', 'AVAudioSessionChannelDescription', 'GLKView', 'UIActivityViewController', 'GKAchievementViewController', 'GKTurnBasedParticipant', 'NSURLProtocol', 'NSUserDefaults', 'NSCalendar', 'SKKeyframeSequence', 'AVMetadataItemFilter', 'CKModifyRecordZonesOperation', 'WKPreferences', 'NSMethodSignature', 'NSRegularExpression', 'EAGLSharegroup', 'AVPlayerItemVideoOutput', 'PHContentEditingInputRequestOptions', 'GKMatch', 'CIColor', 'UIDictationPhrase'}
+COCOA_PROTOCOLS = {'SKStoreProductViewControllerDelegate', 'AVVideoCompositionInstruction', 'AVAudioSessionDelegate', 'GKMatchDelegate', 'NSFileManagerDelegate', 'UILayoutSupport', 'NSCopying', 'UIPrintInteractionControllerDelegate', 'QLPreviewControllerDataSource', 'SKProductsRequestDelegate', 'NSTextStorageDelegate', 'MCBrowserViewControllerDelegate', 'MTLComputeCommandEncoder', 'SCNSceneExportDelegate', 'UISearchResultsUpdating', 'MFMailComposeViewControllerDelegate', 'MTLBlitCommandEncoder', 'NSDecimalNumberBehaviors', 'PHContentEditingController', 'NSMutableCopying', 'UIActionSheetDelegate', 'UIViewControllerTransitioningDelegate', 'UIAlertViewDelegate', 'AVAudioPlayerDelegate', 'MKReverseGeocoderDelegate', 'NSCoding', 'UITextInputTokenizer', 'GKFriendRequestComposeViewControllerDelegate', 'UIActivityItemSource', 'NSCacheDelegate', 'UIAdaptivePresentationControllerDelegate', 'GKAchievementViewControllerDelegate', 'UIViewControllerTransitionCoordinator', 'EKEventEditViewDelegate', 'NSURLConnectionDelegate', 'UITableViewDelegate', 'GKPeerPickerControllerDelegate', 'UIGuidedAccessRestrictionDelegate', 'AVSpeechSynthesizerDelegate', 'AVAudio3DMixing', 'AVPlayerItemLegibleOutputPushDelegate', 'ADInterstitialAdDelegate', 'HMAccessoryBrowserDelegate', 'AVAssetResourceLoaderDelegate', 'UITabBarControllerDelegate', 'CKRecordValue', 'SKPaymentTransactionObserver', 'AVCaptureAudioDataOutputSampleBufferDelegate', 'UIInputViewAudioFeedback', 'GKChallengeListener', 'SKSceneDelegate', 'UIPickerViewDelegate', 'UIWebViewDelegate', 'UIApplicationDelegate', 'GKInviteEventListener', 'MPMediaPlayback', 'MyClassJavaScriptMethods', 'AVAsynchronousKeyValueLoading', 'QLPreviewItem', 'SCNBoundingVolume', 'NSPortDelegate', 'UIContentContainer', 'SCNNodeRendererDelegate', 'SKRequestDelegate', 'SKPhysicsContactDelegate', 'HMAccessoryDelegate', 'UIPageViewControllerDataSource', 'SCNSceneRendererDelegate', 'SCNPhysicsContactDelegate', 'MKMapViewDelegate', 'AVPlayerItemOutputPushDelegate', 'UICollectionViewDelegate', 'UIImagePickerControllerDelegate', 'MTLRenderCommandEncoder', 'PKPaymentAuthorizationViewControllerDelegate', 'UIToolbarDelegate', 'WKUIDelegate', 'SCNActionable', 'NSURLConnectionDataDelegate', 'MKOverlay', 'CBCentralManagerDelegate', 'JSExport', 'NSTextLayoutOrientationProvider', 'UIPickerViewDataSource', 'PKPushRegistryDelegate', 'UIViewControllerTransitionCoordinatorContext', 'NSLayoutManagerDelegate', 'MTLLibrary', 'NSFetchedResultsControllerDelegate', 'ABPeoplePickerNavigationControllerDelegate', 'MTLResource', 'NSDiscardableContent', 'UITextFieldDelegate', 'MTLBuffer', 'MTLSamplerState', 'GKGameCenterControllerDelegate', 'MPMediaPickerControllerDelegate', 'UISplitViewControllerDelegate', 'UIAppearance', 'UIPickerViewAccessibilityDelegate', 'UITraitEnvironment', 'UIScrollViewAccessibilityDelegate', 'ADBannerViewDelegate', 'MPPlayableContentDataSource', 'MTLComputePipelineState', 'NSURLSessionDelegate', 'MTLCommandBuffer', 'NSXMLParserDelegate', 'UIViewControllerRestoration', 'UISearchBarDelegate', 'UIBarPositioning', 'CBPeripheralDelegate', 'UISearchDisplayDelegate', 'CAAction', 'PKAddPassesViewControllerDelegate', 'MCNearbyServiceAdvertiserDelegate', 'MTLDepthStencilState', 'GKTurnBasedMatchmakerViewControllerDelegate', 'MPPlayableContentDelegate', 'AVCaptureVideoDataOutputSampleBufferDelegate', 'UIAppearanceContainer', 'UIStateRestoring', 'UITextDocumentProxy', 'MTLDrawable', 'NSURLSessionTaskDelegate', 'NSFilePresenter', 'AVAudioStereoMixing', 'UIViewControllerContextTransitioning', 'UITextInput', 'CBPeripheralManagerDelegate', 'UITextInputDelegate', 'NSFastEnumeration', 'NSURLAuthenticationChallengeSender', 'SCNProgramDelegate', 'AVVideoCompositing', 'SCNAnimatable', 'NSSecureCoding', 'MCAdvertiserAssistantDelegate', 'GKLocalPlayerListener', 'GLKNamedEffect', 'UIPopoverControllerDelegate', 'AVCaptureMetadataOutputObjectsDelegate', 'NSExtensionRequestHandling', 'UITextSelecting', 'UIPrinterPickerControllerDelegate', 'NCWidgetProviding', 'MTLCommandEncoder', 'NSURLProtocolClient', 'MFMessageComposeViewControllerDelegate', 'UIVideoEditorControllerDelegate', 'WKNavigationDelegate', 'GKSavedGameListener', 'UITableViewDataSource', 'MTLFunction', 'EKCalendarChooserDelegate', 'NSUserActivityDelegate', 'UICollisionBehaviorDelegate', 'NSStreamDelegate', 'MCNearbyServiceBrowserDelegate', 'HMHomeDelegate', 'UINavigationControllerDelegate', 'MCSessionDelegate', 'UIDocumentPickerDelegate', 'UIViewControllerInteractiveTransitioning', 'GKTurnBasedEventListener', 'SCNSceneRenderer', 'MTLTexture', 'GLKViewDelegate', 'EAAccessoryDelegate', 'WKScriptMessageHandler', 'PHPhotoLibraryChangeObserver', 'NSKeyedUnarchiverDelegate', 'AVPlayerItemMetadataOutputPushDelegate', 'NSMachPortDelegate', 'SCNShadable', 'UIPopoverBackgroundViewMethods', 'UIDocumentMenuDelegate', 'UIBarPositioningDelegate', 'ABPersonViewControllerDelegate', 'NSNetServiceBrowserDelegate', 'EKEventViewDelegate', 'UIScrollViewDelegate', 'NSURLConnectionDownloadDelegate', 'UIGestureRecognizerDelegate', 'UINavigationBarDelegate', 'AVAudioMixing', 'NSFetchedResultsSectionInfo', 'UIDocumentInteractionControllerDelegate', 'MTLParallelRenderCommandEncoder', 'QLPreviewControllerDelegate', 'UIAccessibilityReadingContent', 'ABUnknownPersonViewControllerDelegate', 'GLKViewControllerDelegate', 'UICollectionViewDelegateFlowLayout', 'UIPopoverPresentationControllerDelegate', 'UIDynamicAnimatorDelegate', 'NSTextAttachmentContainer', 'MKAnnotation', 'UIAccessibilityIdentification', 'UICoordinateSpace', 'ABNewPersonViewControllerDelegate', 'MTLDevice', 'CAMediaTiming', 'AVCaptureFileOutputRecordingDelegate', 'HMHomeManagerDelegate', 'UITextViewDelegate', 'UITabBarDelegate', 'GKLeaderboardViewControllerDelegate', 'UISearchControllerDelegate', 'EAWiFiUnconfiguredAccessoryBrowserDelegate', 'UITextInputTraits', 'MTLRenderPipelineState', 'GKVoiceChatClient', 'UIKeyInput', 'UICollectionViewDataSource', 'SCNTechniqueSupport', 'NSLocking', 'AVCaptureFileOutputDelegate', 'GKChallengeEventHandlerDelegate', 'UIObjectRestoration', 'CIFilterConstructor', 'AVPlayerItemOutputPullDelegate', 'EAGLDrawable', 'AVVideoCompositionValidationHandling', 'UIViewControllerAnimatedTransitioning', 'NSURLSessionDownloadDelegate', 'UIAccelerometerDelegate', 'UIPageViewControllerDelegate', 'MTLCommandQueue', 'UIDataSourceModelAssociation', 'AVAudioRecorderDelegate', 'GKSessionDelegate', 'NSKeyedArchiverDelegate', 'CAMetalDrawable', 'UIDynamicItem', 'CLLocationManagerDelegate', 'NSMetadataQueryDelegate', 'NSNetServiceDelegate', 'GKMatchmakerViewControllerDelegate', 'NSURLSessionDataDelegate'}
+COCOA_PRIMITIVES = {'ROTAHeader', '__CFBundle', 'MortSubtable', 'AudioFilePacketTableInfo', 'CGPDFOperatorTable', 'KerxStateEntry', 'ExtendedTempoEvent', 'CTParagraphStyleSetting', 'OpaqueMIDIPort', '_GLKMatrix3', '_GLKMatrix2', '_GLKMatrix4', 'ExtendedControlEvent', 'CAFAudioDescription', 'OpaqueCMBlockBuffer', 'CGTextDrawingMode', 'EKErrorCode', 'gss_buffer_desc_struct', 'AudioUnitParameterInfo', '__SCPreferences', '__CTFrame', '__CTLine', 'AudioFile_SMPTE_Time', 'gss_krb5_lucid_context_v1', 'OpaqueJSValue', 'TrakTableEntry', 'AudioFramePacketTranslation', 'CGImageSource', 'OpaqueJSPropertyNameAccumulator', 'JustPCGlyphRepeatAddAction', '__CFBinaryHeap', 'OpaqueMIDIThruConnection', 'opaqueCMBufferQueue', 'OpaqueMusicSequence', 'MortRearrangementSubtable', 'MixerDistanceParams', 'MorxSubtable', 'MIDIObjectPropertyChangeNotification', 'SFNTLookupSegment', 'CGImageMetadataErrors', 'CGPath', 'OpaqueMIDIEndpoint', 'AudioComponentPlugInInterface', 'gss_ctx_id_t_desc_struct', 'sfntFontFeatureSetting', 'OpaqueJSContextGroup', '__SCNetworkConnection', 'AudioUnitParameterValueTranslation', 'CGImageMetadataType', 'CGPattern', 'AudioFileTypeAndFormatID', 'CGContext', 'AUNodeInteraction', 'SFNTLookupTable', 'JustPCDecompositionAction', 'KerxControlPointHeader', 'AudioStreamPacketDescription', 'KernSubtableHeader', '__SecCertificate', 'AUMIDIOutputCallbackStruct', 'MIDIMetaEvent', 'AudioQueueChannelAssignment', 'AnchorPoint', 'JustTable', '__CFNetService', 'CF_BRIDGED_TYPE', 'gss_krb5_lucid_key', 'CGPDFDictionary', 'KerxSubtableHeader', 'CAF_UUID_ChunkHeader', 'gss_krb5_cfx_keydata', 'OpaqueJSClass', 'CGGradient', 'OpaqueMIDISetup', 'JustPostcompTable', '__CTParagraphStyle', 'AudioUnitParameterHistoryInfo', 'OpaqueJSContext', 'CGShading', 'MIDIThruConnectionParams', 'BslnFormat0Part', 'SFNTLookupSingle', '__CFHost', '__SecRandom', '__CTFontDescriptor', '_NSRange', 'sfntDirectory', 'AudioQueueLevelMeterState', 'CAFPositionPeak', 'PropLookupSegment', '__CVOpenGLESTextureCache', 'sfntInstance', '_GLKQuaternion', 'AnkrTable', '__SCNetworkProtocol', 'CAFFileHeader', 'KerxOrderedListHeader', 'CGBlendMode', 'STXEntryOne', 'CAFRegion', 'SFNTLookupTrimmedArrayHeader', 'SCNMatrix4', 'KerxControlPointEntry', 'OpaqueMusicTrack', '_GLKVector4', 'gss_OID_set_desc_struct', 'OpaqueMusicPlayer', '_CFHTTPAuthentication', 'CGAffineTransform', 'CAFMarkerChunk', 'AUHostIdentifier', 'ROTAGlyphEntry', 'BslnTable', 'gss_krb5_lucid_context_version', '_GLKMatrixStack', 'CGImage', 'KernStateEntry', 'SFNTLookupSingleHeader', 'MortLigatureSubtable', 'CAFUMIDChunk', 'SMPTETime', 'CAFDataChunk', 'CGPDFStream', 'AudioFileRegionList', 'STEntryTwo', 'SFNTLookupBinarySearchHeader', 'OpbdTable', '__CTGlyphInfo', 'BslnFormat2Part', 'KerxIndexArrayHeader', 'TrakTable', 'KerxKerningPair', '__CFBitVector', 'KernVersion0SubtableHeader', 'OpaqueAudioComponentInstance', 'AudioChannelLayout', '__CFUUID', 'MIDISysexSendRequest', '__CFNumberFormatter', 'CGImageSourceStatus', 'AudioFileMarkerList', 'AUSamplerBankPresetData', 'CGDataProvider', 'AudioFormatInfo', '__SecIdentity', 'sfntCMapExtendedSubHeader', 'MIDIChannelMessage', 'KernOffsetTable', 'CGColorSpaceModel', 'MFMailComposeErrorCode', 'CGFunction', '__SecTrust', 'AVAudio3DAngularOrientation', 'CGFontPostScriptFormat', 'KernStateHeader', 'AudioUnitCocoaViewInfo', 'CGDataConsumer', 'OpaqueMIDIDevice', 'KernVersion0Header', 'AnchorPointTable', 'CGImageDestination', 'CAFInstrumentChunk', 'AudioUnitMeterClipping', 'MorxChain', '__CTFontCollection', 'STEntryOne', 'STXEntryTwo', 'ExtendedNoteOnEvent', 'CGColorRenderingIntent', 'KerxSimpleArrayHeader', 'MorxTable', '_GLKVector3', '_GLKVector2', 'MortTable', 'CGPDFBox', 'AudioUnitParameterValueFromString', '__CFSocket', 'ALCdevice_struct', 'MIDINoteMessage', 'sfntFeatureHeader', 'CGRect', '__SCNetworkInterface', '__CFTree', 'MusicEventUserData', 'TrakTableData', 'GCQuaternion', 'MortContextualSubtable', '__CTRun', 'AudioUnitFrequencyResponseBin', 'MortChain', 'MorxInsertionSubtable', 'CGImageMetadata', 'gss_auth_identity', 'AudioUnitMIDIControlMapping', 'CAFChunkHeader', 'CGImagePropertyOrientation', 'CGPDFScanner', 'OpaqueMusicEventIterator', 'sfntDescriptorHeader', 'AudioUnitNodeConnection', 'OpaqueMIDIDeviceList', 'ExtendedAudioFormatInfo', 'BslnFormat1Part', 'sfntFontDescriptor', 'KernSimpleArrayHeader', '__CFRunLoopObserver', 'CGPatternTiling', 'MIDINotification', 'MorxLigatureSubtable', 'MessageComposeResult', 'MIDIThruConnectionEndpoint', 'MusicDeviceStdNoteParams', 'opaqueCMSimpleQueue', 'ALCcontext_struct', 'OpaqueAudioQueue', 'PropLookupSingle', 'CGInterpolationQuality', 'CGColor', 'AudioOutputUnitStartAtTimeParams', 'gss_name_t_desc_struct', 'CGFunctionCallbacks', 'CAFPacketTableHeader', 'AudioChannelDescription', 'sfntFeatureName', 'MorxContextualSubtable', 'CVSMPTETime', 'AudioValueRange', 'CGTextEncoding', 'AudioStreamBasicDescription', 'AUNodeRenderCallback', 'AudioPanningInfo', 'KerxOrderedListEntry', '__CFAllocator', 'OpaqueJSPropertyNameArray', '__SCDynamicStore', 'OpaqueMIDIEntity', '__CTRubyAnnotation', 'SCNVector4', 'CFHostClientContext', 'CFNetServiceClientContext', 'AudioUnitPresetMAS_SettingData', 'opaqueCMBufferQueueTriggerToken', 'AudioUnitProperty', 'CAFRegionChunk', 'CGPDFString', '__GLsync', '__CFStringTokenizer', 'JustWidthDeltaEntry', 'sfntVariationAxis', '__CFNetDiagnostic', 'CAFOverviewSample', 'sfntCMapEncoding', 'CGVector', '__SCNetworkService', 'opaqueCMSampleBuffer', 'AUHostVersionIdentifier', 'AudioBalanceFade', 'sfntFontRunFeature', 'KerxCoordinateAction', 'sfntCMapSubHeader', 'CVPlanarPixelBufferInfo', 'AUNumVersion', 'AUSamplerInstrumentData', 'AUPreset', '__CTRunDelegate', 'OpaqueAudioQueueProcessingTap', 'KerxTableHeader', '_NSZone', 'OpaqueExtAudioFile', '__CFRunLoopSource', '__CVMetalTextureCache', 'KerxAnchorPointAction', 'OpaqueJSString', 'AudioQueueParameterEvent', '__CFHTTPMessage', 'OpaqueCMClock', 'ScheduledAudioFileRegion', 'STEntryZero', 'AVAudio3DPoint', 'gss_channel_bindings_struct', 'sfntVariationHeader', 'AUChannelInfo', 'UIOffset', 'GLKEffectPropertyPrv', 'KerxStateHeader', 'CGLineJoin', 'CGPDFDocument', '__CFBag', 'KernOrderedListHeader', '__SCNetworkSet', '__SecKey', 'MIDIObjectAddRemoveNotification', 'AudioUnitParameter', 'JustPCActionSubrecord', 'AudioComponentDescription', 'AudioUnitParameterValueName', 'AudioUnitParameterEvent', 'KerxControlPointAction', 'AudioTimeStamp', 'KernKerningPair', 'gss_buffer_set_desc_struct', 'MortFeatureEntry', 'FontVariation', 'CAFStringID', 'LcarCaretClassEntry', 'AudioUnitParameterStringFromValue', 'ACErrorCode', 'ALMXGlyphEntry', 'LtagTable', '__CTTypesetter', 'AuthorizationOpaqueRef', 'UIEdgeInsets', 'CGPathElement', 'CAFMarker', 'KernTableHeader', 'NoteParamsControlValue', 'SSLContext', 'gss_cred_id_t_desc_struct', 'AudioUnitParameterNameInfo', 'CGDataConsumerCallbacks', 'ALMXHeader', 'CGLineCap', 'MIDIControlTransform', 'CGPDFArray', '__SecPolicy', 'AudioConverterPrimeInfo', '__CTTextTab', '__CFNetServiceMonitor', 'AUInputSamplesInOutputCallbackStruct', '__CTFramesetter', 'CGPDFDataFormat', 'STHeader', 'CVPlanarPixelBufferInfo_YCbCrPlanar', 'MIDIValueMap', 'JustDirectionTable', '__SCBondStatus', 'SFNTLookupSegmentHeader', 'OpaqueCMMemoryPool', 'CGPathDrawingMode', 'CGFont', '__SCNetworkReachability', 'AudioClassDescription', 'CGPoint', 'AVAudio3DVectorOrientation', 'CAFStrings', '__CFNetServiceBrowser', 'opaqueMTAudioProcessingTap', 'sfntNameRecord', 'CGPDFPage', 'CGLayer', 'ComponentInstanceRecord', 'CAFInfoStrings', 'HostCallbackInfo', 'MusicDeviceNoteParams', 'OpaqueVTCompressionSession', 'KernIndexArrayHeader', 'CVPlanarPixelBufferInfo_YCbCrBiPlanar', 'MusicTrackLoopInfo', 'opaqueCMFormatDescription', 'STClassTable', 'sfntDirectoryEntry', 'OpaqueCMTimebase', 'CGDataProviderDirectCallbacks', 'MIDIPacketList', 'CAFOverviewChunk', 'MIDIPacket', 'ScheduledAudioSlice', 'CGDataProviderSequentialCallbacks', 'AudioBuffer', 'MorxRearrangementSubtable', 'CGPatternCallbacks', 'AUDistanceAttenuationData', 'MIDIIOErrorNotification', 'CGPDFContentStream', 'IUnknownVTbl', 'MIDITransform', 'MortInsertionSubtable', 'CABarBeatTime', 'AudioBufferList', '__CVBuffer', 'AURenderCallbackStruct', 'STXEntryZero', 'JustPCDuctilityAction', 'OpaqueAudioQueueTimeline', 'VTDecompressionOutputCallbackRecord', 'OpaqueMIDIClient', '__CFPlugInInstance', 'AudioQueueBuffer', '__CFFileDescriptor', 'AudioUnitConnection', '_GKTurnBasedExchangeStatus', 'LcarCaretTable', 'CVPlanarComponentInfo', 'JustWidthDeltaGroup', 'OpaqueAudioComponent', 'ParameterEvent', '__CVPixelBufferPool', '__CTFont', 'CGColorSpace', 'CGSize', 'AUDependentParameter', 'MIDIDriverInterface', 'gss_krb5_rfc1964_keydata', '__CFDateFormatter', 'LtagStringRange', 'OpaqueVTDecompressionSession', 'gss_iov_buffer_desc_struct', 'AUPresetEvent', 'PropTable', 'KernOrderedListEntry', 'CF_BRIDGED_MUTABLE_TYPE', 'gss_OID_desc_struct', 'AudioUnitPresetMAS_Settings', 'AudioFileMarker', 'JustPCConditionalAddAction', 'BslnFormat3Part', '__CFNotificationCenter', 'MortSwashSubtable', 'AUParameterMIDIMapping', 'SCNVector3', 'OpaqueAudioConverter', 'MIDIRawData', 'sfntNameHeader', '__CFRunLoop', 'MFMailComposeResult', 'CATransform3D', 'OpbdSideValues', 'CAF_SMPTE_Time', '__SecAccessControl', 'JustPCAction', 'OpaqueVTFrameSilo', 'OpaqueVTMultiPassStorage', 'CGPathElementType', 'AudioFormatListItem', 'AudioUnitExternalBuffer', 'AudioFileRegion', 'AudioValueTranslation', 'CGImageMetadataTag', 'CAFPeakChunk', 'AudioBytePacketTranslation', 'sfntCMapHeader', '__CFURLEnumerator', 'STXHeader', 'CGPDFObjectType', 'SFNTLookupArrayHeader'}
 
 if __name__ == '__main__':  # pragma: no cover
     import os
@@ -40,7 +38,8 @@
                 continue
 
             headerFilePath = frameworkHeadersDir + f
-            content = open(headerFilePath).read()
+            with open(headerFilePath) as f:
+                content = f.read()
             res = re.findall(r'(?<=@interface )\w+', content)
             for r in res:
                 all_interfaces.add(r)
--- a/eric6/ThirdParty/Pygments/pygments/lexers/_csound_builtins.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/ThirdParty/Pygments/pygments/lexers/_csound_builtins.py	Sat May 02 13:51:07 2020 +0200
@@ -3,52 +3,56 @@
     pygments.lexers._csound_builtins
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-    :copyright: Copyright 2006-2018 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
-# Opcodes in Csound 6.12.0 at commit 6ca322bd31f1ca907c008616b40a5f237ff449db using
-#   python -c "
-#   import re, subprocess
-#   output = subprocess.Popen(['csound', '--list-opcodes0'], stderr=subprocess.PIPE).communicate()[1]
-#   opcodes = output[re.search(r'^$', output, re.M).end():re.search(r'^\d+ opcodes$', output, re.M).start()].split()
-#   output = subprocess.Popen(['csound', '--list-opcodes2'], stderr=subprocess.PIPE).communicate()[1]
-#   all_opcodes = output[re.search(r'^$', output, re.M).end():re.search(r'^\d+ opcodes$', output, re.M).start()].split()
+# Opcodes in Csound 6.14.0 using:
+#   python3 -c "
+#   import re
+#   from subprocess import Popen, PIPE
+#   output = Popen(['csound', '--list-opcodes0'], stderr=PIPE, text=True).communicate()[1]
+#   opcodes = output[re.search(r'^\$', output, re.M).end() : re.search(r'^\d+ opcodes\$', output, re.M).start()].split()
+#   output = Popen(['csound', '--list-opcodes2'], stderr=PIPE, text=True).communicate()[1]
+#   all_opcodes = output[re.search(r'^\$', output, re.M).end() : re.search(r'^\d+ opcodes\$', output, re.M).start()].split()
 #   deprecated_opcodes = [opcode for opcode in all_opcodes if opcode not in opcodes]
-#   print '''OPCODES = set(\'''
-#   {}
+#   # Remove opcodes that csound.py treats as keywords.
+#   keyword_opcodes = [
+#       'cggoto',   # https://csound.com/docs/manual/cggoto.html
+#       'cigoto',   # https://csound.com/docs/manual/cigoto.html
+#       'cingoto',  # (undocumented)
+#       'ckgoto',   # https://csound.com/docs/manual/ckgoto.html
+#       'cngoto',   # https://csound.com/docs/manual/cngoto.html
+#       'cnkgoto',  # (undocumented)
+#       'endin',    # https://csound.com/docs/manual/endin.html
+#       'endop',    # https://csound.com/docs/manual/endop.html
+#       'goto',     # https://csound.com/docs/manual/goto.html
+#       'igoto',    # https://csound.com/docs/manual/igoto.html
+#       'instr',    # https://csound.com/docs/manual/instr.html
+#       'kgoto',    # https://csound.com/docs/manual/kgoto.html
+#       'loop_ge',  # https://csound.com/docs/manual/loop_ge.html
+#       'loop_gt',  # https://csound.com/docs/manual/loop_gt.html
+#       'loop_le',  # https://csound.com/docs/manual/loop_le.html
+#       'loop_lt',  # https://csound.com/docs/manual/loop_lt.html
+#       'opcode',   # https://csound.com/docs/manual/opcode.html
+#       'reinit',   # https://csound.com/docs/manual/reinit.html
+#       'return',   # https://csound.com/docs/manual/return.html
+#       'rireturn', # https://csound.com/docs/manual/rireturn.html
+#       'rigoto',   # https://csound.com/docs/manual/rigoto.html
+#       'tigoto',   # https://csound.com/docs/manual/tigoto.html
+#       'timout'    # https://csound.com/docs/manual/timout.html
+#   ]
+#   opcodes = [opcode for opcode in opcodes if opcode not in keyword_opcodes]
+#   newline = '\n'
+#   print(f'''OPCODES = set(\'''
+#   {newline.join(opcodes)}
 #   \'''.split())
 #
 #   DEPRECATED_OPCODES = set(\'''
-#   {}
+#   {newline.join(deprecated_opcodes)}
 #   \'''.split())
-#   '''.format('\n'.join(opcodes), '\n'.join(deprecated_opcodes))
+#   ''')
 #   "
-# except for
-#   cggoto   csound.com/docs/manual/cggoto.html
-#   cigoto   csound.com/docs/manual/cigoto.html
-#   cingoto  (undocumented)
-#   ckgoto   csound.com/docs/manual/ckgoto.html
-#   cngoto   csound.com/docs/manual/cngoto.html
-#   cnkgoto  (undocumented)
-#   endin    csound.com/docs/manual/endin.html
-#   endop    csound.com/docs/manual/endop.html
-#   goto     csound.com/docs/manual/goto.html
-#   igoto    csound.com/docs/manual/igoto.html
-#   instr    csound.com/docs/manual/instr.html
-#   kgoto    csound.com/docs/manual/kgoto.html
-#   loop_ge  csound.com/docs/manual/loop_ge.html
-#   loop_gt  csound.com/docs/manual/loop_gt.html
-#   loop_le  csound.com/docs/manual/loop_le.html
-#   loop_lt  csound.com/docs/manual/loop_lt.html
-#   opcode   csound.com/docs/manual/opcode.html
-#   reinit   csound.com/docs/manual/reinit.html
-#   return   csound.com/docs/manual/return.html
-#   rireturn csound.com/docs/manual/rireturn.html
-#   rigoto   csound.com/docs/manual/rigoto.html
-#   tigoto   csound.com/docs/manual/tigoto.html
-#   timout   csound.com/docs/manual/timout.html
-# which are treated as keywords in csound.py.
 
 OPCODES = set('''
 ATSadd
@@ -169,8 +173,8 @@
 STKBrass
 STKClarinet
 STKDrummer
+STKFMVoices
 STKFlute
-STKFMVoices
 STKHevyMetl
 STKMandolin
 STKModalBar
@@ -201,6 +205,7 @@
 ampdb
 ampdbfs
 ampmidi
+ampmidicurve
 ampmidid
 areson
 aresonk
@@ -249,7 +254,6 @@
 ceps
 cepsinv
 chanctrl
-changed
 changed2
 chani
 chano
@@ -261,11 +265,19 @@
 chnclear
 chnexport
 chnget
+chngeta
+chngeti
+chngetk
 chngetks
+chngets
 chnmix
 chnparams
 chnset
+chnseta
+chnseti
+chnsetk
 chnsetks
+chnsets
 chuap
 clear
 clfilt
@@ -418,6 +430,17 @@
 flooper
 flooper2
 floor
+fluidAllOut
+fluidCCi
+fluidCCk
+fluidControl
+fluidEngine
+fluidInfo
+fluidLoad
+fluidNote
+fluidOut
+fluidProgramSelect
+fluidSetInterpMethod
 fmanal
 fmax
 fmb3
@@ -452,6 +475,7 @@
 ftchnls
 ftconv
 ftcps
+ftexists
 ftfree
 ftgen
 ftgenonce
@@ -492,6 +516,7 @@
 grain2
 grain3
 granule
+gtf
 guiro
 harmon
 harmon2
@@ -599,6 +624,10 @@
 la_i_multiply_mr
 la_i_multiply_vc
 la_i_multiply_vr
+la_i_norm1_mc
+la_i_norm1_mr
+la_i_norm1_vc
+la_i_norm1_vr
 la_i_norm_euclid_mc
 la_i_norm_euclid_mr
 la_i_norm_euclid_vc
@@ -609,10 +638,6 @@
 la_i_norm_inf_vr
 la_i_norm_max_mc
 la_i_norm_max_mr
-la_i_norm1_mc
-la_i_norm1_mr
-la_i_norm1_vc
-la_i_norm1_vr
 la_i_print_mc
 la_i_print_mr
 la_i_print_vc
@@ -697,6 +722,10 @@
 la_k_multiply_mr
 la_k_multiply_vc
 la_k_multiply_vr
+la_k_norm1_mc
+la_k_norm1_mr
+la_k_norm1_vc
+la_k_norm1_vr
 la_k_norm_euclid_mc
 la_k_norm_euclid_mr
 la_k_norm_euclid_vc
@@ -707,10 +736,6 @@
 la_k_norm_inf_vr
 la_k_norm_max_mc
 la_k_norm_max_mr
-la_k_norm1_mc
-la_k_norm1_mr
-la_k_norm1_vc
-la_k_norm1_vr
 la_k_qr_eigen_mc
 la_k_qr_eigen_mr
 la_k_qr_factor_mc
@@ -732,6 +757,7 @@
 la_k_upper_solve_mr
 la_k_vc_set
 la_k_vr_set
+lastcycle
 lenarray
 lfo
 limit
@@ -822,6 +848,7 @@
 median
 mediank
 metro
+metro2
 mfb
 midglobal
 midiarp
@@ -900,6 +927,8 @@
 nsamp
 nstance
 nstrnum
+nstrstr
+ntof
 ntom
 ntrpol
 nxtpow2
@@ -1030,7 +1059,6 @@
 ptable
 ptable3
 ptablei
-ptableiw
 ptablew
 ptrack
 puts
@@ -1175,6 +1203,7 @@
 qnan
 r2c
 rand
+randc
 randh
 randi
 random
@@ -1235,6 +1264,7 @@
 schedkwhen
 schedkwhennamed
 schedule
+schedulek
 schedwhen
 scoreline
 scoreline_i
@@ -1337,6 +1367,7 @@
 strget
 strindex
 strindexk
+string2array
 strlen
 strlenk
 strlower
@@ -1344,6 +1375,7 @@
 strrindex
 strrindexk
 strset
+strstrip
 strsub
 strsubk
 strtod
@@ -1380,7 +1412,6 @@
 tableigpw
 tableikt
 tableimix
-tableiw
 tablekt
 tablemix
 tableng
@@ -1589,6 +1620,7 @@
 array
 bformdec
 bformenc
+changed
 copy2ftab
 copy2ttab
 hrtfer
@@ -1598,6 +1630,7 @@
 mintab
 pop
 pop_f
+ptableiw
 push
 push_f
 scalet
@@ -1616,6 +1649,7 @@
 stack
 sumtab
 tabgen
+tableiw
 tabmap
 tabmap_i
 tabslice
--- a/eric6/ThirdParty/Pygments/pygments/lexers/_lasso_builtins.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/ThirdParty/Pygments/pygments/lexers/_lasso_builtins.py	Sat May 02 13:51:07 2020 +0200
@@ -5,7 +5,7 @@
 
     Built-in Lasso types, traits, methods, and members.
 
-    :copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
--- a/eric6/ThirdParty/Pygments/pygments/lexers/_lua_builtins.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/ThirdParty/Pygments/pygments/lexers/_lua_builtins.py	Sat May 02 13:51:07 2020 +0200
@@ -9,12 +9,10 @@
 
     Do not edit the MODULES dict by hand.
 
-    :copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
-from __future__ import print_function
-
 MODULES = {'basic': ('_G',
            '_VERSION',
            'assert',
@@ -288,7 +286,7 @@
             print('>> %s' % full_function_name)
             m = get_function_module(full_function_name)
             modules.setdefault(m, []).append(full_function_name)
-        modules = dict((k, tuple(v)) for k, v in modules.iteritems())
+        modules = {k: tuple(v) for k, v in modules.items()}
 
         regenerate(__file__, modules)
 
--- a/eric6/ThirdParty/Pygments/pygments/lexers/_mapping.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/ThirdParty/Pygments/pygments/lexers/_mapping.py	Sat May 02 13:51:07 2020 +0200
@@ -13,8 +13,6 @@
     :license: BSD, see LICENSE for details.
 """
 
-from __future__ import print_function
-
 LEXERS = {
     'ABAPLexer': ('pygments.lexers.business', 'ABAP', ('abap',), ('*.abap', '*.ABAP'), ('text/x-abap',)),
     'APLLexer': ('pygments.lexers.apl', 'APL', ('apl',), ('*.apl',), ()),
@@ -44,14 +42,16 @@
     'ArduinoLexer': ('pygments.lexers.c_like', 'Arduino', ('arduino',), ('*.ino',), ('text/x-arduino',)),
     'AspectJLexer': ('pygments.lexers.jvm', 'AspectJ', ('aspectj',), ('*.aj',), ('text/x-aspectj',)),
     'AsymptoteLexer': ('pygments.lexers.graphics', 'Asymptote', ('asy', 'asymptote'), ('*.asy',), ('text/x-asymptote',)),
+    'AugeasLexer': ('pygments.lexers.configs', 'Augeas', ('augeas',), ('*.aug',), ()),
     'AutoItLexer': ('pygments.lexers.automation', 'AutoIt', ('autoit',), ('*.au3',), ('text/x-autoit',)),
     'AutohotkeyLexer': ('pygments.lexers.automation', 'autohotkey', ('ahk', 'autohotkey'), ('*.ahk', '*.ahkl'), ('text/x-autohotkey',)),
     'AwkLexer': ('pygments.lexers.textedit', 'Awk', ('awk', 'gawk', 'mawk', 'nawk'), ('*.awk',), ('application/x-awk',)),
+    'BBCBasicLexer': ('pygments.lexers.basic', 'BBC Basic', ('bbcbasic',), ('*.bbc',), ()),
     'BBCodeLexer': ('pygments.lexers.markup', 'BBCode', ('bbcode',), (), ('text/x-bbcode',)),
     'BCLexer': ('pygments.lexers.algebra', 'BC', ('bc',), ('*.bc',), ()),
     'BSTLexer': ('pygments.lexers.bibtex', 'BST', ('bst', 'bst-pybtex'), ('*.bst',), ()),
     'BaseMakefileLexer': ('pygments.lexers.make', 'Base Makefile', ('basemake',), (), ()),
-    'BashLexer': ('pygments.lexers.shell', 'Bash', ('bash', 'sh', 'ksh', 'zsh', 'shell'), ('*.sh', '*.ksh', '*.bash', '*.ebuild', '*.eclass', '*.exheres-0', '*.exlib', '*.zsh', '.bashrc', 'bashrc', '.bash_*', 'bash_*', 'zshrc', '.zshrc', 'PKGBUILD'), ('application/x-sh', 'application/x-shellscript')),
+    'BashLexer': ('pygments.lexers.shell', 'Bash', ('bash', 'sh', 'ksh', 'zsh', 'shell'), ('*.sh', '*.ksh', '*.bash', '*.ebuild', '*.eclass', '*.exheres-0', '*.exlib', '*.zsh', '.bashrc', 'bashrc', '.bash_*', 'bash_*', 'zshrc', '.zshrc', 'PKGBUILD'), ('application/x-sh', 'application/x-shellscript', 'text/x-shellscript')),
     'BashSessionLexer': ('pygments.lexers.shell', 'Bash Session', ('console', 'shell-session'), ('*.sh-session', '*.shell-session'), ('application/x-shell-session', 'application/x-sh-session')),
     'BatchLexer': ('pygments.lexers.shell', 'Batchfile', ('bat', 'batch', 'dosbatch', 'winbatch'), ('*.bat', '*.cmd'), ('application/x-dos-batch',)),
     'BefungeLexer': ('pygments.lexers.esoteric', 'Befunge', ('befunge',), ('*.befunge',), ('application/x-befunge',)),
@@ -59,10 +59,10 @@
     'BlitzBasicLexer': ('pygments.lexers.basic', 'BlitzBasic', ('blitzbasic', 'b3d', 'bplus'), ('*.bb', '*.decls'), ('text/x-bb',)),
     'BlitzMaxLexer': ('pygments.lexers.basic', 'BlitzMax', ('blitzmax', 'bmax'), ('*.bmx',), ('text/x-bmx',)),
     'BnfLexer': ('pygments.lexers.grammar_notation', 'BNF', ('bnf',), ('*.bnf',), ('text/x-bnf',)),
+    'BoaLexer': ('pygments.lexers.boa', 'Boa', ('boa',), ('*.boa',), ()),
     'BooLexer': ('pygments.lexers.dotnet', 'Boo', ('boo',), ('*.boo',), ('text/x-boo',)),
     'BoogieLexer': ('pygments.lexers.verification', 'Boogie', ('boogie',), ('*.bpl',), ()),
     'BrainfuckLexer': ('pygments.lexers.esoteric', 'Brainfuck', ('brainfuck', 'bf'), ('*.bf', '*.b'), ('application/x-brainfuck',)),
-    'BroLexer': ('pygments.lexers.dsls', 'Bro', ('bro',), ('*.bro',), ()),
     'BugsLexer': ('pygments.lexers.modeling', 'BUGS', ('bugs', 'winbugs', 'openbugs'), ('*.bug',), ()),
     'CAmkESLexer': ('pygments.lexers.esoteric', 'CAmkES', ('camkes', 'idl4'), ('*.camkes', '*.idl4'), ()),
     'CLexer': ('pygments.lexers.c_cpp', 'C', ('c',), ('*.c', '*.h', '*.idc'), ('text/x-chdr', 'text/x-csrc')),
@@ -80,6 +80,7 @@
     'Cfengine3Lexer': ('pygments.lexers.configs', 'CFEngine3', ('cfengine3', 'cf3'), ('*.cf',), ()),
     'ChaiscriptLexer': ('pygments.lexers.scripting', 'ChaiScript', ('chai', 'chaiscript'), ('*.chai',), ('text/x-chaiscript', 'application/x-chaiscript')),
     'ChapelLexer': ('pygments.lexers.chapel', 'Chapel', ('chapel', 'chpl'), ('*.chpl',), ()),
+    'CharmciLexer': ('pygments.lexers.c_like', 'Charmci', ('charmci',), ('*.ci',), ()),
     'CheetahHtmlLexer': ('pygments.lexers.templates', 'HTML+Cheetah', ('html+cheetah', 'html+spitfire', 'htmlcheetah'), (), ('text/html+cheetah', 'text/html+spitfire')),
     'CheetahJavascriptLexer': ('pygments.lexers.templates', 'JavaScript+Cheetah', ('js+cheetah', 'javascript+cheetah', 'js+spitfire', 'javascript+spitfire'), (), ('application/x-javascript+cheetah', 'text/x-javascript+cheetah', 'text/javascript+cheetah', 'application/x-javascript+spitfire', 'text/x-javascript+spitfire', 'text/javascript+spitfire')),
     'CheetahLexer': ('pygments.lexers.templates', 'Cheetah', ('cheetah', 'spitfire'), ('*.tmpl', '*.spt'), ('application/x-cheetah', 'application/x-spitfire')),
@@ -105,7 +106,7 @@
     'CryptolLexer': ('pygments.lexers.haskell', 'Cryptol', ('cryptol', 'cry'), ('*.cry',), ('text/x-cryptol',)),
     'CrystalLexer': ('pygments.lexers.crystal', 'Crystal', ('cr', 'crystal'), ('*.cr',), ('text/x-crystal',)),
     'CsoundDocumentLexer': ('pygments.lexers.csound', 'Csound Document', ('csound-document', 'csound-csd'), ('*.csd',), ()),
-    'CsoundOrchestraLexer': ('pygments.lexers.csound', 'Csound Orchestra', ('csound', 'csound-orc'), ('*.orc',), ()),
+    'CsoundOrchestraLexer': ('pygments.lexers.csound', 'Csound Orchestra', ('csound', 'csound-orc'), ('*.orc', '*.udo'), ()),
     'CsoundScoreLexer': ('pygments.lexers.csound', 'Csound Score', ('csound-score', 'csound-sco'), ('*.sco',), ()),
     'CssDjangoLexer': ('pygments.lexers.templates', 'CSS+Django/Jinja', ('css+django', 'css+jinja'), (), ('text/css+django', 'text/css+jinja')),
     'CssErbLexer': ('pygments.lexers.templates', 'CSS+Ruby', ('css+erb', 'css+ruby'), (), ('text/css+ruby',)),
@@ -120,6 +121,7 @@
     'DObjdumpLexer': ('pygments.lexers.asm', 'd-objdump', ('d-objdump',), ('*.d-objdump',), ('text/x-d-objdump',)),
     'DarcsPatchLexer': ('pygments.lexers.diff', 'Darcs Patch', ('dpatch',), ('*.dpatch', '*.darcspatch'), ()),
     'DartLexer': ('pygments.lexers.javascript', 'Dart', ('dart',), ('*.dart',), ('text/x-dart',)),
+    'Dasm16Lexer': ('pygments.lexers.asm', 'DASM16', ('dasm16',), ('*.dasm16', '*.dasm'), ('text/x-dasm16',)),
     'DebianControlLexer': ('pygments.lexers.installers', 'Debian Control file', ('control', 'debcontrol'), ('control',), ()),
     'DelphiLexer': ('pygments.lexers.pascal', 'Delphi', ('delphi', 'pas', 'pascal', 'objectpascal'), ('*.pas', '*.dpr'), ('text/x-pascal',)),
     'DgLexer': ('pygments.lexers.python', 'dg', ('dg',), ('*.dg',), ('text/x-dg',)),
@@ -138,9 +140,10 @@
     'EbnfLexer': ('pygments.lexers.parsers', 'EBNF', ('ebnf',), ('*.ebnf',), ('text/x-ebnf',)),
     'EiffelLexer': ('pygments.lexers.eiffel', 'Eiffel', ('eiffel',), ('*.e',), ('text/x-eiffel',)),
     'ElixirConsoleLexer': ('pygments.lexers.erlang', 'Elixir iex session', ('iex',), (), ('text/x-elixir-shellsession',)),
-    'ElixirLexer': ('pygments.lexers.erlang', 'Elixir', ('elixir', 'ex', 'exs'), ('*.ex', '*.exs'), ('text/x-elixir',)),
+    'ElixirLexer': ('pygments.lexers.erlang', 'Elixir', ('elixir', 'ex', 'exs'), ('*.ex', '*.eex', '*.exs'), ('text/x-elixir',)),
     'ElmLexer': ('pygments.lexers.elm', 'Elm', ('elm',), ('*.elm',), ('text/x-elm',)),
     'EmacsLispLexer': ('pygments.lexers.lisp', 'EmacsLisp', ('emacs', 'elisp', 'emacs-lisp'), ('*.el',), ('text/x-elisp', 'application/x-elisp')),
+    'EmailLexer': ('pygments.lexers.email', 'E-mail', ('email', 'eml'), ('*.eml',), ('message/rfc822',)),
     'ErbLexer': ('pygments.lexers.templates', 'ERB', ('erb',), (), ('application/x-ruby-templating',)),
     'ErlangLexer': ('pygments.lexers.erlang', 'Erlang', ('erlang',), ('*.erl', '*.hrl', '*.es', '*.escript'), ('text/x-erlang',)),
     'ErlangShellLexer': ('pygments.lexers.erlang', 'Erlang erl session', ('erl',), ('*.erl-sh',), ('text/x-erl-shellsession',)),
@@ -148,7 +151,7 @@
     'EvoqueLexer': ('pygments.lexers.templates', 'Evoque', ('evoque',), ('*.evoque',), ('application/x-evoque',)),
     'EvoqueXmlLexer': ('pygments.lexers.templates', 'XML+Evoque', ('xml+evoque',), ('*.xml',), ('application/xml+evoque',)),
     'EzhilLexer': ('pygments.lexers.ezhil', 'Ezhil', ('ezhil',), ('*.n',), ('text/x-ezhil',)),
-    'FSharpLexer': ('pygments.lexers.dotnet', 'FSharp', ('fsharp',), ('*.fs', '*.fsi'), ('text/x-fsharp',)),
+    'FSharpLexer': ('pygments.lexers.dotnet', 'F#', ('fsharp', 'f#'), ('*.fs', '*.fsi'), ('text/x-fsharp',)),
     'FactorLexer': ('pygments.lexers.factor', 'Factor', ('factor',), ('*.factor',), ('text/x-factor',)),
     'FancyLexer': ('pygments.lexers.ruby', 'Fancy', ('fancy', 'fy'), ('*.fy', '*.fancypack'), ('text/x-fancysrc',)),
     'FantomLexer': ('pygments.lexers.fantom', 'Fantom', ('fan',), ('*.fan',), ('application/x-fantom',)),
@@ -156,10 +159,12 @@
     'FennelLexer': ('pygments.lexers.lisp', 'Fennel', ('fennel', 'fnl'), ('*.fnl',), ()),
     'FishShellLexer': ('pygments.lexers.shell', 'Fish', ('fish', 'fishshell'), ('*.fish', '*.load'), ('application/x-fish',)),
     'FlatlineLexer': ('pygments.lexers.dsls', 'Flatline', ('flatline',), (), ('text/x-flatline',)),
+    'FloScriptLexer': ('pygments.lexers.floscript', 'FloScript', ('floscript', 'flo'), ('*.flo',), ()),
     'ForthLexer': ('pygments.lexers.forth', 'Forth', ('forth',), ('*.frt', '*.fs'), ('application/x-forth',)),
     'FortranFixedLexer': ('pygments.lexers.fortran', 'FortranFixed', ('fortranfixed',), ('*.f', '*.F'), ()),
     'FortranLexer': ('pygments.lexers.fortran', 'Fortran', ('fortran',), ('*.f03', '*.f90', '*.F03', '*.F90'), ('text/x-fortran',)),
     'FoxProLexer': ('pygments.lexers.foxpro', 'FoxPro', ('foxpro', 'vfp', 'clipper', 'xbase'), ('*.PRG', '*.prg'), ()),
+    'FreeFemLexer': ('pygments.lexers.freefem', 'Freefem', ('freefem',), ('*.edp',), ('text/x-freefem',)),
     'GAPLexer': ('pygments.lexers.algebra', 'GAP', ('gap',), ('*.g', '*.gd', '*.gi', '*.gap'), ()),
     'GLShaderLexer': ('pygments.lexers.graphics', 'GLSL', ('glsl',), ('*.vert', '*.frag', '*.geo'), ('text/x-glslsrc',)),
     'GasLexer': ('pygments.lexers.asm', 'GAS', ('gas', 'asm'), ('*.s', '*.S'), ('text/x-gas',)),
@@ -183,6 +188,7 @@
     'HaxeLexer': ('pygments.lexers.haxe', 'Haxe', ('hx', 'haxe', 'hxsl'), ('*.hx', '*.hxsl'), ('text/haxe', 'text/x-haxe', 'text/x-hx')),
     'HexdumpLexer': ('pygments.lexers.hexdump', 'Hexdump', ('hexdump',), (), ()),
     'HsailLexer': ('pygments.lexers.asm', 'HSAIL', ('hsail', 'hsa'), ('*.hsail',), ('text/x-hsail',)),
+    'HspecLexer': ('pygments.lexers.haskell', 'Hspec', ('hspec',), (), ()),
     'HtmlDjangoLexer': ('pygments.lexers.templates', 'HTML+Django/Jinja', ('html+django', 'html+jinja', 'htmldjango'), (), ('text/html+django', 'text/html+jinja')),
     'HtmlGenshiLexer': ('pygments.lexers.templates', 'HTML+Genshi', ('html+genshi', 'html+kid'), (), ('text/html+genshi',)),
     'HtmlLexer': ('pygments.lexers.html', 'HTML', ('html',), ('*.html', '*.htm', '*.xhtml', '*.xslt'), ('text/html', 'application/xhtml+xml')),
@@ -193,6 +199,7 @@
     'HyLexer': ('pygments.lexers.lisp', 'Hy', ('hylang',), ('*.hy',), ('text/x-hy', 'application/x-hy')),
     'HybrisLexer': ('pygments.lexers.scripting', 'Hybris', ('hybris', 'hy'), ('*.hy', '*.hyb'), ('text/x-hybris', 'application/x-hybris')),
     'IDLLexer': ('pygments.lexers.idl', 'IDL', ('idl',), ('*.pro',), ('text/idl',)),
+    'IconLexer': ('pygments.lexers.unicon', 'Icon', ('icon',), ('*.icon', '*.ICON'), ()),
     'IdrisLexer': ('pygments.lexers.haskell', 'Idris', ('idris', 'idr'), ('*.idr',), ('text/x-idris',)),
     'IgorLexer': ('pygments.lexers.igor', 'Igor', ('igor', 'igorpro'), ('*.ipf',), ('text/ipf',)),
     'Inform6Lexer': ('pygments.lexers.int_fiction', 'Inform 6', ('inform6', 'i6'), ('*.inf',), ()),
@@ -210,20 +217,21 @@
     'JavascriptDjangoLexer': ('pygments.lexers.templates', 'JavaScript+Django/Jinja', ('js+django', 'javascript+django', 'js+jinja', 'javascript+jinja'), (), ('application/x-javascript+django', 'application/x-javascript+jinja', 'text/x-javascript+django', 'text/x-javascript+jinja', 'text/javascript+django', 'text/javascript+jinja')),
     'JavascriptErbLexer': ('pygments.lexers.templates', 'JavaScript+Ruby', ('js+erb', 'javascript+erb', 'js+ruby', 'javascript+ruby'), (), ('application/x-javascript+ruby', 'text/x-javascript+ruby', 'text/javascript+ruby')),
     'JavascriptGenshiLexer': ('pygments.lexers.templates', 'JavaScript+Genshi Text', ('js+genshitext', 'js+genshi', 'javascript+genshitext', 'javascript+genshi'), (), ('application/x-javascript+genshi', 'text/x-javascript+genshi', 'text/javascript+genshi')),
-    'JavascriptLexer': ('pygments.lexers.javascript', 'JavaScript', ('js', 'javascript'), ('*.js', '*.jsm'), ('application/javascript', 'application/x-javascript', 'text/x-javascript', 'text/javascript')),
+    'JavascriptLexer': ('pygments.lexers.javascript', 'JavaScript', ('js', 'javascript'), ('*.js', '*.jsm', '*.mjs'), ('application/javascript', 'application/x-javascript', 'text/x-javascript', 'text/javascript')),
     'JavascriptPhpLexer': ('pygments.lexers.templates', 'JavaScript+PHP', ('js+php', 'javascript+php'), (), ('application/x-javascript+php', 'text/x-javascript+php', 'text/javascript+php')),
     'JavascriptSmartyLexer': ('pygments.lexers.templates', 'JavaScript+Smarty', ('js+smarty', 'javascript+smarty'), (), ('application/x-javascript+smarty', 'text/x-javascript+smarty', 'text/javascript+smarty')),
     'JclLexer': ('pygments.lexers.scripting', 'JCL', ('jcl',), ('*.jcl',), ('text/x-jcl',)),
     'JsgfLexer': ('pygments.lexers.grammar_notation', 'JSGF', ('jsgf',), ('*.jsgf',), ('application/jsgf', 'application/x-jsgf', 'text/jsgf')),
     'JsonBareObjectLexer': ('pygments.lexers.data', 'JSONBareObject', ('json-object',), (), ('application/json-object',)),
     'JsonLdLexer': ('pygments.lexers.data', 'JSON-LD', ('jsonld', 'json-ld'), ('*.jsonld',), ('application/ld+json',)),
-    'JsonLexer': ('pygments.lexers.data', 'JSON', ('json',), ('*.json',), ('application/json',)),
+    'JsonLexer': ('pygments.lexers.data', 'JSON', ('json',), ('*.json', 'Pipfile.lock'), ('application/json',)),
     'JspLexer': ('pygments.lexers.templates', 'Java Server Page', ('jsp',), ('*.jsp',), ('application/x-jsp',)),
     'JuliaConsoleLexer': ('pygments.lexers.julia', 'Julia console', ('jlcon',), (), ()),
     'JuliaLexer': ('pygments.lexers.julia', 'Julia', ('julia', 'jl'), ('*.jl',), ('text/x-julia', 'application/x-julia')),
     'JuttleLexer': ('pygments.lexers.javascript', 'Juttle', ('juttle', 'juttle'), ('*.juttle',), ('application/juttle', 'application/x-juttle', 'text/x-juttle', 'text/juttle')),
     'KalLexer': ('pygments.lexers.javascript', 'Kal', ('kal',), ('*.kal',), ('text/kal', 'application/kal')),
     'KconfigLexer': ('pygments.lexers.configs', 'Kconfig', ('kconfig', 'menuconfig', 'linux-config', 'kernel-config'), ('Kconfig', '*Config.in*', 'external.in*', 'standard-modules.in'), ('text/x-kconfig',)),
+    'KernelLogLexer': ('pygments.lexers.textfmts', 'Kernel log', ('kmsg', 'dmesg'), ('*.kmsg', '*.dmesg'), ()),
     'KokaLexer': ('pygments.lexers.haskell', 'Koka', ('koka',), ('*.kk', '*.kki'), ('text/x-koka',)),
     'KotlinLexer': ('pygments.lexers.jvm', 'Kotlin', ('kotlin',), ('*.kt',), ('text/x-kotlin',)),
     'LSLLexer': ('pygments.lexers.scripting', 'LSL', ('lsl',), ('*.lsl',), ('text/x-lsl',)),
@@ -243,9 +251,12 @@
     'LiterateIdrisLexer': ('pygments.lexers.haskell', 'Literate Idris', ('lidr', 'literate-idris', 'lidris'), ('*.lidr',), ('text/x-literate-idris',)),
     'LiveScriptLexer': ('pygments.lexers.javascript', 'LiveScript', ('live-script', 'livescript'), ('*.ls',), ('text/livescript',)),
     'LlvmLexer': ('pygments.lexers.asm', 'LLVM', ('llvm',), ('*.ll',), ('text/x-llvm',)),
+    'LlvmMirBodyLexer': ('pygments.lexers.asm', 'LLVM-MIR Body', ('llvm-mir-body',), (), ()),
+    'LlvmMirLexer': ('pygments.lexers.asm', 'LLVM-MIR', ('llvm-mir',), ('*.mir',), ()),
     'LogosLexer': ('pygments.lexers.objective', 'Logos', ('logos',), ('*.x', '*.xi', '*.xm', '*.xmi'), ('text/x-logos',)),
     'LogtalkLexer': ('pygments.lexers.prolog', 'Logtalk', ('logtalk',), ('*.lgt', '*.logtalk'), ('text/x-logtalk',)),
     'LuaLexer': ('pygments.lexers.scripting', 'Lua', ('lua',), ('*.lua', '*.wlua'), ('text/x-lua', 'application/x-lua')),
+    'MIMELexer': ('pygments.lexers.mime', 'MIME', ('mime',), (), ('multipart/mixed', 'multipart/related', 'multipart/alternative')),
     'MOOCodeLexer': ('pygments.lexers.scripting', 'MOOCode', ('moocode', 'moo'), ('*.moo',), ('text/x-moocode',)),
     'MSDOSSessionLexer': ('pygments.lexers.shell', 'MSDOS Session', ('doscon',), (), ()),
     'MakefileLexer': ('pygments.lexers.make', 'Makefile', ('make', 'makefile', 'mf', 'bsdmake'), ('*.mak', '*.mk', 'Makefile', 'makefile', 'Makefile.*', 'GNUmakefile'), ('text/x-makefile',)),
@@ -262,12 +273,14 @@
     'MatlabLexer': ('pygments.lexers.matlab', 'Matlab', ('matlab',), ('*.m',), ('text/matlab',)),
     'MatlabSessionLexer': ('pygments.lexers.matlab', 'Matlab session', ('matlabsession',), (), ()),
     'MiniDLexer': ('pygments.lexers.d', 'MiniD', ('minid',), (), ('text/x-minidsrc',)),
+    'MiniScriptLexer': ('pygments.lexers.scripting', 'MiniScript', ('ms', 'miniscript'), ('*.ms',), ('text/x-minicript', 'application/x-miniscript')),
     'ModelicaLexer': ('pygments.lexers.modeling', 'Modelica', ('modelica',), ('*.mo',), ('text/x-modelica',)),
     'Modula2Lexer': ('pygments.lexers.modula2', 'Modula-2', ('modula2', 'm2'), ('*.def', '*.mod'), ('text/x-modula2',)),
     'MoinWikiLexer': ('pygments.lexers.markup', 'MoinMoin/Trac Wiki markup', ('trac-wiki', 'moin'), (), ('text/x-trac-wiki',)),
     'MonkeyLexer': ('pygments.lexers.basic', 'Monkey', ('monkey',), ('*.monkey',), ('text/x-monkey',)),
     'MonteLexer': ('pygments.lexers.monte', 'Monte', ('monte',), ('*.mt',), ()),
     'MoonScriptLexer': ('pygments.lexers.scripting', 'MoonScript', ('moon', 'moonscript'), ('*.moon',), ('text/x-moonscript', 'application/x-moonscript')),
+    'MoselLexer': ('pygments.lexers.mosel', 'Mosel', ('mosel',), ('*.mos',), ()),
     'MozPreprocCssLexer': ('pygments.lexers.markup', 'CSS+mozpreproc', ('css+mozpreproc',), ('*.css.in',), ()),
     'MozPreprocHashLexer': ('pygments.lexers.markup', 'mozhashpreproc', ('mozhashpreproc',), (), ()),
     'MozPreprocJavascriptLexer': ('pygments.lexers.markup', 'Javascript+mozpreproc', ('javascript+mozpreproc',), ('*.js.in',), ()),
@@ -295,6 +308,7 @@
     'NimrodLexer': ('pygments.lexers.nimrod', 'Nimrod', ('nim', 'nimrod'), ('*.nim', '*.nimrod'), ('text/x-nim',)),
     'NitLexer': ('pygments.lexers.nit', 'Nit', ('nit',), ('*.nit',), ()),
     'NixLexer': ('pygments.lexers.nix', 'Nix', ('nixos', 'nix'), ('*.nix',), ('text/x-nix',)),
+    'NotmuchLexer': ('pygments.lexers.textfmts', 'Notmuch', ('notmuch',), (), ()),
     'NuSMVLexer': ('pygments.lexers.smv', 'NuSMV', ('nusmv',), ('*.smv',), ()),
     'NumPyLexer': ('pygments.lexers.python', 'NumPy', ('numpy',), (), ()),
     'ObjdumpLexer': ('pygments.lexers.asm', 'objdump', ('objdump',), ('*.objdump',), ('text/x-objdump',)),
@@ -311,13 +325,15 @@
     'PanLexer': ('pygments.lexers.dsls', 'Pan', ('pan',), ('*.pan',), ()),
     'ParaSailLexer': ('pygments.lexers.parasail', 'ParaSail', ('parasail',), ('*.psi', '*.psl'), ('text/x-parasail',)),
     'PawnLexer': ('pygments.lexers.pawn', 'Pawn', ('pawn',), ('*.p', '*.pwn', '*.inc'), ('text/x-pawn',)),
-    'Perl6Lexer': ('pygments.lexers.perl', 'Perl6', ('perl6', 'pl6'), ('*.pl', '*.pm', '*.nqp', '*.p6', '*.6pl', '*.p6l', '*.pl6', '*.6pm', '*.p6m', '*.pm6', '*.t'), ('text/x-perl6', 'application/x-perl6')),
+    'PegLexer': ('pygments.lexers.grammar_notation', 'PEG', ('peg',), ('*.peg',), ('text/x-peg',)),
+    'Perl6Lexer': ('pygments.lexers.perl', 'Perl6', ('perl6', 'pl6', 'raku'), ('*.pl', '*.pm', '*.nqp', '*.p6', '*.6pl', '*.p6l', '*.pl6', '*.6pm', '*.p6m', '*.pm6', '*.t', '*.raku', '*.rakumod', '*.rakutest', '*.rakudoc'), ('text/x-perl6', 'application/x-perl6')),
     'PerlLexer': ('pygments.lexers.perl', 'Perl', ('perl', 'pl'), ('*.pl', '*.pm', '*.t'), ('text/x-perl', 'application/x-perl')),
     'PhpLexer': ('pygments.lexers.php', 'PHP', ('php', 'php3', 'php4', 'php5'), ('*.php', '*.php[345]', '*.inc'), ('text/x-php',)),
     'PigLexer': ('pygments.lexers.jvm', 'Pig', ('pig',), ('*.pig',), ('text/x-pig',)),
     'PikeLexer': ('pygments.lexers.c_like', 'Pike', ('pike',), ('*.pike', '*.pmod'), ('text/x-pike',)),
     'PkgConfigLexer': ('pygments.lexers.configs', 'PkgConfig', ('pkgconfig',), ('*.pc',), ()),
     'PlPgsqlLexer': ('pygments.lexers.sql', 'PL/pgSQL', ('plpgsql',), (), ('text/x-plpgsql',)),
+    'PonyLexer': ('pygments.lexers.pony', 'Pony', ('pony',), ('*.pony',), ()),
     'PostScriptLexer': ('pygments.lexers.graphics', 'PostScript', ('postscript', 'postscr'), ('*.ps', '*.eps'), ('application/postscript',)),
     'PostgresConsoleLexer': ('pygments.lexers.sql', 'PostgreSQL console (psql)', ('psql', 'postgresql-console', 'postgres-console'), (), ('text/x-postgresql-psql',)),
     'PostgresLexer': ('pygments.lexers.sql', 'PostgreSQL SQL dialect', ('postgresql', 'postgres'), (), ('text/x-postgresql',)),
@@ -331,11 +347,11 @@
     'PugLexer': ('pygments.lexers.html', 'Pug', ('pug', 'jade'), ('*.pug', '*.jade'), ('text/x-pug', 'text/x-jade')),
     'PuppetLexer': ('pygments.lexers.dsls', 'Puppet', ('puppet',), ('*.pp',), ()),
     'PyPyLogLexer': ('pygments.lexers.console', 'PyPy Log', ('pypylog', 'pypy'), ('*.pypylog',), ('application/x-pypylog',)),
-    'Python3Lexer': ('pygments.lexers.python', 'Python 3', ('python3', 'py3'), (), ('text/x-python3', 'application/x-python3')),
-    'Python3TracebackLexer': ('pygments.lexers.python', 'Python 3.0 Traceback', ('py3tb',), ('*.py3tb',), ('text/x-python3-traceback',)),
+    'Python2Lexer': ('pygments.lexers.python', 'Python 2.x', ('python2', 'py2'), (), ('text/x-python2', 'application/x-python2')),
+    'Python2TracebackLexer': ('pygments.lexers.python', 'Python 2.x Traceback', ('py2tb',), ('*.py2tb',), ('text/x-python2-traceback',)),
     'PythonConsoleLexer': ('pygments.lexers.python', 'Python console session', ('pycon',), (), ('text/x-python-doctest',)),
-    'PythonLexer': ('pygments.lexers.python', 'Python', ('python', 'py', 'sage'), ('*.py', '*.pyw', '*.sc', 'SConstruct', 'SConscript', '*.tac', '*.sage'), ('text/x-python', 'application/x-python')),
-    'PythonTracebackLexer': ('pygments.lexers.python', 'Python Traceback', ('pytb',), ('*.pytb',), ('text/x-python-traceback',)),
+    'PythonLexer': ('pygments.lexers.python', 'Python', ('python', 'py', 'sage', 'python3', 'py3'), ('*.py', '*.pyw', '*.jy', '*.sage', '*.sc', 'SConstruct', 'SConscript', '*.bzl', 'BUCK', 'BUILD', 'BUILD.bazel', 'WORKSPACE', '*.tac'), ('text/x-python', 'application/x-python', 'text/x-python3', 'application/x-python3')),
+    'PythonTracebackLexer': ('pygments.lexers.python', 'Python Traceback', ('pytb', 'py3tb'), ('*.pytb', '*.py3tb'), ('text/x-python-traceback', 'text/x-python3-traceback')),
     'QBasicLexer': ('pygments.lexers.basic', 'QBasic', ('qbasic', 'basic'), ('*.BAS', '*.bas'), ('text/basic',)),
     'QVToLexer': ('pygments.lexers.qvt', 'QVTO', ('qvto', 'qvt'), ('*.qvto',), ()),
     'QmlLexer': ('pygments.lexers.webmisc', 'QML', ('qml', 'qbs'), ('*.qml', '*.qbs'), ('application/x-qml', 'application/x-qt.qbs+qml')),
@@ -353,40 +369,50 @@
     'RagelRubyLexer': ('pygments.lexers.parsers', 'Ragel in Ruby Host', ('ragel-ruby', 'ragel-rb'), ('*.rl',), ()),
     'RawTokenLexer': ('pygments.lexers.special', 'Raw token data', ('raw',), (), ('application/x-pygments-tokens',)),
     'RdLexer': ('pygments.lexers.r', 'Rd', ('rd',), ('*.Rd',), ('text/x-r-doc',)),
+    'ReasonLexer': ('pygments.lexers.ml', 'ReasonML', ('reason', 'reasonml'), ('*.re', '*.rei'), ('text/x-reasonml',)),
     'RebolLexer': ('pygments.lexers.rebol', 'REBOL', ('rebol',), ('*.r', '*.r3', '*.reb'), ('text/x-rebol',)),
     'RedLexer': ('pygments.lexers.rebol', 'Red', ('red', 'red/system'), ('*.red', '*.reds'), ('text/x-red', 'text/x-red-system')),
     'RedcodeLexer': ('pygments.lexers.esoteric', 'Redcode', ('redcode',), ('*.cw',), ()),
     'RegeditLexer': ('pygments.lexers.configs', 'reg', ('registry',), ('*.reg',), ('text/x-windows-registry',)),
-    'ResourceLexer': ('pygments.lexers.resource', 'ResourceBundle', ('resource', 'resourcebundle'), ('*.txt',), ()),
+    'ResourceLexer': ('pygments.lexers.resource', 'ResourceBundle', ('resource', 'resourcebundle'), (), ()),
     'RexxLexer': ('pygments.lexers.scripting', 'Rexx', ('rexx', 'arexx'), ('*.rexx', '*.rex', '*.rx', '*.arexx'), ('text/x-rexx',)),
     'RhtmlLexer': ('pygments.lexers.templates', 'RHTML', ('rhtml', 'html+erb', 'html+ruby'), ('*.rhtml',), ('text/html+ruby',)),
+    'RideLexer': ('pygments.lexers.ride', 'Ride', ('ride',), ('*.ride',), ('text/x-ride',)),
     'RoboconfGraphLexer': ('pygments.lexers.roboconf', 'Roboconf Graph', ('roboconf-graph',), ('*.graph',), ()),
     'RoboconfInstancesLexer': ('pygments.lexers.roboconf', 'Roboconf Instances', ('roboconf-instances',), ('*.instances',), ()),
-    'RobotFrameworkLexer': ('pygments.lexers.robotframework', 'RobotFramework', ('robotframework',), ('*.txt', '*.robot'), ('text/x-robotframework',)),
+    'RobotFrameworkLexer': ('pygments.lexers.robotframework', 'RobotFramework', ('robotframework',), ('*.robot',), ('text/x-robotframework',)),
     'RqlLexer': ('pygments.lexers.sql', 'RQL', ('rql',), ('*.rql',), ('text/x-rql',)),
     'RslLexer': ('pygments.lexers.dsls', 'RSL', ('rsl',), ('*.rsl',), ('text/rsl',)),
     'RstLexer': ('pygments.lexers.markup', 'reStructuredText', ('rst', 'rest', 'restructuredtext'), ('*.rst', '*.rest'), ('text/x-rst', 'text/prs.fallenstein.rst')),
     'RtsLexer': ('pygments.lexers.trafficscript', 'TrafficScript', ('rts', 'trafficscript'), ('*.rts',), ()),
     'RubyConsoleLexer': ('pygments.lexers.ruby', 'Ruby irb session', ('rbcon', 'irb'), (), ('text/x-ruby-shellsession',)),
     'RubyLexer': ('pygments.lexers.ruby', 'Ruby', ('rb', 'ruby', 'duby'), ('*.rb', '*.rbw', 'Rakefile', '*.rake', '*.gemspec', '*.rbx', '*.duby', 'Gemfile'), ('text/x-ruby', 'application/x-ruby')),
-    'RustLexer': ('pygments.lexers.rust', 'Rust', ('rust', 'rs'), ('*.rs', '*.rs.in'), ('text/rust',)),
+    'RustLexer': ('pygments.lexers.rust', 'Rust', ('rust', 'rs'), ('*.rs', '*.rs.in'), ('text/rust', 'text/x-rust')),
     'SASLexer': ('pygments.lexers.sas', 'SAS', ('sas',), ('*.SAS', '*.sas'), ('text/x-sas', 'text/sas', 'application/x-sas')),
     'SLexer': ('pygments.lexers.r', 'S', ('splus', 's', 'r'), ('*.S', '*.R', '.Rhistory', '.Rprofile', '.Renviron'), ('text/S-plus', 'text/S', 'text/x-r-source', 'text/x-r', 'text/x-R', 'text/x-r-history', 'text/x-r-profile')),
     'SMLLexer': ('pygments.lexers.ml', 'Standard ML', ('sml',), ('*.sml', '*.sig', '*.fun'), ('text/x-standardml', 'application/x-standardml')),
+    'SarlLexer': ('pygments.lexers.jvm', 'SARL', ('sarl',), ('*.sarl',), ('text/x-sarl',)),
     'SassLexer': ('pygments.lexers.css', 'Sass', ('sass',), ('*.sass',), ('text/x-sass',)),
     'ScalaLexer': ('pygments.lexers.jvm', 'Scala', ('scala',), ('*.scala',), ('text/x-scala',)),
     'ScamlLexer': ('pygments.lexers.html', 'Scaml', ('scaml',), ('*.scaml',), ('text/x-scaml',)),
+    'ScdocLexer': ('pygments.lexers.scdoc', 'scdoc', ('scdoc', 'scd'), ('*.scd', '*.scdoc'), ()),
     'SchemeLexer': ('pygments.lexers.lisp', 'Scheme', ('scheme', 'scm'), ('*.scm', '*.ss'), ('text/x-scheme', 'application/x-scheme')),
     'ScilabLexer': ('pygments.lexers.matlab', 'Scilab', ('scilab',), ('*.sci', '*.sce', '*.tst'), ('text/scilab',)),
     'ScssLexer': ('pygments.lexers.css', 'SCSS', ('scss',), ('*.scss',), ('text/x-scss',)),
+    'ShExCLexer': ('pygments.lexers.rdf', 'ShExC', ('shexc', 'shex'), ('*.shex',), ('text/shex',)),
     'ShenLexer': ('pygments.lexers.lisp', 'Shen', ('shen',), ('*.shen',), ('text/x-shen', 'application/x-shen')),
+    'SieveLexer': ('pygments.lexers.sieve', 'Sieve', ('sieve',), ('*.siv', '*.sieve'), ()),
     'SilverLexer': ('pygments.lexers.verification', 'Silver', ('silver',), ('*.sil', '*.vpr'), ()),
+    'SlashLexer': ('pygments.lexers.slash', 'Slash', ('slash',), ('*.sl',), ()),
     'SlimLexer': ('pygments.lexers.webmisc', 'Slim', ('slim',), ('*.slim',), ('text/x-slim',)),
+    'SlurmBashLexer': ('pygments.lexers.shell', 'Slurm', ('slurm', 'sbatch'), ('*.sl',), ()),
     'SmaliLexer': ('pygments.lexers.dalvik', 'Smali', ('smali',), ('*.smali',), ('text/smali',)),
     'SmalltalkLexer': ('pygments.lexers.smalltalk', 'Smalltalk', ('smalltalk', 'squeak', 'st'), ('*.st',), ('text/x-smalltalk',)),
+    'SmartGameFormatLexer': ('pygments.lexers.sgf', 'SmartGameFormat', ('sgf',), ('*.sgf',), ()),
     'SmartyLexer': ('pygments.lexers.templates', 'Smarty', ('smarty',), ('*.tpl',), ('application/x-smarty',)),
     'SnobolLexer': ('pygments.lexers.snobol', 'Snobol', ('snobol',), ('*.snobol',), ('text/x-snobol',)),
     'SnowballLexer': ('pygments.lexers.dsls', 'Snowball', ('snowball',), ('*.sbl',), ()),
+    'SolidityLexer': ('pygments.lexers.solidity', 'Solidity', ('solidity',), ('*.sol',), ()),
     'SourcePawnLexer': ('pygments.lexers.pawn', 'SourcePawn', ('sp',), ('*.sp',), ('text/x-sourcepawn',)),
     'SourcesListLexer': ('pygments.lexers.installers', 'Debian Sourcelist', ('sourceslist', 'sources.list', 'debsources'), ('sources.list',), ()),
     'SparqlLexer': ('pygments.lexers.rdf', 'SPARQL', ('sparql',), ('*.rq', '*.sparql'), ('application/sparql-query',)),
@@ -401,12 +427,14 @@
     'SwigLexer': ('pygments.lexers.c_like', 'SWIG', ('swig',), ('*.swg', '*.i'), ('text/swig',)),
     'SystemVerilogLexer': ('pygments.lexers.hdl', 'systemverilog', ('systemverilog', 'sv'), ('*.sv', '*.svh'), ('text/x-systemverilog',)),
     'TAPLexer': ('pygments.lexers.testing', 'TAP', ('tap',), ('*.tap',), ()),
+    'TOMLLexer': ('pygments.lexers.configs', 'TOML', ('toml',), ('*.toml', 'Pipfile', 'poetry.lock'), ()),
     'Tads3Lexer': ('pygments.lexers.int_fiction', 'TADS 3', ('tads3',), ('*.t',), ()),
     'TasmLexer': ('pygments.lexers.asm', 'TASM', ('tasm',), ('*.asm', '*.ASM', '*.tasm'), ('text/x-tasm',)),
     'TclLexer': ('pygments.lexers.tcl', 'Tcl', ('tcl',), ('*.tcl', '*.rvt'), ('text/x-tcl', 'text/x-script.tcl', 'application/x-tcl')),
     'TcshLexer': ('pygments.lexers.shell', 'Tcsh', ('tcsh', 'csh'), ('*.tcsh', '*.csh'), ('application/x-csh',)),
     'TcshSessionLexer': ('pygments.lexers.shell', 'Tcsh Session', ('tcshcon',), (), ()),
     'TeaTemplateLexer': ('pygments.lexers.templates', 'Tea', ('tea',), ('*.tea',), ('text/x-tea',)),
+    'TeraTermLexer': ('pygments.lexers.teraterm', 'Tera Term macro', ('ttl', 'teraterm', 'teratermmacro'), ('*.ttl',), ('text/x-teratermmacro',)),
     'TermcapLexer': ('pygments.lexers.configs', 'Termcap', ('termcap',), ('termcap', 'termcap.src'), ()),
     'TerminfoLexer': ('pygments.lexers.configs', 'Terminfo', ('terminfo',), ('terminfo', 'terminfo.src'), ()),
     'TerraformLexer': ('pygments.lexers.configs', 'Terraform', ('terraform', 'tf'), ('*.tf',), ('application/x-tf', 'application/x-terraform')),
@@ -422,8 +450,12 @@
     'TypeScriptLexer': ('pygments.lexers.javascript', 'TypeScript', ('ts', 'typescript'), ('*.ts', '*.tsx'), ('text/x-typescript',)),
     'TypoScriptCssDataLexer': ('pygments.lexers.typoscript', 'TypoScriptCssData', ('typoscriptcssdata',), (), ()),
     'TypoScriptHtmlDataLexer': ('pygments.lexers.typoscript', 'TypoScriptHtmlData', ('typoscripthtmldata',), (), ()),
-    'TypoScriptLexer': ('pygments.lexers.typoscript', 'TypoScript', ('typoscript',), ('*.ts', '*.txt'), ('text/x-typoscript',)),
+    'TypoScriptLexer': ('pygments.lexers.typoscript', 'TypoScript', ('typoscript',), ('*.typoscript',), ('text/x-typoscript',)),
+    'UcodeLexer': ('pygments.lexers.unicon', 'ucode', ('ucode',), ('*.u', '*.u1', '*.u2'), ()),
+    'UniconLexer': ('pygments.lexers.unicon', 'Unicon', ('unicon',), ('*.icn',), ('text/unicon',)),
     'UrbiscriptLexer': ('pygments.lexers.urbi', 'UrbiScript', ('urbiscript',), ('*.u',), ('application/x-urbiscript',)),
+    'UsdLexer': ('pygments.lexers.usd', 'USD', ('usd', 'usda'), ('*.usd', '*.usda'), ()),
+    'VBScriptLexer': ('pygments.lexers.basic', 'VBScript', ('vbscript',), ('*.vbs', '*.VBS'), ()),
     'VCLLexer': ('pygments.lexers.varnish', 'VCL', ('vcl',), ('*.vcl',), ('text/x-vclsrc',)),
     'VCLSnippetLexer': ('pygments.lexers.varnish', 'VCLSnippets', ('vclsnippets', 'vclsnippet'), (), ('text/x-vclsnippet',)),
     'VCTreeStatusLexer': ('pygments.lexers.console', 'VCTreeStatus', ('vctreestatus',), (), ()),
@@ -438,6 +470,7 @@
     'VhdlLexer': ('pygments.lexers.hdl', 'vhdl', ('vhdl',), ('*.vhdl', '*.vhd'), ('text/x-vhdl',)),
     'VimLexer': ('pygments.lexers.textedit', 'VimL', ('vim',), ('*.vim', '.vimrc', '.exrc', '.gvimrc', '_vimrc', '_exrc', '_gvimrc', 'vimrc', 'gvimrc'), ('text/x-vim',)),
     'WDiffLexer': ('pygments.lexers.diff', 'WDiff', ('wdiff',), ('*.wdiff',), ()),
+    'WebIDLLexer': ('pygments.lexers.webidl', 'Web IDL', ('webidl',), ('*.webidl',), ()),
     'WhileyLexer': ('pygments.lexers.whiley', 'Whiley', ('whiley',), ('*.whiley',), ('text/x-whiley',)),
     'X10Lexer': ('pygments.lexers.x10', 'X10', ('x10', 'xten'), ('*.x10',), ('text/x-x10',)),
     'XQueryLexer': ('pygments.lexers.webmisc', 'XQuery', ('xquery', 'xqy', 'xq', 'xql', 'xqm'), ('*.xqy', '*.xquery', '*.xq', '*.xql', '*.xqm'), ('text/xquery', 'application/xquery')),
@@ -452,7 +485,9 @@
     'XtlangLexer': ('pygments.lexers.lisp', 'xtlang', ('extempore',), ('*.xtm',), ()),
     'YamlJinjaLexer': ('pygments.lexers.templates', 'YAML+Jinja', ('yaml+jinja', 'salt', 'sls'), ('*.sls',), ('text/x-yaml+jinja', 'text/x-sls')),
     'YamlLexer': ('pygments.lexers.data', 'YAML', ('yaml',), ('*.yaml', '*.yml'), ('text/x-yaml',)),
+    'ZeekLexer': ('pygments.lexers.dsls', 'Zeek', ('zeek', 'bro'), ('*.zeek', '*.bro'), ()),
     'ZephirLexer': ('pygments.lexers.php', 'Zephir', ('zephir',), ('*.zep',), ()),
+    'ZigLexer': ('pygments.lexers.zig', 'Zig', ('zig',), ('*.zig',), ('text/zig',)),
 }
 
 if __name__ == '__main__':  # pragma: no cover
--- a/eric6/ThirdParty/Pygments/pygments/lexers/_mql_builtins.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/ThirdParty/Pygments/pygments/lexers/_mql_builtins.py	Sat May 02 13:51:07 2020 +0200
@@ -5,7 +5,7 @@
 
     Builtins for the MqlLexer.
 
-    :copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 types = (
@@ -884,7 +884,7 @@
     'PERIOD_W1',
     'POINTER_AUTOMATIC',
     'POINTER_DYNAMIC',
-    'POINTER_INVALID'
+    'POINTER_INVALID',
     'PRICE_CLOSE',
     'PRICE_HIGH',
     'PRICE_LOW',
--- a/eric6/ThirdParty/Pygments/pygments/lexers/_openedge_builtins.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/ThirdParty/Pygments/pygments/lexers/_openedge_builtins.py	Sat May 02 13:51:07 2020 +0200
@@ -5,7 +5,7 @@
 
     Builtin list for the OpenEdgeLexer.
 
-    :copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
--- a/eric6/ThirdParty/Pygments/pygments/lexers/_php_builtins.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/ThirdParty/Pygments/pygments/lexers/_php_builtins.py	Sat May 02 13:51:07 2020 +0200
@@ -12,12 +12,10 @@
              internet connection. don't run that at home, use
              a server ;-)
 
-    :copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
-from __future__ import print_function
-
 MODULES = {'.NET': ('dotnet_load',),
  'APC': ('apc_add',
          'apc_bin_dump',
@@ -4698,18 +4696,19 @@
 
         for file in get_php_references():
             module = ''
-            for line in open(file):
-                if not module:
-                    search = module_re.search(line)
-                    if search:
-                        module = search.group(1)
-                        modules[module] = []
+            with open(file) as f:
+                for line in f:
+                    if not module:
+                        search = module_re.search(line)
+                        if search:
+                            module = search.group(1)
+                            modules[module] = []
 
-                elif 'href="function.' in line:
-                    for match in function_re.finditer(line):
-                        fn = match.group(1)
-                        if '-&gt;' not in fn and '::' not in fn and fn not in modules[module]:
-                            modules[module].append(fn)
+                    elif 'href="function.' in line:
+                        for match in function_re.finditer(line):
+                            fn = match.group(1)
+                            if '-&gt;' not in fn and '::' not in fn and fn not in modules[module]:
+                                modules[module].append(fn)
 
             if module:
                 # These are dummy manual pages, not actual functions
@@ -4726,9 +4725,8 @@
 
     def get_php_references():
         download = urlretrieve(PHP_MANUAL_URL)
-        tar = tarfile.open(download[0])
-        tar.extractall()
-        tar.close()
+        with tarfile.open(download[0]) as tar:
+            tar.extractall()
         for file in glob.glob("%s%s" % (PHP_MANUAL_DIR, PHP_REFERENCE_GLOB)):
             yield file
         os.remove(download[0])
--- a/eric6/ThirdParty/Pygments/pygments/lexers/_postgres_builtins.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/ThirdParty/Pygments/pygments/lexers/_postgres_builtins.py	Sat May 02 13:51:07 2020 +0200
@@ -5,7 +5,7 @@
 
     Self-updating data files for PostgreSQL lexer.
 
-    :copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
--- a/eric6/ThirdParty/Pygments/pygments/lexers/_scilab_builtins.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/ThirdParty/Pygments/pygments/lexers/_scilab_builtins.py	Sat May 02 13:51:07 2020 +0200
@@ -5,7 +5,7 @@
 
     Builtin list for the ScilabLexer.
 
-    :copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -3089,6 +3089,6 @@
     with open(__file__, 'w') as f:
         f.write(header)
         f.write('# Autogenerated\n\n')
-        for k, v in sorted(new_data.iteritems()):
+        for k, v in sorted(new_data.items()):
             f.write(format_lines(k + '_kw', v) + '\n\n')
         f.write(footer)
--- a/eric6/ThirdParty/Pygments/pygments/lexers/_sourcemod_builtins.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/ThirdParty/Pygments/pygments/lexers/_sourcemod_builtins.py	Sat May 02 13:51:07 2020 +0200
@@ -8,12 +8,10 @@
 
     Do not edit the FUNCTIONS list by hand.
 
-    :copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
-from __future__ import print_function
-
 FUNCTIONS = (
     'OnEntityCreated',
     'OnEntityDestroyed',
--- a/eric6/ThirdParty/Pygments/pygments/lexers/_stan_builtins.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/ThirdParty/Pygments/pygments/lexers/_stan_builtins.py	Sat May 02 13:51:07 2020 +0200
@@ -4,24 +4,23 @@
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
     This file contains the names of functions for Stan used by
-    ``pygments.lexers.math.StanLexer. This is for Stan language version 2.8.0.
+    ``pygments.lexers.math.StanLexer. This is for Stan language version 2.17.0.
 
-    :copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
 KEYWORDS = (
+    'break',
+    'continue',
     'else',
     'for',
     'if',
     'in',
-    'increment_log_prob',
-    'integrate_ode',
-    'lp__',
     'print',
     'reject',
     'return',
-    'while'
+    'while',
 )
 
 TYPES = (
@@ -35,18 +34,18 @@
     'positive_ordered',
     'real',
     'row_vector',
-    'row_vectormatrix',
     'simplex',
     'unit_vector',
     'vector',
-    'void')
+    'void',
+)
 
 FUNCTIONS = (
-    'Phi',
-    'Phi_approx',
     'abs',
     'acos',
     'acosh',
+    'algebra_solver',
+    'append_array',
     'append_col',
     'append_row',
     'asin',
@@ -54,55 +53,59 @@
     'atan',
     'atan2',
     'atanh',
-    'bernoulli_ccdf_log',
     'bernoulli_cdf',
-    'bernoulli_cdf_log',
-    'bernoulli_log',
-    'bernoulli_logit_log',
+    'bernoulli_lccdf',
+    'bernoulli_lcdf',
+    'bernoulli_logit_lpmf',
+    'bernoulli_logit_rng',
+    'bernoulli_lpmf',
     'bernoulli_rng',
     'bessel_first_kind',
     'bessel_second_kind',
-    'beta_binomial_ccdf_log',
     'beta_binomial_cdf',
-    'beta_binomial_cdf_log',
-    'beta_binomial_log',
+    'beta_binomial_lccdf',
+    'beta_binomial_lcdf',
+    'beta_binomial_lpmf',
     'beta_binomial_rng',
-    'beta_ccdf_log',
     'beta_cdf',
-    'beta_cdf_log',
-    'beta_log',
+    'beta_lccdf',
+    'beta_lcdf',
+    'beta_lpdf',
     'beta_rng',
     'binary_log_loss',
-    'binomial_ccdf_log',
     'binomial_cdf',
-    'binomial_cdf_log',
     'binomial_coefficient_log',
-    'binomial_log',
-    'binomial_logit_log',
+    'binomial_lccdf',
+    'binomial_lcdf',
+    'binomial_logit_lpmf',
+    'binomial_lpmf',
     'binomial_rng',
     'block',
-    'categorical_log',
-    'categorical_logit_log',
+    'categorical_logit_lpmf',
+    'categorical_logit_rng',
+    'categorical_lpmf',
     'categorical_rng',
-    'cauchy_ccdf_log',
     'cauchy_cdf',
-    'cauchy_cdf_log',
-    'cauchy_log',
+    'cauchy_lccdf',
+    'cauchy_lcdf',
+    'cauchy_lpdf',
     'cauchy_rng',
     'cbrt',
     'ceil',
-    'chi_square_ccdf_log',
     'chi_square_cdf',
-    'chi_square_cdf_log',
-    'chi_square_log',
+    'chi_square_lccdf',
+    'chi_square_lcdf',
+    'chi_square_lpdf',
     'chi_square_rng',
     'cholesky_decompose',
+    'choose',
     'col',
     'cols',
     'columns_dot_product',
     'columns_dot_self',
     'cos',
     'cosh',
+    'cov_exp_quad',
     'crossprod',
     'csr_extract_u',
     'csr_extract_v',
@@ -117,15 +120,15 @@
     'diagonal',
     'digamma',
     'dims',
-    'dirichlet_log',
+    'dirichlet_lpdf',
     'dirichlet_rng',
     'distance',
     'dot_product',
     'dot_self',
-    'double_exponential_ccdf_log',
     'double_exponential_cdf',
-    'double_exponential_cdf_log',
-    'double_exponential_log',
+    'double_exponential_lccdf',
+    'double_exponential_lcdf',
+    'double_exponential_lpdf',
     'double_exponential_rng',
     'e',
     'eigenvalues_sym',
@@ -134,16 +137,16 @@
     'erfc',
     'exp',
     'exp2',
-    'exp_mod_normal_ccdf_log',
     'exp_mod_normal_cdf',
-    'exp_mod_normal_cdf_log',
-    'exp_mod_normal_log',
+    'exp_mod_normal_lccdf',
+    'exp_mod_normal_lcdf',
+    'exp_mod_normal_lpdf',
     'exp_mod_normal_rng',
     'expm1',
-    'exponential_ccdf_log',
     'exponential_cdf',
-    'exponential_cdf_log',
-    'exponential_log',
+    'exponential_lccdf',
+    'exponential_lcdf',
+    'exponential_lpdf',
     'exponential_rng',
     'fabs',
     'falling_factorial',
@@ -153,60 +156,65 @@
     'fmax',
     'fmin',
     'fmod',
-    'frechet_ccdf_log',
     'frechet_cdf',
-    'frechet_cdf_log',
-    'frechet_log',
+    'frechet_lccdf',
+    'frechet_lcdf',
+    'frechet_lpdf',
     'frechet_rng',
-    'gamma_ccdf_log',
     'gamma_cdf',
-    'gamma_cdf_log',
-    'gamma_log',
+    'gamma_lccdf',
+    'gamma_lcdf',
+    'gamma_lpdf',
     'gamma_p',
     'gamma_q',
     'gamma_rng',
-    'gaussian_dlm_obs_log',
+    'gaussian_dlm_obs_lpdf',
     'get_lp',
-    'gumbel_ccdf_log',
     'gumbel_cdf',
-    'gumbel_cdf_log',
-    'gumbel_log',
+    'gumbel_lccdf',
+    'gumbel_lcdf',
+    'gumbel_lpdf',
     'gumbel_rng',
     'head',
-    'hypergeometric_log',
+    'hypergeometric_lpmf',
     'hypergeometric_rng',
     'hypot',
-    'if_else',
+    'inc_beta',
     'int_step',
+    'integrate_ode',
+    'integrate_ode_bdf',
+    'integrate_ode_rk45',
     'inv',
-    'inv_chi_square_ccdf_log',
     'inv_chi_square_cdf',
-    'inv_chi_square_cdf_log',
-    'inv_chi_square_log',
+    'inv_chi_square_lccdf',
+    'inv_chi_square_lcdf',
+    'inv_chi_square_lpdf',
     'inv_chi_square_rng',
     'inv_cloglog',
-    'inv_gamma_ccdf_log',
     'inv_gamma_cdf',
-    'inv_gamma_cdf_log',
-    'inv_gamma_log',
+    'inv_gamma_lccdf',
+    'inv_gamma_lcdf',
+    'inv_gamma_lpdf',
     'inv_gamma_rng',
     'inv_logit',
-    'inv_phi',
+    'inv_Phi',
     'inv_sqrt',
     'inv_square',
-    'inv_wishart_log',
+    'inv_wishart_lpdf',
     'inv_wishart_rng',
     'inverse',
     'inverse_spd',
     'is_inf',
     'is_nan',
     'lbeta',
+    'lchoose',
     'lgamma',
-    'lkj_corr_cholesky_log',
+    'lkj_corr_cholesky_lpdf',
     'lkj_corr_cholesky_rng',
-    'lkj_corr_log',
+    'lkj_corr_lpdf',
     'lkj_corr_rng',
     'lmgamma',
+    'lmultiply',
     'log',
     'log10',
     'log1m',
@@ -223,81 +231,87 @@
     'log_rising_factorial',
     'log_softmax',
     'log_sum_exp',
-    'logistic_ccdf_log',
     'logistic_cdf',
-    'logistic_cdf_log',
-    'logistic_log',
+    'logistic_lccdf',
+    'logistic_lcdf',
+    'logistic_lpdf',
     'logistic_rng',
     'logit',
-    'lognormal_ccdf_log',
     'lognormal_cdf',
-    'lognormal_cdf_log',
-    'lognormal_log',
+    'lognormal_lccdf',
+    'lognormal_lcdf',
+    'lognormal_lpdf',
     'lognormal_rng',
     'machine_precision',
+    'matrix_exp',
     'max',
+    'mdivide_left_spd',
     'mdivide_left_tri_low',
+    'mdivide_right_spd',
     'mdivide_right_tri_low',
     'mean',
     'min',
     'modified_bessel_first_kind',
     'modified_bessel_second_kind',
-    'multi_gp_cholesky_log',
-    'multi_gp_log',
-    'multi_normal_cholesky_log',
+    'multi_gp_cholesky_lpdf',
+    'multi_gp_lpdf',
+    'multi_normal_cholesky_lpdf',
     'multi_normal_cholesky_rng',
-    'multi_normal_log',
-    'multi_normal_prec_log',
+    'multi_normal_lpdf',
+    'multi_normal_prec_lpdf',
     'multi_normal_rng',
-    'multi_student_t_log',
+    'multi_student_t_lpdf',
     'multi_student_t_rng',
-    'multinomial_log',
+    'multinomial_lpmf',
     'multinomial_rng',
     'multiply_log',
     'multiply_lower_tri_self_transpose',
-    'neg_binomial_2_ccdf_log',
     'neg_binomial_2_cdf',
-    'neg_binomial_2_cdf_log',
-    'neg_binomial_2_log',
-    'neg_binomial_2_log_log',
+    'neg_binomial_2_lccdf',
+    'neg_binomial_2_lcdf',
+    'neg_binomial_2_log_lpmf',
     'neg_binomial_2_log_rng',
+    'neg_binomial_2_lpmf',
     'neg_binomial_2_rng',
-    'neg_binomial_ccdf_log',
     'neg_binomial_cdf',
-    'neg_binomial_cdf_log',
-    'neg_binomial_log',
+    'neg_binomial_lccdf',
+    'neg_binomial_lcdf',
+    'neg_binomial_lpmf',
     'neg_binomial_rng',
     'negative_infinity',
-    'normal_ccdf_log',
     'normal_cdf',
-    'normal_cdf_log',
-    'normal_log',
+    'normal_lccdf',
+    'normal_lcdf',
+    'normal_lpdf',
     'normal_rng',
     'not_a_number',
     'num_elements',
-    'ordered_logistic_log',
+    'ordered_logistic_lpmf',
     'ordered_logistic_rng',
     'owens_t',
-    'pareto_ccdf_log',
     'pareto_cdf',
-    'pareto_cdf_log',
-    'pareto_log',
+    'pareto_lccdf',
+    'pareto_lcdf',
+    'pareto_lpdf',
     'pareto_rng',
-    'pareto_type_2_ccdf_log',
     'pareto_type_2_cdf',
-    'pareto_type_2_cdf_log',
-    'pareto_type_2_log',
+    'pareto_type_2_lccdf',
+    'pareto_type_2_lcdf',
+    'pareto_type_2_lpdf',
     'pareto_type_2_rng',
+    'Phi',
+    'Phi_approx',
     'pi',
-    'poisson_ccdf_log',
     'poisson_cdf',
-    'poisson_cdf_log',
-    'poisson_log',
-    'poisson_log_log',
+    'poisson_lccdf',
+    'poisson_lcdf',
+    'poisson_log_lpmf',
     'poisson_log_rng',
+    'poisson_lpmf',
     'poisson_rng',
     'positive_infinity',
     'pow',
+    'print',
     'prod',
     'qr_Q',
     'qr_R',
@@ -305,11 +319,12 @@
     'quad_form_diag',
     'quad_form_sym',
     'rank',
-    'rayleigh_ccdf_log',
     'rayleigh_cdf',
-    'rayleigh_cdf_log',
-    'rayleigh_log',
+    'rayleigh_lccdf',
+    'rayleigh_lcdf',
+    'rayleigh_lpdf',
     'rayleigh_rng',
+    'reject',
     'rep_array',
     'rep_matrix',
     'rep_row_vector',
@@ -320,10 +335,10 @@
     'rows',
     'rows_dot_product',
     'rows_dot_self',
-    'scaled_inv_chi_square_ccdf_log',
     'scaled_inv_chi_square_cdf',
-    'scaled_inv_chi_square_cdf_log',
-    'scaled_inv_chi_square_log',
+    'scaled_inv_chi_square_lccdf',
+    'scaled_inv_chi_square_lcdf',
+    'scaled_inv_chi_square_lpdf',
     'scaled_inv_chi_square_rng',
     'sd',
     'segment',
@@ -331,10 +346,10 @@
     'singular_values',
     'sinh',
     'size',
-    'skew_normal_ccdf_log',
     'skew_normal_cdf',
-    'skew_normal_cdf_log',
-    'skew_normal_log',
+    'skew_normal_lccdf',
+    'skew_normal_lcdf',
+    'skew_normal_lpdf',
     'skew_normal_rng',
     'softmax',
     'sort_asc',
@@ -346,10 +361,10 @@
     'square',
     'squared_distance',
     'step',
-    'student_t_ccdf_log',
     'student_t_cdf',
-    'student_t_cdf_log',
-    'student_t_log',
+    'student_t_lccdf',
+    'student_t_lcdf',
+    'student_t_lpdf',
     'student_t_rng',
     'sub_col',
     'sub_row',
@@ -357,6 +372,7 @@
     'tail',
     'tan',
     'tanh',
+    'target',
     'tcrossprod',
     'tgamma',
     'to_array_1d',
@@ -369,22 +385,22 @@
     'trace_quad_form',
     'trigamma',
     'trunc',
-    'uniform_ccdf_log',
     'uniform_cdf',
-    'uniform_cdf_log',
-    'uniform_log',
+    'uniform_lccdf',
+    'uniform_lcdf',
+    'uniform_lpdf',
     'uniform_rng',
     'variance',
-    'von_mises_log',
+    'von_mises_lpdf',
     'von_mises_rng',
-    'weibull_ccdf_log',
     'weibull_cdf',
-    'weibull_cdf_log',
-    'weibull_log',
+    'weibull_lccdf',
+    'weibull_lcdf',
+    'weibull_lpdf',
     'weibull_rng',
-    'wiener_log',
-    'wishart_log',
-    'wishart_rng'
+    'wiener_lpdf',
+    'wishart_lpdf',
+    'wishart_rng',
 )
 
 DISTRIBUTIONS = (
@@ -438,7 +454,7 @@
     'von_mises',
     'weibull',
     'wiener',
-    'wishart'
+    'wishart',
 )
 
 RESERVED = (
@@ -469,19 +485,23 @@
     'do',
     'double',
     'dynamic_cast',
+    'else',
     'enum',
     'explicit',
     'export',
     'extern',
     'false',
-    'false',
     'float',
+    'for',
     'friend',
     'fvar',
     'goto',
+    'if',
+    'in',
     'inline',
     'int',
     'long',
+    'lp__',
     'mutable',
     'namespace',
     'new',
@@ -498,9 +518,16 @@
     'register',
     'reinterpret_cast',
     'repeat',
+    'return',
     'short',
     'signed',
     'sizeof',
+    'STAN_MAJOR',
+    'STAN_MATH_MAJOR',
+    'STAN_MATH_MINOR',
+    'STAN_MATH_PATCH',
+    'STAN_MINOR',
+    'STAN_PATCH',
     'static',
     'static_assert',
     'static_cast',
@@ -512,7 +539,6 @@
     'thread_local',
     'throw',
     'true',
-    'true',
     'try',
     'typedef',
     'typeid',
@@ -526,7 +552,7 @@
     'void',
     'volatile',
     'wchar_t',
+    'while',
     'xor',
-    'xor_eq'
+    'xor_eq',
 )
-
--- a/eric6/ThirdParty/Pygments/pygments/lexers/_stata_builtins.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/ThirdParty/Pygments/pygments/lexers/_stata_builtins.py	Sat May 02 13:51:07 2020 +0200
@@ -5,11 +5,15 @@
 
     Builtins for Stata
 
-    :copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
 
+builtins_special = (
+    "if", "in", "using", "replace", "by", "gen", "generate"
+)
+
 builtins_base = (
     "if", "else", "in", "foreach", "for", "forv", "forva",
     "forval", "forvalu", "forvalue", "forvalues", "by", "bys",
@@ -66,7 +70,7 @@
     "doedit", "dotplot", "dotplot_7", "dprobit", "drawnorm",
     "drop", "ds", "ds_util", "dstdize", "duplicates", "durbina",
     "dwstat", "dydx", "e", "ed", "edi", "edit", "egen",
-    "eivreg", "emdef", "en", "enc", "enco", "encod", "encode",
+    "eivreg", "emdef", "end", "en", "enc", "enco", "encod", "encode",
     "eq", "erase", "ereg", "ereg_lf", "ereg_p", "ereg_sw",
     "ereghet", "ereghet_glf", "ereghet_glf_sh", "ereghet_gp",
     "ereghet_ilf", "ereghet_ilf_sh", "ereghet_ip", "eret",
@@ -415,5 +419,3 @@
     "weekly", "wofd", "word", "wordcount", "year", "yearly",
     "yh", "ym", "yofd", "yq", "yw"
 )
-
-
--- a/eric6/ThirdParty/Pygments/pygments/lexers/_tsql_builtins.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/ThirdParty/Pygments/pygments/lexers/_tsql_builtins.py	Sat May 02 13:51:07 2020 +0200
@@ -5,7 +5,7 @@
 
     These are manually translated lists from https://msdn.microsoft.com.
 
-    :copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/eric6/ThirdParty/Pygments/pygments/lexers/_usd_builtins.py	Sat May 02 13:51:07 2020 +0200
@@ -0,0 +1,107 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+"""A collection of known USD-related keywords, attributes, and types."""
+
+COMMON_ATTRIBUTES = [
+    "extent",
+    "xformOpOrder",
+]
+
+KEYWORDS = [
+    "class",
+    "clips",
+    "custom",
+    "customData",
+    "def",
+    "dictionary",
+    "inherits",
+    "over",
+    "payload",
+    "references",
+    "rel",
+    "subLayers",
+    "timeSamples",
+    "uniform",
+    "variantSet",
+    "variantSets",
+    "variants",
+]
+
+OPERATORS = [
+    "add",
+    "append",
+    "delete",
+    "prepend",
+    "reorder",
+]
+
+SPECIAL_NAMES = [
+    "active",
+    "apiSchemas",
+    "defaultPrim",
+    "elementSize",
+    "endTimeCode",
+    "hidden",
+    "instanceable",
+    "interpolation",
+    "kind",
+    "startTimeCode",
+    "upAxis",
+]
+
+TYPES = [
+    "asset",
+    "bool",
+    "color3d",
+    "color3f",
+    "color3h",
+    "color4d",
+    "color4f",
+    "color4h",
+    "double",
+    "double2",
+    "double3",
+    "double4",
+    "float",
+    "float2",
+    "float3",
+    "float4",
+    "frame4d",
+    "half",
+    "half2",
+    "half3",
+    "half4",
+    "int",
+    "int2",
+    "int3",
+    "int4",
+    "keyword",
+    "matrix2d",
+    "matrix3d",
+    "matrix4d",
+    "normal3d",
+    "normal3f",
+    "normal3h",
+    "point3d",
+    "point3f",
+    "point3h",
+    "quatd",
+    "quatf",
+    "quath",
+    "string",
+    "syn",
+    "token",
+    "uchar",
+    "uchar2",
+    "uchar3",
+    "uchar4",
+    "uint",
+    "uint2",
+    "uint3",
+    "uint4",
+    "usdaType",
+    "vector3d",
+    "vector3f",
+    "vector3h",
+]
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/eric6/ThirdParty/Pygments/pygments/lexers/_vbscript_builtins.py	Sat May 02 13:51:07 2020 +0200
@@ -0,0 +1,280 @@
+# -*- coding: utf-8 -*-
+"""
+    pygments.lexers._vbscript_builtins
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+    These are manually translated lists from
+    http://www.indusoft.com/pdf/VBScript%20Reference.pdf.
+
+    :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
+    :license: BSD, see LICENSE for details.
+"""
+
+KEYWORDS = [
+    'ByRef',
+    'ByVal',
+    # dim: special rule
+    'call',
+    'case',
+    'class',
+    # const: special rule
+    'do',
+    'each',
+    'else',
+    'elseif',
+    'end',
+    'erase',
+    'execute',
+    'function',
+    'exit',
+    'for',
+    'function',
+    'GetRef',
+    'global',
+    'if',
+    'let',
+    'loop',
+    'next',
+    'new',
+    # option: special rule
+    'private',
+    'public',
+    'redim',
+    'select',
+    'set',
+    'sub',
+    'then',
+    'wend',
+    'while',
+    'with',
+]
+
+BUILTIN_FUNCTIONS = [
+    'Abs',
+    'Array',
+    'Asc',
+    'Atn',
+    'CBool',
+    'CByte',
+    'CCur',
+    'CDate',
+    'CDbl',
+    'Chr',
+    'CInt',
+    'CLng',
+    'Cos',
+    'CreateObject',
+    'CSng',
+    'CStr',
+    'Date',
+    'DateAdd',
+    'DateDiff',
+    'DatePart',
+    'DateSerial',
+    'DateValue',
+    'Day',
+    'Eval',
+    'Exp',
+    'Filter',
+    'Fix',
+    'FormatCurrency',
+    'FormatDateTime',
+    'FormatNumber',
+    'FormatPercent',
+    'GetObject',
+    'GetLocale',
+    'Hex',
+    'Hour',
+    'InStr',
+    'inStrRev',
+    'Int',
+    'IsArray',
+    'IsDate',
+    'IsEmpty',
+    'IsNull',
+    'IsNumeric',
+    'IsObject',
+    'Join',
+    'LBound',
+    'LCase',
+    'Left',
+    'Len',
+    'LoadPicture',
+    'Log',
+    'LTrim',
+    'Mid',
+    'Minute',
+    'Month',
+    'MonthName',
+    'MsgBox',
+    'Now',
+    'Oct',
+    'Randomize',
+    'RegExp',
+    'Replace',
+    'RGB',
+    'Right',
+    'Rnd',
+    'Round',
+    'RTrim',
+    'ScriptEngine',
+    'ScriptEngineBuildVersion',
+    'ScriptEngineMajorVersion',
+    'ScriptEngineMinorVersion',
+    'Second',
+    'SetLocale',
+    'Sgn',
+    'Space',
+    'Split',
+    'Sqr',
+    'StrComp',
+    'String',
+    'StrReverse',
+    'Tan',
+    'Time',
+    'Timer',
+    'TimeSerial',
+    'TimeValue',
+    'Trim',
+    'TypeName',
+    'UBound',
+    'UCase',
+    'VarType',
+    'Weekday',
+    'WeekdayName',
+    'Year',
+]
+
+BUILTIN_VARIABLES = [
+    'Debug',
+    'Dictionary',
+    'Drive',
+    'Drives',
+    'Err',
+    'File',
+    'Files',
+    'FileSystemObject',
+    'Folder',
+    'Folders',
+    'Match',
+    'Matches',
+    'RegExp',
+    'Submatches',
+    'TextStream',
+]
+
+OPERATORS = [
+    '+',
+    '-',
+    '*',
+    '/',
+    '\\',
+    '^',
+    '|',
+    '<',
+    '<=',
+    '>',
+    '>=',
+    '=',
+    '<>',
+    '&',
+    '$',
+]
+
+OPERATOR_WORDS = [
+    'mod',
+    'and',
+    'or',
+    'xor',
+    'eqv',
+    'imp',
+    'is',
+    'not',
+]
+
+BUILTIN_CONSTANTS = [
+    'False',
+    'True',
+    'vbAbort',
+    'vbAbortRetryIgnore',
+    'vbApplicationModal',
+    'vbArray',
+    'vbBinaryCompare',
+    'vbBlack',
+    'vbBlue',
+    'vbBoole',
+    'vbByte',
+    'vbCancel',
+    'vbCr',
+    'vbCritical',
+    'vbCrLf',
+    'vbCurrency',
+    'vbCyan',
+    'vbDataObject',
+    'vbDate',
+    'vbDefaultButton1',
+    'vbDefaultButton2',
+    'vbDefaultButton3',
+    'vbDefaultButton4',
+    'vbDouble',
+    'vbEmpty',
+    'vbError',
+    'vbExclamation',
+    'vbFalse',
+    'vbFirstFullWeek',
+    'vbFirstJan1',
+    'vbFormFeed',
+    'vbFriday',
+    'vbGeneralDate',
+    'vbGreen',
+    'vbIgnore',
+    'vbInformation',
+    'vbInteger',
+    'vbLf',
+    'vbLong',
+    'vbLongDate',
+    'vbLongTime',
+    'vbMagenta',
+    'vbMonday',
+    'vbMsgBoxHelpButton',
+    'vbMsgBoxRight',
+    'vbMsgBoxRtlReading',
+    'vbMsgBoxSetForeground',
+    'vbNewLine',
+    'vbNo',
+    'vbNull',
+    'vbNullChar',
+    'vbNullString',
+    'vbObject',
+    'vbObjectError',
+    'vbOK',
+    'vbOKCancel',
+    'vbOKOnly',
+    'vbQuestion',
+    'vbRed',
+    'vbRetry',
+    'vbRetryCancel',
+    'vbSaturday',
+    'vbShortDate',
+    'vbShortTime',
+    'vbSingle',
+    'vbString',
+    'vbSunday',
+    'vbSystemModal',
+    'vbTab',
+    'vbTextCompare',
+    'vbThursday',
+    'vbTrue',
+    'vbTuesday',
+    'vbUseDefault',
+    'vbUseSystem',
+    'vbUseSystem',
+    'vbVariant',
+    'vbVerticalTab',
+    'vbWednesday',
+    'vbWhite',
+    'vbYellow',
+    'vbYes',
+    'vbYesNo',
+    'vbYesNoCancel',
+]
--- a/eric6/ThirdParty/Pygments/pygments/lexers/_vim_builtins.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/ThirdParty/Pygments/pygments/lexers/_vim_builtins.py	Sat May 02 13:51:07 2020 +0200
@@ -5,7 +5,7 @@
 
     This file is autogenerated by scripts/get_vimkw.py
 
-    :copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
--- a/eric6/ThirdParty/Pygments/pygments/lexers/actionscript.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/ThirdParty/Pygments/pygments/lexers/actionscript.py	Sat May 02 13:51:07 2020 +0200
@@ -5,7 +5,7 @@
 
     Lexers for ActionScript and MXML.
 
-    :copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
--- a/eric6/ThirdParty/Pygments/pygments/lexers/agile.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/ThirdParty/Pygments/pygments/lexers/agile.py	Sat May 02 13:51:07 2020 +0200
@@ -5,7 +5,7 @@
 
     Just export lexer classes previously contained in this module.
 
-    :copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
--- a/eric6/ThirdParty/Pygments/pygments/lexers/algebra.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/ThirdParty/Pygments/pygments/lexers/algebra.py	Sat May 02 13:51:07 2020 +0200
@@ -5,7 +5,7 @@
 
     Lexers for computer algebra systems.
 
-    :copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
--- a/eric6/ThirdParty/Pygments/pygments/lexers/ambient.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/ThirdParty/Pygments/pygments/lexers/ambient.py	Sat May 02 13:51:07 2020 +0200
@@ -5,7 +5,7 @@
 
     Lexers for AmbientTalk language.
 
-    :copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
--- a/eric6/ThirdParty/Pygments/pygments/lexers/ampl.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/ThirdParty/Pygments/pygments/lexers/ampl.py	Sat May 02 13:51:07 2020 +0200
@@ -5,7 +5,7 @@
 
     Lexers for the AMPL language.
 
-    :copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
--- a/eric6/ThirdParty/Pygments/pygments/lexers/apl.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/ThirdParty/Pygments/pygments/lexers/apl.py	Sat May 02 13:51:07 2020 +0200
@@ -5,7 +5,7 @@
 
     Lexers for APL.
 
-    :copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
--- a/eric6/ThirdParty/Pygments/pygments/lexers/archetype.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/ThirdParty/Pygments/pygments/lexers/archetype.py	Sat May 02 13:51:07 2020 +0200
@@ -14,7 +14,7 @@
     Contributed by Thomas Beale <https://github.com/wolandscat>,
     <https://bitbucket.org/thomas_beale>.
 
-    :copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
--- a/eric6/ThirdParty/Pygments/pygments/lexers/asm.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/ThirdParty/Pygments/pygments/lexers/asm.py	Sat May 02 13:51:07 2020 +0200
@@ -5,22 +5,23 @@
 
     Lexers for assembly languages.
 
-    :copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
 import re
 
 from pygments.lexer import RegexLexer, include, bygroups, using, words, \
-    DelegatingLexer
+    DelegatingLexer, default
 from pygments.lexers.c_cpp import CppLexer, CLexer
 from pygments.lexers.d import DLexer
 from pygments.token import Text, Name, Number, String, Comment, Punctuation, \
-    Other, Keyword, Operator
+    Other, Keyword, Operator, Literal
 
 __all__ = ['GasLexer', 'ObjdumpLexer', 'DObjdumpLexer', 'CppObjdumpLexer',
-           'CObjdumpLexer', 'HsailLexer', 'LlvmLexer', 'NasmLexer',
-           'NasmObjdumpLexer', 'TasmLexer', 'Ca65Lexer']
+           'CObjdumpLexer', 'HsailLexer', 'LlvmLexer', 'LlvmMirBodyLexer',
+           'LlvmMirLexer', 'NasmLexer', 'NasmObjdumpLexer', 'TasmLexer',
+           'Ca65Lexer', 'Dasm16Lexer']
 
 
 class GasLexer(RegexLexer):
@@ -37,6 +38,7 @@
     char = r'[\w$.@-]'
     identifier = r'(?:[a-zA-Z$_]' + char + r'*|\.' + char + '+)'
     number = r'(?:0[xX][a-zA-Z0-9]+|\d+)'
+    register = '%' + identifier
 
     tokens = {
         'root': [
@@ -52,8 +54,11 @@
             (string, String),
             ('@' + identifier, Name.Attribute),
             (number, Number.Integer),
+            (register, Name.Variable),
             (r'[\r\n]+', Text, '#pop'),
-            (r'[;#].*?\n', Comment, '#pop'),
+            (r'([;#]|//).*?\n', Comment.Single, '#pop'),
+            (r'/[*].*?[*]/', Comment.Multiline),
+            (r'/[*].*?\n[\w\W]*?[*]/', Comment.Multiline, '#pop'),
 
             include('punctuation'),
             include('whitespace')
@@ -72,12 +77,14 @@
             (identifier, Name.Constant),
             (number, Number.Integer),
             # Registers
-            ('%' + identifier, Name.Variable),
+            (register, Name.Variable),
             # Numeric constants
             ('$'+number, Number.Integer),
             (r"$'(.|\\')'", String.Char),
             (r'[\r\n]+', Text, '#pop'),
-            (r'[;#].*?\n', Comment, '#pop'),
+            (r'([;#]|//).*?\n', Comment.Single, '#pop'),
+            (r'/[*].*?[*]/', Comment.Multiline),
+            (r'/[*].*?\n[\w\W]*?[*]/', Comment.Multiline, '#pop'),
 
             include('punctuation'),
             include('whitespace')
@@ -85,7 +92,8 @@
         'whitespace': [
             (r'\n', Text),
             (r'\s+', Text),
-            (r'[;#].*?\n', Comment)
+            (r'([;#]|//).*?\n', Comment.Single),
+            (r'/[*][\w\W]*?[*]/', Comment.Multiline)
         ],
         'punctuation': [
             (r'[-*,.()\[\]!:]+', Punctuation)
@@ -93,9 +101,9 @@
     }
 
     def analyse_text(text):
-        if re.match(r'^\.(text|data|section)', text, re.M):
+        if re.search(r'^\.(text|data|section)', text, re.M):
             return True
-        elif re.match(r'^\.\w+', text, re.M):
+        elif re.search(r'^\.\w+', text, re.M):
             return 0.1
 
 
@@ -377,54 +385,63 @@
         'keyword': [
             # Regular keywords
             (words((
-                'begin', 'end', 'true', 'false', 'declare', 'define', 'global',
-                'constant', 'private', 'linker_private', 'internal',
-                'available_externally', 'linkonce', 'linkonce_odr', 'weak',
-                'weak_odr', 'appending', 'dllimport', 'dllexport', 'common',
-                'default', 'hidden', 'protected', 'extern_weak', 'external',
-                'thread_local', 'zeroinitializer', 'undef', 'null', 'to', 'tail',
-                'target', 'triple', 'datalayout', 'volatile', 'nuw', 'nsw', 'nnan',
-                'ninf', 'nsz', 'arcp', 'fast', 'exact', 'inbounds', 'align',
-                'addrspace', 'section', 'alias', 'module', 'asm', 'sideeffect',
-                'gc', 'dbg', 'linker_private_weak', 'attributes', 'blockaddress',
-                'initialexec', 'localdynamic', 'localexec', 'prefix', 'unnamed_addr',
-                'ccc', 'fastcc', 'coldcc', 'x86_stdcallcc', 'x86_fastcallcc',
-                'arm_apcscc', 'arm_aapcscc', 'arm_aapcs_vfpcc', 'ptx_device',
-                'ptx_kernel', 'intel_ocl_bicc', 'msp430_intrcc', 'spir_func',
-                'spir_kernel', 'x86_64_sysvcc', 'x86_64_win64cc', 'x86_thiscallcc',
-                'cc', 'c', 'signext', 'zeroext', 'inreg', 'sret', 'nounwind',
-                'noreturn', 'noalias', 'nocapture', 'byval', 'nest', 'readnone',
-                'readonly', 'inlinehint', 'noinline', 'alwaysinline', 'optsize', 'ssp',
-                'sspreq', 'noredzone', 'noimplicitfloat', 'naked', 'builtin', 'cold',
-                'nobuiltin', 'noduplicate', 'nonlazybind', 'optnone', 'returns_twice',
-                'sanitize_address', 'sanitize_memory', 'sanitize_thread', 'sspstrong',
-                'uwtable', 'returned', 'type', 'opaque', 'eq', 'ne', 'slt', 'sgt',
-                'sle', 'sge', 'ult', 'ugt', 'ule', 'uge', 'oeq', 'one', 'olt', 'ogt',
-                'ole', 'oge', 'ord', 'uno', 'ueq', 'une', 'x', 'acq_rel', 'acquire',
-                'alignstack', 'atomic', 'catch', 'cleanup', 'filter', 'inteldialect',
-                'max', 'min', 'monotonic', 'nand', 'personality', 'release', 'seq_cst',
-                'singlethread', 'umax', 'umin', 'unordered', 'xchg', 'add', 'fadd',
-                'sub', 'fsub', 'mul', 'fmul', 'udiv', 'sdiv', 'fdiv', 'urem', 'srem',
-                'frem', 'shl', 'lshr', 'ashr', 'and', 'or', 'xor', 'icmp', 'fcmp',
-                'phi', 'call', 'trunc', 'zext', 'sext', 'fptrunc', 'fpext', 'uitofp',
-                'sitofp', 'fptoui', 'fptosi', 'inttoptr', 'ptrtoint', 'bitcast',
-                'addrspacecast', 'select', 'va_arg', 'ret', 'br', 'switch', 'invoke',
-                'unwind', 'unreachable', 'indirectbr', 'landingpad', 'resume',
-                'malloc', 'alloca', 'free', 'load', 'store', 'getelementptr',
-                'extractelement', 'insertelement', 'shufflevector', 'getresult',
-                'extractvalue', 'insertvalue', 'atomicrmw', 'cmpxchg', 'fence',
-                'allocsize', 'amdgpu_cs', 'amdgpu_gs', 'amdgpu_kernel', 'amdgpu_ps',
-                'amdgpu_vs', 'any', 'anyregcc', 'argmemonly', 'avr_intrcc',
-                'avr_signalcc', 'caller', 'catchpad', 'catchret', 'catchswitch',
-                'cleanuppad', 'cleanupret', 'comdat', 'convergent', 'cxx_fast_tlscc',
-                'deplibs', 'dereferenceable', 'dereferenceable_or_null', 'distinct',
-                'exactmatch', 'externally_initialized', 'from', 'ghccc', 'hhvm_ccc',
-                'hhvmcc', 'ifunc', 'inaccessiblemem_or_argmemonly', 'inaccessiblememonly',
-                'inalloca', 'jumptable', 'largest', 'local_unnamed_addr', 'minsize',
-                'musttail', 'noduplicates', 'none', 'nonnull', 'norecurse', 'notail',
-                'preserve_allcc', 'preserve_mostcc', 'prologue', 'safestack', 'samesize',
-                'source_filename', 'swiftcc', 'swifterror', 'swiftself', 'webkit_jscc',
-                'within', 'writeonly', 'x86_intrcc', 'x86_vectorcallcc'),
+                'acq_rel', 'acquire', 'add', 'addrspace', 'addrspacecast', 'afn', 'alias',
+                'aliasee', 'align', 'alignLog2', 'alignstack', 'alloca', 'allocsize', 'allOnes',
+                'alwaysinline', 'amdgpu_cs', 'amdgpu_es', 'amdgpu_gs', 'amdgpu_hs',
+                'amdgpu_kernel', 'amdgpu_ls', 'amdgpu_ps', 'amdgpu_vs', 'and', 'any',
+                'anyregcc', 'appending', 'arcp', 'argmemonly', 'args', 'arm_aapcs_vfpcc',
+                'arm_aapcscc', 'arm_apcscc', 'ashr', 'asm', 'atomic', 'atomicrmw', 'attributes',
+                'available_externally', 'avr_intrcc', 'avr_signalcc', 'bit', 'bitcast',
+                'bitMask', 'blockaddress', 'br', 'branchFunnel', 'builtin', 'byArg', 'byte',
+                'byteArray', 'byval', 'c', 'call', 'callee', 'caller', 'calls', 'catch',
+                'catchpad', 'catchret', 'catchswitch', 'cc', 'ccc', 'cleanup', 'cleanuppad',
+                'cleanupret', 'cmpxchg', 'cold', 'coldcc', 'comdat', 'common', 'constant',
+                'contract', 'convergent', 'critical', 'cxx_fast_tlscc', 'datalayout', 'declare',
+                'default', 'define', 'deplibs', 'dereferenceable', 'dereferenceable_or_null',
+                'distinct', 'dllexport', 'dllimport', 'double', 'dso_local', 'dso_preemptable',
+                'dsoLocal', 'eq', 'exact', 'exactmatch', 'extern_weak', 'external',
+                'externally_initialized', 'extractelement', 'extractvalue', 'fadd', 'false',
+                'fast', 'fastcc', 'fcmp', 'fdiv', 'fence', 'filter', 'flags', 'float', 'fmul',
+                'fp128', 'fpext', 'fptosi', 'fptoui', 'fptrunc', 'frem', 'from', 'fsub',
+                'funcFlags', 'function', 'gc', 'getelementptr', 'ghccc', 'global', 'guid', 'gv',
+                'half', 'hash', 'hhvm_ccc', 'hhvmcc', 'hidden', 'hot', 'hotness', 'icmp',
+                'ifunc', 'inaccessiblemem_or_argmemonly', 'inaccessiblememonly', 'inalloca',
+                'inbounds', 'indir', 'indirectbr', 'info', 'initialexec', 'inline',
+                'inlineBits', 'inlinehint', 'inrange', 'inreg', 'insertelement', 'insertvalue',
+                'insts', 'intel_ocl_bicc', 'inteldialect', 'internal', 'inttoptr', 'invoke',
+                'jumptable', 'kind', 'label', 'landingpad', 'largest', 'linkage', 'linkonce',
+                'linkonce_odr', 'live', 'load', 'local_unnamed_addr', 'localdynamic',
+                'localexec', 'lshr', 'max', 'metadata', 'min', 'minsize', 'module', 'monotonic',
+                'msp430_intrcc', 'mul', 'musttail', 'naked', 'name', 'nand', 'ne', 'nest',
+                'ninf', 'nnan', 'noalias', 'nobuiltin', 'nocapture', 'nocf_check',
+                'noduplicate', 'noduplicates', 'noimplicitfloat', 'noinline', 'none',
+                'nonlazybind', 'nonnull', 'norecurse', 'noRecurse', 'noredzone', 'noreturn',
+                'notail', 'notEligibleToImport', 'nounwind', 'nsw', 'nsz', 'null', 'nuw', 'oeq',
+                'offset', 'oge', 'ogt', 'ole', 'olt', 'one', 'opaque', 'optforfuzzing',
+                'optnone', 'optsize', 'or', 'ord', 'path', 'personality', 'phi', 'ppc_fp128',
+                'prefix', 'preserve_allcc', 'preserve_mostcc', 'private', 'prologue',
+                'protected', 'ptrtoint', 'ptx_device', 'ptx_kernel', 'readnone', 'readNone',
+                'readonly', 'readOnly', 'reassoc', 'refs', 'relbf', 'release', 'resByArg',
+                'resume', 'ret', 'returnDoesNotAlias', 'returned', 'returns_twice', 'safestack',
+                'samesize', 'sanitize_address', 'sanitize_hwaddress', 'sanitize_memory',
+                'sanitize_thread', 'sdiv', 'section', 'select', 'seq_cst', 'sext', 'sge', 'sgt',
+                'shadowcallstack', 'shl', 'shufflevector', 'sideeffect', 'signext', 'single',
+                'singleImpl', 'singleImplName', 'sitofp', 'sizeM1', 'sizeM1BitWidth', 'sle',
+                'slt', 'source_filename', 'speculatable', 'spir_func', 'spir_kernel', 'srem',
+                'sret', 'ssp', 'sspreq', 'sspstrong', 'store', 'strictfp', 'sub', 'summaries',
+                'summary', 'swiftcc', 'swifterror', 'swiftself', 'switch', 'syncscope', 'tail',
+                'target', 'thread_local', 'to', 'token', 'triple', 'true', 'trunc', 'type',
+                'typeCheckedLoadConstVCalls', 'typeCheckedLoadVCalls', 'typeid', 'typeIdInfo',
+                'typeTestAssumeConstVCalls', 'typeTestAssumeVCalls', 'typeTestRes', 'typeTests',
+                'udiv', 'ueq', 'uge', 'ugt', 'uitofp', 'ule', 'ult', 'umax', 'umin', 'undef',
+                'une', 'uniformRetVal', 'uniqueRetVal', 'unknown', 'unnamed_addr', 'uno',
+                'unordered', 'unreachable', 'unsat', 'unwind', 'urem', 'uselistorder',
+                'uselistorder_bb', 'uwtable', 'va_arg', 'variable', 'vFuncId',
+                'virtualConstProp', 'void', 'volatile', 'weak', 'weak_odr', 'webkit_jscc',
+                'win64cc', 'within', 'wpdRes', 'wpdResolutions', 'writeonly', 'x',
+                'x86_64_sysvcc', 'x86_fastcallcc', 'x86_fp80', 'x86_intrcc', 'x86_mmx',
+                'x86_regcallcc', 'x86_stdcallcc', 'x86_thiscallcc', 'x86_vectorcallcc', 'xchg',
+                'xor', 'zeroext', 'zeroinitializer', 'zext', 'immarg', 'willreturn'),
                 suffix=r'\b'), Keyword),
 
             # Types
@@ -436,6 +453,217 @@
         ]
     }
 
+class LlvmMirBodyLexer(RegexLexer):
+    """
+    For LLVM MIR examples without the YAML wrapper
+
+    For more information on LLVM MIR see https://llvm.org/docs/MIRLangRef.html.
+
+    .. versionadded:: 2.6
+    """
+    name = 'LLVM-MIR Body'
+    aliases = ['llvm-mir-body']
+    filenames = []
+    mimetypes = []
+
+    tokens = {
+        'root': [
+            # Attributes on basic blocks
+            (words(('liveins', 'successors'), suffix=':'), Keyword),
+            # Basic Block Labels
+            (r'bb\.[0-9]+(\.[0-9a-zA-Z_.-]+)?( \(address-taken\))?:', Name.Label),
+            (r'bb\.[0-9]+ \(%[0-9a-zA-Z_.-]+\)( \(address-taken\))?:', Name.Label),
+            (r'%bb\.[0-9]+(\.\w+)?', Name.Label),
+            # Stack references
+            (r'%stack\.[0-9]+(\.\w+\.addr)?', Name),
+            # Subreg indices
+            (r'%subreg\.\w+', Name),
+            # Virtual registers
+            (r'%[0-9a-zA-Z_]+ *', Name.Variable, 'vreg'),
+            # Reference to LLVM-IR global
+            include('global'),
+            # Reference to Intrinsic
+            (r'intrinsic\(\@[0-9a-zA-Z_.]+\)', Name.Variable.Global),
+            # Comparison predicates
+            (words(('eq', 'ne', 'sgt', 'sge', 'slt', 'sle', 'ugt', 'uge', 'ult',
+                    'ule'), prefix=r'intpred\(', suffix=r'\)'), Name.Builtin),
+            (words(('oeq', 'one', 'ogt', 'oge', 'olt', 'ole', 'ugt', 'uge',
+                    'ult', 'ule'), prefix=r'floatpred\(', suffix=r'\)'),
+             Name.Builtin),
+            # Physical registers
+            (r'\$\w+', String.Single),
+            # Assignment operator
+            (r'[=]', Operator),
+            # gMIR Opcodes
+            (r'(G_ANYEXT|G_[SZ]EXT|G_SEXT_INREG|G_TRUNC|G_IMPLICIT_DEF|G_PHI|'
+             r'G_FRAME_INDEX|G_GLOBAL_VALUE|G_INTTOPTR|G_PTRTOINT|G_BITCAST|'
+             r'G_CONSTANT|G_FCONSTANT|G_VASTART|G_VAARG|G_CTLZ|G_CTLZ_ZERO_UNDEF|'
+             r'G_CTTZ|G_CTTZ_ZERO_UNDEF|G_CTPOP|G_BSWAP|G_BITREVERSE|'
+             r'G_ADDRSPACE_CAST|G_BLOCK_ADDR|G_JUMP_TABLE|G_DYN_STACKALLOC|'
+             r'G_ADD|G_SUB|G_MUL|G_[SU]DIV|G_[SU]REM|G_AND|G_OR|G_XOR|G_SHL|'
+             r'G_[LA]SHR|G_[IF]CMP|G_SELECT|G_GEP|G_PTR_MASK|G_SMIN|G_SMAX|'
+             r'G_UMIN|G_UMAX|G_[US]ADDO|G_[US]ADDE|G_[US]SUBO|G_[US]SUBE|'
+             r'G_[US]MULO|G_[US]MULH|G_FNEG|G_FPEXT|G_FPTRUNC|G_FPTO[US]I|'
+             r'G_[US]ITOFP|G_FABS|G_FCOPYSIGN|G_FCANONICALIZE|G_FMINNUM|'
+             r'G_FMAXNUM|G_FMINNUM_IEEE|G_FMAXNUM_IEEE|G_FMINIMUM|G_FMAXIMUM|'
+             r'G_FADD|G_FSUB|G_FMUL|G_FMA|G_FMAD|G_FDIV|G_FREM|G_FPOW|G_FEXP|'
+             r'G_FEXP2|G_FLOG|G_FLOG2|G_FLOG10|G_FCEIL|G_FCOS|G_FSIN|G_FSQRT|'
+             r'G_FFLOOR|G_FRINT|G_FNEARBYINT|G_INTRINSIC_TRUNC|'
+             r'G_INTRINSIC_ROUND|G_LOAD|G_[ZS]EXTLOAD|G_INDEXED_LOAD|'
+             r'G_INDEXED_[ZS]EXTLOAD|G_STORE|G_INDEXED_STORE|'
+             r'G_ATOMIC_CMPXCHG_WITH_SUCCESS|G_ATOMIC_CMPXCHG|'
+             r'G_ATOMICRMW_(XCHG|ADD|SUB|AND|NAND|OR|XOR|MAX|MIN|UMAX|UMIN|FADD|'
+                           r'FSUB)'
+             r'|G_FENCE|G_EXTRACT|G_UNMERGE_VALUES|G_INSERT|G_MERGE_VALUES|'
+             r'G_BUILD_VECTOR|G_BUILD_VECTOR_TRUNC|G_CONCAT_VECTORS|'
+             r'G_INTRINSIC|G_INTRINSIC_W_SIDE_EFFECTS|G_BR|G_BRCOND|'
+             r'G_BRINDIRECT|G_BRJT|G_INSERT_VECTOR_ELT|G_EXTRACT_VECTOR_ELT|'
+             r'G_SHUFFLE_VECTOR)\b',
+             Name.Builtin),
+            # Target independent opcodes
+            (r'(COPY|PHI|INSERT_SUBREG|EXTRACT_SUBREG|REG_SEQUENCE)\b',
+             Name.Builtin),
+            # Flags
+            (words(('killed', 'implicit')), Keyword),
+            # ConstantInt values
+            (r'[i][0-9]+ +', Keyword.Type, 'constantint'),
+            # ConstantFloat values
+            (r'(half|float|double) +', Keyword.Type, 'constantfloat'),
+            # Bare immediates
+            include('integer'),
+            # MMO's
+            (r':: *', Operator, 'mmo'),
+            # MIR Comments
+            (r';.*', Comment),
+            # If we get here, assume it's a target instruction
+            (r'[0-9a-zA-Z_]+', Name),
+            # Everything else that isn't highlighted
+            (r'[(), \n]+', Text),
+        ],
+        # The integer constant from a ConstantInt value
+        'constantint': [
+            include('integer'),
+            (r'(?=.)', Text, '#pop'),
+        ],
+        # The floating point constant from a ConstantFloat value
+        'constantfloat': [
+            include('float'),
+            (r'(?=.)', Text, '#pop'),
+        ],
+        'vreg': [
+            # The bank or class if there is one
+            (r' *:(?!:)', Keyword, ('#pop', 'vreg_bank_or_class')),
+            # The LLT if there is one
+            (r' *\(', Text, 'vreg_type'),
+            (r'(?=.)', Text, '#pop'),
+        ],
+        'vreg_bank_or_class': [
+            # The unassigned bank/class
+            (r' *_', Name.Variable.Magic),
+            (r' *[0-9a-zA-Z_]+', Name.Variable),
+            # The LLT if there is one
+            (r' *\(', Text, 'vreg_type'),
+            (r'(?=.)', Text, '#pop'),
+        ],
+        'vreg_type': [
+            # Scalar and pointer types
+            (r' *[sp][0-9]+', Keyword.Type),
+            (r' *<[0-9]+ *x *[sp][0-9]+>', Keyword.Type),
+            (r'\)', Text, '#pop'),
+            (r'(?=.)', Text, '#pop'),
+        ],
+        'mmo': [
+            (r'\(', Text),
+            (r' +', Text),
+            (words(('load', 'store', 'on', 'into', 'from', 'align', 'monotonic',
+                    'acquire', 'release', 'acq_rel', 'seq_cst')),
+             Keyword),
+            # IR references
+            (r'%ir\.[0-9a-zA-Z_.-]+', Name),
+            (r'%ir-block\.[0-9a-zA-Z_.-]+', Name),
+            (r'[-+]', Operator),
+            include('integer'),
+            include('global'),
+            (r',', Punctuation),
+            (r'\), \(', Text),
+            (r'\)', Text, '#pop'),
+        ],
+        'integer': [(r'-?[0-9]+', Number.Integer),],
+        'float': [(r'-?[0-9]+\.[0-9]+(e[+-][0-9]+)?', Number.Float)],
+        'global': [(r'\@[0-9a-zA-Z_.]+', Name.Variable.Global)],
+    }
+
+class LlvmMirLexer(RegexLexer):
+    """
+    Lexer for the overall LLVM MIR document format
+
+    MIR is a human readable serialization format that's used to represent LLVM's
+    machine specific intermediate representation. It allows LLVM's developers to
+    see the state of the compilation process at various points, as well as test
+    individual pieces of the compiler.
+
+    For more information on LLVM MIR see https://llvm.org/docs/MIRLangRef.html.
+
+    .. versionadded:: 2.6
+    """
+    name = 'LLVM-MIR'
+    aliases = ['llvm-mir']
+    filenames = ['*.mir']
+
+    tokens = {
+        'root': [
+            # Comments are hashes at the YAML level
+            (r'#.*', Comment),
+            # Documents starting with | are LLVM-IR
+            (r'--- \|$', Keyword, 'llvm_ir'),
+            # Other documents are MIR
+            (r'---', Keyword, 'llvm_mir'),
+            # Consume everything else in one token for efficiency
+            (r'[^-#]+|.', Text),
+        ],
+        'llvm_ir': [
+            # Documents end with '...' or '---'
+            (r'(\.\.\.|(?=---))', Keyword, '#pop'),
+            # Delegate to the LlvmLexer
+            (r'((?:.|\n)+?)(?=(\.\.\.|---))', bygroups(using(LlvmLexer))),
+        ],
+        'llvm_mir': [
+            # Comments are hashes at the YAML level
+            (r'#.*', Comment),
+            # Documents end with '...' or '---'
+            (r'(\.\.\.|(?=---))', Keyword, '#pop'),
+            # Handle the simple attributes
+            (r'name:', Keyword, 'name'),
+            (words(('alignment', ),
+                   suffix=':'), Keyword, 'number'),
+            (words(('legalized', 'regBankSelected', 'tracksRegLiveness',
+                    'selected', 'exposesReturnsTwice'),
+                   suffix=':'), Keyword, 'boolean'),
+            # Handle the attributes don't highlight inside
+            (words(('registers', 'stack', 'fixedStack', 'liveins', 'frameInfo',
+                    'machineFunctionInfo'),
+                   suffix=':'), Keyword),
+            # Delegate the body block to the LlvmMirBodyLexer
+            (r'body: *\|', Keyword, 'llvm_mir_body'),
+            # Consume everything else
+            (r'.+', Text),
+            (r'\n', Text),
+        ],
+        'name': [ (r'[^\n]+', Name), default('#pop') ],
+        'boolean': [ (r' *(true|false)', Name.Builtin), default('#pop') ],
+        'number': [ (r' *[0-9]+', Number), default('#pop') ],
+        'llvm_mir_body': [
+            # Documents end with '...' or '---'.
+            # We have to pop llvm_mir_body and llvm_mir
+            (r'(\.\.\.|(?=---))', Keyword, '#pop:2'),
+            # Delegate the body block to the LlvmMirBodyLexer
+            (r'((?:.|\n)+?)(?=\.\.\.|---)', bygroups(using(LlvmMirBodyLexer))),
+            # The '...' is optional. If we didn't already find it then it isn't
+            # there. There might be a '---' instead though.
+            (r'(?!\.\.\.|---)((.|\n)+)', bygroups(using(LlvmMirBodyLexer), Keyword)),
+        ],
+    }
+
 
 class NasmLexer(RegexLexer):
     """
@@ -446,6 +674,10 @@
     filenames = ['*.asm', '*.ASM']
     mimetypes = ['text/x-nasm']
 
+    # Tasm uses the same file endings, but TASM is not as common as NASM, so
+    # we prioritize NASM higher by default
+    priority = 1.0
+
     identifier = r'[a-z$._?][\w$.?#@~]*'
     hexn = r'(?:0x[0-9a-f]+|$0[0-9a-f]*|[0-9]+[0-9a-f]*h)'
     octn = r'[0-7]+q'
@@ -459,9 +691,11 @@
                 r'mm[0-7]|cr[0-4]|dr[0-367]|tr[3-7]')
     wordop = r'seg|wrt|strict'
     type = r'byte|[dq]?word'
-    directives = (r'BITS|USE16|USE32|SECTION|SEGMENT|ABSOLUTE|EXTERN|GLOBAL|'
+    # Directives must be followed by whitespace, otherwise CPU will match
+    # cpuid for instance.
+    directives = (r'(?:BITS|USE16|USE32|SECTION|SEGMENT|ABSOLUTE|EXTERN|GLOBAL|'
                   r'ORG|ALIGN|STRUC|ENDSTRUC|COMMON|CPU|GROUP|UPPERCASE|IMPORT|'
-                  r'EXPORT|LIBRARY|MODULE')
+                  r'EXPORT|LIBRARY|MODULE)\s+')
 
     flags = re.IGNORECASE | re.MULTILINE
     tokens = {
@@ -509,6 +743,11 @@
         ],
     }
 
+    def analyse_text(text):
+        # Probably TASM
+        if re.match(r'PROC', text, re.IGNORECASE):
+            return False
+
 
 class NasmObjdumpLexer(ObjdumpLexer):
     """
@@ -603,6 +842,11 @@
         ],
     }
 
+    def analyse_text(text):
+        # See above
+        if re.match(r'PROC', text, re.I):
+            return True
+
 
 class Ca65Lexer(RegexLexer):
     """
@@ -639,5 +883,111 @@
 
     def analyse_text(self, text):
         # comments in GAS start with "#"
-        if re.match(r'^\s*;', text, re.MULTILINE):
+        if re.search(r'^\s*;', text, re.MULTILINE):
             return 0.9
+
+
+class Dasm16Lexer(RegexLexer):
+    """
+    Simple lexer for DCPU-16 Assembly
+
+    Check http://0x10c.com/doc/dcpu-16.txt
+
+    .. versionadded:: 2.4
+    """
+    name = 'DASM16'
+    aliases = ['dasm16']
+    filenames = ['*.dasm16', '*.dasm']
+    mimetypes = ['text/x-dasm16']
+
+    INSTRUCTIONS = [
+        'SET',
+        'ADD', 'SUB',
+        'MUL', 'MLI',
+        'DIV', 'DVI',
+        'MOD', 'MDI',
+        'AND', 'BOR', 'XOR',
+        'SHR', 'ASR', 'SHL',
+        'IFB', 'IFC', 'IFE', 'IFN', 'IFG', 'IFA', 'IFL', 'IFU',
+        'ADX', 'SBX',
+        'STI', 'STD',
+        'JSR',
+        'INT', 'IAG', 'IAS', 'RFI', 'IAQ', 'HWN', 'HWQ', 'HWI',
+    ]
+
+    REGISTERS = [
+        'A', 'B', 'C',
+        'X', 'Y', 'Z',
+        'I', 'J',
+        'SP', 'PC', 'EX',
+        'POP', 'PEEK', 'PUSH'
+    ]
+
+    # Regexes yo
+    char = r'[a-zA-Z$._0-9@]'
+    identifier = r'(?:[a-zA-Z$_]' + char + r'*|\.' + char + '+)'
+    number = r'[+-]?(?:0[xX][a-zA-Z0-9]+|\d+)'
+    binary_number = r'0b[01_]+'
+    instruction = r'(?i)(' + '|'.join(INSTRUCTIONS) + ')'
+    single_char = r"'\\?" + char + "'"
+    string = r'"(\\"|[^"])*"'
+
+    def guess_identifier(lexer, match):
+        ident = match.group(0)
+        klass = Name.Variable if ident.upper() in lexer.REGISTERS else Name.Label
+        yield match.start(), klass, ident
+
+    tokens = {
+        'root': [
+            include('whitespace'),
+            (':' + identifier, Name.Label),
+            (identifier + ':', Name.Label),
+            (instruction, Name.Function, 'instruction-args'),
+            (r'\.' + identifier, Name.Function, 'data-args'),
+            (r'[\r\n]+', Text)
+        ],
+
+        'numeric' : [
+            (binary_number, Number.Integer),
+            (number, Number.Integer),
+            (single_char, String),
+        ],
+
+        'arg' : [
+            (identifier, guess_identifier),
+            include('numeric')
+        ],
+
+        'deref' : [
+            (r'\+', Punctuation),
+            (r'\]', Punctuation, '#pop'),
+            include('arg'),
+            include('whitespace')
+        ],
+
+        'instruction-line' : [
+            (r'[\r\n]+', Text, '#pop'),
+            (r';.*?$', Comment, '#pop'),
+            include('whitespace')
+        ],
+
+        'instruction-args': [
+            (r',', Punctuation),
+            (r'\[', Punctuation, 'deref'),
+            include('arg'),
+            include('instruction-line')
+        ],
+
+        'data-args' : [
+            (r',', Punctuation),
+            include('numeric'),
+            (string, String),
+            include('instruction-line')
+        ],
+
+        'whitespace': [
+            (r'\n', Text),
+            (r'\s+', Text),
+            (r';.*?\n', Comment)
+        ],
+    }
--- a/eric6/ThirdParty/Pygments/pygments/lexers/automation.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/ThirdParty/Pygments/pygments/lexers/automation.py	Sat May 02 13:51:07 2020 +0200
@@ -5,7 +5,7 @@
 
     Lexers for automation scripting languages.
 
-    :copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
--- a/eric6/ThirdParty/Pygments/pygments/lexers/basic.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/ThirdParty/Pygments/pygments/lexers/basic.py	Sat May 02 13:51:07 2020 +0200
@@ -5,18 +5,21 @@
 
     Lexers for BASIC like languages (other than VB.net).
 
-    :copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
 import re
 
 from pygments.lexer import RegexLexer, bygroups, default, words, include
-from pygments.token import Text, Comment, Operator, Keyword, Name, String, \
-    Number, Punctuation
+from pygments.token import Comment, Error, Keyword, Name, Number, \
+    Punctuation, Operator, String, Text, Whitespace
+from pygments.lexers import _vbscript_builtins
+
 
 __all__ = ['BlitzBasicLexer', 'BlitzMaxLexer', 'MonkeyLexer', 'CbmBasicV2Lexer',
-           'QBasicLexer']
+           'QBasicLexer', 'VBScriptLexer', 'BBCBasicLexer']
+
 
 
 class BlitzMaxLexer(RegexLexer):
@@ -498,3 +501,159 @@
     def analyse_text(text):
         if '$DYNAMIC' in text or '$STATIC' in text:
             return 0.9
+
+
+class VBScriptLexer(RegexLexer):
+    """
+    VBScript is scripting language that is modeled on Visual Basic.
+
+    .. versionadded:: 2.4
+    """
+    name = 'VBScript'
+    aliases = ['vbscript']
+    filenames = ['*.vbs', '*.VBS']
+    flags = re.IGNORECASE
+
+    tokens = {
+        'root': [
+            (r"'[^\n]*", Comment.Single),
+            (r'\s+', Whitespace),
+            ('"', String.Double, 'string'),
+            ('&h[0-9a-f]+', Number.Hex),
+            # Float variant 1, for example: 1., 1.e2, 1.2e3
+            (r'[0-9]+\.[0-9]*(e[+-]?[0-9]+)?', Number.Float),
+            (r'\.[0-9]+(e[+-]?[0-9]+)?', Number.Float),  # Float variant 2, for example: .1, .1e2
+            (r'[0-9]+e[+-]?[0-9]+', Number.Float),  # Float variant 3, for example: 123e45
+            (r'\d+', Number.Integer),
+            ('#.+#', String),  # date or time value
+            (r'(dim)(\s+)([a-z_][a-z0-9_]*)',
+             bygroups(Keyword.Declaration, Whitespace, Name.Variable), 'dim_more'),
+            (r'(function|sub)(\s+)([a-z_][a-z0-9_]*)',
+             bygroups(Keyword.Declaration, Whitespace, Name.Function)),
+            (r'(class)(\s+)([a-z_][a-z0-9_]*)', bygroups(Keyword.Declaration, Whitespace, Name.Class)),
+            (r'(const)(\s+)([a-z_][a-z0-9_]*)', bygroups(Keyword.Declaration, Whitespace, Name.Constant)),
+            (r'(end)(\s+)(class|function|if|property|sub|with)', bygroups(Keyword, Whitespace, Keyword)),
+            (r'(on)(\s+)(error)(\s+)(goto)(\s+)(0)',
+             bygroups(Keyword, Whitespace, Keyword, Whitespace, Keyword, Whitespace, Number.Integer)),
+            (r'(on)(\s+)(error)(\s+)(resume)(\s+)(next)',
+             bygroups(Keyword, Whitespace, Keyword, Whitespace, Keyword, Whitespace, Keyword)),
+            (r'(option)(\s+)(explicit)', bygroups(Keyword, Whitespace, Keyword)),
+            (r'(property)(\s+)(get|let|set)(\s+)([a-z_][a-z0-9_]*)',
+             bygroups(Keyword.Declaration, Whitespace, Keyword.Declaration, Whitespace, Name.Property)),
+            (r'rem\s.*[^\n]*', Comment.Single),
+            (words(_vbscript_builtins.KEYWORDS, suffix=r'\b'), Keyword),
+            (words(_vbscript_builtins.OPERATORS), Operator),
+            (words(_vbscript_builtins.OPERATOR_WORDS, suffix=r'\b'), Operator.Word),
+            (words(_vbscript_builtins.BUILTIN_CONSTANTS, suffix=r'\b'), Name.Constant),
+            (words(_vbscript_builtins.BUILTIN_FUNCTIONS, suffix=r'\b'), Name.Builtin),
+            (words(_vbscript_builtins.BUILTIN_VARIABLES, suffix=r'\b'), Name.Builtin),
+            (r'[a-z_][a-z0-9_]*', Name),
+            (r'\b_\n', Operator),
+            (words(r'(),.:'), Punctuation),
+            (r'.+(\n)?', Error)
+        ],
+        'dim_more': [
+            (r'(\s*)(,)(\s*)([a-z_][a-z0-9]*)', bygroups(Whitespace, Punctuation, Whitespace, Name.Variable)),
+            default('#pop'),
+        ],
+        'string': [
+            (r'[^"\n]+', String.Double),
+            (r'\"\"', String.Double),
+            (r'"', String.Double, '#pop'),
+            (r'\n', Error, '#pop'),  # Unterminated string
+        ],
+    }
+
+
+class BBCBasicLexer(RegexLexer):
+    """
+    BBC Basic was supplied on the BBC Micro, and later Acorn RISC OS.
+    It is also used by BBC Basic For Windows.
+
+    .. versionadded:: 2.4
+    """
+    base_keywords = ['OTHERWISE', 'AND', 'DIV', 'EOR', 'MOD', 'OR', 'ERROR',
+                     'LINE', 'OFF', 'STEP', 'SPC', 'TAB', 'ELSE', 'THEN',
+                     'OPENIN', 'PTR', 'PAGE', 'TIME', 'LOMEM', 'HIMEM', 'ABS',
+                     'ACS', 'ADVAL', 'ASC', 'ASN', 'ATN', 'BGET', 'COS', 'COUNT',
+                     'DEG', 'ERL', 'ERR', 'EVAL', 'EXP', 'EXT', 'FALSE', 'FN',
+                     'GET', 'INKEY', 'INSTR', 'INT', 'LEN', 'LN', 'LOG', 'NOT',
+                     'OPENUP', 'OPENOUT', 'PI', 'POINT', 'POS', 'RAD', 'RND',
+                     'SGN', 'SIN', 'SQR', 'TAN', 'TO', 'TRUE', 'USR', 'VAL',
+                     'VPOS', 'CHR$', 'GET$', 'INKEY$', 'LEFT$', 'MID$',
+                     'RIGHT$', 'STR$', 'STRING$', 'EOF', 'PTR', 'PAGE', 'TIME',
+                     'LOMEM', 'HIMEM', 'SOUND', 'BPUT', 'CALL', 'CHAIN', 'CLEAR',
+                     'CLOSE', 'CLG', 'CLS', 'DATA', 'DEF', 'DIM', 'DRAW', 'END',
+                     'ENDPROC', 'ENVELOPE', 'FOR', 'GOSUB', 'GOTO', 'GCOL', 'IF',
+                     'INPUT', 'LET', 'LOCAL', 'MODE', 'MOVE', 'NEXT', 'ON',
+                     'VDU', 'PLOT', 'PRINT', 'PROC', 'READ', 'REM', 'REPEAT',
+                     'REPORT', 'RESTORE', 'RETURN', 'RUN', 'STOP', 'COLOUR',
+                     'TRACE', 'UNTIL', 'WIDTH', 'OSCLI']
+
+    basic5_keywords = ['WHEN', 'OF', 'ENDCASE', 'ENDIF', 'ENDWHILE', 'CASE',
+                       'CIRCLE', 'FILL', 'ORIGIN', 'POINT', 'RECTANGLE', 'SWAP',
+                       'WHILE', 'WAIT', 'MOUSE', 'QUIT', 'SYS', 'INSTALL',
+                       'LIBRARY', 'TINT', 'ELLIPSE', 'BEATS', 'TEMPO', 'VOICES',
+                       'VOICE', 'STEREO', 'OVERLAY', 'APPEND', 'AUTO', 'CRUNCH',
+                       'DELETE', 'EDIT', 'HELP', 'LIST', 'LOAD', 'LVAR', 'NEW',
+                       'OLD', 'RENUMBER', 'SAVE', 'TEXTLOAD', 'TEXTSAVE',
+                       'TWIN', 'TWINO', 'INSTALL', 'SUM', 'BEAT']
+
+
+    name = 'BBC Basic'
+    aliases = ['bbcbasic']
+    filenames = ['*.bbc']
+
+    tokens = {
+        'root': [
+            (r"[0-9]+", Name.Label),
+            (r"(\*)([^\n]*)",
+             bygroups(Keyword.Pseudo, Comment.Special)),
+            (r"", Whitespace, 'code'),
+        ],
+
+        'code': [
+            (r"(REM)([^\n]*)",
+             bygroups(Keyword.Declaration, Comment.Single)),
+            (r'\n', Whitespace, 'root'),
+            (r'\s+', Whitespace),
+            (r':', Comment.Preproc),
+
+            # Some special cases to make functions come out nicer
+            (r'(DEF)(\s*)(FN|PROC)([A-Za-z_@][\w@]*)',
+             bygroups(Keyword.Declaration, Whitespace, Keyword.Declaration, Name.Function)),
+            (r'(FN|PROC)([A-Za-z_@][\w@]*)',
+             bygroups(Keyword, Name.Function)),
+
+            (r'(GOTO|GOSUB|THEN|RESTORE)(\s*)(\d+)',
+             bygroups(Keyword, Whitespace, Name.Label)),
+
+            (r'(TRUE|FALSE)', Keyword.Constant),
+            (r'(PAGE|LOMEM|HIMEM|TIME|WIDTH|ERL|ERR|REPORT\$|POS|VPOS|VOICES)', Keyword.Pseudo),
+
+            (words(base_keywords), Keyword),
+            (words(basic5_keywords), Keyword),
+
+            ('"', String.Double, 'string'),
+
+            ('%[01]{1,32}', Number.Bin),
+            ('&[0-9a-f]{1,8}', Number.Hex),
+
+            (r'[+-]?[0-9]+\.[0-9]*(E[+-]?[0-9]+)?', Number.Float),
+            (r'[+-]?\.[0-9]+(E[+-]?[0-9]+)?', Number.Float),
+            (r'[+-]?[0-9]+E[+-]?[0-9]+', Number.Float),
+            (r'[+-]?\d+', Number.Integer),
+
+            (r'([A-Za-z_@][\w@]*[%$]?)', Name.Variable),
+            (r'([+\-]=|[$!|?+\-*/%^=><();]|>=|<=|<>|<<|>>|>>>|,)', Operator),
+        ],
+        'string': [
+            (r'[^"\n]+', String.Double),
+            (r'"', String.Double, '#pop'),
+            (r'\n', Error, 'root'),  # Unterminated string
+        ],
+    }
+
+    def analyse_text(text):
+        if text.startswith('10REM >') or text.startswith('REM >'):
+            return 0.9
--- a/eric6/ThirdParty/Pygments/pygments/lexers/bibtex.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/ThirdParty/Pygments/pygments/lexers/bibtex.py	Sat May 02 13:51:07 2020 +0200
@@ -5,7 +5,7 @@
 
     Lexers for BibTeX bibliography data and styles
 
-    :copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -33,7 +33,7 @@
     flags = re.IGNORECASE
 
     ALLOWED_CHARS = r'@!$&*+\-./:;<>?\[\\\]^`|~'
-    IDENTIFIER = '[{0}][{1}]*'.format('a-z_' + ALLOWED_CHARS, r'\w' + ALLOWED_CHARS)
+    IDENTIFIER = '[{}][{}]*'.format('a-z_' + ALLOWED_CHARS, r'\w' + ALLOWED_CHARS)
 
     def open_brace_callback(self, match, ctx):
         opening_brace = match.group()
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/eric6/ThirdParty/Pygments/pygments/lexers/boa.py	Sat May 02 13:51:07 2020 +0200
@@ -0,0 +1,102 @@
+# -*- coding: utf-8 -*-
+"""
+    pygments.lexers.boa
+    ~~~~~~~~~~~~~~~~~~~
+
+    Lexers for the Boa language.
+
+    :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
+    :license: BSD, see LICENSE for details.
+"""
+
+import re
+
+from pygments.lexer import RegexLexer, words
+from pygments.token import String, Comment, Keyword, Name, Number, Text, \
+    Operator, Punctuation
+
+__all__ = ['BoaLexer']
+
+line_re = re.compile('.*?\n')
+
+
+class BoaLexer(RegexLexer):
+    """
+    Lexer for the `Boa <http://boa.cs.iastate.edu/docs/>`_ language.
+
+    .. versionadded:: 2.4
+    """
+    name = 'Boa'
+    aliases = ['boa']
+    filenames = ['*.boa']
+
+    reserved = words(
+        ('input', 'output', 'of', 'weight', 'before', 'after', 'stop',
+         'ifall', 'foreach', 'exists', 'function', 'break', 'switch', 'case',
+         'visitor', 'default', 'return', 'visit', 'while', 'if', 'else'),
+        suffix=r'\b', prefix=r'\b')
+    keywords = words(
+        ('bottom', 'collection', 'maximum', 'mean', 'minimum', 'set', 'sum',
+         'top', 'string', 'int', 'bool', 'float', 'time', 'false', 'true',
+         'array', 'map', 'stack', 'enum', 'type'), suffix=r'\b', prefix=r'\b')
+    classes = words(
+        ('Project', 'ForgeKind', 'CodeRepository', 'Revision', 'RepositoryKind',
+         'ChangedFile', 'FileKind', 'ASTRoot', 'Namespace', 'Declaration', 'Type',
+         'Method', 'Variable', 'Statement', 'Expression', 'Modifier',
+         'StatementKind', 'ExpressionKind', 'ModifierKind', 'Visibility',
+         'TypeKind', 'Person', 'ChangeKind'),
+        suffix=r'\b', prefix=r'\b')
+    operators = ('->', ':=', ':', '=', '<<', '!', '++', '||',
+                 '&&', '+', '-', '*', ">", "<")
+    string_sep = ('`', '\"')
+    built_in_functions = words(
+        (
+            # Array functions
+            'new', 'sort',
+            # Date & Time functions
+            'yearof', 'dayofyear', 'hourof', 'minuteof', 'secondof', 'now',
+            'addday', 'addmonth', 'addweek', 'addyear', 'dayofmonth', 'dayofweek',
+            'dayofyear', 'formattime', 'trunctoday', 'trunctohour', 'trunctominute',
+            'trunctomonth', 'trunctosecond', 'trunctoyear',
+            # Map functions
+            'clear', 'haskey', 'keys', 'lookup', 'remove', 'values',
+            # Math functions
+            'abs', 'acos', 'acosh', 'asin', 'asinh', 'atan', 'atan2', 'atanh',
+            'ceil', 'cos', 'cosh', 'exp', 'floor', 'highbit', 'isfinite', 'isinf',
+            'isnan', 'isnormal', 'log', 'log10', 'max', 'min', 'nrand', 'pow',
+            'rand', 'round', 'sin', 'sinh', 'sqrt', 'tan', 'tanh', 'trunc',
+            # Other functions
+            'def', 'hash', 'len',
+            # Set functions
+            'add', 'contains', 'remove',
+            # String functions
+            'format', 'lowercase', 'match', 'matchposns', 'matchstrs', 'regex',
+            'split', 'splitall', 'splitn', 'strfind', 'strreplace', 'strrfind',
+            'substring', 'trim', 'uppercase',
+            # Type Conversion functions
+            'bool', 'float', 'int', 'string', 'time',
+            # Domain-Specific functions
+            'getast', 'getsnapshot', 'hasfiletype', 'isfixingrevision', 'iskind',
+            'isliteral',
+        ),
+        prefix=r'\b',
+        suffix=r'\(')
+
+    tokens = {
+        'root': [
+            (r'#.*?$', Comment.Single),
+            (r'/\*.*?\*/', Comment.Multiline),
+            (reserved, Keyword.Reserved),
+            (built_in_functions, Name.Function),
+            (keywords, Keyword.Type),
+            (classes, Name.Classes),
+            (words(operators), Operator),
+            (r'[][(),;{}\\.]', Punctuation),
+            (r'"(\\\\|\\"|[^"])*"', String),
+            (r'`(\\\\|\\`|[^`])*`', String),
+            (words(string_sep), String.Delimeter),
+            (r'[a-zA-Z_]+', Name.Variable),
+            (r'[0-9]+', Number.Integer),
+            (r'\s+?', Text),  # Whitespace
+        ]
+    }
--- a/eric6/ThirdParty/Pygments/pygments/lexers/business.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/ThirdParty/Pygments/pygments/lexers/business.py	Sat May 02 13:51:07 2020 +0200
@@ -5,7 +5,7 @@
 
     Lexers for "business-oriented" languages.
 
-    :copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -504,7 +504,7 @@
 class GoodDataCLLexer(RegexLexer):
     """
     Lexer for `GoodData-CL
-    <http://github.com/gooddata/GoodData-CL/raw/master/cli/src/main/resources/\
+    <https://github.com/gooddata/GoodData-CL/raw/master/cli/src/main/resources/\
 com/gooddata/processor/COMMANDS.txt>`_
     script files.
 
--- a/eric6/ThirdParty/Pygments/pygments/lexers/c_cpp.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/ThirdParty/Pygments/pygments/lexers/c_cpp.py	Sat May 02 13:51:07 2020 +0200
@@ -5,7 +5,7 @@
 
     Lexers for C/C++ languages.
 
-    :copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -144,21 +144,21 @@
         ]
     }
 
-    stdlib_types = set((
+    stdlib_types = {
         'size_t', 'ssize_t', 'off_t', 'wchar_t', 'ptrdiff_t', 'sig_atomic_t', 'fpos_t',
         'clock_t', 'time_t', 'va_list', 'jmp_buf', 'FILE', 'DIR', 'div_t', 'ldiv_t',
-        'mbstate_t', 'wctrans_t', 'wint_t', 'wctype_t'))
-    c99_types = set((
+        'mbstate_t', 'wctrans_t', 'wint_t', 'wctype_t'}
+    c99_types = {
         '_Bool', '_Complex', 'int8_t', 'int16_t', 'int32_t', 'int64_t', 'uint8_t',
         'uint16_t', 'uint32_t', 'uint64_t', 'int_least8_t', 'int_least16_t',
         'int_least32_t', 'int_least64_t', 'uint_least8_t', 'uint_least16_t',
         'uint_least32_t', 'uint_least64_t', 'int_fast8_t', 'int_fast16_t', 'int_fast32_t',
         'int_fast64_t', 'uint_fast8_t', 'uint_fast16_t', 'uint_fast32_t', 'uint_fast64_t',
-        'intptr_t', 'uintptr_t', 'intmax_t', 'uintmax_t'))
-    linux_types = set((
+        'intptr_t', 'uintptr_t', 'intmax_t', 'uintmax_t'}
+    linux_types = {
         'clockid_t', 'cpu_set_t', 'cpumask_t', 'dev_t', 'gid_t', 'id_t', 'ino_t', 'key_t',
         'mode_t', 'nfds_t', 'pid_t', 'rlim_t', 'sig_t', 'sighandler_t', 'siginfo_t',
-        'sigset_t', 'sigval_t', 'socklen_t', 'timer_t', 'uid_t'))
+        'sigset_t', 'sigval_t', 'socklen_t', 'timer_t', 'uid_t'}
 
     def __init__(self, **options):
         self.stdlibhighlighting = get_bool_opt(options, 'stdlibhighlighting', True)
@@ -218,8 +218,9 @@
                 'try', 'typeid', 'typename', 'using', 'virtual',
                 'constexpr', 'nullptr', 'decltype', 'thread_local',
                 'alignas', 'alignof', 'static_assert', 'noexcept', 'override',
-                'final'), suffix=r'\b'), Keyword),
-            (r'char(16_t|32_t)\b', Keyword.Type),
+                'final', 'constinit', 'consteval', 'concept', 'co_await',
+                'co_return', 'co_yield', 'requires', 'import', 'module'), suffix=r'\b'), Keyword),
+            (r'char(16_t|32_t|8_t)\b', Keyword.Type),
             (r'(class)(\s+)', bygroups(Keyword, Text), 'classname'),
             # C++11 raw strings
             (r'(R)(")([^\\()\s]{,16})(\()((?:.|\n)*?)(\)\3)(")',
--- a/eric6/ThirdParty/Pygments/pygments/lexers/c_like.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/ThirdParty/Pygments/pygments/lexers/c_like.py	Sat May 02 13:51:07 2020 +0200
@@ -5,7 +5,7 @@
 
     Lexers for other C-like languages.
 
-    :copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -20,7 +20,7 @@
 from pygments.lexers import _mql_builtins
 
 __all__ = ['PikeLexer', 'NesCLexer', 'ClayLexer', 'ECLexer', 'ValaLexer',
-           'CudaLexer', 'SwigLexer', 'MqlLexer', 'ArduinoLexer']
+           'CudaLexer', 'SwigLexer', 'MqlLexer', 'ArduinoLexer', 'CharmciLexer']
 
 
 class PikeLexer(CppLexer):
@@ -291,23 +291,23 @@
     aliases = ['cuda', 'cu']
     mimetypes = ['text/x-cuda']
 
-    function_qualifiers = set(('__device__', '__global__', '__host__',
-                               '__noinline__', '__forceinline__'))
-    variable_qualifiers = set(('__device__', '__constant__', '__shared__',
-                               '__restrict__'))
-    vector_types = set(('char1', 'uchar1', 'char2', 'uchar2', 'char3', 'uchar3',
-                        'char4', 'uchar4', 'short1', 'ushort1', 'short2', 'ushort2',
-                        'short3', 'ushort3', 'short4', 'ushort4', 'int1', 'uint1',
-                        'int2', 'uint2', 'int3', 'uint3', 'int4', 'uint4', 'long1',
-                        'ulong1', 'long2', 'ulong2', 'long3', 'ulong3', 'long4',
-                        'ulong4', 'longlong1', 'ulonglong1', 'longlong2',
-                        'ulonglong2', 'float1', 'float2', 'float3', 'float4',
-                        'double1', 'double2', 'dim3'))
-    variables = set(('gridDim', 'blockIdx', 'blockDim', 'threadIdx', 'warpSize'))
-    functions = set(('__threadfence_block', '__threadfence', '__threadfence_system',
-                     '__syncthreads', '__syncthreads_count', '__syncthreads_and',
-                     '__syncthreads_or'))
-    execution_confs = set(('<<<', '>>>'))
+    function_qualifiers = {'__device__', '__global__', '__host__',
+                           '__noinline__', '__forceinline__'}
+    variable_qualifiers = {'__device__', '__constant__', '__shared__',
+                           '__restrict__'}
+    vector_types = {'char1', 'uchar1', 'char2', 'uchar2', 'char3', 'uchar3',
+                    'char4', 'uchar4', 'short1', 'ushort1', 'short2', 'ushort2',
+                    'short3', 'ushort3', 'short4', 'ushort4', 'int1', 'uint1',
+                    'int2', 'uint2', 'int3', 'uint3', 'int4', 'uint4', 'long1',
+                    'ulong1', 'long2', 'ulong2', 'long3', 'ulong3', 'long4',
+                    'ulong4', 'longlong1', 'ulonglong1', 'longlong2',
+                    'ulonglong2', 'float1', 'float2', 'float3', 'float4',
+                    'double1', 'double2', 'dim3'}
+    variables = {'gridDim', 'blockIdx', 'blockDim', 'threadIdx', 'warpSize'}
+    functions = {'__threadfence_block', '__threadfence', '__threadfence_system',
+                 '__syncthreads', '__syncthreads_count', '__syncthreads_and',
+                 '__syncthreads_or'}
+    execution_confs = {'<<<', '>>>'}
 
     def get_tokens_unprocessed(self, text):
         for index, token, value in CLexer.get_tokens_unprocessed(self, text):
@@ -352,7 +352,7 @@
     }
 
     # This is a far from complete set of SWIG directives
-    swig_directives = set((
+    swig_directives = {
         # Most common directives
         '%apply', '%define', '%director', '%enddef', '%exception', '%extend',
         '%feature', '%fragment', '%ignore', '%immutable', '%import', '%include',
@@ -371,7 +371,7 @@
         '%pythoncallback', '%pythoncode', '%pythondynamic', '%pythonmaybecall',
         '%pythonnondynamic', '%pythonprepend', '%refobject', '%shadow', '%sizeof',
         '%trackobjects', '%types', '%unrefobject', '%varargs', '%warn',
-        '%warnfilter'))
+        '%warnfilter'}
 
     def analyse_text(text):
         rv = 0
@@ -412,6 +412,7 @@
         ],
     }
 
+
 class ArduinoLexer(CppLexer):
     """
     For `Arduino(tm) <https://arduino.cc/>`_ source.
@@ -428,13 +429,13 @@
     mimetypes = ['text/x-arduino']
 
     # Language sketch main structure functions
-    structure = set(('setup', 'loop'))
+    structure = {'setup', 'loop'}
 
     # Language operators
-    operators = set(('not', 'or', 'and', 'xor'))
+    operators = {'not', 'or', 'and', 'xor'}
 
     # Language 'variables'
-    variables = set((
+    variables = {
         'DIGITAL_MESSAGE', 'FIRMATA_STRING', 'ANALOG_MESSAGE', 'REPORT_DIGITAL',
         'REPORT_ANALOG', 'INPUT_PULLUP', 'SET_PIN_MODE', 'INTERNAL2V56', 'SYSTEM_RESET',
         'LED_BUILTIN', 'INTERNAL1V1', 'SYSEX_START', 'INTERNAL', 'EXTERNAL', 'HIGH',
@@ -451,10 +452,10 @@
         'signed', 'inline', 'delete', '_Bool', 'complex', '_Complex', '_Imaginary',
         'atomic_bool', 'atomic_char', 'atomic_schar', 'atomic_uchar', 'atomic_short',
         'atomic_ushort', 'atomic_int', 'atomic_uint', 'atomic_long', 'atomic_ulong',
-        'atomic_llong', 'atomic_ullong', 'PROGMEM'))
+        'atomic_llong', 'atomic_ullong', 'PROGMEM'}
 
     # Language shipped functions and class ( )
-    functions = set((
+    functions = {
         'KeyboardController', 'MouseController', 'SoftwareSerial', 'EthernetServer',
         'EthernetClient', 'LiquidCrystal', 'RobotControl', 'GSMVoiceCall',
         'EthernetUDP', 'EsploraTFT', 'HttpClient', 'RobotMotor', 'WiFiClient',
@@ -514,16 +515,15 @@
         'peek', 'beep', 'rect', 'line', 'open', 'seek', 'fill', 'size', 'turn', 'stop',
         'home', 'find', 'step', 'tone', 'sqrt', 'RSSI', 'SSID', 'end', 'bit', 'tan',
         'cos', 'sin', 'pow', 'map', 'abs', 'max', 'min', 'get', 'run', 'put',
-        'isAlphaNumeric', 'isAlpha', 'isAscii', 'isWhitespace', 'isControl', 'isDigit', 
-        'isGraph', 'isLowerCase', 'isPrintable', 'isPunct', 'isSpace', 'isUpperCase', 
-        'isHexadecimalDigit'))    
+        'isAlphaNumeric', 'isAlpha', 'isAscii', 'isWhitespace', 'isControl', 'isDigit',
+        'isGraph', 'isLowerCase', 'isPrintable', 'isPunct', 'isSpace', 'isUpperCase',
+        'isHexadecimalDigit'}
 
     # do not highlight
-    suppress_highlight = set((
-        'namespace', 'template', 'mutable', 'using', 'asm', 'typeid', 
-        'typename', 'this', 'alignof', 'constexpr', 'decltype', 'noexcept', 
-        'static_assert', 'thread_local', 'restrict'))
-
+    suppress_highlight = {
+        'namespace', 'template', 'mutable', 'using', 'asm', 'typeid',
+        'typename', 'this', 'alignof', 'constexpr', 'decltype', 'noexcept',
+        'static_assert', 'thread_local', 'restrict'}
 
     def get_tokens_unprocessed(self, text):
         for index, token, value in CppLexer.get_tokens_unprocessed(self, text):
@@ -539,3 +539,33 @@
                 yield index, Name.Function, value
             else:
                 yield index, token, value
+
+
+class CharmciLexer(CppLexer):
+    """
+    For `Charm++ <https://charm.cs.illinois.edu>`_ interface files (.ci).
+
+    .. versionadded:: 2.4
+    """
+
+    name = 'Charmci'
+    aliases = ['charmci']
+    filenames = ['*.ci']
+
+    mimetypes = []
+
+    tokens = {
+        'statements': [
+            (r'(module)(\s+)', bygroups(Keyword, Text), 'classname'),
+            (words(('mainmodule', 'mainchare', 'chare', 'array', 'group',
+                    'nodegroup', 'message', 'conditional')), Keyword),
+            (words(('entry', 'aggregate', 'threaded', 'sync', 'exclusive',
+                    'nokeep', 'notrace', 'immediate', 'expedited', 'inline',
+                    'local', 'python', 'accel', 'readwrite', 'writeonly',
+                    'accelblock', 'memcritical', 'packed', 'varsize',
+                    'initproc', 'initnode', 'initcall', 'stacksize',
+                    'createhere', 'createhome', 'reductiontarget', 'iget',
+                    'nocopy', 'mutable', 'migratable', 'readonly')), Keyword),
+            inherit,
+        ],
+    }
--- a/eric6/ThirdParty/Pygments/pygments/lexers/capnproto.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/ThirdParty/Pygments/pygments/lexers/capnproto.py	Sat May 02 13:51:07 2020 +0200
@@ -5,7 +5,7 @@
 
     Lexers for the Cap'n Proto schema language.
 
-    :copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
--- a/eric6/ThirdParty/Pygments/pygments/lexers/chapel.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/ThirdParty/Pygments/pygments/lexers/chapel.py	Sat May 02 13:51:07 2020 +0200
@@ -5,7 +5,7 @@
 
     Lexer for the Chapel language.
 
-    :copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -38,24 +38,24 @@
 
             (r'(config|const|in|inout|out|param|ref|type|var)\b',
              Keyword.Declaration),
-            (r'(false|nil|true)\b', Keyword.Constant),
-            (r'(bool|complex|imag|int|opaque|range|real|string|uint)\b',
+            (r'(false|nil|none|true)\b', Keyword.Constant),
+            (r'(bool|bytes|complex|imag|int|nothing|opaque|range|real|string|uint|void)\b',
              Keyword.Type),
             (words((
                 'align', 'as', 'atomic',
                 'begin', 'borrowed', 'break', 'by',
                 'catch', 'cobegin', 'coforall', 'continue',
-                'delete', 'dmapped', 'do', 'domain',
+                'defer', 'delete', 'dmapped', 'do', 'domain',
                 'else', 'enum', 'except', 'export', 'extern',
-                'for', 'forall',
-                'if', 'index', 'inline',
-                'label', 'lambda', 'let', 'local',
+                'for', 'forall', 'forwarding',
+                'if', 'index', 'init', 'inline',
+                'label', 'lambda', 'let', 'lifetime', 'local', 'locale'
                 'new', 'noinit',
                 'on', 'only', 'otherwise', 'override', 'owned',
                 'pragma', 'private', 'prototype', 'public',
                 'reduce', 'require', 'return',
                 'scan', 'select', 'serial', 'shared', 'single', 'sparse', 'subdomain', 'sync',
-                'then', 'throw', 'throws', 'try',
+                'then', 'this', 'throw', 'throws', 'try',
                 'unmanaged', 'use',
                 'when', 'where', 'while', 'with',
                 'yield',
--- a/eric6/ThirdParty/Pygments/pygments/lexers/clean.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/ThirdParty/Pygments/pygments/lexers/clean.py	Sat May 02 13:51:07 2020 +0200
@@ -5,7 +5,7 @@
 
     Lexer for the Clean language.
 
-    :copyright: Copyright 2006-2015 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
--- a/eric6/ThirdParty/Pygments/pygments/lexers/compiled.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/ThirdParty/Pygments/pygments/lexers/compiled.py	Sat May 02 13:51:07 2020 +0200
@@ -5,7 +5,7 @@
 
     Just export lexer classes previously contained in this module.
 
-    :copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
--- a/eric6/ThirdParty/Pygments/pygments/lexers/configs.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/ThirdParty/Pygments/pygments/lexers/configs.py	Sat May 02 13:51:07 2020 +0200
@@ -5,7 +5,7 @@
 
     Lexers for configuration file formats.
 
-    :copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -21,7 +21,7 @@
            'Cfengine3Lexer', 'ApacheConfLexer', 'SquidConfLexer',
            'NginxConfLexer', 'LighttpdConfLexer', 'DockerLexer',
            'TerraformLexer', 'TermcapLexer', 'TerminfoLexer',
-           'PkgConfigLexer', 'PacmanConfLexer']
+           'PkgConfigLexer', 'PacmanConfLexer', 'AugeasLexer', 'TOMLLexer']
 
 
 class IniLexer(RegexLexer):
@@ -300,11 +300,10 @@
     tokens = {
         'root': [
             (r'\s+', Text),
-            (r'(#.*?)$', Comment),
-            (r'(<[^\s>]+)(?:(\s+)(.*?))?(>)',
+            (r'#(.*\\\n)+.*$|(#.*?)$', Comment),
+            (r'(<[^\s>]+)(?:(\s+)(.*))?(>)',
              bygroups(Name.Tag, Text, String, Name.Tag)),
-            (r'([a-z]\w*)(\s+)',
-             bygroups(Name.Builtin, Text), 'value'),
+            (r'[a-z]\w*', Name.Builtin, 'value'),
             (r'\.+', Text),
         ],
         'value': [
@@ -314,12 +313,12 @@
             (r'[^\S\n]+', Text),
             (r'\d+\.\d+\.\d+\.\d+(?:/\d+)?', Number),
             (r'\d+', Number),
-            (r'/([a-z0-9][\w./-]+)', String.Other),
+            (r'/([*a-z0-9][*\w./-]+)', String.Other),
             (r'(on|off|none|any|all|double|email|dns|min|minimal|'
              r'os|productonly|full|emerg|alert|crit|error|warn|'
              r'notice|info|debug|registry|script|inetd|standalone|'
              r'user|group)\b', Keyword),
-            (r'"([^"\\]*(?:\\.[^"\\]*)*)"', String.Double),
+            (r'"([^"\\]*(?:\\(.|[\n])[^"\\]*)*)"', String.Double),
             (r'[^\s"\\]+', Text)
         ],
     }
@@ -540,14 +539,16 @@
     filenames = ['Dockerfile', '*.docker']
     mimetypes = ['text/x-dockerfile-config']
 
-    _keywords = (r'(?:FROM|MAINTAINER|EXPOSE|WORKDIR|USER|STOPSIGNAL)')
+    _keywords = (r'(?:MAINTAINER|EXPOSE|WORKDIR|USER|STOPSIGNAL)')
     _bash_keywords = (r'(?:RUN|CMD|ENTRYPOINT|ENV|ARG|LABEL|ADD|COPY)')
-    _lb = r'(?:\s*\\?\s*)' # dockerfile line break regex
+    _lb = r'(?:\s*\\?\s*)'  # dockerfile line break regex
     flags = re.IGNORECASE | re.MULTILINE
 
     tokens = {
         'root': [
             (r'#.*', Comment),
+            (r'(FROM)([ \t]*)(\S*)([ \t]*)(?:(AS)([ \t]*)(\S*))?',
+             bygroups(Keyword, Text, String, Text, Keyword, Text, String)),
             (r'(ONBUILD)(%s)' % (_lb,), bygroups(Keyword, using(BashLexer))),
             (r'(HEALTHCHECK)((%s--\w+=\w+%s)*)' % (_lb, _lb),
                 bygroups(Keyword, using(BashLexer))),
@@ -574,30 +575,35 @@
     filenames = ['*.tf']
     mimetypes = ['application/x-tf', 'application/x-terraform']
 
+    embedded_keywords = ('ingress', 'egress', 'listener', 'default',
+                         'connection', 'alias', 'terraform', 'tags', 'vars',
+                         'config', 'lifecycle', 'timeouts')
+
     tokens = {
         'root': [
-             include('string'),
-             include('punctuation'),
-             include('curly'),
-             include('basic'),
-             include('whitespace'),
-             (r'[0-9]+', Number),
+            include('string'),
+            include('punctuation'),
+            include('curly'),
+            include('basic'),
+            include('whitespace'),
+            (r'[0-9]+', Number),
         ],
         'basic': [
-             (words(('true', 'false'), prefix=r'\b', suffix=r'\b'), Keyword.Type),
-             (r'\s*/\*', Comment.Multiline, 'comment'),
-             (r'\s*#.*\n', Comment.Single),
-             (r'(.*?)(\s*)(=)', bygroups(Name.Attribute, Text, Operator)),
-             (words(('variable', 'resource', 'provider', 'provisioner', 'module'),
-                    prefix=r'\b', suffix=r'\b'), Keyword.Reserved, 'function'),
-             (words(('ingress', 'egress', 'listener', 'default', 'connection', 'alias'),
-                    prefix=r'\b', suffix=r'\b'), Keyword.Declaration),
-             (r'\$\{', String.Interpol, 'var_builtin'),
+            (words(('true', 'false'), prefix=r'\b', suffix=r'\b'), Keyword.Type),
+            (r'\s*/\*', Comment.Multiline, 'comment'),
+            (r'\s*#.*\n', Comment.Single),
+            (r'(.*?)(\s*)(=)', bygroups(Name.Attribute, Text, Operator)),
+            (words(('variable', 'resource', 'provider', 'provisioner', 'module',
+                    'backend', 'data', 'output'), prefix=r'\b', suffix=r'\b'),
+             Keyword.Reserved, 'function'),
+            (words(embedded_keywords, prefix=r'\b', suffix=r'\b'),
+             Keyword.Declaration),
+            (r'\$\{', String.Interpol, 'var_builtin'),
         ],
         'function': [
-             (r'(\s+)(".*")(\s+)', bygroups(Text, String, Text)),
-             include('punctuation'),
-             include('curly'),
+            (r'(\s+)(".*")(\s+)', bygroups(Text, String, Text)),
+            include('punctuation'),
+            include('curly'),
         ],
         'var_builtin': [
             (r'\$\{', String.Interpol, '#push'),
@@ -837,3 +843,97 @@
             (r'.', Text),
         ],
     }
+
+
+class AugeasLexer(RegexLexer):
+    """
+    Lexer for `Augeas <http://augeas.net>`_.
+
+    .. versionadded:: 2.4
+    """
+    name = 'Augeas'
+    aliases = ['augeas']
+    filenames = ['*.aug']
+
+    tokens = {
+        'root': [
+            (r'(module)(\s*)([^\s=]+)', bygroups(Keyword.Namespace, Text, Name.Namespace)),
+            (r'(let)(\s*)([^\s=]+)', bygroups(Keyword.Declaration, Text, Name.Variable)),
+            (r'(del|store|value|counter|seq|key|label|autoload|incl|excl|transform|test|get|put)(\s+)', bygroups(Name.Builtin, Text)),
+            (r'(\()([^:]+)(\:)(unit|string|regexp|lens|tree|filter)(\))', bygroups(Punctuation, Name.Variable, Punctuation, Keyword.Type, Punctuation)),
+            (r'\(\*', Comment.Multiline, 'comment'),
+            (r'[*+\-.;=?|]', Operator),
+            (r'[()\[\]{}]', Operator),
+            (r'"', String.Double, 'string'),
+            (r'\/', String.Regex, 'regex'),
+            (r'([A-Z]\w*)(\.)(\w+)', bygroups(Name.Namespace, Punctuation, Name.Variable)),
+            (r'.', Name.Variable),
+            (r'\s', Text),
+        ],
+        'string': [
+            (r'\\.', String.Escape),
+            (r'[^"]', String.Double),
+            (r'"', String.Double, '#pop'),
+        ],
+        'regex': [
+            (r'\\.', String.Escape),
+            (r'[^/]', String.Regex),
+            (r'\/', String.Regex, '#pop'),
+        ],
+        'comment': [
+            (r'[^*)]', Comment.Multiline),
+            (r'\(\*', Comment.Multiline, '#push'),
+            (r'\*\)', Comment.Multiline, '#pop'),
+            (r'[)*]', Comment.Multiline)
+        ],
+    }
+
+
+class TOMLLexer(RegexLexer):
+    """
+    Lexer for `TOML <https://github.com/toml-lang/toml>`_, a simple language
+    for config files.
+
+    .. versionadded:: 2.4
+    """
+
+    name = 'TOML'
+    aliases = ['toml']
+    filenames = ['*.toml', 'Pipfile', 'poetry.lock']
+
+    tokens = {
+        'root': [
+
+            # Basics, comments, strings
+            (r'\s+', Text),
+            (r'#.*?$', Comment.Single),
+            # Basic string
+            (r'"(\\\\|\\"|[^"])*"', String),
+            # Literal string
+            (r'\'\'\'(.*)\'\'\'', String),
+            (r'\'[^\']*\'', String),
+            (r'(true|false)$', Keyword.Constant),
+            (r'[a-zA-Z_][\w\-]*', Name),
+
+            (r'\[.*?\]$', Keyword),
+            # Datetime
+            # TODO this needs to be expanded, as TOML is rather flexible:
+            # https://github.com/toml-lang/toml#offset-date-time
+            (r'\d{4}-\d{2}-\d{2}(?:T| )\d{2}:\d{2}:\d{2}(?:Z|[-+]\d{2}:\d{2})', Number.Integer),
+
+            # Numbers
+            (r'(\d+\.\d*|\d*\.\d+)([eE][+-]?[0-9]+)?j?', Number.Float),
+            (r'\d+[eE][+-]?[0-9]+j?', Number.Float),
+            # Handle +-inf, +-infinity, +-nan
+            (r'[+-]?(?:(inf(?:inity)?)|nan)', Number.Float),
+            (r'[+-]?\d+', Number.Integer),
+
+            # Punctuation
+            (r'[]{}:(),;[]', Punctuation),
+            (r'\.', Punctuation),
+
+            # Operators
+            (r'=', Operator)
+
+        ]
+    }
--- a/eric6/ThirdParty/Pygments/pygments/lexers/console.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/ThirdParty/Pygments/pygments/lexers/console.py	Sat May 02 13:51:07 2020 +0200
@@ -5,7 +5,7 @@
 
     Lexers for misc console output.
 
-    :copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
--- a/eric6/ThirdParty/Pygments/pygments/lexers/crystal.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/ThirdParty/Pygments/pygments/lexers/crystal.py	Sat May 02 13:51:07 2020 +0200
@@ -5,7 +5,7 @@
 
     Lexer for Crystal.
 
-    :copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
--- a/eric6/ThirdParty/Pygments/pygments/lexers/csound.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/ThirdParty/Pygments/pygments/lexers/csound.py	Sat May 02 13:51:07 2020 +0200
@@ -5,7 +5,7 @@
 
     Lexers for Csound languages.
 
-    :copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -35,6 +35,7 @@
 
         'preprocessor directives': [
             (r'#(?:e(?:nd(?:if)?|lse)\b|##)|@@?[ \t]*\d+', Comment.Preproc),
+            (r'#includestr', Comment.Preproc, 'includestr directive'),
             (r'#include', Comment.Preproc, 'include directive'),
             (r'#[ \t]*define', Comment.Preproc, 'define directive'),
             (r'#(?:ifn?def|undef)\b', Comment.Preproc, 'macro directive')
@@ -44,6 +45,10 @@
             include('whitespace'),
             (r'([^ \t]).*?\1', String, '#pop')
         ],
+        'includestr directive': [
+            include('whitespace'),
+            (r'"', String, ('#pop', 'quoted string'))
+        ],
 
         'define directive': [
             (r'\n', Text),
@@ -114,6 +119,13 @@
             (r'\d+', Number.Integer)
         ],
 
+        'quoted string': [
+            (r'"', String, '#pop'),
+            (r'[^"$]+', String),
+            include('macro uses'),
+            (r'[$]', String)
+        ],
+
         'braced string': [
             # Do nothing. This must be defined in subclasses.
         ]
@@ -122,7 +134,7 @@
 
 class CsoundScoreLexer(CsoundLexer):
     """
-    For `Csound <https://csound.github.io>`_ scores.
+    For `Csound <https://csound.com>`_ scores.
 
     .. versionadded:: 2.1
     """
@@ -144,7 +156,7 @@
             (r'z', Keyword.Constant),
             # z is a constant equal to 800,000,000,000. 800 billion seconds is about
             # 25,367.8 years. See also
-            # https://csound.github.io/docs/manual/ScoreTop.html and
+            # https://csound.com/docs/manual/ScoreTop.html and
             # https://github.com/csound/csound/search?q=stof+path%3AEngine+filename%3Asread.c.
 
             (r'([nNpP][pP])(\d+)', bygroups(Keyword, Number.Integer)),
@@ -164,13 +176,6 @@
             (r'\n', Text, '#pop')
         ],
 
-        'quoted string': [
-            (r'"', String, '#pop'),
-            (r'[^"$]+', String),
-            include('macro uses'),
-            (r'[$]', String)
-        ],
-
         'loop after left brace': [
             include('whitespace and macro uses'),
             (r'\d+', Number.Integer, ('#pop', 'loop after repeat count')),
@@ -184,8 +189,8 @@
             include('root')
         ],
 
-        # Braced strings are not allowed in Csound scores, but this is needed
-        # because the superclass includes it.
+        # Braced strings are not allowed in Csound scores, but this is needed because the
+        # superclass includes it.
         'braced string': [
             (r'\}\}', String, '#pop'),
             (r'[^}]|\}(?!\})', String)
@@ -195,7 +200,7 @@
 
 class CsoundOrchestraLexer(CsoundLexer):
     """
-    For `Csound <https://csound.github.io>`_ orchestras.
+    For `Csound <https://csound.com>`_ orchestras.
 
     .. versionadded:: 2.1
     """
@@ -212,24 +217,25 @@
         yield match.start(), Name.Function, opcode
 
     def name_callback(lexer, match):
+        type_annotation_token = Keyword.Type
+
         name = match.group(1)
         if name in OPCODES or name in DEPRECATED_OPCODES:
             yield match.start(), Name.Builtin, name
-            if match.group(2):
-                yield match.start(2), Punctuation, match.group(2)
-                yield match.start(3), Keyword.Type, match.group(3)
         elif name in lexer.user_defined_opcodes:
             yield match.start(), Name.Function, name
         else:
-            nameMatch = re.search(r'^(g?[afikSw])(\w+)', name)
-            if nameMatch:
-                yield nameMatch.start(1), Keyword.Type, nameMatch.group(1)
-                yield nameMatch.start(2), Name, nameMatch.group(2)
+            type_annotation_token = Name
+            name_match = re.search(r'^(g?[afikSw])(\w+)', name)
+            if name_match:
+                yield name_match.start(1), Keyword.Type, name_match.group(1)
+                yield name_match.start(2), Name, name_match.group(2)
             else:
                 yield match.start(), Name, name
-                if match.group(2):
-                    yield match.start(2), Punctuation, match.group(2)
-                    yield match.start(3), Name, match.group(3)
+
+        if match.group(2):
+            yield match.start(2), Punctuation, match.group(2)
+            yield match.start(3), type_annotation_token, match.group(3)
 
     tokens = {
         'root': [
@@ -324,15 +330,15 @@
             (r'\\(?:[\\abnrt"]|[0-7]{1,3})', String.Escape)
         ],
         # Format specifiers are highlighted in all strings, even though only
-        #   fprintks        https://csound.github.io/docs/manual/fprintks.html
-        #   fprints         https://csound.github.io/docs/manual/fprints.html
-        #   printf/printf_i https://csound.github.io/docs/manual/printf.html
-        #   printks         https://csound.github.io/docs/manual/printks.html
-        #   prints          https://csound.github.io/docs/manual/prints.html
-        #   sprintf         https://csound.github.io/docs/manual/sprintf.html
-        #   sprintfk        https://csound.github.io/docs/manual/sprintfk.html
-        # work with strings that contain format specifiers. In addition, these
-        # opcodes’ handling of format specifiers is inconsistent:
+        #   fprintks        https://csound.com/docs/manual/fprintks.html
+        #   fprints         https://csound.com/docs/manual/fprints.html
+        #   printf/printf_i https://csound.com/docs/manual/printf.html
+        #   printks         https://csound.com/docs/manual/printks.html
+        #   prints          https://csound.com/docs/manual/prints.html
+        #   sprintf         https://csound.com/docs/manual/sprintf.html
+        #   sprintfk        https://csound.com/docs/manual/sprintfk.html
+        # work with strings that contain format specifiers. In addition, these opcodes’
+        # handling of format specifiers is inconsistent:
         #   - fprintks, fprints, printks, and prints do accept %a and %A
         #     specifiers, but can’t accept %s specifiers.
         #   - printf, printf_i, sprintf, and sprintfk don’t accept %a and %A
@@ -367,6 +373,7 @@
 
         'Csound score opcode': [
             include('whitespace and macro uses'),
+            (r'"', String, 'quoted string'),
             (r'\{\{', String, 'Csound score'),
             (r'\n', Text, '#pop')
         ],
@@ -377,6 +384,7 @@
 
         'Python opcode': [
             include('whitespace and macro uses'),
+            (r'"', String, 'quoted string'),
             (r'\{\{', String, 'Python'),
             (r'\n', Text, '#pop')
         ],
@@ -387,6 +395,7 @@
 
         'Lua opcode': [
             include('whitespace and macro uses'),
+            (r'"', String, 'quoted string'),
             (r'\{\{', String, 'Lua'),
             (r'\n', Text, '#pop')
         ],
@@ -399,7 +408,7 @@
 
 class CsoundDocumentLexer(RegexLexer):
     """
-    For `Csound <https://csound.github.io>`_ documents.
+    For `Csound <https://csound.com>`_ documents.
 
     .. versionadded:: 2.1
     """
--- a/eric6/ThirdParty/Pygments/pygments/lexers/css.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/ThirdParty/Pygments/pygments/lexers/css.py	Sat May 02 13:51:07 2020 +0200
@@ -5,7 +5,7 @@
 
     Lexers for CSS and related stylesheet formats.
 
-    :copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -16,7 +16,6 @@
     default, words, inherit
 from pygments.token import Text, Comment, Operator, Keyword, Name, String, \
     Number, Punctuation
-from pygments.util import iteritems
 
 __all__ = ['CssLexer', 'SassLexer', 'ScssLexer', 'LessCssLexer']
 
@@ -612,7 +611,7 @@
             (r"\*/", Comment, '#pop'),
         ],
     }
-    for group, common in iteritems(common_sass_tokens):
+    for group, common in common_sass_tokens.items():
         tokens[group] = copy.copy(common)
     tokens['value'].append((r'\n', Text, 'root'))
     tokens['selector'].append((r'\n', Text, 'root'))
@@ -662,7 +661,7 @@
             (r"\*/", Comment, '#pop'),
         ],
     }
-    for group, common in iteritems(common_sass_tokens):
+    for group, common in common_sass_tokens.items():
         tokens[group] = copy.copy(common)
     tokens['value'].extend([(r'\n', Text), (r'[;{}]', Punctuation, '#pop')])
     tokens['selector'].extend([(r'\n', Text), (r'[;{}]', Punctuation, '#pop')])
--- a/eric6/ThirdParty/Pygments/pygments/lexers/d.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/ThirdParty/Pygments/pygments/lexers/d.py	Sat May 02 13:51:07 2020 +0200
@@ -5,7 +5,7 @@
 
     Lexers for D languages.
 
-    :copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -47,12 +47,17 @@
                 'module', 'new', 'nothrow', 'out', 'override', 'package', 'pragma',
                 'private', 'protected', 'public', 'pure', 'ref', 'return', 'scope',
                 'shared', 'static', 'struct', 'super', 'switch', 'synchronized',
-                'template', 'this', 'throw', 'try', 'typedef', 'typeid', 'typeof',
+                'template', 'this', 'throw', 'try', 'typeid', 'typeof',
                 'union', 'unittest', 'version', 'volatile', 'while', 'with',
                 '__gshared', '__traits', '__vector', '__parameters'),
                 suffix=r'\b'),
              Keyword),
             (words((
+                # Removed in 2.072
+                'typedef', ),
+                suffix=r'\b'),
+             Keyword.Removed),
+            (words((
                 'bool', 'byte', 'cdouble', 'cent', 'cfloat', 'char', 'creal',
                 'dchar', 'double', 'float', 'idouble', 'ifloat', 'int', 'ireal',
                 'long', 'real', 'short', 'ubyte', 'ucent', 'uint', 'ulong',
@@ -60,9 +65,9 @@
              Keyword.Type),
             (r'(false|true|null)\b', Keyword.Constant),
             (words((
-                '__FILE__', '__MODULE__', '__LINE__', '__FUNCTION__', '__PRETTY_FUNCTION__'
-                '', '__DATE__', '__EOF__', '__TIME__', '__TIMESTAMP__', '__VENDOR__',
-                '__VERSION__'), suffix=r'\b'),
+                '__FILE__', '__FILE_FULL_PATH__', '__MODULE__', '__LINE__', '__FUNCTION__',
+                '__PRETTY_FUNCTION__', '__DATE__', '__EOF__', '__TIME__', '__TIMESTAMP__',
+                '__VENDOR__', '__VERSION__'), suffix=r'\b'),
              Keyword.Pseudo),
             (r'macro\b', Keyword.Reserved),
             (r'(string|wstring|dstring|size_t|ptrdiff_t)\b', Name.Builtin),
--- a/eric6/ThirdParty/Pygments/pygments/lexers/dalvik.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/ThirdParty/Pygments/pygments/lexers/dalvik.py	Sat May 02 13:51:07 2020 +0200
@@ -5,7 +5,7 @@
 
     Pygments lexers for Dalvik VM-related languages.
 
-    :copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
--- a/eric6/ThirdParty/Pygments/pygments/lexers/data.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/ThirdParty/Pygments/pygments/lexers/data.py	Sat May 02 13:51:07 2020 +0200
@@ -5,7 +5,7 @@
 
     Lexers for data file format.
 
-    :copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -233,7 +233,7 @@
             # whitespaces separating tokens
             (r'[ ]+', Text),
             # key with colon
-            (r'([^,:?\[\]{}\n]+)(:)(?=[ ]|$)',
+            (r'''([^#,:?\[\]{}"'\n]+)(:)(?=[ ]|$)''',
              bygroups(Name.Tag, set_indent(Punctuation, implicit=True))),
             # tags, anchors and aliases,
             include('descriptors'),
@@ -312,7 +312,7 @@
         # a flow mapping indicated by '{' and '}'
         'flow-mapping': [
             # key with colon
-            (r'([^,:?\[\]{}\n]+)(:)(?=[ ]|$)',
+            (r'''([^,:?\[\]{}"'\n]+)(:)(?=[ ]|$)''',
              bygroups(Name.Tag, Punctuation)),
             # include flow collection rules
             include('flow-collection'),
@@ -445,7 +445,7 @@
 
     name = 'JSON'
     aliases = ['json']
-    filenames = ['*.json']
+    filenames = ['*.json', 'Pipfile.lock']
     mimetypes = ['application/json']
 
     flags = re.DOTALL
--- a/eric6/ThirdParty/Pygments/pygments/lexers/diff.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/ThirdParty/Pygments/pygments/lexers/diff.py	Sat May 02 13:51:07 2020 +0200
@@ -5,7 +5,7 @@
 
     Lexers for diff/patch formats.
 
-    :copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
--- a/eric6/ThirdParty/Pygments/pygments/lexers/dotnet.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/ThirdParty/Pygments/pygments/lexers/dotnet.py	Sat May 02 13:51:07 2020 +0200
@@ -5,7 +5,7 @@
 
     Lexers for .net languages.
 
-    :copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 import re
@@ -14,7 +14,7 @@
     using, this, default, words
 from pygments.token import Punctuation, \
     Text, Comment, Operator, Keyword, Name, String, Number, Literal, Other
-from pygments.util import get_choice_opt, iteritems
+from pygments.util import get_choice_opt
 from pygments import unistring as uni
 
 from pygments.lexers.html import XmlLexer
@@ -71,7 +71,7 @@
     tokens = {}
     token_variants = True
 
-    for levelname, cs_ident in iteritems(levels):
+    for levelname, cs_ident in levels.items():
         tokens[levelname] = {
             'root': [
                 # method names
@@ -184,7 +184,7 @@
     tokens = {}
     token_variants = True
 
-    for levelname, cs_ident in iteritems(levels):
+    for levelname, cs_ident in levels.items():
         tokens[levelname] = {
             'root': [
                 # method names
@@ -541,16 +541,13 @@
 # Very close to functional.OcamlLexer
 class FSharpLexer(RegexLexer):
     """
-    For the F# language (version 3.0).
-
-    AAAAACK Strings
-    http://research.microsoft.com/en-us/um/cambridge/projects/fsharp/manual/spec.html#_Toc335818775
+    For the `F# language <https://fsharp.org/>`_ (version 3.0).
 
     .. versionadded:: 1.5
     """
 
-    name = 'FSharp'
-    aliases = ['fsharp']
+    name = 'F#'
+    aliases = ['fsharp', 'f#']
     filenames = ['*.fs', '*.fsi']
     mimetypes = ['text/x-fsharp']
 
--- a/eric6/ThirdParty/Pygments/pygments/lexers/dsls.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/ThirdParty/Pygments/pygments/lexers/dsls.py	Sat May 02 13:51:07 2020 +0200
@@ -5,7 +5,7 @@
 
     Lexers for various domain-specific languages.
 
-    :copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -16,7 +16,7 @@
 from pygments.token import Text, Comment, Operator, Keyword, Name, String, \
     Number, Punctuation, Literal, Whitespace
 
-__all__ = ['ProtoBufLexer', 'BroLexer', 'PuppetLexer', 'RslLexer',
+__all__ = ['ProtoBufLexer', 'ZeekLexer', 'PuppetLexer', 'RslLexer',
            'MscgenLexer', 'VGLLexer', 'AlloyLexer', 'PanLexer',
            'CrmshLexer', 'ThriftLexer', 'FlatlineLexer', 'SnowballLexer']
 
@@ -40,9 +40,9 @@
             (r'/(\\\n)?/(\n|(.|\n)*?[^\\]\n)', Comment.Single),
             (r'/(\\\n)?\*(.|\n)*?\*(\\\n)?/', Comment.Multiline),
             (words((
-                'import', 'option', 'optional', 'required', 'repeated', 'default',
-                'packed', 'ctype', 'extensions', 'to', 'max', 'rpc', 'returns',
-                'oneof'), prefix=r'\b', suffix=r'\b'),
+                'import', 'option', 'optional', 'required', 'repeated',
+                'reserved', 'default', 'packed', 'ctype', 'extensions', 'to',
+                'max', 'rpc', 'returns', 'oneof'), prefix=r'\b', suffix=r'\b'),
              Keyword),
             (words((
                 'int32', 'int64', 'uint32', 'uint64', 'sint32', 'sint64',
@@ -188,84 +188,166 @@
     }
 
 
-class BroLexer(RegexLexer):
+class ZeekLexer(RegexLexer):
     """
-    For `Bro <http://bro-ids.org/>`_ scripts.
+    For `Zeek <https://www.zeek.org/>`_ scripts.
 
-    .. versionadded:: 1.5
+    .. versionadded:: 2.5
     """
-    name = 'Bro'
-    aliases = ['bro']
-    filenames = ['*.bro']
+    name = 'Zeek'
+    aliases = ['zeek', 'bro']
+    filenames = ['*.zeek', '*.bro']
 
-    _hex = r'[0-9a-fA-F_]'
+    _hex = r'[0-9a-fA-F]'
     _float = r'((\d*\.?\d+)|(\d+\.?\d*))([eE][-+]?\d+)?'
     _h = r'[A-Za-z0-9][-A-Za-z0-9]*'
 
     tokens = {
         'root': [
-            # Whitespace
-            (r'^@.*?\n', Comment.Preproc),
-            (r'#.*?\n', Comment.Single),
+            include('whitespace'),
+            include('comments'),
+            include('directives'),
+            include('attributes'),
+            include('types'),
+            include('keywords'),
+            include('literals'),
+            include('operators'),
+            include('punctuation'),
+            (r'((?:[A-Za-z_]\w*)(?:::(?:[A-Za-z_]\w*))*)(?=\s*\()',
+                Name.Function),
+            include('identifiers'),
+        ],
+
+        'whitespace': [
             (r'\n', Text),
             (r'\s+', Text),
             (r'\\\n', Text),
-            # Keywords
-            (r'(add|alarm|break|case|const|continue|delete|do|else|enum|event'
-             r'|export|for|function|if|global|hook|local|module|next'
-             r'|of|print|redef|return|schedule|switch|type|when|while)\b', Keyword),
-            (r'(addr|any|bool|count|counter|double|file|int|interval|net'
-             r'|pattern|port|record|set|string|subnet|table|time|timer'
-             r'|vector)\b', Keyword.Type),
+        ],
+
+        'comments': [
+            (r'#.*$', Comment),
+        ],
+
+        'directives': [
+            (r'@(load-plugin|load-sigs|load|unload)\b.*$', Comment.Preproc),
+            (r'@(DEBUG|DIR|FILENAME|deprecated|if|ifdef|ifndef|else|endif)\b', Comment.Preproc),
+            (r'(@prefixes)\s*(\+?=).*$', Comment.Preproc),
+        ],
+
+        'attributes': [
+            (words(('redef', 'priority', 'log', 'optional', 'default', 'add_func',
+                    'delete_func', 'expire_func', 'read_expire', 'write_expire',
+                    'create_expire', 'synchronized', 'persistent', 'rotate_interval',
+                    'rotate_size', 'encrypt', 'raw_output', 'mergeable', 'error_handler',
+                    'type_column', 'deprecated'),
+                prefix=r'&', suffix=r'\b'),
+             Keyword.Pseudo),
+        ],
+
+        'types': [
+            (words(('any',
+                    'enum', 'record', 'set', 'table', 'vector',
+                    'function', 'hook', 'event',
+                    'addr', 'bool', 'count', 'double', 'file', 'int', 'interval',
+                    'pattern', 'port', 'string', 'subnet', 'time'),
+                suffix=r'\b'),
+             Keyword.Type),
+
+            (r'(opaque)(\s+)(of)(\s+)((?:[A-Za-z_]\w*)(?:::(?:[A-Za-z_]\w*))*)\b',
+                bygroups(Keyword.Type, Text, Operator.Word, Text, Keyword.Type)),
+
+            (r'(type)(\s+)((?:[A-Za-z_]\w*)(?:::(?:[A-Za-z_]\w*))*)(\s*)(:)(\s*)\b(record|enum)\b',
+                bygroups(Keyword, Text, Name.Class, Text, Operator, Text, Keyword.Type)),
+
+            (r'(type)(\s+)((?:[A-Za-z_]\w*)(?:::(?:[A-Za-z_]\w*))*)(\s*)(:)',
+                bygroups(Keyword, Text, Name, Text, Operator)),
+
+            (r'(redef)(\s+)(record|enum)(\s+)((?:[A-Za-z_]\w*)(?:::(?:[A-Za-z_]\w*))*)\b',
+                bygroups(Keyword, Text, Keyword.Type, Text, Name.Class)),
+        ],
+
+        'keywords': [
+            (words(('redef', 'export', 'if', 'else', 'for', 'while',
+                    'return', 'break', 'next', 'continue', 'fallthrough',
+                    'switch', 'default', 'case',
+                    'add', 'delete',
+                    'when', 'timeout', 'schedule'),
+                suffix=r'\b'),
+             Keyword),
+            (r'(print)\b', Keyword),
+            (r'(global|local|const|option)\b', Keyword.Declaration),
+            (r'(module)(\s+)(([A-Za-z_]\w*)(?:::([A-Za-z_]\w*))*)\b',
+                bygroups(Keyword.Namespace, Text, Name.Namespace)),
+        ],
+
+        'literals': [
+            (r'"', String, 'string'),
+
+            # Not the greatest match for patterns, but generally helps
+            # disambiguate between start of a pattern and just a division
+            # operator.
+            (r'/(?=.*/)', String.Regex, 'regex'),
+
             (r'(T|F)\b', Keyword.Constant),
-            (r'(&)((?:add|delete|expire)_func|attr|(?:create|read|write)_expire'
-             r'|default|disable_print_hook|raw_output|encrypt|group|log'
-             r'|mergeable|optional|persistent|priority|redef'
-             r'|rotate_(?:interval|size)|synchronized)\b',
-             bygroups(Punctuation, Keyword)),
-            (r'\s+module\b', Keyword.Namespace),
-            # Addresses, ports and networks
-            (r'\d+/(tcp|udp|icmp|unknown)\b', Number),
-            (r'(\d+\.){3}\d+', Number),
-            (r'(' + _hex + r'){7}' + _hex, Number),
-            (r'0x' + _hex + r'(' + _hex + r'|:)*::(' + _hex + r'|:)*', Number),
-            (r'((\d+|:)(' + _hex + r'|:)*)?::(' + _hex + r'|:)*', Number),
-            (r'(\d+\.\d+\.|(\d+\.){2}\d+)', Number),
+
+            # Port
+            (r'\d{1,5}/(udp|tcp|icmp|unknown)\b', Number),
+
+            # IPv4 Address
+            (r'(\d{1,3}.){3}(\d{1,3})\b', Number),
+
+            # IPv6 Address
+            (r'\[([0-9a-fA-F]{0,4}:){2,7}([0-9a-fA-F]{0,4})?((\d{1,3}.){3}(\d{1,3}))?\]', Number),
+
+            # Numeric
+            (r'0[xX]' + _hex + r'+\b', Number.Hex),
+            (_float + r'\s*(day|hr|min|sec|msec|usec)s?\b', Number.Float),
+            (_float + r'\b', Number.Float),
+            (r'(\d+)\b', Number.Integer),
+
             # Hostnames
             (_h + r'(\.' + _h + r')+', String),
-            # Numeric
-            (_float + r'\s+(day|hr|min|sec|msec|usec)s?\b', Literal.Date),
-            (r'0[xX]' + _hex, Number.Hex),
-            (_float, Number.Float),
-            (r'\d+', Number.Integer),
-            (r'/', String.Regex, 'regex'),
-            (r'"', String, 'string'),
-            # Operators
-            (r'[!%*/+:<=>?~|-]', Operator),
+        ],
+
+        'operators': [
+            (r'[!%*/+<=>~|&^-]', Operator),
             (r'([-+=&|]{2}|[+=!><-]=)', Operator),
-            (r'(in|match)\b', Operator.Word),
-            (r'[{}()\[\]$.,;]', Punctuation),
-            # Identfier
-            (r'([_a-zA-Z]\w*)(::)', bygroups(Name, Name.Namespace)),
+            (r'(in|as|is|of)\b', Operator.Word),
+            (r'\??\$', Operator),
+        ],
+
+        'punctuation': [
+            (r'[{}()\[\],;.]', Punctuation),
+            # The "ternary if", which uses '?' and ':', could instead be
+            # treated as an Operator, but colons are more frequently used to
+            # separate field/identifier names from their types, so the (often)
+            # less-prominent Punctuation is used even with '?' for consistency.
+            (r'[?:]', Punctuation),
+        ],
+
+        'identifiers': [
+            (r'([a-zA-Z_]\w*)(::)', bygroups(Name, Punctuation)),
             (r'[a-zA-Z_]\w*', Name)
         ],
+
         'string': [
+            (r'\\.', String.Escape),
+            (r'%-?[0-9]*(\.[0-9]+)?[DTdxsefg]', String.Escape),
             (r'"', String, '#pop'),
-            (r'\\([\\abfnrtv"\']|x[a-fA-F0-9]{2,4}|[0-7]{1,3})', String.Escape),
-            (r'[^\\"\n]+', String),
-            (r'\\\n', String),
-            (r'\\', String)
+            (r'.', String),
         ],
+
         'regex': [
+            (r'\\.', String.Escape),
             (r'/', String.Regex, '#pop'),
-            (r'\\[\\nt/]', String.Regex),  # String.Escape is too intense here.
-            (r'[^\\/\n]+', String.Regex),
-            (r'\\\n', String.Regex),
-            (r'\\', String.Regex)
-        ]
+            (r'.', String.Regex),
+        ],
     }
 
 
+BroLexer = ZeekLexer
+
+
 class PuppetLexer(RegexLexer):
     """
     For `Puppet <http://puppetlabs.com/>`__ configuration DSL.
@@ -558,7 +640,7 @@
 
 class PanLexer(RegexLexer):
     """
-    Lexer for `pan <http://github.com/quattor/pan/>`_ source files.
+    Lexer for `pan <https://github.com/quattor/pan/>`_ source files.
 
     Based on tcsh lexer.
 
--- a/eric6/ThirdParty/Pygments/pygments/lexers/dylan.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/ThirdParty/Pygments/pygments/lexers/dylan.py	Sat May 02 13:51:07 2020 +0200
@@ -5,7 +5,7 @@
 
     Lexers for the Dylan language.
 
-    :copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -32,27 +32,27 @@
 
     flags = re.IGNORECASE
 
-    builtins = set((
+    builtins = {
         'subclass', 'abstract', 'block', 'concrete', 'constant', 'class',
         'compiler-open', 'compiler-sideways', 'domain', 'dynamic',
         'each-subclass', 'exception', 'exclude', 'function', 'generic',
         'handler', 'inherited', 'inline', 'inline-only', 'instance',
         'interface', 'import', 'keyword', 'library', 'macro', 'method',
         'module', 'open', 'primary', 'required', 'sealed', 'sideways',
-        'singleton', 'slot', 'thread', 'variable', 'virtual'))
+        'singleton', 'slot', 'thread', 'variable', 'virtual'}
 
-    keywords = set((
+    keywords = {
         'above', 'afterwards', 'begin', 'below', 'by', 'case', 'cleanup',
         'create', 'define', 'else', 'elseif', 'end', 'export', 'finally',
         'for', 'from', 'if', 'in', 'let', 'local', 'otherwise', 'rename',
         'select', 'signal', 'then', 'to', 'unless', 'until', 'use', 'when',
-        'while'))
+        'while'}
 
-    operators = set((
+    operators = {
         '~', '+', '-', '*', '|', '^', '=', '==', '~=', '~==', '<', '<=',
-        '>', '>=', '&', '|'))
+        '>', '>=', '&', '|'}
 
-    functions = set((
+    functions = {
         'abort', 'abs', 'add', 'add!', 'add-method', 'add-new', 'add-new!',
         'all-superclasses', 'always', 'any?', 'applicable-method?', 'apply',
         'aref', 'aref-setter', 'as', 'as-lowercase', 'as-lowercase!',
@@ -86,7 +86,7 @@
         'subtype?', 'table-protocol', 'tail', 'tail-setter', 'third',
         'third-setter', 'truncate', 'truncate/', 'type-error-expected-type',
         'type-error-value', 'type-for-copy', 'type-union', 'union', 'values',
-        'vector', 'zero?'))
+        'vector', 'zero?'}
 
     valid_name = '\\\\?[\\w!&*<>|^$%@\\-+~?/=]+'
 
--- a/eric6/ThirdParty/Pygments/pygments/lexers/ecl.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/ThirdParty/Pygments/pygments/lexers/ecl.py	Sat May 02 13:51:07 2020 +0200
@@ -5,7 +5,7 @@
 
     Lexers for the ECL language.
 
-    :copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
--- a/eric6/ThirdParty/Pygments/pygments/lexers/eiffel.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/ThirdParty/Pygments/pygments/lexers/eiffel.py	Sat May 02 13:51:07 2020 +0200
@@ -5,7 +5,7 @@
 
     Lexer for the Eiffel language.
 
-    :copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
--- a/eric6/ThirdParty/Pygments/pygments/lexers/elm.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/ThirdParty/Pygments/pygments/lexers/elm.py	Sat May 02 13:51:07 2020 +0200
@@ -5,7 +5,7 @@
 
     Lexer for the Elm programming language.
 
-    :copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -77,7 +77,7 @@
             (words((builtinOps), prefix=r'\(', suffix=r'\)'), Name.Function),
 
             # Infix Operators
-            (words((builtinOps)), Name.Function),
+            (words(builtinOps), Name.Function),
 
             # Numbers
             include('numbers'),
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/eric6/ThirdParty/Pygments/pygments/lexers/email.py	Sat May 02 13:51:07 2020 +0200
@@ -0,0 +1,154 @@
+# -*- coding: utf-8 -*-
+"""
+    pygments.lexers.email
+    ~~~~~~~~~~~~~~~~~~~~~
+
+    Lexer for the raw E-mail.
+
+    :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
+    :license: BSD, see LICENSE for details.
+"""
+
+from pygments.lexer import RegexLexer, DelegatingLexer, bygroups
+from pygments.lexers.mime import MIMELexer
+from pygments.token import Text, Keyword, Name, String, Number, Comment
+from pygments.util import get_bool_opt
+
+__all__ = ["EmailLexer"]
+
+
+class EmailHeaderLexer(RegexLexer):
+    """
+    Sub-lexer for raw E-mail. This lexer only process header part of e-mail.
+
+    .. versionadded:: 2.5
+    """
+
+    def __init__(self, **options):
+        super(EmailHeaderLexer, self).__init__(**options)
+        self.highlight_x = get_bool_opt(options, "highlight-X-header", False)
+
+    def get_x_header_tokens(self, match):
+        if self.highlight_x:
+            # field
+            yield match.start(1), Name.Tag, match.group(1)
+
+            # content
+            default_actions = self.get_tokens_unprocessed(
+                match.group(2), stack=("root", "header"))
+            for item in default_actions:
+                yield item
+        else:
+            # lowlight
+            yield match.start(1), Comment.Special, match.group(1)
+            yield match.start(2), Comment.Multiline, match.group(2)
+
+    tokens = {
+        "root": [
+            (r"^(?:[A-WYZ]|X400)[\w\-]*:", Name.Tag, "header"),
+            (r"^(X-(?:\w[\w\-]*:))([\s\S]*?\n)(?![ \t])", get_x_header_tokens),
+        ],
+        "header": [
+            # folding
+            (r"\n[ \t]", Text.Whitespace),
+            (r"\n(?![ \t])", Text.Whitespace, "#pop"),
+
+            # keywords
+            (r"\bE?SMTPS?\b", Keyword),
+            (r"\b(?:HE|EH)LO\b", Keyword),
+
+            # mailbox
+            (r"[\w\.\-\+=]+@[\w\.\-]+", Name.Label),
+            (r"<[\w\.\-\+=]+@[\w\.\-]+>", Name.Label),
+
+            # domain
+            (r"\b(\w[\w\.-]*\.[\w\.-]*\w[a-zA-Z]+)\b", Name.Function),
+
+            # IPv4
+            (
+                r"(?<=\b)(?:(?:25[0-5]|2[0-4][0-9]|1?[0-9][0-9]?)\.){3}(?:25[0"
+                r"-5]|2[0-4][0-9]|1?[0-9][0-9]?)(?=\b)",
+                Number.Integer,
+            ),
+
+            # IPv6
+            (r"(?<=\b)([0-9a-fA-F]{1,4}:){1,7}:(?!\b)", Number.Hex),
+            (r"(?<=\b):((:[0-9a-fA-F]{1,4}){1,7}|:)(?=\b)", Number.Hex),
+            (r"(?<=\b)([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}(?=\b)", Number.Hex),
+            (r"(?<=\b)([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}(?=\b)", Number.Hex),
+            (r"(?<=\b)[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})(?=\b)", Number.Hex),
+            (r"(?<=\b)fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}(?=\b)", Number.Hex),
+            (r"(?<=\b)([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}(?=\b)", Number.Hex),
+            (r"(?<=\b)([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}(?=\b)",
+             Number.Hex),
+            (r"(?<=\b)([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}(?=\b)",
+             Number.Hex),
+            (r"(?<=\b)([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}(?=\b)",
+             Number.Hex),
+            (
+                r"(?<=\b)::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}"
+                r"[0-9]){0,1}[0-9])\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}"
+                r"[0-9])(?=\b)",
+                Number.Hex,
+            ),
+            (
+                r"(?<=\b)([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-"
+                r"9]){0,1}[0-9])\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-"
+                r"9])(?=\b)",
+                Number.Hex,
+            ),
+
+            # Date time
+            (
+                r"(?:(Sun|Mon|Tue|Wed|Thu|Fri|Sat),\s+)?(0[1-9]|[1-2]?[0-9]|3["
+                r"01])\s+(Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)\s+("
+                r"19[0-9]{2}|[2-9][0-9]{3})\s+(2[0-3]|[0-1][0-9]):([0-5][0-9])"
+                r"(?::(60|[0-5][0-9]))?(?:\.\d{1,5})?\s+([-\+][0-9]{2}[0-5][0-"
+                r"9]|\(?(?:UTC?|GMT|(?:E|C|M|P)(?:ST|ET|DT)|[A-IK-Z])\)?)",
+                Name.Decorator,
+            ),
+
+            # RFC-2047 encoded string
+            (
+                r"(=\?)([\w-]+)(\?)([BbQq])(\?)([\[\w!\"#$%&\'()*+,-./:;<=>@[\\"
+                r"\]^_`{|}~]+)(\?=)",
+                bygroups(
+                    String.Affix,
+                    Name.Constant,
+                    String.Affix,
+                    Keyword.Constant,
+                    String.Affix,
+                    Number.Hex,
+                    String.Affix
+                )
+            ),
+
+            # others
+            (r'[\s]+', Text.Whitespace),
+            (r'[\S]', Text),
+        ],
+    }
+
+
+class EmailLexer(DelegatingLexer):
+    """
+    Lexer for raw E-mail.
+
+    Additional options accepted:
+
+    `highlight-X-header`
+        Highlight the fields of ``X-`` user-defined email header. (default:
+        ``False``).
+
+    .. versionadded:: 2.5
+    """
+
+    name = "E-mail"
+    aliases = ["email", "eml"]
+    filenames = ["*.eml"]
+    mimetypes = ["message/rfc822"]
+
+    def __init__(self, **options):
+        super(EmailLexer, self).__init__(
+            EmailHeaderLexer, MIMELexer, Comment, **options
+        )
--- a/eric6/ThirdParty/Pygments/pygments/lexers/erlang.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/ThirdParty/Pygments/pygments/lexers/erlang.py	Sat May 02 13:51:07 2020 +0200
@@ -5,7 +5,7 @@
 
     Lexers for Erlang.
 
-    :copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -163,7 +163,7 @@
     filenames = ['*.erl-sh']
     mimetypes = ['text/x-erl-shellsession']
 
-    _prompt_re = re.compile(r'\d+>(?=\s|\Z)')
+    _prompt_re = re.compile(r'(?:\([\w@_.]+\))?\d+>(?=\s|\Z)')
 
     def get_tokens_unprocessed(self, text):
         erlexer = ErlangLexer(**self.options)
@@ -233,7 +233,7 @@
 
     name = 'Elixir'
     aliases = ['elixir', 'ex', 'exs']
-    filenames = ['*.ex', '*.exs']
+    filenames = ['*.ex', '*.eex', '*.exs']
     mimetypes = ['text/x-elixir']
 
     KEYWORD = ('fn', 'do', 'end', 'after', 'else', 'rescue', 'catch')
@@ -495,7 +495,7 @@
     aliases = ['iex']
     mimetypes = ['text/x-elixir-shellsession']
 
-    _prompt_re = re.compile(r'(iex|\.{3})(\(\d+\))?> ')
+    _prompt_re = re.compile(r'(iex|\.{3})((?:\([\w@_.]+\))?\d+|\(\d+\))?> ')
 
     def get_tokens_unprocessed(self, text):
         exlexer = ElixirLexer(**self.options)
--- a/eric6/ThirdParty/Pygments/pygments/lexers/esoteric.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/ThirdParty/Pygments/pygments/lexers/esoteric.py	Sat May 02 13:51:07 2020 +0200
@@ -5,7 +5,7 @@
 
     Lexers for esoteric languages.
 
-    :copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -245,7 +245,7 @@
 
     Aheui_ is esoteric language based on Korean alphabets.
 
-    .. _Aheui:: http://aheui.github.io/
+    .. _Aheui: http://aheui.github.io/
 
     """
 
--- a/eric6/ThirdParty/Pygments/pygments/lexers/ezhil.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/ThirdParty/Pygments/pygments/lexers/ezhil.py	Sat May 02 13:51:07 2020 +0200
@@ -5,7 +5,7 @@
 
     Pygments lexers for Ezhil language.
 
-    :copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
--- a/eric6/ThirdParty/Pygments/pygments/lexers/factor.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/ThirdParty/Pygments/pygments/lexers/factor.py	Sat May 02 13:51:07 2020 +0200
@@ -5,7 +5,7 @@
 
     Lexers for the Factor language.
 
-    :copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
--- a/eric6/ThirdParty/Pygments/pygments/lexers/fantom.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/ThirdParty/Pygments/pygments/lexers/fantom.py	Sat May 02 13:51:07 2020 +0200
@@ -5,7 +5,7 @@
 
     Lexer for the Fantom language.
 
-    :copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
--- a/eric6/ThirdParty/Pygments/pygments/lexers/felix.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/ThirdParty/Pygments/pygments/lexers/felix.py	Sat May 02 13:51:07 2020 +0200
@@ -5,7 +5,7 @@
 
     Lexer for the Felix language.
 
-    :copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/eric6/ThirdParty/Pygments/pygments/lexers/floscript.py	Sat May 02 13:51:07 2020 +0200
@@ -0,0 +1,83 @@
+# -*- coding: utf-8 -*-
+"""
+    pygments.lexers.floscript
+    ~~~~~~~~~~~~~~~~~~~~~~~~~
+
+    Lexer for FloScript
+
+    :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
+    :license: BSD, see LICENSE for details.
+"""
+
+from pygments.lexer import RegexLexer, include
+from pygments.token import Text, Comment, Operator, Keyword, Name, String, \
+    Number, Punctuation
+
+__all__ = ['FloScriptLexer']
+
+
+class FloScriptLexer(RegexLexer):
+    """
+    For `FloScript <https://github.com/ioflo/ioflo>`_ configuration language source code.
+
+    .. versionadded:: 2.4
+    """
+
+    name = 'FloScript'
+    aliases = ['floscript', 'flo']
+    filenames = ['*.flo']
+
+    def innerstring_rules(ttype):
+        return [
+            # the old style '%s' % (...) string formatting
+            (r'%(\(\w+\))?[-#0 +]*([0-9]+|[*])?(\.([0-9]+|[*]))?'
+             '[hlL]?[E-GXc-giorsux%]', String.Interpol),
+            # backslashes, quotes and formatting signs must be parsed one at a time
+            (r'[^\\\'"%\n]+', ttype),
+            (r'[\'"\\]', ttype),
+            # unhandled string formatting sign
+            (r'%', ttype),
+            # newlines are an error (use "nl" state)
+        ]
+
+    tokens = {
+        'root': [
+            (r'\n', Text),
+            (r'[^\S\n]+', Text),
+
+            (r'[]{}:(),;[]', Punctuation),
+            (r'\\\n', Text),
+            (r'\\', Text),
+            (r'(to|by|with|from|per|for|cum|qua|via|as|at|in|of|on|re|is|if|be|into|'
+             r'and|not)\b', Operator.Word),
+            (r'!=|==|<<|>>|[-~+/*%=<>&^|.]', Operator),
+            (r'(load|init|server|logger|log|loggee|first|over|under|next|done|timeout|'
+             r'repeat|native|benter|enter|recur|exit|precur|renter|rexit|print|put|inc|'
+             r'copy|set|aux|rear|raze|go|let|do|bid|ready|start|stop|run|abort|use|flo|'
+             r'give|take)\b', Name.Builtin),
+            (r'(frame|framer|house)\b', Keyword),
+            ('"', String, 'string'),
+
+            include('name'),
+            include('numbers'),
+            (r'#.+$', Comment.Singleline),
+        ],
+        'string': [
+            ('[^"]+', String),
+            ('"', String, '#pop'),
+        ],
+        'numbers': [
+            (r'(\d+\.\d*|\d*\.\d+)([eE][+-]?[0-9]+)?j?', Number.Float),
+            (r'\d+[eE][+-]?[0-9]+j?', Number.Float),
+            (r'0[0-7]+j?', Number.Oct),
+            (r'0[bB][01]+', Number.Bin),
+            (r'0[xX][a-fA-F0-9]+', Number.Hex),
+            (r'\d+L', Number.Integer.Long),
+            (r'\d+j?', Number.Integer)
+        ],
+
+        'name': [
+            (r'@[\w.]+', Name.Decorator),
+            (r'[a-zA-Z_]\w*', Name),
+        ],
+    }
--- a/eric6/ThirdParty/Pygments/pygments/lexers/forth.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/ThirdParty/Pygments/pygments/lexers/forth.py	Sat May 02 13:51:07 2020 +0200
@@ -3,7 +3,9 @@
     pygments.lexers.forth
     ~~~~~~~~~~~~~~~~~~~~~
 
-    :copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS.
+    Lexer for the Forth language.
+
+    :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
--- a/eric6/ThirdParty/Pygments/pygments/lexers/fortran.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/ThirdParty/Pygments/pygments/lexers/fortran.py	Sat May 02 13:51:07 2020 +0200
@@ -5,7 +5,7 @@
 
     Lexers for Fortran languages.
 
-    :copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
--- a/eric6/ThirdParty/Pygments/pygments/lexers/foxpro.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/ThirdParty/Pygments/pygments/lexers/foxpro.py	Sat May 02 13:51:07 2020 +0200
@@ -5,7 +5,7 @@
 
     Simple lexer for Microsoft Visual FoxPro source code.
 
-    :copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/eric6/ThirdParty/Pygments/pygments/lexers/freefem.py	Sat May 02 13:51:07 2020 +0200
@@ -0,0 +1,898 @@
+# -*- coding: utf-8 -*-
+"""
+    pygments.lexers.freefem
+    ~~~~~~~~~~~~~~~~~~~~~~~
+
+    Lexer for FreeFem++ language.
+
+    :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
+    :license: BSD, see LICENSE for details.
+"""
+
+from pygments.lexer import RegexLexer, include, bygroups, inherit, words, \
+    default
+from pygments.token import Text, Comment, Operator, Keyword, Name, String, \
+    Number, Punctuation
+
+from pygments.lexers.c_cpp import CLexer, CppLexer
+from pygments.lexers import _mql_builtins
+
+__all__ = ['FreeFemLexer']
+
+
+class FreeFemLexer(CppLexer):
+    """
+    For `FreeFem++ <https://freefem.org/>`_ source.
+
+    This is an extension of the CppLexer, as the FreeFem Language is a superset
+    of C++.
+
+    .. versionadded:: 2.4
+    """
+
+    name = 'Freefem'
+    aliases = ['freefem']
+    filenames = ['*.edp']
+    mimetypes = ['text/x-freefem']
+
+    # Language operators
+    operators = {'+', '-', '*', '.*', '/', './', '%', '^', '^-1', ':', '\''}
+
+    # types
+    types = {'bool', 'border', 'complex', 'dmatrix', 'fespace', 'func', 'gslspline',
+             'ifstream', 'int', 'macro', 'matrix', 'mesh', 'mesh3', 'mpiComm',
+             'mpiGroup', 'mpiRequest', 'NewMacro', 'EndMacro', 'ofstream', 'Pmmap',
+             'problem', 'Psemaphore', 'real', 'solve', 'string', 'varf'}
+
+    # finite element spaces
+    fespaces = {'BDM1', 'BDM1Ortho', 'Edge03d', 'Edge13d', 'Edge23d', 'FEQF', 'HCT',
+                'P0', 'P03d', 'P0Edge', 'P1', 'P13d', 'P1b', 'P1b3d', 'P1bl', 'P1bl3d',
+                'P1dc', 'P1Edge', 'P1nc', 'P2', 'P23d', 'P2b', 'P2BR', 'P2dc', 'P2Edge',
+                'P2h', 'P2Morley', 'P2pnc', 'P3', 'P3dc', 'P3Edge', 'P4', 'P4dc',
+                'P4Edge', 'P5Edge', 'RT0', 'RT03d', 'RT0Ortho', 'RT1', 'RT1Ortho',
+                'RT2', 'RT2Ortho'}
+
+    # preprocessor
+    preprocessor = {'ENDIFMACRO', 'include', 'IFMACRO', 'load'}
+
+    # Language keywords
+    keywords = {
+                'adj',
+                'append',
+                'area',
+                'ARGV',
+                'be',
+                'binary',
+                'BoundaryEdge',
+                'bordermeasure',
+                'CG',
+                'Cholesky',
+                'cin',
+                'cout',
+                'Crout',
+                'default',
+                'diag',
+                'edgeOrientation',
+                'endl',
+                'false',
+                'ffind',
+                'FILE',
+                'find',
+                'fixed',
+                'flush',
+                'GMRES',
+                'good',
+                'hTriangle',
+                'im',
+                'imax',
+                'imin',
+                'InternalEdge',
+                'l1',
+                'l2',
+                'label',
+                'lenEdge',
+                'length',
+                'LINE',
+                'linfty',
+                'LU',
+                'm',
+                'max',
+                'measure',
+                'min',
+                'mpiAnySource',
+                'mpiBAND',
+                'mpiBXOR',
+                'mpiCommWorld',
+                'mpiLAND',
+                'mpiLOR',
+                'mpiLXOR',
+                'mpiMAX',
+                'mpiMIN',
+                'mpiPROD',
+                'mpirank',
+                'mpisize',
+                'mpiSUM',
+                'mpiUndefined',
+                'n',
+                'N',
+                'nbe',
+                'ndof',
+                'ndofK',
+                'noshowbase',
+                'noshowpos',
+                'notaregion',
+                'nt',
+                'nTonEdge',
+                'nuEdge',
+                'nuTriangle',
+                'nv',
+                'P',
+                'pi',
+                'precision',
+                'qf1pE',
+                'qf1pElump',
+                'qf1pT',
+                'qf1pTlump',
+                'qfV1',
+                'qfV1lump',
+                'qf2pE',
+                'qf2pT',
+                'qf2pT4P1',
+                'qfV2',
+                'qf3pE',
+                'qf4pE',
+                'qf5pE',
+                'qf5pT',
+                'qfV5',
+                'qf7pT',
+                'qf9pT',
+                'qfnbpE',
+                'quantile',
+                're',
+                'region',
+                'rfind',
+                'scientific',
+                'searchMethod',
+                'setw',
+                'showbase',
+                'showpos',
+                'sparsesolver',
+                'sum',
+                'tellp',
+                'true',
+                'UMFPACK',
+                'unused',
+                'whoinElement',
+                'verbosity',
+                'version',
+                'volume',
+                'x',
+                'y',
+                'z'
+    }
+
+    # Language shipped functions and class ( )
+    functions = {
+                'abs',
+                'acos',
+                'acosh',
+                'adaptmesh',
+                'adj',
+                'AffineCG',
+                'AffineGMRES',
+                'arg',
+                'asin',
+                'asinh',
+                'assert',
+                'atan',
+                'atan2',
+                'atanh',
+                'atof',
+                'atoi',
+                'BFGS',
+                'broadcast',
+                'buildlayers',
+                'buildmesh',
+                'ceil',
+                'chi',
+                'complexEigenValue',
+                'copysign',
+                'change',
+                'checkmovemesh',
+                'clock',
+                'cmaes',
+                'conj',
+                'convect',
+                'cos',
+                'cosh',
+                'cube',
+                'd',
+                'dd',
+                'dfft',
+                'diffnp',
+                'diffpos',
+                'dimKrylov',
+                'dist',
+                'dumptable',
+                'dx',
+                'dxx',
+                'dxy',
+                'dxz',
+                'dy',
+                'dyx',
+                'dyy',
+                'dyz',
+                'dz',
+                'dzx',
+                'dzy',
+                'dzz',
+                'EigenValue',
+                'emptymesh',
+                'erf',
+                'erfc',
+                'exec',
+                'exit',
+                'exp',
+                'fdim',
+                'floor',
+                'fmax',
+                'fmin',
+                'fmod',
+                'freeyams',
+                'getARGV',
+                'getline',
+                'gmshload',
+                'gmshload3',
+                'gslcdfugaussianP',
+                'gslcdfugaussianQ',
+                'gslcdfugaussianPinv',
+                'gslcdfugaussianQinv',
+                'gslcdfgaussianP',
+                'gslcdfgaussianQ',
+                'gslcdfgaussianPinv',
+                'gslcdfgaussianQinv',
+                'gslcdfgammaP',
+                'gslcdfgammaQ',
+                'gslcdfgammaPinv',
+                'gslcdfgammaQinv',
+                'gslcdfcauchyP',
+                'gslcdfcauchyQ',
+                'gslcdfcauchyPinv',
+                'gslcdfcauchyQinv',
+                'gslcdflaplaceP',
+                'gslcdflaplaceQ',
+                'gslcdflaplacePinv',
+                'gslcdflaplaceQinv',
+                'gslcdfrayleighP',
+                'gslcdfrayleighQ',
+                'gslcdfrayleighPinv',
+                'gslcdfrayleighQinv',
+                'gslcdfchisqP',
+                'gslcdfchisqQ',
+                'gslcdfchisqPinv',
+                'gslcdfchisqQinv',
+                'gslcdfexponentialP',
+                'gslcdfexponentialQ',
+                'gslcdfexponentialPinv',
+                'gslcdfexponentialQinv',
+                'gslcdfexppowP',
+                'gslcdfexppowQ',
+                'gslcdftdistP',
+                'gslcdftdistQ',
+                'gslcdftdistPinv',
+                'gslcdftdistQinv',
+                'gslcdffdistP',
+                'gslcdffdistQ',
+                'gslcdffdistPinv',
+                'gslcdffdistQinv',
+                'gslcdfbetaP',
+                'gslcdfbetaQ',
+                'gslcdfbetaPinv',
+                'gslcdfbetaQinv',
+                'gslcdfflatP',
+                'gslcdfflatQ',
+                'gslcdfflatPinv',
+                'gslcdfflatQinv',
+                'gslcdflognormalP',
+                'gslcdflognormalQ',
+                'gslcdflognormalPinv',
+                'gslcdflognormalQinv',
+                'gslcdfgumbel1P',
+                'gslcdfgumbel1Q',
+                'gslcdfgumbel1Pinv',
+                'gslcdfgumbel1Qinv',
+                'gslcdfgumbel2P',
+                'gslcdfgumbel2Q',
+                'gslcdfgumbel2Pinv',
+                'gslcdfgumbel2Qinv',
+                'gslcdfweibullP',
+                'gslcdfweibullQ',
+                'gslcdfweibullPinv',
+                'gslcdfweibullQinv',
+                'gslcdfparetoP',
+                'gslcdfparetoQ',
+                'gslcdfparetoPinv',
+                'gslcdfparetoQinv',
+                'gslcdflogisticP',
+                'gslcdflogisticQ',
+                'gslcdflogisticPinv',
+                'gslcdflogisticQinv',
+                'gslcdfbinomialP',
+                'gslcdfbinomialQ',
+                'gslcdfpoissonP',
+                'gslcdfpoissonQ',
+                'gslcdfgeometricP',
+                'gslcdfgeometricQ',
+                'gslcdfnegativebinomialP',
+                'gslcdfnegativebinomialQ',
+                'gslcdfpascalP',
+                'gslcdfpascalQ',
+                'gslinterpakima',
+                'gslinterpakimaperiodic',
+                'gslinterpcsplineperiodic',
+                'gslinterpcspline',
+                'gslinterpsteffen',
+                'gslinterplinear',
+                'gslinterppolynomial',
+                'gslranbernoullipdf',
+                'gslranbeta',
+                'gslranbetapdf',
+                'gslranbinomialpdf',
+                'gslranexponential',
+                'gslranexponentialpdf',
+                'gslranexppow',
+                'gslranexppowpdf',
+                'gslrancauchy',
+                'gslrancauchypdf',
+                'gslranchisq',
+                'gslranchisqpdf',
+                'gslranerlang',
+                'gslranerlangpdf',
+                'gslranfdist',
+                'gslranfdistpdf',
+                'gslranflat',
+                'gslranflatpdf',
+                'gslrangamma',
+                'gslrangammaint',
+                'gslrangammapdf',
+                'gslrangammamt',
+                'gslrangammaknuth',
+                'gslrangaussian',
+                'gslrangaussianratiomethod',
+                'gslrangaussianziggurat',
+                'gslrangaussianpdf',
+                'gslranugaussian',
+                'gslranugaussianratiomethod',
+                'gslranugaussianpdf',
+                'gslrangaussiantail',
+                'gslrangaussiantailpdf',
+                'gslranugaussiantail',
+                'gslranugaussiantailpdf',
+                'gslranlandau',
+                'gslranlandaupdf',
+                'gslrangeometricpdf',
+                'gslrangumbel1',
+                'gslrangumbel1pdf',
+                'gslrangumbel2',
+                'gslrangumbel2pdf',
+                'gslranlogistic',
+                'gslranlogisticpdf',
+                'gslranlognormal',
+                'gslranlognormalpdf',
+                'gslranlogarithmicpdf',
+                'gslrannegativebinomialpdf',
+                'gslranpascalpdf',
+                'gslranpareto',
+                'gslranparetopdf',
+                'gslranpoissonpdf',
+                'gslranrayleigh',
+                'gslranrayleighpdf',
+                'gslranrayleightail',
+                'gslranrayleightailpdf',
+                'gslrantdist',
+                'gslrantdistpdf',
+                'gslranlaplace',
+                'gslranlaplacepdf',
+                'gslranlevy',
+                'gslranweibull',
+                'gslranweibullpdf',
+                'gslsfairyAi',
+                'gslsfairyBi',
+                'gslsfairyAiscaled',
+                'gslsfairyBiscaled',
+                'gslsfairyAideriv',
+                'gslsfairyBideriv',
+                'gslsfairyAiderivscaled',
+                'gslsfairyBiderivscaled',
+                'gslsfairyzeroAi',
+                'gslsfairyzeroBi',
+                'gslsfairyzeroAideriv',
+                'gslsfairyzeroBideriv',
+                'gslsfbesselJ0',
+                'gslsfbesselJ1',
+                'gslsfbesselJn',
+                'gslsfbesselY0',
+                'gslsfbesselY1',
+                'gslsfbesselYn',
+                'gslsfbesselI0',
+                'gslsfbesselI1',
+                'gslsfbesselIn',
+                'gslsfbesselI0scaled',
+                'gslsfbesselI1scaled',
+                'gslsfbesselInscaled',
+                'gslsfbesselK0',
+                'gslsfbesselK1',
+                'gslsfbesselKn',
+                'gslsfbesselK0scaled',
+                'gslsfbesselK1scaled',
+                'gslsfbesselKnscaled',
+                'gslsfbesselj0',
+                'gslsfbesselj1',
+                'gslsfbesselj2',
+                'gslsfbesseljl',
+                'gslsfbessely0',
+                'gslsfbessely1',
+                'gslsfbessely2',
+                'gslsfbesselyl',
+                'gslsfbesseli0scaled',
+                'gslsfbesseli1scaled',
+                'gslsfbesseli2scaled',
+                'gslsfbesselilscaled',
+                'gslsfbesselk0scaled',
+                'gslsfbesselk1scaled',
+                'gslsfbesselk2scaled',
+                'gslsfbesselklscaled',
+                'gslsfbesselJnu',
+                'gslsfbesselYnu',
+                'gslsfbesselInuscaled',
+                'gslsfbesselInu',
+                'gslsfbesselKnuscaled',
+                'gslsfbesselKnu',
+                'gslsfbessellnKnu',
+                'gslsfbesselzeroJ0',
+                'gslsfbesselzeroJ1',
+                'gslsfbesselzeroJnu',
+                'gslsfclausen',
+                'gslsfhydrogenicR1',
+                'gslsfdawson',
+                'gslsfdebye1',
+                'gslsfdebye2',
+                'gslsfdebye3',
+                'gslsfdebye4',
+                'gslsfdebye5',
+                'gslsfdebye6',
+                'gslsfdilog',
+                'gslsfmultiply',
+                'gslsfellintKcomp',
+                'gslsfellintEcomp',
+                'gslsfellintPcomp',
+                'gslsfellintDcomp',
+                'gslsfellintF',
+                'gslsfellintE',
+                'gslsfellintRC',
+                'gslsferfc',
+                'gslsflogerfc',
+                'gslsferf',
+                'gslsferfZ',
+                'gslsferfQ',
+                'gslsfhazard',
+                'gslsfexp',
+                'gslsfexpmult',
+                'gslsfexpm1',
+                'gslsfexprel',
+                'gslsfexprel2',
+                'gslsfexpreln',
+                'gslsfexpintE1',
+                'gslsfexpintE2',
+                'gslsfexpintEn',
+                'gslsfexpintE1scaled',
+                'gslsfexpintE2scaled',
+                'gslsfexpintEnscaled',
+                'gslsfexpintEi',
+                'gslsfexpintEiscaled',
+                'gslsfShi',
+                'gslsfChi',
+                'gslsfexpint3',
+                'gslsfSi',
+                'gslsfCi',
+                'gslsfatanint',
+                'gslsffermidiracm1',
+                'gslsffermidirac0',
+                'gslsffermidirac1',
+                'gslsffermidirac2',
+                'gslsffermidiracint',
+                'gslsffermidiracmhalf',
+                'gslsffermidirachalf',
+                'gslsffermidirac3half',
+                'gslsffermidiracinc0',
+                'gslsflngamma',
+                'gslsfgamma',
+                'gslsfgammastar',
+                'gslsfgammainv',
+                'gslsftaylorcoeff',
+                'gslsffact',
+                'gslsfdoublefact',
+                'gslsflnfact',
+                'gslsflndoublefact',
+                'gslsflnchoose',
+                'gslsfchoose',
+                'gslsflnpoch',
+                'gslsfpoch',
+                'gslsfpochrel',
+                'gslsfgammaincQ',
+                'gslsfgammaincP',
+                'gslsfgammainc',
+                'gslsflnbeta',
+                'gslsfbeta',
+                'gslsfbetainc',
+                'gslsfgegenpoly1',
+                'gslsfgegenpoly2',
+                'gslsfgegenpoly3',
+                'gslsfgegenpolyn',
+                'gslsfhyperg0F1',
+                'gslsfhyperg1F1int',
+                'gslsfhyperg1F1',
+                'gslsfhypergUint',
+                'gslsfhypergU',
+                'gslsfhyperg2F0',
+                'gslsflaguerre1',
+                'gslsflaguerre2',
+                'gslsflaguerre3',
+                'gslsflaguerren',
+                'gslsflambertW0',
+                'gslsflambertWm1',
+                'gslsflegendrePl',
+                'gslsflegendreP1',
+                'gslsflegendreP2',
+                'gslsflegendreP3',
+                'gslsflegendreQ0',
+                'gslsflegendreQ1',
+                'gslsflegendreQl',
+                'gslsflegendrePlm',
+                'gslsflegendresphPlm',
+                'gslsflegendrearraysize',
+                'gslsfconicalPhalf',
+                'gslsfconicalPmhalf',
+                'gslsfconicalP0',
+                'gslsfconicalP1',
+                'gslsfconicalPsphreg',
+                'gslsfconicalPcylreg',
+                'gslsflegendreH3d0',
+                'gslsflegendreH3d1',
+                'gslsflegendreH3d',
+                'gslsflog',
+                'gslsflogabs',
+                'gslsflog1plusx',
+                'gslsflog1plusxmx',
+                'gslsfpowint',
+                'gslsfpsiint',
+                'gslsfpsi',
+                'gslsfpsi1piy',
+                'gslsfpsi1int',
+                'gslsfpsi1',
+                'gslsfpsin',
+                'gslsfsynchrotron1',
+                'gslsfsynchrotron2',
+                'gslsftransport2',
+                'gslsftransport3',
+                'gslsftransport4',
+                'gslsftransport5',
+                'gslsfsin',
+                'gslsfcos',
+                'gslsfhypot',
+                'gslsfsinc',
+                'gslsflnsinh',
+                'gslsflncosh',
+                'gslsfanglerestrictsymm',
+                'gslsfanglerestrictpos',
+                'gslsfzetaint',
+                'gslsfzeta',
+                'gslsfzetam1',
+                'gslsfzetam1int',
+                'gslsfhzeta',
+                'gslsfetaint',
+                'gslsfeta',
+                'imag',
+                'int1d',
+                'int2d',
+                'int3d',
+                'intalledges',
+                'intallfaces',
+                'interpolate',
+                'invdiff',
+                'invdiffnp',
+                'invdiffpos',
+                'Isend',
+                'isInf',
+                'isNaN',
+                'isoline',
+                'Irecv',
+                'j0',
+                'j1',
+                'jn',
+                'jump',
+                'lgamma',
+                'LinearCG',
+                'LinearGMRES',
+                'log',
+                'log10',
+                'lrint',
+                'lround',
+                'max',
+                'mean',
+                'medit',
+                'min',
+                'mmg3d',
+                'movemesh',
+                'movemesh23',
+                'mpiAlltoall',
+                'mpiAlltoallv',
+                'mpiAllgather',
+                'mpiAllgatherv',
+                'mpiAllReduce',
+                'mpiBarrier',
+                'mpiGather',
+                'mpiGatherv',
+                'mpiRank',
+                'mpiReduce',
+                'mpiScatter',
+                'mpiScatterv',
+                'mpiSize',
+                'mpiWait',
+                'mpiWaitAny',
+                'mpiWtick',
+                'mpiWtime',
+                'mshmet',
+                'NaN',
+                'NLCG',
+                'on',
+                'plot',
+                'polar',
+                'Post',
+                'pow',
+                'processor',
+                'processorblock',
+                'projection',
+                'randinit',
+                'randint31',
+                'randint32',
+                'random',
+                'randreal1',
+                'randreal2',
+                'randreal3',
+                'randres53',
+                'Read',
+                'readmesh',
+                'readmesh3',
+                'Recv',
+                'rint',
+                'round',
+                'savemesh',
+                'savesol',
+                'savevtk',
+                'seekg',
+                'Sent',
+                'set',
+                'sign',
+                'signbit',
+                'sin',
+                'sinh',
+                'sort',
+                'splitComm',
+                'splitmesh',
+                'sqrt',
+                'square',
+                'srandom',
+                'srandomdev',
+                'Stringification',
+                'swap',
+                'system',
+                'tan',
+                'tanh',
+                'tellg',
+                'tetg',
+                'tetgconvexhull',
+                'tetgreconstruction',
+                'tetgtransfo',
+                'tgamma',
+                'triangulate',
+                'trunc',
+                'Wait',
+                'Write',
+                'y0',
+                'y1',
+                'yn'
+    }
+
+    # function parameters
+    parameters = {
+                'A',
+                'A1',
+                'abserror',
+                'absolute',
+                'aniso',
+                'aspectratio',
+                'B',
+                'B1',
+                'bb',
+                'beginend',
+                'bin',
+                'boundary',
+                'bw',
+                'close',
+                'cmm',
+                'coef',
+                'composante',
+                'cutoff',
+                'datafilename',
+                'dataname',
+                'dim',
+                'distmax',
+                'displacement',
+                'doptions',
+                'dparams',
+                'eps',
+                'err',
+                'errg',
+                'facemerge',
+                'facetcl',
+                'factorize',
+                'file',
+                'fill',
+                'fixedborder',
+                'flabel',
+                'flags',
+                'floatmesh',
+                'floatsol',
+                'fregion',
+                'gradation',
+                'grey',
+                'hmax',
+                'hmin',
+                'holelist',
+                'hsv',
+                'init',
+                'inquire',
+                'inside',
+                'IsMetric',
+                'iso',
+                'ivalue',
+                'keepbackvertices',
+                'label',
+                'labeldown',
+                'labelmid',
+                'labelup',
+                'levelset',
+                'loptions',
+                'lparams',
+                'maxit',
+                'maxsubdiv',
+                'meditff',
+                'mem',
+                'memory',
+                'metric',
+                'mode',
+                'nbarrow',
+                'nbiso',
+                'nbiter',
+                'nbjacoby',
+                'nboffacetcl',
+                'nbofholes',
+                'nbofregions',
+                'nbregul',
+                'nbsmooth',
+                'nbvx',
+                'ncv',
+                'nev',
+                'nomeshgeneration',
+                'normalization',
+                'omega',
+                'op',
+                'optimize',
+                'option',
+                'options',
+                'order',
+                'orientation',
+                'periodic',
+                'power',
+                'precon',
+                'prev',
+                'ps',
+                'ptmerge',
+                'qfe',
+                'qforder',
+                'qft',
+                'qfV',
+                'ratio',
+                'rawvector',
+                'reffacelow',
+                'reffacemid',
+                'reffaceup',
+                'refnum',
+                'reftet',
+                'reftri',
+                'region',
+                'regionlist',
+                'renumv',
+                'rescaling',
+                'ridgeangle',
+                'save',
+                'sigma',
+                'sizeofvolume',
+                'smoothing',
+                'solver',
+                'sparams',
+                'split',
+                'splitin2',
+                'splitpbedge',
+                'stop',
+                'strategy',
+                'swap',
+                'switch',
+                'sym',
+                't',
+                'tgv',
+                'thetamax',
+                'tol',
+                'tolpivot',
+                'tolpivotsym',
+                'transfo',
+                'U2Vc',
+                'value',
+                'varrow',
+                'vector',
+                'veps',
+                'viso',
+                'wait',
+                'width',
+                'withsurfacemesh',
+                'WindowIndex',
+                'which',
+                'zbound'
+    }
+
+    # deprecated
+    deprecated = {'fixeborder'}
+
+    # do not highlight
+    suppress_highlight = {
+                'alignof',
+                'asm',
+                'constexpr',
+                'decltype',
+                'div',
+                'double',
+                'grad',
+                'mutable',
+                'namespace',
+                'noexcept',
+                'restrict',
+                'static_assert',
+                'template',
+                'this',
+                'thread_local',
+                'typeid',
+                'typename',
+                'using'
+    }
+
+    def get_tokens_unprocessed(self, text):
+        for index, token, value in CppLexer.get_tokens_unprocessed(self, text):
+            if value in self.operators:
+                yield index, Operator, value
+            elif value in self.types:
+                yield index, Keyword.Type, value
+            elif value in self.fespaces:
+                yield index, Name.Class, value
+            elif value in self.preprocessor:
+                yield index, Comment.Preproc, value
+            elif value in self.keywords:
+                yield index, Keyword.Reserved, value
+            elif value in self.functions:
+                yield index, Name.Function, value
+            elif value in self.parameters:
+                yield index, Keyword.Pseudo, value
+            elif value in self.suppress_highlight:
+                yield index, Name, value
+            else:
+                yield index, token, value
--- a/eric6/ThirdParty/Pygments/pygments/lexers/functional.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/ThirdParty/Pygments/pygments/lexers/functional.py	Sat May 02 13:51:07 2020 +0200
@@ -5,7 +5,7 @@
 
     Just export lexer classes previously contained in this module.
 
-    :copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
--- a/eric6/ThirdParty/Pygments/pygments/lexers/go.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/ThirdParty/Pygments/pygments/lexers/go.py	Sat May 02 13:51:07 2020 +0200
@@ -5,7 +5,7 @@
 
     Lexers for the Google Go language.
 
-    :copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
--- a/eric6/ThirdParty/Pygments/pygments/lexers/grammar_notation.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/ThirdParty/Pygments/pygments/lexers/grammar_notation.py	Sat May 02 13:51:07 2020 +0200
@@ -5,7 +5,7 @@
 
     Lexers for grammer notations like BNF.
 
-    :copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -15,7 +15,7 @@
 from pygments.token import Comment, Keyword, Literal, Name, Number, \
     Operator, Punctuation, String, Text
 
-__all__ = ['BnfLexer', 'AbnfLexer', 'JsgfLexer']
+__all__ = ['BnfLexer', 'AbnfLexer', 'JsgfLexer', 'PegLexer']
 
 
 class BnfLexer(RegexLexer):
@@ -211,3 +211,60 @@
             (r'.', Comment.Multiline),
         ],
     }
+
+
+class PegLexer(RegexLexer):
+    """
+    This lexer is for `Parsing Expression Grammars
+    <https://bford.info/pub/lang/peg.pdf>`_ (PEG).
+
+    Various implementations of PEG have made different decisions
+    regarding the syntax, so let's try to be accommodating:
+
+    * `<-`, `←`, `:`, and `=` are all accepted as rule operators.
+
+    * Both `|` and `/` are choice operators.
+
+    * `^`, `↑`, and `~` are cut operators.
+
+    * A single `a-z` character immediately before a string, or
+      multiple `a-z` characters following a string, are part of the
+      string (e.g., `r"..."` or `"..."ilmsuxa`).
+
+    .. versionadded:: 2.6
+    """
+
+    name = 'PEG'
+    aliases = ['peg']
+    filenames = ['*.peg']
+    mimetypes = ['text/x-peg']
+
+    tokens = {
+        'root': [
+            # Comments
+            (r'#.*', Comment.Single),
+
+            # All operators
+            (r'<-|[←:=/|&!?*+^↑~]', Operator),
+
+            # Other punctuation
+            (r'[()]', Punctuation),
+
+            # Keywords
+            (r'\.', Keyword),
+
+            # Character classes
+            (r'(\[)([^\]]*(?:\\.[^\]\\]*)*)(\])',
+             bygroups(Punctuation, String, Punctuation)),
+
+            # Single and double quoted strings (with optional modifiers)
+            (r'[a-z]?"[^"\\]*(?:\\.[^"\\]*)*"[a-z]*', String.Double),
+            (r"[a-z]?'[^'\\]*(?:\\.[^'\\]*)*'[a-z]*", String.Single),
+
+            # Nonterminals are not whitespace, operators, or punctuation
+            (r'[^\s<←:=/|&!?*+\^↑~()\[\]"\'#]+', Name.Class),
+
+            # Fallback
+            (r'.', Text),
+        ],
+    }
--- a/eric6/ThirdParty/Pygments/pygments/lexers/graph.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/ThirdParty/Pygments/pygments/lexers/graph.py	Sat May 02 13:51:07 2020 +0200
@@ -5,7 +5,7 @@
 
     Lexers for graph query languages.
 
-    :copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -22,9 +22,9 @@
 class CypherLexer(RegexLexer):
     """
     For `Cypher Query Language
-    <http://docs.neo4j.org/chunked/milestone/cypher-query-lang.html>`_
+    <https://neo4j.com/docs/developer-manual/3.3/cypher/>`_
 
-    For the Cypher version in Neo4J 2.0
+    For the Cypher version in Neo4j 3.3
 
     .. versionadded:: 2.0
     """
@@ -49,14 +49,19 @@
         ],
         'keywords': [
             (r'(create|order|match|limit|set|skip|start|return|with|where|'
-             r'delete|foreach|not|by)\b', Keyword),
+             r'delete|foreach|not|by|true|false)\b', Keyword),
         ],
         'clauses': [
-            # TODO: many missing ones, see http://docs.neo4j.org/refcard/2.0/
-            (r'(all|any|as|asc|create|create\s+unique|delete|'
-             r'desc|distinct|foreach|in|is\s+null|limit|match|none|'
-             r'order\s+by|return|set|skip|single|start|union|where|with)\b',
-             Keyword),
+            # based on https://neo4j.com/docs/cypher-refcard/3.3/
+            (r'(all|any|as|asc|ascending|assert|call|case|create|'
+             r'create\s+index|create\s+unique|delete|desc|descending|'
+             r'distinct|drop\s+constraint\s+on|drop\s+index\s+on|end|'
+             r'ends\s+with|fieldterminator|foreach|in|is\s+node\s+key|'
+             r'is\s+null|is\s+unique|limit|load\s+csv\s+from|match|merge|none|'
+             r'not|null|on\s+match|on\s+create|optional\s+match|order\s+by|'
+             r'remove|return|set|skip|single|start|starts\s+with|then|union|'
+             r'union\s+all|unwind|using\s+periodic\s+commit|yield|where|when|'
+             r'with)\b', Keyword),
         ],
         'relations': [
             (r'(-\[)(.*?)(\]->)', bygroups(Operator, using(this), Operator)),
--- a/eric6/ThirdParty/Pygments/pygments/lexers/graphics.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/ThirdParty/Pygments/pygments/lexers/graphics.py	Sat May 02 13:51:07 2020 +0200
@@ -5,7 +5,7 @@
 
     Lexers for computer graphics and plotting related languages.
 
-    :copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
--- a/eric6/ThirdParty/Pygments/pygments/lexers/haskell.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/ThirdParty/Pygments/pygments/lexers/haskell.py	Sat May 02 13:51:07 2020 +0200
@@ -5,19 +5,19 @@
 
     Lexers for Haskell and related languages.
 
-    :copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
 import re
 
 from pygments.lexer import Lexer, RegexLexer, bygroups, do_insertions, \
-    default, include
+    default, include, inherit
 from pygments.token import Text, Comment, Operator, Keyword, Name, String, \
     Number, Punctuation, Generic
 from pygments import unistring as uni
 
-__all__ = ['HaskellLexer', 'IdrisLexer', 'AgdaLexer', 'CryptolLexer',
+__all__ = ['HaskellLexer', 'HspecLexer', 'IdrisLexer', 'AgdaLexer', 'CryptolLexer',
            'LiterateHaskellLexer', 'LiterateIdrisLexer', 'LiterateAgdaLexer',
            'LiterateCryptolLexer', 'KokaLexer']
 
@@ -66,6 +66,7 @@
             (r"(')[" + uni.Lu + r"][\w\']*", Keyword.Type),
             (r"(')\[[^\]]*\]", Keyword.Type),  # tuples and lists get special treatment in GHC
             (r"(')\([^)]*\)", Keyword.Type),  # ..
+            (r"(')[:!#$%&*+.\\/<=>?@^|~-]+", Keyword.Type),  # promoted type operators
             #  Operators
             (r'\\(?![:!#$%&*+.\\/<=>?@^|~-]+)', Name.Function),  # lambda operator
             (r'(<-|::|->|=>|=)(?![:!#$%&*+.\\/<=>?@^|~-]+)', Operator.Word),  # specials
@@ -73,7 +74,8 @@
             (r'[:!#$%&*+.\\/<=>?@^|~-]+', Operator),  # Other operators
             #  Numbers
             (r'0[xX]_*[\da-fA-F](_*[\da-fA-F])*_*[pP][+-]?\d(_*\d)*', Number.Float),
-            (r'0[xX]_*[\da-fA-F](_*[\da-fA-F])*\.[\da-fA-F](_*[\da-fA-F])*(_*[pP][+-]?\d(_*\d)*)?', Number.Float),
+            (r'0[xX]_*[\da-fA-F](_*[\da-fA-F])*\.[\da-fA-F](_*[\da-fA-F])*'
+             r'(_*[pP][+-]?\d(_*\d)*)?', Number.Float),
             (r'\d(_*\d)*_*[eE][+-]?\d(_*\d)*', Number.Float),
             (r'\d(_*\d)*\.\d(_*\d)*(_*[eE][+-]?\d(_*\d)*)?', Number.Float),
             (r'0[bB]_*[01](_*[01])*', Number.Bin),
@@ -157,6 +159,28 @@
     }
 
 
+class HspecLexer(HaskellLexer):
+    """
+    A Haskell lexer with support for Hspec constructs.
+
+    .. versionadded:: 2.4.0
+    """
+
+    name = 'Hspec'
+    aliases = ['hspec']
+    filenames = []
+    mimetypes = []
+
+    tokens = {
+        'root': [
+            (r'(it\s*)("[^"]*")', bygroups(Text, String.Doc)),
+            (r'(describe\s*)("[^"]*")', bygroups(Text, String.Doc)),
+            (r'(context\s*)("[^"]*")', bygroups(Text, String.Doc)),
+            inherit,
+        ],
+    }
+
+
 class IdrisLexer(RegexLexer):
     """
     A lexer for the dependently typed programming language Idris.
@@ -174,6 +198,7 @@
                 'if', 'in', 'infix[lr]?', 'instance', 'rewrite', 'auto',
                 'namespace', 'codata', 'mutual', 'private', 'public', 'abstract',
                 'total', 'partial',
+                'interface', 'implementation', 'export', 'covering', 'constructor',
                 'let', 'proof', 'of', 'then', 'static', 'where', '_', 'with',
                 'pattern',  'term',  'syntax', 'prefix',
                 'postulate', 'parameters', 'record', 'dsl', 'impossible', 'implicit',
@@ -190,7 +215,7 @@
     tokens = {
         'root': [
             # Comments
-            (r'^(\s*)(%%%s)' % '|'.join(directives),
+            (r'^(\s*)(%%(%s))' % '|'.join(directives),
              bygroups(Text, Keyword.Reserved)),
             (r'(\s*)(--(?![!#$%&*+./<=>?@^|_~:\\]).*?)$', bygroups(Text, Comment.Single)),
             (r'(\s*)(\|{3}.*?)$', bygroups(Text, Comment.Single)),
@@ -302,10 +327,10 @@
             #  Identifiers
             (r'\b(%s)(?!\')\b' % '|'.join(reserved), Keyword.Reserved),
             (r'(import|module)(\s+)', bygroups(Keyword.Reserved, Text), 'module'),
-            (r'\b(Set|Prop)\b', Keyword.Type),
+            (u'\\b(Set|Prop)[\u2080-\u2089]*\\b', Keyword.Type),
             #  Special Symbols
             (r'(\(|\)|\{|\})', Operator),
-            (u'(\\.{1,3}|\\||\u039B|\u2200|\u2192|:|=|->)', Operator.Word),
+            (u'(\\.{1,3}|\\||\u03BB|\u2200|\u2192|:|=|->)', Operator.Word),
             #  Numbers
             (r'\d+[eE][+-]?\d+', Number.Float),
             (r'\d+\.\d+([eE][+-]?\d+)?', Number.Float),
@@ -421,8 +446,8 @@
             (r'[A-Z]\w*', Keyword.Type),
             (r'(_[\w\']+|[a-z][\w\']*)', Name.Function),
             # TODO: these don't match the comments in docs, remove.
-            #(r'--(?![!#$%&*+./<=>?@^|_~:\\]).*?$', Comment.Single),
-            #(r'{-', Comment.Multiline, 'comment'),
+            # (r'--(?![!#$%&*+./<=>?@^|_~:\\]).*?$', Comment.Single),
+            # (r'{-', Comment.Multiline, 'comment'),
             (r',', Punctuation),
             (r'[:!#$%&*+.\\/<=>?@^|~-]+', Operator),
             # (HACK, but it makes sense to push two instances, believe me)
@@ -458,10 +483,10 @@
         ],
     }
 
-    EXTRA_KEYWORDS = set(('join', 'split', 'reverse', 'transpose', 'width',
-                          'length', 'tail', '<<', '>>', '<<<', '>>>', 'const',
-                          'reg', 'par', 'seq', 'ASSERT', 'undefined', 'error',
-                          'trace'))
+    EXTRA_KEYWORDS = {'join', 'split', 'reverse', 'transpose', 'width',
+                      'length', 'tail', '<<', '>>', '<<<', '>>>', 'const',
+                      'reg', 'par', 'seq', 'ASSERT', 'undefined', 'error',
+                      'trace'}
 
     def get_tokens_unprocessed(self, text):
         stack = ['root']
--- a/eric6/ThirdParty/Pygments/pygments/lexers/haxe.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/ThirdParty/Pygments/pygments/lexers/haxe.py	Sat May 02 13:51:07 2020 +0200
@@ -5,7 +5,7 @@
 
     Lexers for Haxe and related stuff.
 
-    :copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -79,7 +79,7 @@
         if proc in ['error']:
             ctx.stack.append('preproc-error')
 
-        yield match.start(), Comment.Preproc, '#' + proc
+        yield match.start(), Comment.Preproc, u'#' + proc
         ctx.pos = match.end()
 
     tokens = {
--- a/eric6/ThirdParty/Pygments/pygments/lexers/hdl.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/ThirdParty/Pygments/pygments/lexers/hdl.py	Sat May 02 13:51:07 2020 +0200
@@ -5,7 +5,7 @@
 
     Lexers for hardware descriptor languages.
 
-    :copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -131,15 +131,6 @@
         ]
     }
 
-    def get_tokens_unprocessed(self, text):
-        for index, token, value in \
-                RegexLexer.get_tokens_unprocessed(self, text):
-            # Convention: mark all upper case names as constants
-            if token is Name:
-                if value.isupper():
-                    token = Name.Constant
-            yield index, token, value
-
 
 class SystemVerilogLexer(RegexLexer):
     """
@@ -184,63 +175,75 @@
             (r'`[a-zA-Z_]\w*', Name.Constant),
 
             (words((
-                'accept_on', 'alias', 'always', 'always_comb', 'always_ff', 'always_latch',
-                'and', 'assert', 'assign', 'assume', 'automatic', 'before', 'begin', 'bind', 'bins',
-                'binsof', 'bit', 'break', 'buf', 'bufif0', 'bufif1', 'byte', 'case', 'casex', 'casez',
-                'cell', 'chandle', 'checker', 'class', 'clocking', 'cmos', 'config', 'const', 'constraint',
-                'context', 'continue', 'cover', 'covergroup', 'coverpoint', 'cross', 'deassign',
-                'default', 'defparam', 'design', 'disable', 'dist', 'do', 'edge', 'else', 'end', 'endcase',
-                'endchecker', 'endclass', 'endclocking', 'endconfig', 'endfunction', 'endgenerate',
-                'endgroup', 'endinterface', 'endmodule', 'endpackage', 'endprimitive',
-                'endprogram', 'endproperty', 'endsequence', 'endspecify', 'endtable',
-                'endtask', 'enum', 'event', 'eventually', 'expect', 'export', 'extends', 'extern',
-                'final', 'first_match', 'for', 'force', 'foreach', 'forever', 'fork', 'forkjoin',
-                'function', 'generate', 'genvar', 'global', 'highz0', 'highz1', 'if', 'iff', 'ifnone',
-                'ignore_bins', 'illegal_bins', 'implies', 'import', 'incdir', 'include',
-                'initial', 'inout', 'input', 'inside', 'instance', 'int', 'integer', 'interface',
-                'intersect', 'join', 'join_any', 'join_none', 'large', 'let', 'liblist', 'library',
-                'local', 'localparam', 'logic', 'longint', 'macromodule', 'matches', 'medium',
-                'modport', 'module', 'nand', 'negedge', 'new', 'nexttime', 'nmos', 'nor', 'noshowcancelled',
-                'not', 'notif0', 'notif1', 'null', 'or', 'output', 'package', 'packed', 'parameter',
-                'pmos', 'posedge', 'primitive', 'priority', 'program', 'property', 'protected',
-                'pull0', 'pull1', 'pulldown', 'pullup', 'pulsestyle_ondetect', 'pulsestyle_onevent',
-                'pure', 'rand', 'randc', 'randcase', 'randsequence', 'rcmos', 'real', 'realtime',
-                'ref', 'reg', 'reject_on', 'release', 'repeat', 'restrict', 'return', 'rnmos',
-                'rpmos', 'rtran', 'rtranif0', 'rtranif1', 's_always', 's_eventually', 's_nexttime',
-                's_until', 's_until_with', 'scalared', 'sequence', 'shortint', 'shortreal',
-                'showcancelled', 'signed', 'small', 'solve', 'specify', 'specparam', 'static',
-                'string', 'strong', 'strong0', 'strong1', 'struct', 'super', 'supply0', 'supply1',
-                'sync_accept_on', 'sync_reject_on', 'table', 'tagged', 'task', 'this', 'throughout',
-                'time', 'timeprecision', 'timeunit', 'tran', 'tranif0', 'tranif1', 'tri', 'tri0',
-                'tri1', 'triand', 'trior', 'trireg', 'type', 'typedef', 'union', 'unique', 'unique0',
-                'unsigned', 'until', 'until_with', 'untyped', 'use', 'uwire', 'var', 'vectored',
-                'virtual', 'void', 'wait', 'wait_order', 'wand', 'weak', 'weak0', 'weak1', 'while',
-                'wildcard', 'wire', 'with', 'within', 'wor', 'xnor', 'xor'), suffix=r'\b'),
+                'accept_on', 'alias', 'always', 'always_comb', 'always_ff',
+                'always_latch', 'and', 'assert', 'assign', 'assume', 'automatic',
+                'before', 'begin', 'bind', 'bins', 'binsof', 'bit', 'break', 'buf',
+                'bufif0', 'bufif1', 'byte', 'case', 'casex', 'casez', 'cell',
+                'chandle', 'checker', 'class', 'clocking', 'cmos', 'config',
+                'const', 'constraint', 'context', 'continue', 'cover', 'covergroup',
+                'coverpoint', 'cross', 'deassign', 'default', 'defparam', 'design',
+                'disable', 'dist', 'do', 'edge', 'else', 'end', 'endcase',
+                'endchecker', 'endclass', 'endclocking', 'endconfig', 'endfunction',
+                'endgenerate', 'endgroup', 'endinterface', 'endmodule', 'endpackage',
+                'endprimitive', 'endprogram', 'endproperty', 'endsequence',
+                'endspecify', 'endtable', 'endtask', 'enum', 'event', 'eventually',
+                'expect', 'export', 'extends', 'extern', 'final', 'first_match',
+                'for', 'force', 'foreach', 'forever', 'fork', 'forkjoin', 'function',
+                'generate', 'genvar', 'global', 'highz0', 'highz1', 'if', 'iff',
+                'ifnone', 'ignore_bins', 'illegal_bins', 'implies', 'import',
+                'incdir', 'include', 'initial', 'inout', 'input', 'inside',
+                'instance', 'int', 'integer', 'interface', 'intersect', 'join',
+                'join_any', 'join_none', 'large', 'let', 'liblist', 'library',
+                'local', 'localparam', 'logic', 'longint', 'macromodule', 'matches',
+                'medium', 'modport', 'module', 'nand', 'negedge', 'new', 'nexttime',
+                'nmos', 'nor', 'noshowcancelled', 'not', 'notif0', 'notif1', 'null',
+                'or', 'output', 'package', 'packed', 'parameter', 'pmos', 'posedge',
+                'primitive', 'priority', 'program', 'property', 'protected', 'pull0',
+                'pull1', 'pulldown', 'pullup', 'pulsestyle_ondetect',
+                'pulsestyle_onevent', 'pure', 'rand', 'randc', 'randcase',
+                'randsequence', 'rcmos', 'real', 'realtime', 'ref', 'reg',
+                'reject_on', 'release', 'repeat', 'restrict', 'return', 'rnmos',
+                'rpmos', 'rtran', 'rtranif0', 'rtranif1', 's_always', 's_eventually',
+                's_nexttime', 's_until', 's_until_with', 'scalared', 'sequence',
+                'shortint', 'shortreal', 'showcancelled', 'signed', 'small', 'solve',
+                'specify', 'specparam', 'static', 'string', 'strong', 'strong0',
+                'strong1', 'struct', 'super', 'supply0', 'supply1', 'sync_accept_on',
+                'sync_reject_on', 'table', 'tagged', 'task', 'this', 'throughout',
+                'time', 'timeprecision', 'timeunit', 'tran', 'tranif0', 'tranif1',
+                'tri', 'tri0', 'tri1', 'triand', 'trior', 'trireg', 'type',
+                'typedef', 'union', 'unique', 'unique0', 'unsigned', 'until',
+                'until_with', 'untyped', 'use', 'uwire', 'var', 'vectored',
+                'virtual', 'void', 'wait', 'wait_order', 'wand', 'weak', 'weak0',
+                'weak1', 'while', 'wildcard', 'wire', 'with', 'within', 'wor',
+                'xnor', 'xor'), suffix=r'\b'),
              Keyword),
 
             (words((
-                '`__FILE__', '`__LINE__', '`begin_keywords', '`celldefine', '`default_nettype',
-                '`define', '`else', '`elsif', '`end_keywords', '`endcelldefine', '`endif',
-                '`ifdef', '`ifndef', '`include', '`line', '`nounconnected_drive', '`pragma',
-                '`resetall', '`timescale', '`unconnected_drive', '`undef', '`undefineall'),
+                '`__FILE__', '`__LINE__', '`begin_keywords', '`celldefine',
+                '`default_nettype', '`define', '`else', '`elsif', '`end_keywords',
+                '`endcelldefine', '`endif', '`ifdef', '`ifndef', '`include',
+                '`line', '`nounconnected_drive', '`pragma', '`resetall',
+                '`timescale', '`unconnected_drive', '`undef', '`undefineall'),
                 suffix=r'\b'),
              Comment.Preproc),
 
             (words((
-                '$display', '$displayb', '$displayh', '$displayo', '$dumpall', '$dumpfile',
-                '$dumpflush', '$dumplimit', '$dumpoff', '$dumpon', '$dumpports',
-                '$dumpportsall', '$dumpportsflush', '$dumpportslimit', '$dumpportsoff',
-                '$dumpportson', '$dumpvars', '$fclose', '$fdisplay', '$fdisplayb',
-                '$fdisplayh', '$fdisplayo', '$feof', '$ferror', '$fflush', '$fgetc',
-                '$fgets', '$finish', '$fmonitor', '$fmonitorb', '$fmonitorh', '$fmonitoro',
-                '$fopen', '$fread', '$fscanf', '$fseek', '$fstrobe', '$fstrobeb', '$fstrobeh',
+                '$display', '$displayb', '$displayh', '$displayo', '$dumpall',
+                '$dumpfile', '$dumpflush', '$dumplimit', '$dumpoff', '$dumpon',
+                '$dumpports', '$dumpportsall', '$dumpportsflush', '$dumpportslimit',
+                '$dumpportsoff', '$dumpportson', '$dumpvars', '$fclose',
+                '$fdisplay', '$fdisplayb', '$fdisplayh', '$fdisplayo', '$feof',
+                '$ferror', '$fflush', '$fgetc', '$fgets', '$finish', '$fmonitor',
+                '$fmonitorb', '$fmonitorh', '$fmonitoro', '$fopen', '$fread',
+                '$fscanf', '$fseek', '$fstrobe', '$fstrobeb', '$fstrobeh',
                 '$fstrobeo', '$ftell', '$fwrite', '$fwriteb', '$fwriteh', '$fwriteo',
                 '$monitor', '$monitorb', '$monitorh', '$monitoro', '$monitoroff',
-                '$monitoron', '$plusargs', '$random', '$readmemb', '$readmemh', '$rewind',
-                '$sformat', '$sformatf', '$sscanf', '$strobe', '$strobeb', '$strobeh', '$strobeo',
-                '$swrite', '$swriteb', '$swriteh', '$swriteo', '$test', '$ungetc',
-                '$value$plusargs', '$write', '$writeb', '$writeh', '$writememb',
-                '$writememh', '$writeo'), suffix=r'\b'),
+                '$monitoron', '$plusargs', '$random', '$readmemb', '$readmemh',
+                '$rewind', '$sformat', '$sformatf', '$sscanf', '$strobe',
+                '$strobeb', '$strobeh', '$strobeo', '$swrite', '$swriteb',
+                '$swriteh', '$swriteo', '$test', '$ungetc', '$value$plusargs',
+                '$write', '$writeb', '$writeh', '$writememb', '$writememh',
+                '$writeo'), suffix=r'\b'),
              Name.Builtin),
 
             (r'(class)(\s+)', bygroups(Keyword, Text), 'classname'),
@@ -276,15 +279,6 @@
         ]
     }
 
-    def get_tokens_unprocessed(self, text):
-        for index, token, value in \
-                RegexLexer.get_tokens_unprocessed(self, text):
-            # Convention: mark all upper case names as constants
-            if token is Name:
-                if value.isupper():
-                    token = Name.Constant
-            yield index, token, value
-
 
 class VhdlLexer(RegexLexer):
     """
--- a/eric6/ThirdParty/Pygments/pygments/lexers/hexdump.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/ThirdParty/Pygments/pygments/lexers/hexdump.py	Sat May 02 13:51:07 2020 +0200
@@ -5,7 +5,7 @@
 
     Lexers for hexadecimal dumps.
 
-    :copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
--- a/eric6/ThirdParty/Pygments/pygments/lexers/html.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/ThirdParty/Pygments/pygments/lexers/html.py	Sat May 02 13:51:07 2020 +0200
@@ -5,7 +5,7 @@
 
     Lexers for HTML, XML and related markup.
 
-    :copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -244,7 +244,7 @@
     filenames = ['*.xsl', '*.xslt', '*.xpl']  # xpl is XProc
     mimetypes = ['application/xsl+xml', 'application/xslt+xml']
 
-    EXTRA_KEYWORDS = set((
+    EXTRA_KEYWORDS = {
         'apply-imports', 'apply-templates', 'attribute',
         'attribute-set', 'call-template', 'choose', 'comment',
         'copy', 'copy-of', 'decimal-format', 'element', 'fallback',
@@ -253,7 +253,7 @@
         'preserve-space', 'processing-instruction', 'sort',
         'strip-space', 'stylesheet', 'template', 'text', 'transform',
         'value-of', 'variable', 'when', 'with-param'
-    ))
+    }
 
     def get_tokens_unprocessed(self, text):
         for index, token, value in XmlLexer.get_tokens_unprocessed(self, text):
--- a/eric6/ThirdParty/Pygments/pygments/lexers/idl.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/ThirdParty/Pygments/pygments/lexers/idl.py	Sat May 02 13:51:07 2020 +0200
@@ -5,7 +5,7 @@
 
     Lexers for IDL.
 
-    :copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
--- a/eric6/ThirdParty/Pygments/pygments/lexers/igor.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/ThirdParty/Pygments/pygments/lexers/igor.py	Sat May 02 13:51:07 2020 +0200
@@ -5,7 +5,7 @@
 
     Lexers for Igor Pro.
 
-    :copyright: Copyright 2006-2018 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
--- a/eric6/ThirdParty/Pygments/pygments/lexers/inferno.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/ThirdParty/Pygments/pygments/lexers/inferno.py	Sat May 02 13:51:07 2020 +0200
@@ -5,7 +5,7 @@
 
     Lexers for Inferno os and all the related stuff.
 
-    :copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
--- a/eric6/ThirdParty/Pygments/pygments/lexers/installers.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/ThirdParty/Pygments/pygments/lexers/installers.py	Sat May 02 13:51:07 2020 +0200
@@ -5,7 +5,7 @@
 
     Lexers for installer/packager DSLs and formats.
 
-    :copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
--- a/eric6/ThirdParty/Pygments/pygments/lexers/int_fiction.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/ThirdParty/Pygments/pygments/lexers/int_fiction.py	Sat May 02 13:51:07 2020 +0200
@@ -5,7 +5,7 @@
 
     Lexers for interactive fiction languages.
 
-    :copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
--- a/eric6/ThirdParty/Pygments/pygments/lexers/iolang.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/ThirdParty/Pygments/pygments/lexers/iolang.py	Sat May 02 13:51:07 2020 +0200
@@ -5,7 +5,7 @@
 
     Lexers for the Io language.
 
-    :copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
--- a/eric6/ThirdParty/Pygments/pygments/lexers/j.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/ThirdParty/Pygments/pygments/lexers/j.py	Sat May 02 13:51:07 2020 +0200
@@ -5,7 +5,7 @@
 
     Lexer for the J programming language.
 
-    :copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
--- a/eric6/ThirdParty/Pygments/pygments/lexers/javascript.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/ThirdParty/Pygments/pygments/lexers/javascript.py	Sat May 02 13:51:07 2020 +0200
@@ -5,7 +5,7 @@
 
     Lexers for JavaScript and related languages.
 
-    :copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -15,7 +15,7 @@
     this, words, combined
 from pygments.token import Text, Comment, Operator, Keyword, Name, String, \
     Number, Punctuation, Other
-from pygments.util import get_bool_opt, iteritems
+from pygments.util import get_bool_opt
 import pygments.unistring as uni
 
 __all__ = ['JavascriptLexer', 'KalLexer', 'LiveScriptLexer', 'DartLexer',
@@ -37,7 +37,7 @@
 
     name = 'JavaScript'
     aliases = ['js', 'javascript']
-    filenames = ['*.js', '*.jsm']
+    filenames = ['*.js', '*.jsm', '*.mjs']
     mimetypes = ['application/javascript', 'application/x-javascript',
                  'text/x-javascript', 'text/javascript']
 
@@ -259,11 +259,11 @@
             (r'//', String.Regex, ('#pop', 'multilineregex')),
             (r'/(?! )(\\.|[^[/\\\n]|\[(\\.|[^\]\\\n])*])+/'
              r'([gim]+\b|\B)', String.Regex, '#pop'),
+            (r'/', Operator, '#pop'),
             default('#pop'),
         ],
         'root': [
-            # this next expr leads to infinite loops root -> slashstartsregex
-            # (r'^(?=\s|/|<!--)', Text, 'slashstartsregex'),
+            (r'^(?=\s|/)', Text, 'slashstartsregex'),
             include('commentsandwhitespace'),
             (r'(?:\([^()]+\))?[ ]*[~-]{1,2}>|'
              r'(?:\(?[^()\n]+\)?)?[ ]*<[~-]{1,2}', Name.Function),
@@ -372,6 +372,7 @@
             (r'\b(bool|double|dynamic|int|num|Object|String|void)\b', Keyword.Type),
             (r'\b(false|null|true)\b', Keyword.Constant),
             (r'[~!%^&*+=|?:<>/-]|as\b', Operator),
+            (r'@[a-zA-Z_$]\w*', Name.Decorator),
             (r'[a-zA-Z_$]\w*:', Name.Label),
             (r'[a-zA-Z_$]\w*', Name),
             (r'[(){}\[\],.;]', Punctuation),
@@ -453,6 +454,10 @@
 
     flags = re.DOTALL | re.MULTILINE
 
+    # Higher priority than the TypoScriptLexer, as TypeScript is far more
+    # common these days
+    priority = 0.5
+
     tokens = {
         'commentsandwhitespace': [
             (r'\s+', Text),
@@ -478,7 +483,7 @@
             (r'[{(\[;,]', Punctuation, 'slashstartsregex'),
             (r'[})\].]', Punctuation),
             (r'(for|in|while|do|break|return|continue|switch|case|default|if|else|'
-             r'throw|try|catch|finally|new|delete|typeof|instanceof|void|'
+             r'throw|try|catch|finally|new|delete|typeof|instanceof|void|of|'
              r'this)\b', Keyword, 'slashstartsregex'),
             (r'(var|let|with|function)\b', Keyword.Declaration, 'slashstartsregex'),
             (r'(abstract|boolean|byte|char|class|const|debugger|double|enum|export|'
@@ -534,12 +539,6 @@
         ],
     }
 
-    def analyse_text(text):
-        if re.search(r'^(import.+(from\s+)?["\']|'
-                     r'(export\s*)?(interface|class|function)\s+)',
-                     text, re.MULTILINE):
-            return 1.0
-
 
 class LassoLexer(RegexLexer):
     """
@@ -768,9 +767,9 @@
         self._members = set()
         if self.builtinshighlighting:
             from pygments.lexers._lasso_builtins import BUILTINS, MEMBERS
-            for key, value in iteritems(BUILTINS):
+            for key, value in BUILTINS.items():
                 self._builtins.update(value)
-            for key, value in iteritems(MEMBERS):
+            for key, value in MEMBERS.items():
                 self._members.update(value)
         RegexLexer.__init__(self, **options)
 
@@ -1035,7 +1034,6 @@
     filenames = ['*.coffee']
     mimetypes = ['text/coffeescript']
 
-
     _operator_re = (
         r'\+\+|~|&&|\band\b|\bor\b|\bis\b|\bisnt\b|\bnot\b|\?|:|'
         r'\|\||\\(?=\n)|'
@@ -1062,7 +1060,7 @@
             # This isn't really guarding against mishighlighting well-formed
             # code, just the ability to infinite-loop between root and
             # slashstartsregex.
-            (r'/', Operator),
+            (r'/', Operator, '#pop'),
             default('#pop'),
         ],
         'root': [
@@ -1137,7 +1135,7 @@
 
 class MaskLexer(RegexLexer):
     """
-    For `Mask <http://github.com/atmajs/MaskJS>`__ markup.
+    For `Mask <https://github.com/atmajs/MaskJS>`__ markup.
 
     .. versionadded:: 2.0
     """
@@ -1459,17 +1457,20 @@
             (r'8r[0-7]+', Number.Oct),
             (r'2r[01]+', Number.Bin),
             (r'16r[a-fA-F0-9]+', Number.Hex),
-            (r'([3-79]|[12][0-9]|3[0-6])r[a-zA-Z\d]+(\.[a-zA-Z\d]+)?', Number.Radix),
+            (r'([3-79]|[12][0-9]|3[0-6])r[a-zA-Z\d]+(\.[a-zA-Z\d]+)?',
+             Number.Radix),
             (r'\d+', Number.Integer)
         ],
     }
 
+
 class JuttleLexer(RegexLexer):
     """
     For `Juttle`_ source code.
 
     .. _Juttle: https://github.com/juttle/juttle
 
+    .. versionadded:: 2.2
     """
 
     name = 'Juttle'
@@ -1504,19 +1505,24 @@
              r'(\d+(\.\d*)?|\.\d+)(ms|[smhdwMy])?):', String.Moment),
             (r':\d{4}-\d{2}-\d{2}(T\d{2}:\d{2}:\d{2}(\.\d*)?)?'
              r'(Z|[+-]\d{2}:\d{2}|[+-]\d{4})?:', String.Moment),
-            (r':((\d+(\.\d*)?|\.\d+)[ ]+)?(millisecond|second|minute|hour|day|week|month|year)[s]?'
-             r'(([ ]+and[ ]+(\d+[ ]+)?(millisecond|second|minute|hour|day|week|month|year)[s]?)'
+            (r':((\d+(\.\d*)?|\.\d+)[ ]+)?(millisecond|second|minute|hour|'
+             r'day|week|month|year)[s]?'
+             r'(([ ]+and[ ]+(\d+[ ]+)?(millisecond|second|minute|hour|'
+             r'day|week|month|year)[s]?)'
              r'|[ ]+(ago|from[ ]+now))*:', String.Moment),
             (r'\+\+|--|~|&&|\?|:|\|\||\\(?=\n)|'
              r'(==?|!=?|[-<>+*%&|^/])=?', Operator, 'slashstartsregex'),
             (r'[{(\[;,]', Punctuation, 'slashstartsregex'),
             (r'[})\].]', Punctuation),
             (r'(import|return|continue|if|else)\b', Keyword, 'slashstartsregex'),
-            (r'(var|const|function|reducer|sub|input)\b', Keyword.Declaration, 'slashstartsregex'),
+            (r'(var|const|function|reducer|sub|input)\b', Keyword.Declaration,
+             'slashstartsregex'),
             (r'(batch|emit|filter|head|join|keep|pace|pass|put|read|reduce|remove|'
-             r'sequence|skip|sort|split|tail|unbatch|uniq|view|write)\b', Keyword.Reserved),
+             r'sequence|skip|sort|split|tail|unbatch|uniq|view|write)\b',
+             Keyword.Reserved),
             (r'(true|false|null|Infinity)\b', Keyword.Constant),
-            (r'(Array|Date|Juttle|Math|Number|Object|RegExp|String)\b', Name.Builtin),
+            (r'(Array|Date|Juttle|Math|Number|Object|RegExp|String)\b',
+             Name.Builtin),
             (JS_IDENT, Name.Other),
             (r'[0-9][0-9]*\.[0-9]+([eE][0-9]+)?[fd]?', Number.Float),
             (r'[0-9]+', Number.Integer),
--- a/eric6/ThirdParty/Pygments/pygments/lexers/julia.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/ThirdParty/Pygments/pygments/lexers/julia.py	Sat May 02 13:51:07 2020 +0200
@@ -5,7 +5,7 @@
 
     Lexers for the Julia language.
 
-    :copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -48,6 +48,7 @@
 
             # keywords
             (r'in\b', Keyword.Pseudo),
+            (r'isa\b', Keyword.Pseudo),
             (r'(true|false)\b', Keyword.Constant),
             (r'(local|global|const)\b', Keyword.Declaration),
             (words([
@@ -55,7 +56,8 @@
                 'baremodule', 'begin', 'bitstype', 'break', 'catch', 'ccall',
                 'continue', 'do', 'else', 'elseif', 'end', 'export', 'finally',
                 'for', 'if', 'import', 'importall', 'let', 'macro', 'module',
-                'quote', 'return', 'try', 'using', 'while'],
+                'mutable', 'primitive', 'quote', 'return', 'struct', 'try',
+                'using', 'while'],
                 suffix=r'\b'), Keyword),
 
             # NOTE
--- a/eric6/ThirdParty/Pygments/pygments/lexers/jvm.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/ThirdParty/Pygments/pygments/lexers/jvm.py	Sat May 02 13:51:07 2020 +0200
@@ -5,7 +5,7 @@
 
     Pygments lexers for JVM languages.
 
-    :copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -21,12 +21,12 @@
 __all__ = ['JavaLexer', 'ScalaLexer', 'GosuLexer', 'GosuTemplateLexer',
            'GroovyLexer', 'IokeLexer', 'ClojureLexer', 'ClojureScriptLexer',
            'KotlinLexer', 'XtendLexer', 'AspectJLexer', 'CeylonLexer',
-           'PigLexer', 'GoloLexer', 'JasminLexer']
+           'PigLexer', 'GoloLexer', 'JasminLexer', 'SarlLexer']
 
 
 class JavaLexer(RegexLexer):
     """
-    For `Java <http://www.sun.com/java/>`_ source code.
+    For `Java <https://www.oracle.com/technetwork/java/>`_ source code.
     """
 
     name = 'Java'
@@ -50,7 +50,7 @@
             (r'((?:(?:[^\W\d]|\$)[\w.\[\]$<>]*\s+)+?)'  # return arguments
              r'((?:[^\W\d]|\$)[\w$]*)'                  # method name
              r'(\s*)(\()',                              # signature start
-             bygroups(using(this), Name.Function, Text, Operator)),
+             bygroups(using(this), Name.Function, Text, Punctuation)),
             (r'@[^\W\d][\w.]*', Name.Decorator),
             (r'(abstract|const|enum|extends|final|implements|native|private|'
              r'protected|public|static|strictfp|super|synchronized|throws|'
@@ -61,11 +61,14 @@
             (r'(true|false|null)\b', Keyword.Constant),
             (r'(class|interface)(\s+)', bygroups(Keyword.Declaration, Text),
              'class'),
+            (r'(var)(\s+)', bygroups(Keyword.Declaration, Text),
+             'var'),
             (r'(import(?:\s+static)?)(\s+)', bygroups(Keyword.Namespace, Text),
              'import'),
             (r'"(\\\\|\\"|[^"])*"', String),
             (r"'\\.'|'[^\\]'|'\\u[0-9a-fA-F]{4}'", String.Char),
-            (r'(\.)((?:[^\W\d]|\$)[\w$]*)', bygroups(Operator, Name.Attribute)),
+            (r'(\.)((?:[^\W\d]|\$)[\w$]*)', bygroups(Punctuation,
+                                                     Name.Attribute)),
             (r'^\s*([^\W\d]|\$)[\w$]*:', Name.Label),
             (r'([^\W\d]|\$)[\w$]*', Name),
             (r'([0-9][0-9_]*\.([0-9][0-9_]*)?|'
@@ -80,12 +83,16 @@
             (r'0[bB][01][01_]*[lL]?', Number.Bin),
             (r'0[0-7_]+[lL]?', Number.Oct),
             (r'0|[1-9][0-9_]*[lL]?', Number.Integer),
-            (r'[~^*!%&\[\](){}<>|+=:;,./?-]', Operator),
+            (r'[~^*!%&\[\]<>|+=/?-]', Operator),
+            (r'[{}();:.,]', Punctuation),
             (r'\n', Text)
         ],
         'class': [
             (r'([^\W\d]|\$)[\w$]*', Name.Class, '#pop')
         ],
+        'var': [
+            (r'([^\W\d]|\$)[\w$]*', Name, '#pop')
+        ],
         'import': [
             (r'[\w.]+\*?', Name.Namespace, '#pop')
         ],
@@ -104,7 +111,7 @@
     filenames = ['*.aj']
     mimetypes = ['text/x-aspectj']
 
-    aj_keywords = set((
+    aj_keywords = {
         'aspect', 'pointcut', 'privileged', 'call', 'execution',
         'initialization', 'preinitialization', 'handler', 'get', 'set',
         'staticinitialization', 'target', 'args', 'within', 'withincode',
@@ -114,9 +121,9 @@
         'thisJoinPointStaticPart', 'thisEnclosingJoinPointStaticPart',
         'issingleton', 'perthis', 'pertarget', 'percflow', 'percflowbelow',
         'pertypewithin', 'lock', 'unlock', 'thisAspectInstance'
-    ))
-    aj_inter_type = set(('parents:', 'warning:', 'error:', 'soft:', 'precedence:'))
-    aj_inter_type_annotation = set(('@type', '@method', '@constructor', '@field'))
+    }
+    aj_inter_type = {'parents:', 'warning:', 'error:', 'soft:', 'precedence:'}
+    aj_inter_type_annotation = {'@type', '@method', '@constructor', '@field'}
 
     def get_tokens_unprocessed(self, text):
         for index, token, value in JavaLexer.get_tokens_unprocessed(self, text):
@@ -264,8 +271,7 @@
             # method names
             (r'(class|trait|object)(\s+)', bygroups(Keyword, Text), 'class'),
             (r'[^\S\n]+', Text),
-            (r'//.*?\n', Comment.Single),
-            (r'/\*', Comment.Multiline, 'comment'),
+            include('comments'),
             (u'@%s' % idrest, Name.Decorator),
             (u'(abstract|ca(?:se|tch)|d(?:ef|o)|e(?:lse|xtends)|'
              u'f(?:inal(?:ly)?|or(?:Some)?)|i(?:f|mplicit)|'
@@ -300,16 +306,17 @@
         ],
         'class': [
             (u'(%s|%s|`[^`]+`)(\\s*)(\\[)' % (idrest, op),
-             bygroups(Name.Class, Text, Operator), 'typeparam'),
+             bygroups(Name.Class, Text, Operator), ('#pop', 'typeparam')),
             (r'\s+', Text),
+            include('comments'),
             (r'\{', Operator, '#pop'),
             (r'\(', Operator, '#pop'),
-            (r'//.*?\n', Comment.Single, '#pop'),
             (u'%s|%s|`[^`]+`' % (idrest, op), Name.Class, '#pop'),
         ],
         'type': [
             (r'\s+', Text),
-            (r'<[%:]|>:|[#_]|forSome|type', Keyword),
+            include('comments'),
+            (r'<[%:]|>:|[#_]|\bforSome\b|\btype\b', Keyword),
             (u'([,);}]|=>|=|\u21d2)(\\s*)', bygroups(Operator, Text), '#pop'),
             (r'[({]', Operator, '#push'),
             (u'((?:%s|%s|`[^`]+`)(?:\\.(?:%s|%s|`[^`]+`))*)(\\s*)(\\[)' %
@@ -318,16 +325,21 @@
             (u'((?:%s|%s|`[^`]+`)(?:\\.(?:%s|%s|`[^`]+`))*)(\\s*)$' %
              (idrest, op, idrest, op),
              bygroups(Keyword.Type, Text), '#pop'),
-            (r'//.*?\n', Comment.Single, '#pop'),
             (u'\\.|%s|%s|`[^`]+`' % (idrest, op), Keyword.Type)
         ],
         'typeparam': [
-            (r'[\s,]+', Text),
-            (u'<[%:]|=>|>:|[#_\u21D2]|forSome|type', Keyword),
+            (r'\s+', Text),
+            include('comments'),
+            (r',+', Punctuation),
+            (u'<[%:]|=>|>:|[#_\u21D2]|\bforSome\b|\btype\b', Keyword),
             (r'([\])}])', Operator, '#pop'),
             (r'[(\[{]', Operator, '#push'),
             (u'\\.|%s|%s|`[^`]+`' % (idrest, op), Keyword.Type)
         ],
+        'comments': [
+            (r'//.*?\n', Comment.Single),
+            (r'/\*', Comment.Multiline, 'comment'),
+        ],
         'comment': [
             (r'[^/*]+', Comment.Multiline),
             (r'/\*', Comment.Multiline, '#push'),
@@ -1006,7 +1018,7 @@
 
     .. versionadded:: 1.5
     """
-
+    
     name = 'Kotlin'
     aliases = ['kotlin']
     filenames = ['*.kt']
@@ -1017,15 +1029,22 @@
     kt_name = ('@?[_' + uni.combine('Lu', 'Ll', 'Lt', 'Lm', 'Nl') + ']' +
                '[' + uni.combine('Lu', 'Ll', 'Lt', 'Lm', 'Nl', 'Nd', 'Pc', 'Cf',
                                  'Mn', 'Mc') + ']*')
-    kt_id = '(' + kt_name + '|`' + kt_name + '`)'
+    
+    kt_space_name = ('@?[_' + uni.combine('Lu', 'Ll', 'Lt', 'Lm', 'Nl') + ']' +
+               '[' + uni.combine('Lu', 'Ll', 'Lt', 'Lm', 'Nl', 'Nd', 'Pc', 'Cf',
+                                 'Mn', 'Mc', 'Zs') + ',-]*')
+
+    kt_id = '(' + kt_name + '|`' + kt_space_name + '`)'
 
     tokens = {
         'root': [
             (r'^\s*\[.*?\]', Name.Attribute),
             (r'[^\S\n]+', Text),
+            (r'\s+', Text),
             (r'\\\n', Text),  # line continuation
             (r'//.*?\n', Comment.Single),
             (r'/[*].*?[*]/', Comment.Multiline),
+            (r'""".*?"""', String),
             (r'\n', Text),
             (r'::|!!|\?[:.]', Operator),
             (r'[~!%^&*()+=|\[\]:;,.<>/?-]', Punctuation),
@@ -1035,11 +1054,14 @@
             (r"'\\.'|'[^\\]'", String.Char),
             (r"[0-9](\.[0-9]*)?([eE][+-][0-9]+)?[flFL]?|"
              r"0[xX][0-9a-fA-F]+[Ll]?", Number),
-            (r'(class)(\s+)(object)', bygroups(Keyword, Text, Keyword)),
+            (r'(object)(\s+)(:)(\s+)', bygroups(Keyword, Text, Punctuation, Text), 'class'),
+            (r'(companion)(\s+)(object)', bygroups(Keyword, Text, Keyword)),
             (r'(class|interface|object)(\s+)', bygroups(Keyword, Text), 'class'),
             (r'(package|import)(\s+)', bygroups(Keyword, Text), 'package'),
+            (r'(val|var)(\s+)([(])', bygroups(Keyword, Text, Punctuation), 'property_dec'),
             (r'(val|var)(\s+)', bygroups(Keyword, Text), 'property'),
             (r'(fun)(\s+)', bygroups(Keyword, Text), 'function'),
+            (r'(inline fun)(\s+)', bygroups(Keyword, Text), 'function'),
             (r'(abstract|annotation|as|break|by|catch|class|companion|const|'
              r'constructor|continue|crossinline|data|do|dynamic|else|enum|'
              r'external|false|final|finally|for|fun|get|if|import|in|infix|'
@@ -1058,9 +1080,26 @@
         'property': [
             (kt_id, Name.Property, '#pop')
         ],
+        'property_dec': [
+            (r'(,)(\s*)', bygroups(Punctuation, Text)),
+            (r'(:)(\s*)', bygroups(Punctuation, Text)),
+            (r'<', Punctuation, 'generic'),
+            (r'([)])', Punctuation, '#pop'),
+            (kt_id, Name.Property)
+        ],
         'function': [
+            (r'<', Punctuation, 'generic'),
+            (r''+kt_id+'([.])'+kt_id, bygroups(Name.Class, Punctuation, Name.Function), '#pop'),
             (kt_id, Name.Function, '#pop')
         ],
+        'generic': [
+            (r'(>)(\s*)', bygroups(Punctuation, Text), '#pop'),
+            (r':',Punctuation),
+            (r'(reified|out|in)\b', Keyword),
+            (r',',Text),
+            (r'\s+',Text),
+            (kt_id,Name)
+        ]
     }
 
 
@@ -1571,3 +1610,57 @@
                      re.MULTILINE):
             score += 0.6
         return score
+
+
+class SarlLexer(RegexLexer):
+	"""
+	For `SARL <http://www.sarl.io>`_ source code.
+	
+	.. versionadded:: 2.4
+	"""
+	
+	name = 'SARL'
+	aliases = ['sarl']
+	filenames = ['*.sarl']
+	mimetypes = ['text/x-sarl']
+	
+	flags = re.MULTILINE | re.DOTALL
+	
+	tokens = {
+		'root': [
+			# method names
+			(r'^(\s*(?:[a-zA-Z_][\w.\[\]]*\s+)+?)'  # return arguments
+			 r'([a-zA-Z_$][\w$]*)'                      # method name
+			 r'(\s*)(\()',                             # signature start
+			 bygroups(using(this), Name.Function, Text, Operator)),
+			(r'[^\S\n]+', Text),
+			(r'//.*?\n', Comment.Single),
+			(r'/\*.*?\*/', Comment.Multiline),
+			(r'@[a-zA-Z_][\w.]*', Name.Decorator),
+			(r'(as|break|case|catch|default|do|else|extends|extension|finally|fires|for|if|implements|instanceof|new|on|requires|return|super|switch|throw|throws|try|typeof|uses|while|with)\b',
+			 Keyword),
+			(r'(abstract|def|dispatch|final|native|override|private|protected|public|static|strictfp|synchronized|transient|val|var|volatile)\b', Keyword.Declaration),
+			 (r'(boolean|byte|char|double|float|int|long|short|void)\b',
+			  Keyword.Type),
+			 (r'(package)(\s+)', bygroups(Keyword.Namespace, Text)),
+			 (r'(false|it|null|occurrence|this|true|void)\b', Keyword.Constant),
+			 (r'(agent|annotation|artifact|behavior|capacity|class|enum|event|interface|skill|space)(\s+)', bygroups(Keyword.Declaration, Text),
+			  'class'),
+			 (r'(import)(\s+)', bygroups(Keyword.Namespace, Text), 'import'),
+			 (r'"(\\\\|\\"|[^"])*"', String),
+			 (r"'(\\\\|\\'|[^'])*'", String),
+			 (r'[a-zA-Z_]\w*:', Name.Label),
+			 (r'[a-zA-Z_$]\w*', Name),
+			 (r'[~^*!%&\[\](){}<>\|+=:;,./?-]', Operator),
+			 (r'[0-9][0-9]*\.[0-9]+([eE][0-9]+)?[fd]?', Number.Float),
+			 (r'0x[0-9a-fA-F]+', Number.Hex),
+			 (r'[0-9]+L?', Number.Integer),
+			 (r'\n', Text)
+		],
+		'class': [
+			(r'[a-zA-Z_]\w*', Name.Class, '#pop')
+		],
+		'import': [
+			(r'[\w.]+\*?', Name.Namespace, '#pop')
+		],
+	}
--- a/eric6/ThirdParty/Pygments/pygments/lexers/lisp.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/ThirdParty/Pygments/pygments/lexers/lisp.py	Sat May 02 13:51:07 2020 +0200
@@ -5,7 +5,7 @@
 
     Lexers for Lispy languages.
 
-    :copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -1400,7 +1400,7 @@
 
 class NewLispLexer(RegexLexer):
     """
-    For `newLISP. <www.newlisp.org>`_ source code (version 10.3.0).
+    For `newLISP. <http://www.newlisp.org/>`_ source code (version 10.3.0).
 
     .. versionadded:: 1.5
     """
@@ -1554,7 +1554,7 @@
     # Take a deep breath...
     symbol = r'((?:%s)(?:%s)*)' % (nonmacro, constituent)
 
-    macros = set((
+    macros = {
         'atomic-change-group', 'case', 'block', 'cl-block', 'cl-callf', 'cl-callf2',
         'cl-case', 'cl-decf', 'cl-declaim', 'cl-declare',
         'cl-define-compiler-macro', 'cl-defmacro', 'cl-defstruct',
@@ -1601,17 +1601,17 @@
         'with-tramp-file-property', 'with-tramp-progress-reporter',
         'with-wrapper-hook', 'load-time-value', 'locally', 'macrolet', 'progv',
         'return-from',
-    ))
+    }
 
-    special_forms = set((
+    special_forms = {
         'and', 'catch', 'cond', 'condition-case', 'defconst', 'defvar',
         'function', 'if', 'interactive', 'let', 'let*', 'or', 'prog1',
         'prog2', 'progn', 'quote', 'save-current-buffer', 'save-excursion',
         'save-restriction', 'setq', 'setq-default', 'subr-arity',
         'unwind-protect', 'while',
-    ))
+    }
 
-    builtin_function = set((
+    builtin_function = {
         '%', '*', '+', '-', '/', '/=', '1+', '1-', '<', '<=', '=', '>', '>=',
         'Snarf-documentation', 'abort-recursive-edit', 'abs',
         'accept-process-output', 'access-file', 'accessible-keymaps', 'acos',
@@ -1937,8 +1937,9 @@
         'split-window-internal', 'sqrt', 'standard-case-table',
         'standard-category-table', 'standard-syntax-table', 'start-kbd-macro',
         'start-process', 'stop-process', 'store-kbd-macro-event', 'string',
-        'string-as-multibyte', 'string-as-unibyte', 'string-bytes',
-        'string-collate-equalp', 'string-collate-lessp', 'string-equal',
+        'string=', 'string<', 'string>', 'string-as-multibyte',
+        'string-as-unibyte', 'string-bytes', 'string-collate-equalp',
+        'string-collate-lessp', 'string-equal', 'string-greaterp',
         'string-lessp', 'string-make-multibyte', 'string-make-unibyte',
         'string-match', 'string-to-char', 'string-to-multibyte',
         'string-to-number', 'string-to-syntax', 'string-to-unibyte',
@@ -2050,23 +2051,23 @@
         'xw-color-values', 'xw-display-color-p', 'xw-display-color-p',
         'yes-or-no-p', 'zlib-available-p', 'zlib-decompress-region',
         'forward-point',
-    ))
+    }
 
-    builtin_function_highlighted = set((
+    builtin_function_highlighted = {
         'defvaralias', 'provide', 'require',
         'with-no-warnings', 'define-widget', 'with-electric-help',
         'throw', 'defalias', 'featurep'
-    ))
+    }
 
-    lambda_list_keywords = set((
+    lambda_list_keywords = {
         '&allow-other-keys', '&aux', '&body', '&environment', '&key', '&optional',
         '&rest', '&whole',
-    ))
+    }
 
-    error_keywords = set((
+    error_keywords = {
         'cl-assert', 'cl-check-type', 'error', 'signal',
         'user-error', 'warn',
-    ))
+    }
 
     def get_tokens_unprocessed(self, text):
         stack = ['root']
@@ -2225,7 +2226,7 @@
 
     BUILTINS_ANYWHERE = ('where', 'skip', '>>', '_', '!', '<e>', '<!>')
 
-    MAPPINGS = dict((s, Keyword) for s in DECLARATIONS)
+    MAPPINGS = {s: Keyword for s in DECLARATIONS}
     MAPPINGS.update((s, Name.Builtin) for s in BUILTINS)
     MAPPINGS.update((s, Keyword) for s in SPECIAL_FORMS)
 
--- a/eric6/ThirdParty/Pygments/pygments/lexers/make.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/ThirdParty/Pygments/pygments/lexers/make.py	Sat May 02 13:51:07 2020 +0200
@@ -5,7 +5,7 @@
 
     Lexers for Makefiles and similar.
 
-    :copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -102,8 +102,8 @@
             (r'\$\(', Keyword, 'expansion'),
         ],
         'expansion': [
-            (r'[^$a-zA-Z_()]+', Text),
-            (r'[a-zA-Z_]+', Name.Variable),
+            (r'[^\w$().-]+', Text),
+            (r'[\w.-]+', Name.Variable),
             (r'\$', Keyword),
             (r'\(', Keyword, '#push'),
             (r'\)', Keyword, '#pop'),
--- a/eric6/ThirdParty/Pygments/pygments/lexers/markup.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/ThirdParty/Pygments/pygments/lexers/markup.py	Sat May 02 13:51:07 2020 +0200
@@ -5,7 +5,7 @@
 
     Lexers for non-HTML markup languages.
 
-    :copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -222,10 +222,9 @@
                       Punctuation, Text, using(this, state='inline'))),
             # Comments
             (r'^ *\.\..*(\n( +.*\n|\n)+)?', Comment.Preproc),
-            # Field list
-            (r'^( *)(:[a-zA-Z-]+:)(\s*)$', bygroups(Text, Name.Class, Text)),
-            (r'^( *)(:.*?:)([ \t]+)(.*?)$',
-             bygroups(Text, Name.Class, Text, Name.Function)),
+            # Field list marker
+            (r'^( *)(:(?:\\\\|\\:|[^:\n])+:(?=\s))([ \t]*)',
+             bygroups(Text, Name.Class, Text)),
             # Definition list
             (r'^(\S.*(?<!::)\n)((?:(?: +.*)\n)+)',
              bygroups(using(this, state='inline'), using(this, state='inline'))),
@@ -582,6 +581,11 @@
             (r'[@#][\w/:]+', Name.Entity),
             # (image?) links eg: ![Image of Yaktocat](https://octodex.github.com/images/yaktocat.png)
             (r'(!?\[)([^]]+)(\])(\()([^)]+)(\))', bygroups(Text, Name.Tag, Text, Text, Name.Attribute, Text)),
+            # reference-style links, e.g.:
+            #   [an example][id]
+            #   [id]: http://example.com/
+            (r'(\[)([^]]+)(\])(\[)([^]]*)(\])', bygroups(Text, Name.Tag, Text, Text, Name.Label, Text)),
+            (r'^(\s*\[)([^]]*)(\]:\s*)(.+)', bygroups(Text, Name.Label, Text, Name.Attribute)),
 
             # general text, must come last!
             (r'[^\\\s]+', Text),
--- a/eric6/ThirdParty/Pygments/pygments/lexers/math.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/ThirdParty/Pygments/pygments/lexers/math.py	Sat May 02 13:51:07 2020 +0200
@@ -5,7 +5,7 @@
 
     Just export lexers that were contained in this module.
 
-    :copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
--- a/eric6/ThirdParty/Pygments/pygments/lexers/matlab.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/ThirdParty/Pygments/pygments/lexers/matlab.py	Sat May 02 13:51:07 2020 +0200
@@ -5,7 +5,7 @@
 
     Lexers for Matlab and related languages.
 
-    :copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -72,6 +72,8 @@
              "hilb", "invhilb", "magic", "pascal", "rosser", "toeplitz", "vander",
              "wilkinson")
 
+    _operators = r'-|==|~=|<=|>=|<|>|&&|&|~|\|\|?|\.\*|\*|\+|\.\^|\.\\|\.\/|\/|\\'
+
     tokens = {
         'root': [
             # line starting with '!' is sent as a system command.  not sure what
@@ -79,14 +81,17 @@
             (r'^!.*', String.Other),
             (r'%\{\s*\n', Comment.Multiline, 'blockcomment'),
             (r'%.*$', Comment),
-            (r'^\s*function', Keyword, 'deffunc'),
+            (r'^\s*function\b', Keyword, 'deffunc'),
 
             # from 'iskeyword' on version 7.11 (R2010):
-            (words((
-                'break', 'case', 'catch', 'classdef', 'continue', 'else', 'elseif',
-                'end', 'enumerated', 'events', 'for', 'function', 'global', 'if',
-                'methods', 'otherwise', 'parfor', 'persistent', 'properties',
-                'return', 'spmd', 'switch', 'try', 'while'), suffix=r'\b'),
+            # Check that there is no preceding dot, as keywords are valid field
+            # names.
+            (words(('break', 'case', 'catch', 'classdef', 'continue', 'else',
+                    'elseif', 'end', 'enumerated', 'events', 'for', 'function',
+                    'global', 'if', 'methods', 'otherwise', 'parfor',
+                    'persistent', 'properties', 'return', 'spmd', 'switch',
+                    'try', 'while'),
+                   prefix=r'(?<!\.)', suffix=r'\b'),
              Keyword),
 
             ("(" + "|".join(elfun + specfun + elmat) + r')\b',  Name.Builtin),
@@ -94,10 +99,22 @@
             # line continuation with following comment:
             (r'\.\.\..*$', Comment),
 
+            # command form:
+            # "How MATLAB Recognizes Command Syntax" specifies that an operator
+            # is recognized if it is either surrounded by spaces or by no
+            # spaces on both sides; only the former case matters for us.  (This
+            # allows distinguishing `cd ./foo` from `cd ./ foo`.)
+            (r'(?:^|(?<=;))(\s*)(\w+)(\s+)(?!=|\(|(%s)\s+)' % _operators,
+             bygroups(Text, Name, Text), 'commandargs'),
+
             # operators:
-            (r'-|==|~=|<|>|<=|>=|&&|&|~|\|\|?', Operator),
-            # operators requiring escape for re:
-            (r'\.\*|\*|\+|\.\^|\.\\|\.\/|\/|\\', Operator),
+            (_operators, Operator),
+
+            # numbers (must come before punctuation to handle `.5`; cannot use
+            # `\b` due to e.g. `5. + .5`).
+            (r'(?<!\w)((\d+\.\d*)|(\d*\.\d+))([eEf][+-]?\d+)?(?!\w)', Number.Float),
+            (r'\b\d+[eEf][+-]?[0-9]+\b', Number.Float),
+            (r'\b\d+\b', Number.Integer),
 
             # punctuation:
             (r'\[|\]|\(|\)|\{|\}|:|@|\.|,', Punctuation),
@@ -107,17 +124,12 @@
             # (not great, but handles common cases...)
             (r'(?<=[\w)\].])\'+', Operator),
 
-            (r'(\d+\.\d*|\d*\.\d+)([eEf][+-]?[0-9]+)?', Number.Float),
-            (r'\d+[eEf][+-]?[0-9]+', Number.Float),
-            (r'\d+', Number.Integer),
+            (r'"(""|[^"])*"', String),
 
             (r'(?<![\w)\].])\'', String, 'string'),
             (r'[a-zA-Z_]\w*', Name),
             (r'.', Text),
         ],
-        'string': [
-            (r'[^\']*\'', String, '#pop')
-        ],
         'blockcomment': [
             (r'^\s*%\}', Comment.Multiline, '#pop'),
             (r'^.*\n', Comment.Multiline),
@@ -131,12 +143,29 @@
             # function with no args
             (r'(\s*)([a-zA-Z_]\w*)', bygroups(Text, Name.Function), '#pop'),
         ],
+        'string': [
+            (r"[^']*'", String, '#pop'),
+        ],
+        'commandargs': [
+            (r"[ \t]+", Text),
+            ("'[^']*'", String),
+            (r"[^';\s]+", String),
+            (";?", Punctuation, '#pop'),
+        ]
     }
 
     def analyse_text(text):
-        if re.match(r'^\s*%', text, re.M):  # comment
+        # function declaration.
+        first_non_comment = next((line for line in text.splitlines()
+                                  if not re.match(r'^\s*%', text)), '').strip()
+        if (first_non_comment.startswith('function')
+                and '{' not in first_non_comment):
+            return 1.
+        # comment
+        elif re.search(r'^\s*%', text, re.M):
             return 0.2
-        elif re.match(r'^!\w+', text, re.M):  # system cmd
+        # system cmd
+        elif re.search(r'^!\w+', text, re.M):
             return 0.2
 
 
@@ -536,7 +565,7 @@
         'root': [
             # We should look into multiline comments
             (r'[%#].*$', Comment),
-            (r'^\s*function', Keyword, 'deffunc'),
+            (r'^\s*function\b', Keyword, 'deffunc'),
 
             # from 'iskeyword' on hg changeset 8cc154f45e37
             (words((
@@ -609,7 +638,7 @@
     tokens = {
         'root': [
             (r'//.*?$', Comment.Single),
-            (r'^\s*function', Keyword, 'deffunc'),
+            (r'^\s*function\b', Keyword, 'deffunc'),
 
             (words((
                 '__FILE__', '__LINE__', 'break', 'case', 'catch', 'classdef', 'continue', 'do', 'else',
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/eric6/ThirdParty/Pygments/pygments/lexers/mime.py	Sat May 02 13:51:07 2020 +0200
@@ -0,0 +1,226 @@
+# -*- coding: utf-8 -*-
+"""
+    pygments.lexers.mime
+    ~~~~~~~~~~~~~~~~~~~~
+
+    Lexer for Multipurpose Internet Mail Extensions (MIME) data.
+
+    :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
+    :license: BSD, see LICENSE for details.
+"""
+
+import re
+
+from pygments.lexer import RegexLexer, include
+from pygments.lexers import get_lexer_for_mimetype
+from pygments.token import Text, Name, String, Operator, Comment, Other
+from pygments.util import get_int_opt, ClassNotFound
+
+__all__ = ["MIMELexer"]
+
+
+class MIMELexer(RegexLexer):
+    """
+    Lexer for Multipurpose Internet Mail Extensions (MIME) data. This lexer is
+    designed to process the nested mulitpart data.
+
+    It assumes that the given data contains both header and body (and is
+    splitted by empty line). If no valid header is found, then the entire data
+    would be treated as body.
+
+    Additional options accepted:
+
+    `MIME-max-level`
+        Max recurssion level for nested MIME structure. Any negative number
+        would treated as unlimited. (default: -1)
+
+    `Content-Type`
+        Treat the data as specific content type. Useful when header is
+        missing, or this lexer would try to parse from header. (default:
+        `text/plain`)
+
+    `Multipart-Boundary`
+        Set the default multipart boundary delimiter. This option is only used
+        when `Content-Type` is `multipart` and header is missing. This lexer
+        would try to parse from header by default. (default: None)
+
+    `Content-Transfer-Encoding`
+        Treat the data as specific encoding. Or this lexer would try to parse
+        from header by default. (default: None)
+
+    .. versionadded:: 2.5
+    """
+
+    name = "MIME"
+    aliases = ["mime"]
+    mimetypes = ["multipart/mixed",
+                 "multipart/related",
+                 "multipart/alternative"]
+
+    def __init__(self, **options):
+        super(MIMELexer, self).__init__(**options)
+        self.boundary = options.get("Multipart-Boundary")
+        self.content_transfer_encoding = options.get("Content_Transfer_Encoding")
+        self.content_type = options.get("Content_Type", "text/plain")
+        self.max_nested_level = get_int_opt(options, "MIME-max-level", -1)
+
+    def analyse_text(text):
+        try:
+            header, body = text.strip().split("\n\n", 1)
+            if not body.strip():
+                return 0.1
+
+            invalid_headers = MIMELexer.tokens["header"].sub("", header)
+            if invalid_headers.strip():
+                return 0.1
+            else:
+                return 1
+
+        except ValueError:
+            return 0.1
+
+    def get_header_tokens(self, match):
+        field = match.group(1)
+
+        if field.lower() in self.attention_headers:
+            yield match.start(1), Name.Tag, field + ":"
+            yield match.start(2), Text.Whitespace, match.group(2)
+
+            pos = match.end(2)
+            body = match.group(3)
+            for i, t, v in self.get_tokens_unprocessed(body, ("root", field.lower())):
+                yield pos + i, t, v
+
+        else:
+            yield match.start(), Comment, match.group()
+
+    def get_body_tokens(self, match):
+        pos_body_start = match.start()
+        entire_body = match.group()
+
+        # skip first newline
+        if entire_body[0] == '\n':
+            yield pos_body_start, Text.Whitespace, u'\n'
+            pos_body_start = pos_body_start + 1
+            entire_body = entire_body[1:]
+
+        # if it is not a mulitpart
+        if not self.content_type.startswith("multipart") or not self.boundary:
+            for i, t, v in self.get_bodypart_tokens(entire_body):
+                yield pos_body_start + i, t, v
+            return
+
+        # find boundary
+        bdry_pattern = r"^--%s(--)?\n" % re.escape(self.boundary)
+        bdry_matcher = re.compile(bdry_pattern, re.MULTILINE)
+
+        # some data has prefix text before first boundary
+        m = bdry_matcher.search(entire_body)
+        if m:
+            pos_part_start = pos_body_start + m.end()
+            pos_iter_start = lpos_end = m.end()
+            yield pos_body_start, Text, entire_body[:m.start()]
+            yield pos_body_start + lpos_end, String.Delimiter, m.group()
+        else:
+            pos_part_start = pos_body_start
+            pos_iter_start = 0
+
+        # process tokens of each body part
+        for m in bdry_matcher.finditer(entire_body, pos_iter_start):
+            # bodypart
+            lpos_start = pos_part_start - pos_body_start
+            lpos_end = m.start()
+            part = entire_body[lpos_start:lpos_end]
+            for i, t, v in self.get_bodypart_tokens(part):
+                yield pos_part_start + i, t, v
+
+            # boundary
+            yield pos_body_start + lpos_end, String.Delimiter, m.group()
+            pos_part_start = pos_body_start + m.end()
+
+        # some data has suffix text after last boundary
+        lpos_start = pos_part_start - pos_body_start
+        if lpos_start != len(entire_body):
+            yield pos_part_start, Text, entire_body[lpos_start:]
+
+    def get_bodypart_tokens(self, text):
+        # return if:
+        #  * no content
+        #  * no content type specific
+        #  * content encoding is not readable
+        #  * max recurrsion exceed
+        if not text.strip() or not self.content_type:
+            return [(0, Other, text)]
+
+        cte = self.content_transfer_encoding
+        if cte and cte not in {"8bit", "7bit", "quoted-printable"}:
+            return [(0, Other, text)]
+
+        if self.max_nested_level == 0:
+            return [(0, Other, text)]
+
+        # get lexer
+        try:
+            lexer = get_lexer_for_mimetype(self.content_type)
+        except ClassNotFound:
+            return [(0, Other, text)]
+
+        if isinstance(lexer, type(self)):
+            lexer.max_nested_level = self.max_nested_level - 1
+
+        return lexer.get_tokens_unprocessed(text)
+
+    def store_content_type(self, match):
+        self.content_type = match.group(1)
+
+        prefix_len = match.start(1) - match.start(0)
+        yield match.start(0), Text.Whitespace, match.group(0)[:prefix_len]
+        yield match.start(1), Name.Label, match.group(2)
+        yield match.end(2), String.Delimiter, u"/"
+        yield match.start(3), Name.Label, match.group(3)
+
+    def get_content_type_subtokens(self, match):
+        yield match.start(1), Text, match.group(1)
+        yield match.start(2), Text.Whitespace, match.group(2)
+        yield match.start(3), Name.Attribute, match.group(3)
+        yield match.start(4), Operator, match.group(4)
+        yield match.start(5), String, match.group(5)
+
+        if match.group(3).lower() == "boundary":
+            boundary = match.group(5).strip()
+            if boundary[0] == '"' and boundary[-1] == '"':
+                boundary = boundary[1:-1]
+            self.boundary = boundary
+
+    def store_content_transfer_encoding(self, match):
+        self.content_transfer_encoding = match.group(0).lower()
+        yield match.start(0), Name.Constant, match.group(0)
+
+    attention_headers = {"content-type", "content-transfer-encoding"}
+
+    tokens = {
+        "root": [
+            (r"^([\w-]+):( *)([\s\S]*?\n)(?![ \t])", get_header_tokens),
+            (r"^$[\s\S]+", get_body_tokens),
+        ],
+        "header": [
+            # folding
+            (r"\n[ \t]", Text.Whitespace),
+            (r"\n(?![ \t])", Text.Whitespace, "#pop"),
+        ],
+        "content-type": [
+            include("header"),
+            (
+                r"^\s*((multipart|application|audio|font|image|model|text|video"
+                r"|message)/([\w-]+))",
+                store_content_type,
+            ),
+            (r'(;)((?:[ \t]|\n[ \t])*)([\w:-]+)(=)([\s\S]*?)(?=;|\n(?![ \t]))',
+             get_content_type_subtokens),
+            (r';[ \t]*\n(?![ \t])', Text, '#pop'),
+        ],
+        "content-transfer-encoding": [
+            include("header"),
+            (r"([\w-]+)", store_content_transfer_encoding),
+        ],
+    }
--- a/eric6/ThirdParty/Pygments/pygments/lexers/ml.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/ThirdParty/Pygments/pygments/lexers/ml.py	Sat May 02 13:51:07 2020 +0200
@@ -5,7 +5,7 @@
 
     Lexers for ML family languages.
 
-    :copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -15,7 +15,7 @@
 from pygments.token import Text, Comment, Operator, Keyword, Name, String, \
     Number, Punctuation, Error
 
-__all__ = ['SMLLexer', 'OcamlLexer', 'OpaLexer']
+__all__ = ['SMLLexer', 'OcamlLexer', 'OpaLexer', 'ReasonLexer']
 
 
 class SMLLexer(RegexLexer):
@@ -30,7 +30,7 @@
     filenames = ['*.sml', '*.sig', '*.fun']
     mimetypes = ['text/x-standardml', 'application/x-standardml']
 
-    alphanumid_reserved = set((
+    alphanumid_reserved = {
         # Core
         'abstype', 'and', 'andalso', 'as', 'case', 'datatype', 'do', 'else',
         'end', 'exception', 'fn', 'fun', 'handle', 'if', 'in', 'infix',
@@ -39,16 +39,16 @@
         # Modules
         'eqtype', 'functor', 'include', 'sharing', 'sig', 'signature',
         'struct', 'structure', 'where',
-    ))
+    }
 
-    symbolicid_reserved = set((
+    symbolicid_reserved = {
         # Core
         ':', r'\|', '=', '=>', '->', '#',
         # Modules
         ':>',
-    ))
+    }
 
-    nonid_reserved = set(('(', ')', '[', ']', '{', '}', ',', ';', '...', '_'))
+    nonid_reserved = {'(', ')', '[', ']', '{', '}', ',', ';', '...', '_'}
 
     alphanumid_re = r"[a-zA-Z][\w']*"
     symbolicid_re = r"[!%&$#+\-/:<=>?@\\~`^|*]+"
@@ -445,7 +445,6 @@
         ],
     }
 
-
 class OpaLexer(RegexLexer):
     """
     Lexer for the Opa language (http://opalang.org).
@@ -767,3 +766,94 @@
             (r'[^\-]+|-', Comment),
         ],
     }
+
+class ReasonLexer(RegexLexer):
+    """
+    For the ReasonML language (https://reasonml.github.io/).
+
+    .. versionadded:: 2.6
+    """
+
+    name = 'ReasonML'
+    aliases = ['reason', "reasonml"]
+    filenames = ['*.re', '*.rei']
+    mimetypes = ['text/x-reasonml']
+
+    keywords = (
+    'as', 'assert', 'begin', 'class', 'constraint', 'do', 'done', 'downto', 
+    'else', 'end', 'exception', 'external', 'false', 'for', 'fun', 'esfun', 
+    'function', 'functor', 'if', 'in', 'include', 'inherit', 'initializer', 'lazy', 
+    'let', 'switch', 'module', 'pub', 'mutable', 'new', 'nonrec', 'object', 'of', 
+    'open', 'pri', 'rec', 'sig', 'struct', 'then', 'to', 'true', 'try', 
+    'type', 'val', 'virtual', 'when', 'while', 'with'
+    )
+    keyopts = (
+        '!=', '#', '&', '&&', r'\(', r'\)', r'\*', r'\+', ',', '-',
+        r'-\.', '=>', r'\.', r'\.\.', r'\.\.\.', ':', '::', ':=', ':>', ';', ';;', '<',
+        '<-', '=', '>', '>]', r'>\}', r'\?', r'\?\?', r'\[', r'\[<', r'\[>',
+        r'\[\|', ']', '_', '`', r'\{', r'\{<', r'\|\|', r'\|', r'\|]', r'\}', '~'
+    )
+
+    operators = r'[!$%&*+\./:<=>?@^|~-]'
+    word_operators = ('and', 'asr', 'land', 'lor', 'lsl', 'lsr', 'lxor', 'mod', 'or')
+    prefix_syms = r'[!?~]'
+    infix_syms = r'[=<>@^|&+\*/$%-]'
+    primitives = ('unit', 'int', 'float', 'bool', 'string', 'char', 'list', 'array')
+
+    tokens = {
+        'escape-sequence': [
+            (r'\\[\\"\'ntbr]', String.Escape),
+            (r'\\[0-9]{3}', String.Escape),
+            (r'\\x[0-9a-fA-F]{2}', String.Escape),
+        ],
+        'root': [
+            (r'\s+', Text),
+            (r'false|true|\(\)|\[\]', Name.Builtin.Pseudo),
+            (r'\b([A-Z][\w\']*)(?=\s*\.)', Name.Namespace, 'dotted'),
+            (r'\b([A-Z][\w\']*)', Name.Class),
+            (r'//.*?\n', Comment.Single),
+            (r'\/\*(?![\/])', Comment.Multiline, 'comment'),
+            (r'\b(%s)\b' % '|'.join(keywords), Keyword),
+            (r'(%s)' % '|'.join(keyopts[::-1]), Operator.Word),
+            (r'(%s|%s)?%s' % (infix_syms, prefix_syms, operators), Operator),
+            (r'\b(%s)\b' % '|'.join(word_operators), Operator.Word),
+            (r'\b(%s)\b' % '|'.join(primitives), Keyword.Type),
+
+            (r"[^\W\d][\w']*", Name),
+
+            (r'-?\d[\d_]*(.[\d_]*)?([eE][+\-]?\d[\d_]*)', Number.Float),
+            (r'0[xX][\da-fA-F][\da-fA-F_]*', Number.Hex),
+            (r'0[oO][0-7][0-7_]*', Number.Oct),
+            (r'0[bB][01][01_]*', Number.Bin),
+            (r'\d[\d_]*', Number.Integer),
+
+            (r"'(?:(\\[\\\"'ntbr ])|(\\[0-9]{3})|(\\x[0-9a-fA-F]{2}))'",
+             String.Char),
+            (r"'.'", String.Char),
+            (r"'", Keyword),
+
+            (r'"', String.Double, 'string'),
+
+            (r'[~?][a-z][\w\']*:', Name.Variable),
+        ],
+        'comment': [
+            (r'[^\/*]+', Comment.Multiline),
+            (r'\/\*', Comment.Multiline, '#push'),
+            (r'\*\/', Comment.Multiline, '#pop'),
+            (r'[\*]', Comment.Multiline),
+        ],
+        'string': [
+            (r'[^\\"]+', String.Double),
+            include('escape-sequence'),
+            (r'\\\n', String.Double),
+            (r'"', String.Double, '#pop'),
+        ],
+        'dotted': [
+            (r'\s+', Text),
+            (r'\.', Punctuation),
+            (r'[A-Z][\w\']*(?=\s*\.)', Name.Namespace),
+            (r'[A-Z][\w\']*', Name.Class, '#pop'),
+            (r'[a-z_][\w\']*', Name, '#pop'),
+            default('#pop'),
+        ],
+    }
--- a/eric6/ThirdParty/Pygments/pygments/lexers/modeling.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/ThirdParty/Pygments/pygments/lexers/modeling.py	Sat May 02 13:51:07 2020 +0200
@@ -5,7 +5,7 @@
 
     Lexers for modeling languages.
 
-    :copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -13,7 +13,7 @@
 
 from pygments.lexer import RegexLexer, include, bygroups, using, default
 from pygments.token import Text, Comment, Operator, Keyword, Name, String, \
-    Number, Punctuation
+    Number, Punctuation, Whitespace
 
 from pygments.lexers.html import HtmlLexer
 from pygments.lexers import _stan_builtins
@@ -62,8 +62,8 @@
              r'transpose|vector|zeros)\b', Name.Builtin),
             (r'(algorithm|annotation|break|connect|constant|constrainedby|der|'
              r'discrete|each|else|elseif|elsewhen|encapsulated|enumeration|'
-             r'equation|exit|expandable|extends|external|final|flow|for|if|'
-             r'import|impure|in|initial|inner|input|loop|nondiscrete|outer|'
+             r'equation|exit|expandable|extends|external|firstTick|final|flow|for|if|'
+             r'import|impure|in|initial|inner|input|interval|loop|nondiscrete|outer|'
              r'output|parameter|partial|protected|public|pure|redeclare|'
              r'replaceable|return|stream|then|when|while)\b',
              Keyword.Reserved),
@@ -284,8 +284,8 @@
     """Pygments Lexer for Stan models.
 
     The Stan modeling language is specified in the *Stan Modeling Language
-    User's Guide and Reference Manual, v2.8.0*,
-    `pdf <https://github.com/stan-dev/stan/releases/download/v2.8.8/stan-reference-2.8.0.pdf>`__.
+    User's Guide and Reference Manual, v2.17.0*,
+    `pdf <https://github.com/stan-dev/stan/releases/download/v2.17.0/stan-reference-2.17.0.pdf>`__.
 
     .. versionadded:: 1.6
     """
@@ -316,19 +316,26 @@
                         'parameters', r'transformed\s+parameters',
                         'model', r'generated\s+quantities')),
              bygroups(Keyword.Namespace, Text, Punctuation)),
+            # target keyword
+            (r'target\s*\+=', Keyword),
             # Reserved Words
             (r'(%s)\b' % r'|'.join(_stan_builtins.KEYWORDS), Keyword),
             # Truncation
             (r'T(?=\s*\[)', Keyword),
             # Data types
             (r'(%s)\b' % r'|'.join(_stan_builtins.TYPES), Keyword.Type),
+             # < should be punctuation, but elsewhere I can't tell if it is in
+             # a range constraint
+            (r'(<)(\s*)(upper|lower)(\s*)(=)',
+             bygroups(Operator, Whitespace, Keyword, Whitespace, Punctuation)),
+            (r'(,)(\s*)(upper)(\s*)(=)',
+             bygroups(Punctuation, Whitespace, Keyword, Whitespace, Punctuation)),
             # Punctuation
-            (r"[;:,\[\]()]", Punctuation),
+            (r"[;,\[\]()]", Punctuation),
             # Builtin
-            (r'(%s)(?=\s*\()'
-             % r'|'.join(_stan_builtins.FUNCTIONS
-                         + _stan_builtins.DISTRIBUTIONS),
-             Name.Builtin),
+            (r'(%s)(?=\s*\()' % '|'.join(_stan_builtins.FUNCTIONS), Name.Builtin),
+            (r'(~)(\s*)(%s)(?=\s*\()' % '|'.join(_stan_builtins.DISTRIBUTIONS),
+                bygroups(Operator, Whitespace, Name.Builtin)),
             # Special names ending in __, like lp__
             (r'[A-Za-z]\w*__\b', Name.Builtin.Pseudo),
             (r'(%s)\b' % r'|'.join(_stan_builtins.RESERVED), Keyword.Reserved),
@@ -337,17 +344,18 @@
             # Regular variable names
             (r'[A-Za-z]\w*\b', Name),
             # Real Literals
-            (r'-?[0-9]+(\.[0-9]+)?[eE]-?[0-9]+', Number.Float),
-            (r'-?[0-9]*\.[0-9]*', Number.Float),
+            (r'[0-9]+(\.[0-9]*)?([eE][+-]?[0-9]+)?', Number.Float),
+            (r'\.[0-9]+([eE][+-]?[0-9]+)?', Number.Float),
             # Integer Literals
-            (r'-?[0-9]+', Number.Integer),
+            (r'[0-9]+', Number.Integer),
             # Assignment operators
-            # SLexer makes these tokens Operators.
-            (r'<-|~', Operator),
+            (r'<-|(?:\+|-|\.?/|\.?\*|=)?=|~', Operator),
             # Infix, prefix and postfix operators (and = )
-            (r"\+|-|\.?\*|\.?/|\\|'|\^|==?|!=?|<=?|>=?|\|\||&&", Operator),
+            (r"\+|-|\.?\*|\.?/|\\|'|\^|!=?|<=?|>=?|\|\||&&|%|\?|:", Operator),
             # Block delimiters
             (r'[{}]', Punctuation),
+            # Distribution |
+            (r'\|', Punctuation)
         ]
     }
 
--- a/eric6/ThirdParty/Pygments/pygments/lexers/modula2.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/ThirdParty/Pygments/pygments/lexers/modula2.py	Sat May 02 13:51:07 2020 +0200
@@ -5,7 +5,7 @@
 
     Multi-Dialect Lexer for Modula-2.
 
-    :copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
--- a/eric6/ThirdParty/Pygments/pygments/lexers/monte.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/ThirdParty/Pygments/pygments/lexers/monte.py	Sat May 02 13:51:07 2020 +0200
@@ -5,7 +5,7 @@
 
     Lexer for the Monte programming language.
 
-    :copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/eric6/ThirdParty/Pygments/pygments/lexers/mosel.py	Sat May 02 13:51:07 2020 +0200
@@ -0,0 +1,448 @@
+# -*- coding: utf-8 -*-
+"""
+    pygments.lexers.mosel
+    ~~~~~~~~~~~~~~~~~~~~~
+
+    Lexers for the mosel language.
+    http://www.fico.com/en/products/fico-xpress-optimization
+
+    :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
+    :license: BSD, see LICENSE for details.
+"""
+
+from pygments.lexer import RegexLexer, words
+from pygments.token import Text, Comment, Operator, Keyword, Name, String, \
+    Number, Punctuation
+
+__all__ = ['MoselLexer']
+
+FUNCTIONS = (
+    # core functions
+    '_',
+    'abs',
+    'arctan',
+    'asproc',
+    'assert',
+    'bitflip',
+    'bitneg',
+    'bitset',
+    'bitshift',
+    'bittest',
+    'bitval',
+    'ceil',
+    'cos',
+    'create',
+    'currentdate',
+    'currenttime',
+    'cutelt',
+    'cutfirst',
+    'cuthead',
+    'cutlast',
+    'cuttail',
+    'datablock',
+    'delcell',
+    'exists',
+    'exit',
+    'exp',
+    'exportprob',
+    'fclose',
+    'fflush',
+    'finalize',
+    'findfirst',
+    'findlast',
+    'floor',
+    'fopen',
+    'fselect',
+    'fskipline',
+    'fwrite',
+    'fwrite_',
+    'fwriteln',
+    'fwriteln_',
+    'getact',
+    'getcoeff',
+    'getcoeffs',
+    'getdual',
+    'getelt',
+    'getfid',
+    'getfirst',
+    'getfname',
+    'gethead',
+    'getlast',
+    'getobjval',
+    'getparam',
+    'getrcost',
+    'getreadcnt',
+    'getreverse',
+    'getsize',
+    'getslack',
+    'getsol',
+    'gettail',
+    'gettype',
+    'getvars',
+    'isdynamic',
+    'iseof',
+    'isfinite',
+    'ishidden',
+    'isinf',
+    'isnan',
+    'isodd',
+    'ln',
+    'localsetparam',
+    'log',
+    'makesos1',
+    'makesos2',
+    'maxlist',
+    'memoryuse',
+    'minlist',
+    'newmuid',
+    'publish',
+    'random',
+    'read',
+    'readln',
+    'reset',
+    'restoreparam',
+    'reverse',
+    'round',
+    'setcoeff',
+    'sethidden',
+    'setioerr',
+    'setmatherr',
+    'setname',
+    'setparam',
+    'setrandseed',
+    'setrange',
+    'settype',
+    'sin',
+    'splithead',
+    'splittail',
+    'sqrt',
+    'strfmt',
+    'substr',
+    'timestamp',
+    'unpublish',
+    'versionnum',
+    'versionstr',
+    'write',
+    'write_',
+    'writeln',
+    'writeln_',
+
+    # mosel exam mmxprs | sed -n -e "s/ [pf][a-z]* \([a-zA-Z0-9_]*\).*/'\1',/p" | sort -u
+    'addcut',
+    'addcuts',
+    'addmipsol',
+    'basisstability',
+    'calcsolinfo',
+    'clearmipdir',
+    'clearmodcut',
+    'command',
+    'copysoltoinit',
+    'crossoverlpsol',
+    'defdelayedrows',
+    'defsecurevecs',
+    'delcuts',
+    'dropcuts',
+    'estimatemarginals',
+    'fixglobal',
+    'flushmsgq',
+    'getbstat',
+    'getcnlist',
+    'getcplist',
+    'getdualray',
+    'getiis',
+    'getiissense',
+    'getiistype',
+    'getinfcause',
+    'getinfeas',
+    'getlb',
+    'getlct',
+    'getleft',
+    'getloadedlinctrs',
+    'getloadedmpvars',
+    'getname',
+    'getprimalray',
+    'getprobstat',
+    'getrange',
+    'getright',
+    'getsensrng',
+    'getsize',
+    'getsol',
+    'gettype',
+    'getub',
+    'getvars',
+    'gety',
+    'hasfeature',
+    'implies',
+    'indicator',
+    'initglobal',
+    'ishidden',
+    'isiisvalid',
+    'isintegral',
+    'loadbasis',
+    'loadcuts',
+    'loadlpsol',
+    'loadmipsol',
+    'loadprob',
+    'maximise',
+    'maximize',
+    'minimise',
+    'minimize',
+    'postsolve',
+    'readbasis',
+    'readdirs',
+    'readsol',
+    'refinemipsol',
+    'rejectintsol',
+    'repairinfeas',
+    'repairinfeas_deprec',
+    'resetbasis',
+    'resetiis',
+    'resetsol',
+    'savebasis',
+    'savemipsol',
+    'savesol',
+    'savestate',
+    'selectsol',
+    'setarchconsistency',
+    'setbstat',
+    'setcallback',
+    'setcbcutoff',
+    'setgndata',
+    'sethidden',
+    'setlb',
+    'setmipdir',
+    'setmodcut',
+    'setsol',
+    'setub',
+    'setucbdata',
+    'stopoptimise',
+    'stopoptimize',
+    'storecut',
+    'storecuts',
+    'unloadprob',
+    'uselastbarsol',
+    'writebasis',
+    'writedirs',
+    'writeprob',
+    'writesol',
+    'xor',
+    'xprs_addctr',
+    'xprs_addindic',
+
+    # mosel exam mmsystem | sed -n -e "s/ [pf][a-z]* \([a-zA-Z0-9_]*\).*/'\1',/p" | sort -u
+    'addmonths',
+    'copytext',
+    'cuttext',
+    'deltext',
+    'endswith',
+    'erase',
+    'expandpath',
+    'fcopy',
+    'fdelete',
+    'findfiles',
+    'findtext',
+    'fmove',
+    'formattext',
+    'getasnumber',
+    'getchar',
+    'getcwd',
+    'getdate',
+    'getday',
+    'getdaynum',
+    'getdays',
+    'getdirsep',
+    'getdsoparam',
+    'getendparse',
+    'getenv',
+    'getfsize',
+    'getfstat',
+    'getftime',
+    'gethour',
+    'getminute',
+    'getmonth',
+    'getmsec',
+    'getoserrmsg',
+    'getoserror',
+    'getpathsep',
+    'getqtype',
+    'getsecond',
+    'getsepchar',
+    'getsize',
+    'getstart',
+    'getsucc',
+    'getsysinfo',
+    'getsysstat',
+    'gettime',
+    'gettmpdir',
+    'gettrim',
+    'getweekday',
+    'getyear',
+    'inserttext',
+    'isvalid',
+    'jointext',
+    'makedir',
+    'makepath',
+    'newtar',
+    'newzip',
+    'nextfield',
+    'openpipe',
+    'parseextn',
+    'parseint',
+    'parsereal',
+    'parsetext',
+    'pastetext',
+    'pathmatch',
+    'pathsplit',
+    'qsort',
+    'quote',
+    'readtextline',
+    'regmatch',
+    'regreplace',
+    'removedir',
+    'removefiles',
+    'setchar',
+    'setdate',
+    'setday',
+    'setdsoparam',
+    'setendparse',
+    'setenv',
+    'sethour',
+    'setminute',
+    'setmonth',
+    'setmsec',
+    'setoserror',
+    'setqtype',
+    'setsecond',
+    'setsepchar',
+    'setstart',
+    'setsucc',
+    'settime',
+    'settrim',
+    'setyear',
+    'sleep',
+    'splittext',
+    'startswith',
+    'system',
+    'tarlist',
+    'textfmt',
+    'tolower',
+    'toupper',
+    'trim',
+    'untar',
+    'unzip',
+    'ziplist',
+
+    # mosel exam mmjobs | sed -n -e "s/ [pf][a-z]* \([a-zA-Z0-9_]*\).*/'\1',/p" | sort -u
+    'canceltimer',
+    'clearaliases',
+    'compile',
+    'connect',
+    'detach',
+    'disconnect',
+    'dropnextevent',
+    'findxsrvs',
+    'getaliases',
+    'getannidents',
+    'getannotations',
+    'getbanner',
+    'getclass',
+    'getdsoprop',
+    'getdsopropnum',
+    'getexitcode',
+    'getfromgid',
+    'getfromid',
+    'getfromuid',
+    'getgid',
+    'gethostalias',
+    'getid',
+    'getmodprop',
+    'getmodpropnum',
+    'getnextevent',
+    'getnode',
+    'getrmtid',
+    'getstatus',
+    'getsysinfo',
+    'gettimer',
+    'getuid',
+    'getvalue',
+    'isqueueempty',
+    'load',
+    'nullevent',
+    'peeknextevent',
+    'resetmodpar',
+    'run',
+    'send',
+    'setcontrol',
+    'setdefstream',
+    'setgid',
+    'sethostalias',
+    'setmodpar',
+    'settimer',
+    'setuid',
+    'setworkdir',
+    'stop',
+    'unload',
+    'wait',
+    'waitexpired',
+    'waitfor',
+    'waitforend',
+)
+
+
+class MoselLexer(RegexLexer):
+    """
+    For the Mosel optimization language.
+
+    .. versionadded:: 2.6
+    """
+    name = 'Mosel'
+    aliases = ['mosel']
+    filenames = ['*.mos']
+
+    tokens = {
+        'root': [
+            (r'\n', Text),
+            (r'\s+', Text.Whitespace),
+            (r'!.*?\n', Comment.Single),
+            (r'\(!(.|\n)*?!\)', Comment.Multiline),
+            (words((
+                'and', 'as', 'break', 'case', 'count', 'declarations', 'do',
+                'dynamic', 'elif', 'else', 'end-', 'end', 'evaluation', 'false',
+                'forall', 'forward', 'from', 'function', 'hashmap', 'if',
+                'imports', 'include', 'initialisations', 'initializations', 'inter',
+                'max', 'min', 'model', 'namespace', 'next', 'not', 'nsgroup',
+                'nssearch', 'of', 'options', 'or', 'package', 'parameters',
+                'procedure', 'public', 'prod', 'record', 'repeat', 'requirements',
+                'return', 'sum', 'then', 'to', 'true', 'union', 'until', 'uses',
+                'version', 'while', 'with'), prefix=r'\b', suffix=r'\b'),
+             Keyword.Builtin),
+            (words((
+                'range', 'array', 'set', 'list', 'mpvar', 'mpproblem', 'linctr',
+                'nlctr', 'integer', 'string', 'real', 'boolean', 'text', 'time',
+                'date', 'datetime', 'returned', 'Model', 'Mosel', 'counter',
+                'xmldoc', 'is_sos1', 'is_sos2', 'is_integer', 'is_binary',
+                'is_continuous', 'is_free', 'is_semcont', 'is_semint',
+                'is_partint'), prefix=r'\b', suffix=r'\b'),
+             Keyword.Type),
+            (r'(\+|\-|\*|/|=|<=|>=|\||\^|<|>|<>|\.\.|\.|:=|::|:|in|mod|div)',
+             Operator),
+            (r'[()\[\]{},;]+', Punctuation),
+            (words(FUNCTIONS,  prefix=r'\b', suffix=r'\b'), Name.Function),
+            (r'(\d+\.(?!\.)\d*|\.(?!.)\d+)([eE][+-]?\d+)?', Number.Float),
+            (r'\d+([eE][+-]?\d+)?', Number.Integer),
+            (r'[+-]?Infinity', Number.Integer),
+            (r'0[xX][0-9a-fA-F]+', Number),
+            (r'"', String.Double, 'double_quote'),
+            (r'\'', String.Single, 'single_quote'),
+            (r'(\w+|(\.(?!\.)))', Text),
+        ],
+        'single_quote': [
+            (r'\'', String.Single, '#pop'),
+            (r'[^\']+', String.Single),
+        ],
+        'double_quote': [
+            (r'(\\"|\\[0-7]{1,3}\D|\\[abfnrtv]|\\\\)', String.Escape),
+            (r'\"', String.Double, '#pop'),
+            (r'[^"\\]+', String.Double),
+        ],
+    }
--- a/eric6/ThirdParty/Pygments/pygments/lexers/ncl.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/ThirdParty/Pygments/pygments/lexers/ncl.py	Sat May 02 13:51:07 2020 +0200
@@ -5,7 +5,7 @@
 
     Lexers for NCAR Command Language.
 
-    :copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
--- a/eric6/ThirdParty/Pygments/pygments/lexers/nimrod.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/ThirdParty/Pygments/pygments/lexers/nimrod.py	Sat May 02 13:51:07 2020 +0200
@@ -5,7 +5,7 @@
 
     Lexer for the Nim language (formerly known as Nimrod).
 
-    :copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
--- a/eric6/ThirdParty/Pygments/pygments/lexers/nit.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/ThirdParty/Pygments/pygments/lexers/nit.py	Sat May 02 13:51:07 2020 +0200
@@ -5,7 +5,7 @@
 
     Lexer for the Nit language.
 
-    :copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
--- a/eric6/ThirdParty/Pygments/pygments/lexers/nix.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/ThirdParty/Pygments/pygments/lexers/nix.py	Sat May 02 13:51:07 2020 +0200
@@ -5,7 +5,7 @@
 
     Lexers for the NixOS Nix language.
 
-    :copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
--- a/eric6/ThirdParty/Pygments/pygments/lexers/oberon.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/ThirdParty/Pygments/pygments/lexers/oberon.py	Sat May 02 13:51:07 2020 +0200
@@ -5,7 +5,7 @@
 
     Lexers for Oberon family languages.
 
-    :copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
--- a/eric6/ThirdParty/Pygments/pygments/lexers/objective.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/ThirdParty/Pygments/pygments/lexers/objective.py	Sat May 02 13:51:07 2020 +0200
@@ -5,7 +5,7 @@
 
     Lexers for Objective-C family languages.
 
-    :copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -66,7 +66,7 @@
                     'copy', 'retain', 'assign', 'unsafe_unretained', 'atomic', 'nonatomic',
                     'readonly', 'readwrite', 'setter', 'getter', 'typeof', 'in',
                     'out', 'inout', 'release', 'class', '@dynamic', '@optional',
-                    '@required', '@autoreleasepool'), suffix=r'\b'),
+                    '@required', '@autoreleasepool', '@import'), suffix=r'\b'),
                  Keyword),
                 (words(('id', 'instancetype', 'Class', 'IMP', 'SEL', 'BOOL',
                         'IBOutlet', 'IBAction', 'unichar'), suffix=r'\b'),
--- a/eric6/ThirdParty/Pygments/pygments/lexers/ooc.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/ThirdParty/Pygments/pygments/lexers/ooc.py	Sat May 02 13:51:07 2020 +0200
@@ -5,7 +5,7 @@
 
     Lexers for the Ooc language.
 
-    :copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
--- a/eric6/ThirdParty/Pygments/pygments/lexers/other.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/ThirdParty/Pygments/pygments/lexers/other.py	Sat May 02 13:51:07 2020 +0200
@@ -5,7 +5,7 @@
 
     Just export lexer classes previously contained in this module.
 
-    :copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
--- a/eric6/ThirdParty/Pygments/pygments/lexers/parasail.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/ThirdParty/Pygments/pygments/lexers/parasail.py	Sat May 02 13:51:07 2020 +0200
@@ -5,7 +5,7 @@
 
     Lexer for ParaSail.
 
-    :copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
--- a/eric6/ThirdParty/Pygments/pygments/lexers/parsers.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/ThirdParty/Pygments/pygments/lexers/parsers.py	Sat May 02 13:51:07 2020 +0200
@@ -5,7 +5,7 @@
 
     Lexers for parser generators.
 
-    :copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
--- a/eric6/ThirdParty/Pygments/pygments/lexers/pascal.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/ThirdParty/Pygments/pygments/lexers/pascal.py	Sat May 02 13:51:07 2020 +0200
@@ -5,7 +5,7 @@
 
     Lexers for Pascal family languages.
 
-    :copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -68,29 +68,29 @@
         'dispose', 'exit', 'false', 'new', 'true'
     )
 
-    BLOCK_KEYWORDS = set((
+    BLOCK_KEYWORDS = {
         'begin', 'class', 'const', 'constructor', 'destructor', 'end',
         'finalization', 'function', 'implementation', 'initialization',
         'label', 'library', 'operator', 'procedure', 'program', 'property',
         'record', 'threadvar', 'type', 'unit', 'uses', 'var'
-    ))
+    }
 
-    FUNCTION_MODIFIERS = set((
+    FUNCTION_MODIFIERS = {
         'alias', 'cdecl', 'export', 'inline', 'interrupt', 'nostackframe',
         'pascal', 'register', 'safecall', 'softfloat', 'stdcall',
         'varargs', 'name', 'dynamic', 'near', 'virtual', 'external',
         'override', 'assembler'
-    ))
+    }
 
     # XXX: those aren't global. but currently we know no way for defining
     #      them just for the type context.
-    DIRECTIVES = set((
+    DIRECTIVES = {
         'absolute', 'abstract', 'assembler', 'cppdecl', 'default', 'far',
         'far16', 'forward', 'index', 'oldfpccall', 'private', 'protected',
         'published', 'public'
-    ))
+    }
 
-    BUILTIN_TYPES = set((
+    BUILTIN_TYPES = {
         'ansichar', 'ansistring', 'bool', 'boolean', 'byte', 'bytebool',
         'cardinal', 'char', 'comp', 'currency', 'double', 'dword',
         'extended', 'int64', 'integer', 'iunknown', 'longbool', 'longint',
@@ -104,7 +104,7 @@
         'shortstring', 'single', 'smallint', 'string', 'tclass', 'tdate',
         'tdatetime', 'textfile', 'thandle', 'tobject', 'ttime', 'variant',
         'widechar', 'widestring', 'word', 'wordbool'
-    ))
+    }
 
     BUILTIN_UNITS = {
         'System': (
@@ -246,7 +246,7 @@
         )
     }
 
-    ASM_REGISTERS = set((
+    ASM_REGISTERS = {
         'ah', 'al', 'ax', 'bh', 'bl', 'bp', 'bx', 'ch', 'cl', 'cr0',
         'cr1', 'cr2', 'cr3', 'cr4', 'cs', 'cx', 'dh', 'di', 'dl', 'dr0',
         'dr1', 'dr2', 'dr3', 'dr4', 'dr5', 'dr6', 'dr7', 'ds', 'dx',
@@ -255,9 +255,9 @@
         'mm7', 'si', 'sp', 'ss', 'st0', 'st1', 'st2', 'st3', 'st4', 'st5',
         'st6', 'st7', 'xmm0', 'xmm1', 'xmm2', 'xmm3', 'xmm4', 'xmm5',
         'xmm6', 'xmm7'
-    ))
+    }
 
-    ASM_INSTRUCTIONS = set((
+    ASM_INSTRUCTIONS = {
         'aaa', 'aad', 'aam', 'aas', 'adc', 'add', 'and', 'arpl', 'bound',
         'bsf', 'bsr', 'bswap', 'bt', 'btc', 'btr', 'bts', 'call', 'cbw',
         'cdq', 'clc', 'cld', 'cli', 'clts', 'cmc', 'cmova', 'cmovae',
@@ -296,7 +296,7 @@
         'sysret', 'test', 'ud1', 'ud2', 'umov', 'verr', 'verw', 'wait',
         'wbinvd', 'wrmsr', 'wrshr', 'xadd', 'xbts', 'xchg', 'xlat',
         'xlatb', 'xor'
-    ))
+    }
 
     def __init__(self, **options):
         Lexer.__init__(self, **options)
@@ -577,7 +577,7 @@
             (r'\n+', Text),
         ],
         'numbers': [
-            (r'[0-9_]+#[0-9a-f]+#', Number.Hex),
+            (r'[0-9_]+#[0-9a-f_\.]+#', Number.Hex),
             (r'[0-9_]+\.[0-9_]*', Number.Float),
             (r'[0-9_]+', Number.Integer),
         ],
--- a/eric6/ThirdParty/Pygments/pygments/lexers/pawn.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/ThirdParty/Pygments/pygments/lexers/pawn.py	Sat May 02 13:51:07 2020 +0200
@@ -5,7 +5,7 @@
 
     Lexers for the Pawn languages.
 
-    :copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -86,25 +86,25 @@
         ]
     }
 
-    SM_TYPES = set(('Action', 'bool', 'Float', 'Plugin', 'String', 'any',
-                    'AdminFlag', 'OverrideType', 'OverrideRule', 'ImmunityType',
-                    'GroupId', 'AdminId', 'AdmAccessMode', 'AdminCachePart',
-                    'CookieAccess', 'CookieMenu', 'CookieMenuAction', 'NetFlow',
-                    'ConVarBounds', 'QueryCookie', 'ReplySource',
-                    'ConVarQueryResult', 'ConVarQueryFinished', 'Function',
-                    'Action', 'Identity', 'PluginStatus', 'PluginInfo', 'DBResult',
-                    'DBBindType', 'DBPriority', 'PropType', 'PropFieldType',
-                    'MoveType', 'RenderMode', 'RenderFx', 'EventHookMode',
-                    'EventHook', 'FileType', 'FileTimeMode', 'PathType',
-                    'ParamType', 'ExecType', 'DialogType', 'Handle', 'KvDataTypes',
-                    'NominateResult', 'MapChange', 'MenuStyle', 'MenuAction',
-                    'MenuSource', 'RegexError', 'SDKCallType', 'SDKLibrary',
-                    'SDKFuncConfSource', 'SDKType', 'SDKPassMethod', 'RayType',
-                    'TraceEntityFilter', 'ListenOverride', 'SortOrder', 'SortType',
-                    'SortFunc2D', 'APLRes', 'FeatureType', 'FeatureStatus',
-                    'SMCResult', 'SMCError', 'TFClassType', 'TFTeam', 'TFCond',
-                    'TFResourceType', 'Timer', 'TopMenuAction', 'TopMenuObjectType',
-                    'TopMenuPosition', 'TopMenuObject', 'UserMsg'))
+    SM_TYPES = {'Action', 'bool', 'Float', 'Plugin', 'String', 'any',
+                'AdminFlag', 'OverrideType', 'OverrideRule', 'ImmunityType',
+                'GroupId', 'AdminId', 'AdmAccessMode', 'AdminCachePart',
+                'CookieAccess', 'CookieMenu', 'CookieMenuAction', 'NetFlow',
+                'ConVarBounds', 'QueryCookie', 'ReplySource',
+                'ConVarQueryResult', 'ConVarQueryFinished', 'Function',
+                'Action', 'Identity', 'PluginStatus', 'PluginInfo', 'DBResult',
+                'DBBindType', 'DBPriority', 'PropType', 'PropFieldType',
+                'MoveType', 'RenderMode', 'RenderFx', 'EventHookMode',
+                'EventHook', 'FileType', 'FileTimeMode', 'PathType',
+                'ParamType', 'ExecType', 'DialogType', 'Handle', 'KvDataTypes',
+                'NominateResult', 'MapChange', 'MenuStyle', 'MenuAction',
+                'MenuSource', 'RegexError', 'SDKCallType', 'SDKLibrary',
+                'SDKFuncConfSource', 'SDKType', 'SDKPassMethod', 'RayType',
+                'TraceEntityFilter', 'ListenOverride', 'SortOrder', 'SortType',
+                'SortFunc2D', 'APLRes', 'FeatureType', 'FeatureStatus',
+                'SMCResult', 'SMCError', 'TFClassType', 'TFTeam', 'TFCond',
+                'TFResourceType', 'Timer', 'TopMenuAction', 'TopMenuObjectType',
+                'TopMenuPosition', 'TopMenuObject', 'UserMsg'}
 
     def __init__(self, **options):
         self.smhighlighting = get_bool_opt(options,
--- a/eric6/ThirdParty/Pygments/pygments/lexers/perl.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/ThirdParty/Pygments/pygments/lexers/perl.py	Sat May 02 13:51:07 2020 +0200
@@ -3,9 +3,9 @@
     pygments.lexers.perl
     ~~~~~~~~~~~~~~~~~~~~
 
-    Lexers for Perl and related languages.
+    Lexers for Perl, Raku and related languages.
 
-    :copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -22,7 +22,7 @@
 
 class PerlLexer(RegexLexer):
     """
-    For `Perl <http://www.perl.org>`_ source code.
+    For `Perl <https://www.perl.org>`_ source code.
     """
 
     name = 'Perl'
@@ -214,91 +214,189 @@
 
 class Perl6Lexer(ExtendedRegexLexer):
     """
-    For `Perl 6 <http://www.perl6.org>`_ source code.
+    For `Raku <https://www.raku.org>`_ (a.k.a. Perl 6) source code.
 
     .. versionadded:: 2.0
     """
 
     name = 'Perl6'
-    aliases = ['perl6', 'pl6']
+    aliases = ['perl6', 'pl6', 'raku']
     filenames = ['*.pl', '*.pm', '*.nqp', '*.p6', '*.6pl', '*.p6l', '*.pl6',
-                 '*.6pm', '*.p6m', '*.pm6', '*.t']
+                 '*.6pm', '*.p6m', '*.pm6', '*.t', '*.raku', '*.rakumod',
+                 '*.rakutest', '*.rakudoc']
     mimetypes = ['text/x-perl6', 'application/x-perl6']
     flags = re.MULTILINE | re.DOTALL | re.UNICODE
 
     PERL6_IDENTIFIER_RANGE = r"['\w:-]"
 
     PERL6_KEYWORDS = (
-        'BEGIN', 'CATCH', 'CHECK', 'CONTROL', 'END', 'ENTER', 'FIRST', 'INIT',
-        'KEEP', 'LAST', 'LEAVE', 'NEXT', 'POST', 'PRE', 'START', 'TEMP',
-        'UNDO', 'as', 'assoc', 'async', 'augment', 'binary', 'break', 'but',
-        'cached', 'category', 'class', 'constant', 'contend', 'continue',
-        'copy', 'deep', 'default', 'defequiv', 'defer', 'die', 'do', 'else',
-        'elsif', 'enum', 'equiv', 'exit', 'export', 'fail', 'fatal', 'for',
-        'gather', 'given', 'goto', 'grammar', 'handles', 'has', 'if', 'inline',
-        'irs', 'is', 'last', 'leave', 'let', 'lift', 'loop', 'looser', 'macro',
-        'make', 'maybe', 'method', 'module', 'multi', 'my', 'next', 'of',
-        'ofs', 'only', 'oo', 'ors', 'our', 'package', 'parsed', 'prec',
-        'proto', 'readonly', 'redo', 'ref', 'regex', 'reparsed', 'repeat',
-        'require', 'required', 'return', 'returns', 'role', 'rule', 'rw',
-        'self', 'slang', 'state', 'sub', 'submethod', 'subset', 'supersede',
-        'take', 'temp', 'tighter', 'token', 'trusts', 'try', 'unary',
-        'unless', 'until', 'use', 'warn', 'when', 'where', 'while', 'will',
+        #Phasers
+        'BEGIN','CATCH','CHECK','CLOSE','CONTROL','DOC','END','ENTER','FIRST',
+        'INIT','KEEP','LAST','LEAVE','NEXT','POST','PRE','QUIT','UNDO',
+        #Keywords
+        'anon','augment','but','class','constant','default','does','else',
+        'elsif','enum','for','gather','given','grammar','has','if','import',
+        'is','let','loop','made','make','method','module','multi','my','need',
+        'orwith','our','proceed','proto','repeat','require','return',
+        'return-rw','returns','role','rule','state','sub','submethod','subset',
+        'succeed','supersede','token','try','unit','unless','until','use',
+        'when','while','with','without',
+        #Traits
+        'export','native','repr','required','rw','symbol',
     )
 
     PERL6_BUILTINS = (
-        'ACCEPTS', 'HOW', 'REJECTS', 'VAR', 'WHAT', 'WHENCE', 'WHERE', 'WHICH',
-        'WHO', 'abs', 'acos', 'acosec', 'acosech', 'acosh', 'acotan', 'acotanh',
-        'all', 'any', 'approx', 'arity', 'asec', 'asech', 'asin', 'asinh',
-        'assuming', 'atan', 'atan2', 'atanh', 'attr', 'bless', 'body', 'by',
-        'bytes', 'caller', 'callsame', 'callwith', 'can', 'capitalize', 'cat',
-        'ceiling', 'chars', 'chmod', 'chomp', 'chop', 'chr', 'chroot',
-        'circumfix', 'cis', 'classify', 'clone', 'close', 'cmp_ok', 'codes',
-        'comb', 'connect', 'contains', 'context', 'cos', 'cosec', 'cosech',
-        'cosh', 'cotan', 'cotanh', 'count', 'defined', 'delete', 'diag',
-        'dies_ok', 'does', 'e', 'each', 'eager', 'elems', 'end', 'eof', 'eval',
-        'eval_dies_ok', 'eval_elsewhere', 'eval_lives_ok', 'evalfile', 'exists',
-        'exp', 'first', 'flip', 'floor', 'flunk', 'flush', 'fmt', 'force_todo',
-        'fork', 'from', 'getc', 'gethost', 'getlogin', 'getpeername', 'getpw',
-        'gmtime', 'graphs', 'grep', 'hints', 'hyper', 'im', 'index', 'infix',
-        'invert', 'is_approx', 'is_deeply', 'isa', 'isa_ok', 'isnt', 'iterator',
-        'join', 'key', 'keys', 'kill', 'kv', 'lastcall', 'lazy', 'lc', 'lcfirst',
-        'like', 'lines', 'link', 'lives_ok', 'localtime', 'log', 'log10', 'map',
-        'max', 'min', 'minmax', 'name', 'new', 'nextsame', 'nextwith', 'nfc',
-        'nfd', 'nfkc', 'nfkd', 'nok_error', 'nonce', 'none', 'normalize', 'not',
-        'nothing', 'ok', 'once', 'one', 'open', 'opendir', 'operator', 'ord',
-        'p5chomp', 'p5chop', 'pack', 'pair', 'pairs', 'pass', 'perl', 'pi',
-        'pick', 'plan', 'plan_ok', 'polar', 'pop', 'pos', 'postcircumfix',
-        'postfix', 'pred', 'prefix', 'print', 'printf', 'push', 'quasi',
-        'quotemeta', 'rand', 're', 'read', 'readdir', 'readline', 'reduce',
-        'reverse', 'rewind', 'rewinddir', 'rindex', 'roots', 'round',
-        'roundrobin', 'run', 'runinstead', 'sameaccent', 'samecase', 'say',
-        'sec', 'sech', 'sech', 'seek', 'shape', 'shift', 'sign', 'signature',
-        'sin', 'sinh', 'skip', 'skip_rest', 'sleep', 'slurp', 'sort', 'splice',
-        'split', 'sprintf', 'sqrt', 'srand', 'strand', 'subst', 'substr', 'succ',
-        'sum', 'symlink', 'tan', 'tanh', 'throws_ok', 'time', 'times', 'to',
-        'todo', 'trim', 'trim_end', 'trim_start', 'true', 'truncate', 'uc',
-        'ucfirst', 'undef', 'undefine', 'uniq', 'unlike', 'unlink', 'unpack',
-        'unpolar', 'unshift', 'unwrap', 'use_ok', 'value', 'values', 'vec',
-        'version_lt', 'void', 'wait', 'want', 'wrap', 'write', 'zip',
+        'ACCEPTS','abs','abs2rel','absolute','accept','accessed','acos',
+        'acosec','acosech','acosh','acotan','acotanh','acquire','act','action',
+        'actions','add','add_attribute','add_enum_value','add_fallback',
+        'add_method','add_parent','add_private_method','add_role','add_trustee',
+        'adverb','after','all','allocate','allof','allowed','alternative-names',
+        'annotations','antipair','antipairs','any','anyof','app_lifetime',
+        'append','arch','archname','args','arity','Array','asec','asech','asin',
+        'asinh','ASSIGN-KEY','ASSIGN-POS','assuming','ast','at','atan','atan2',
+        'atanh','AT-KEY','atomic-assign','atomic-dec-fetch','atomic-fetch',
+        'atomic-fetch-add','atomic-fetch-dec','atomic-fetch-inc',
+        'atomic-fetch-sub','atomic-inc-fetch','AT-POS','attributes','auth',
+        'await','backtrace','Bag','BagHash','bail-out','base','basename',
+        'base-repeating','batch','BIND-KEY','BIND-POS','bind-stderr',
+        'bind-stdin','bind-stdout','bind-udp','bits','bless','block','Bool',
+        'bool-only','bounds','break','Bridge','broken','BUILD','build-date',
+        'bytes','cache','callframe','calling-package','CALL-ME','callsame',
+        'callwith','can','cancel','candidates','cando','can-ok','canonpath',
+        'caps','caption','Capture','cas','catdir','categorize','categorize-list',
+        'catfile','catpath','cause','ceiling','cglobal','changed','Channel',
+        'chars','chdir','child','child-name','child-typename','chmod','chomp',
+        'chop','chr','chrs','chunks','cis','classify','classify-list','cleanup',
+        'clone','close','closed','close-stdin','cmp-ok','code','codes','collate',
+        'column','comb','combinations','command','comment','compiler','Complex',
+        'compose','compose_type','composer','condition','config',
+        'configure_destroy','configure_type_checking','conj','connect',
+        'constraints','construct','contains','contents','copy','cos','cosec',
+        'cosech','cosh','cotan','cotanh','count','count-only','cpu-cores',
+        'cpu-usage','CREATE','create_type','cross','cue','curdir','curupdir','d',
+        'Date','DateTime','day','daycount','day-of-month','day-of-week',
+        'day-of-year','days-in-month','declaration','decode','decoder','deepmap',
+        'default','defined','DEFINITE','delayed','DELETE-KEY','DELETE-POS',
+        'denominator','desc','DESTROY','destroyers','devnull','diag',
+        'did-you-mean','die','dies-ok','dir','dirname','dir-sep','DISTROnames',
+        'do','does','does-ok','done','done-testing','duckmap','dynamic','e',
+        'eager','earlier','elems','emit','enclosing','encode','encoder',
+        'encoding','end','ends-with','enum_from_value','enum_value_list',
+        'enum_values','enums','eof','EVAL','eval-dies-ok','EVALFILE',
+        'eval-lives-ok','exception','excludes-max','excludes-min','EXISTS-KEY',
+        'EXISTS-POS','exit','exitcode','exp','expected','explicitly-manage',
+        'expmod','extension','f','fail','fails-like','fc','feature','file',
+        'filename','find_method','find_method_qualified','finish','first','flat',
+        'flatmap','flip','floor','flunk','flush','fmt','format','formatter',
+        'freeze','from','from-list','from-loop','from-posix','full',
+        'full-barrier','get','get_value','getc','gist','got','grab','grabpairs',
+        'grep','handle','handled','handles','hardware','has_accessor','Hash',
+        'head','headers','hh-mm-ss','hidden','hides','hour','how','hyper','id',
+        'illegal','im','in','indent','index','indices','indir','infinite',
+        'infix','infix:<+>','infix:<->','install_method_cache','Instant',
+        'instead','Int','int-bounds','interval','in-timezone','invalid-str',
+        'invert','invocant','IO','IO::Notification.watch-path','is_trusted',
+        'is_type','isa','is-absolute','isa-ok','is-approx','is-deeply',
+        'is-hidden','is-initial-thread','is-int','is-lazy','is-leap-year',
+        'isNaN','isnt','is-prime','is-relative','is-routine','is-setting',
+        'is-win','item','iterator','join','keep','kept','KERNELnames','key',
+        'keyof','keys','kill','kv','kxxv','l','lang','last','lastcall','later',
+        'lazy','lc','leading','level','like','line','lines','link','List',
+        'listen','live','lives-ok','local','lock','log','log10','lookup','lsb',
+        'made','MAIN','make','Map','match','max','maxpairs','merge','message',
+        'method','method_table','methods','migrate','min','minmax','minpairs',
+        'minute','misplaced','Mix','MixHash','mkdir','mode','modified','month',
+        'move','mro','msb','multi','multiness','my','name','named','named_names',
+        'narrow','nativecast','native-descriptor','nativesizeof','new','new_type',
+        'new-from-daycount','new-from-pairs','next','nextcallee','next-handle',
+        'nextsame','nextwith','NFC','NFD','NFKC','NFKD','nl-in','nl-out',
+        'nodemap','nok','none','norm','not','note','now','nude','Num',
+        'numerator','Numeric','of','offset','offset-in-hours','offset-in-minutes',
+        'ok','old','on-close','one','on-switch','open','opened','operation',
+        'optional','ord','ords','orig','os-error','osname','out-buffer','pack',
+        'package','package-kind','package-name','packages','pair','pairs',
+        'pairup','parameter','params','parent','parent-name','parents','parse',
+        'parse-base','parsefile','parse-names','parts','pass','path','path-sep',
+        'payload','peer-host','peer-port','periods','perl','permutations','phaser',
+        'pick','pickpairs','pid','placeholder','plan','plus','polar','poll',
+        'polymod','pop','pos','positional','posix','postfix','postmatch',
+        'precomp-ext','precomp-target','pred','prefix','prematch','prepend',
+        'print','printf','print-nl','print-to','private','private_method_table',
+        'proc','produce','Promise','prompt','protect','pull-one','push',
+        'push-all','push-at-least','push-exactly','push-until-lazy','put',
+        'qualifier-type','quit','r','race','radix','rand','range','Rat','raw',
+        're','read','readchars','readonly','ready','Real','reallocate','reals',
+        'reason','rebless','receive','recv','redispatcher','redo','reduce',
+        'rel2abs','relative','release','rename','repeated','replacement',
+        'report','reserved','resolve','restore','result','resume','rethrow',
+        'reverse','right','rindex','rmdir','role','roles_to_compose','rolish',
+        'roll','rootdir','roots','rotate','rotor','round','roundrobin',
+        'routine-type','run','rwx','s','samecase','samemark','samewith','say',
+        'schedule-on','scheduler','scope','sec','sech','second','seek','self',
+        'send','Set','set_hidden','set_name','set_package','set_rw','set_value',
+        'SetHash','set-instruments','setup_finalization','shape','share','shell',
+        'shift','sibling','sigil','sign','signal','signals','signature','sin',
+        'sinh','sink','sink-all','skip','skip-at-least','skip-at-least-pull-one',
+        'skip-one','skip-rest','sleep','sleep-timer','sleep-until','Slip','slurp',
+        'slurp-rest','slurpy','snap','snapper','so','socket-host','socket-port',
+        'sort','source','source-package','spawn','SPEC','splice','split',
+        'splitdir','splitpath','sprintf','spurt','sqrt','squish','srand','stable',
+        'start','started','starts-with','status','stderr','stdout','Str',
+        'sub_signature','subbuf','subbuf-rw','subname','subparse','subst',
+        'subst-mutate','substr','substr-eq','substr-rw','subtest','succ','sum',
+        'Supply','symlink','t','tail','take','take-rw','tan','tanh','tap',
+        'target','target-name','tc','tclc','tell','then','throttle','throw',
+        'throws-like','timezone','tmpdir','to','today','todo','toggle','to-posix',
+        'total','trailing','trans','tree','trim','trim-leading','trim-trailing',
+        'truncate','truncated-to','trusts','try_acquire','trying','twigil','type',
+        'type_captures','typename','uc','udp','uncaught_handler','unimatch',
+        'uniname','uninames','uniparse','uniprop','uniprops','unique','unival',
+        'univals','unlike','unlink','unlock','unpack','unpolar','unshift',
+        'unwrap','updir','USAGE','use-ok','utc','val','value','values','VAR',
+        'variable','verbose-config','version','VMnames','volume','vow','w','wait',
+        'warn','watch','watch-path','week','weekday-of-month','week-number',
+        'week-year','WHAT','when','WHERE','WHEREFORE','WHICH','WHO',
+        'whole-second','WHY','wordcase','words','workaround','wrap','write',
+        'write-to','x','yada','year','yield','yyyy-mm-dd','z','zip','zip-latest',
+
     )
 
     PERL6_BUILTIN_CLASSES = (
-        'Abstraction', 'Any', 'AnyChar', 'Array', 'Associative', 'Bag', 'Bit',
-        'Blob', 'Block', 'Bool', 'Buf', 'Byte', 'Callable', 'Capture', 'Char', 'Class',
-        'Code', 'Codepoint', 'Comparator', 'Complex', 'Decreasing', 'Exception',
-        'Failure', 'False', 'Grammar', 'Grapheme', 'Hash', 'IO', 'Increasing',
-        'Int', 'Junction', 'KeyBag', 'KeyExtractor', 'KeyHash', 'KeySet',
-        'KitchenSink', 'List', 'Macro', 'Mapping', 'Match', 'Matcher', 'Method',
-        'Module', 'Num', 'Object', 'Ordered', 'Ordering', 'OrderingPair',
-        'Package', 'Pair', 'Positional', 'Proxy', 'Range', 'Rat', 'Regex',
-        'Role', 'Routine', 'Scalar', 'Seq', 'Set', 'Signature', 'Str', 'StrLen',
-        'StrPos', 'Sub', 'Submethod', 'True', 'UInt', 'Undef', 'Version', 'Void',
-        'Whatever', 'bit', 'bool', 'buf', 'buf1', 'buf16', 'buf2', 'buf32',
-        'buf4', 'buf64', 'buf8', 'complex', 'int', 'int1', 'int16', 'int2',
-        'int32', 'int4', 'int64', 'int8', 'num', 'rat', 'rat1', 'rat16', 'rat2',
-        'rat32', 'rat4', 'rat64', 'rat8', 'uint', 'uint1', 'uint16', 'uint2',
-        'uint32', 'uint4', 'uint64', 'uint8', 'utf16', 'utf32', 'utf8',
+        #Booleans
+        'False','True',
+        #Classes
+        'Any','Array','Associative','AST','atomicint','Attribute','Backtrace',
+        'Backtrace::Frame','Bag','Baggy','BagHash','Blob','Block','Bool','Buf',
+        'Callable','CallFrame','Cancellation','Capture','CArray','Channel','Code',
+        'compiler','Complex','ComplexStr','Cool','CurrentThreadScheduler',
+        'Cursor','Date','Dateish','DateTime','Distro','Duration','Encoding',
+        'Exception','Failure','FatRat','Grammar','Hash','HyperWhatever','Instant',
+        'Int','int16','int32','int64','int8','IntStr','IO','IO::ArgFiles',
+        'IO::CatHandle','IO::Handle','IO::Notification','IO::Path',
+        'IO::Path::Cygwin','IO::Path::QNX','IO::Path::Unix','IO::Path::Win32',
+        'IO::Pipe','IO::Socket','IO::Socket::Async','IO::Socket::INET','IO::Spec',
+        'IO::Spec::Cygwin','IO::Spec::QNX','IO::Spec::Unix','IO::Spec::Win32',
+        'IO::Special','Iterable','Iterator','Junction','Kernel','Label','List',
+        'Lock','Lock::Async','long','longlong','Macro','Map','Match',
+        'Metamodel::AttributeContainer','Metamodel::C3MRO','Metamodel::ClassHOW',
+        'Metamodel::EnumHOW','Metamodel::Finalization','Metamodel::MethodContainer',
+        'Metamodel::MROBasedMethodDispatch','Metamodel::MultipleInheritance',
+        'Metamodel::Naming','Metamodel::Primitives','Metamodel::PrivateMethodContainer',
+        'Metamodel::RoleContainer','Metamodel::Trusting','Method','Mix','MixHash',
+        'Mixy','Mu','NFC','NFD','NFKC','NFKD','Nil','Num','num32','num64',
+        'Numeric','NumStr','ObjAt','Order','Pair','Parameter','Perl','Pod::Block',
+        'Pod::Block::Code','Pod::Block::Comment','Pod::Block::Declarator',
+        'Pod::Block::Named','Pod::Block::Para','Pod::Block::Table','Pod::Heading',
+        'Pod::Item','Pointer','Positional','PositionalBindFailover','Proc',
+        'Proc::Async','Promise','Proxy','PseudoStash','QuantHash','Range','Rat',
+        'Rational','RatStr','Real','Regex','Routine','Scalar','Scheduler',
+        'Semaphore','Seq','Set','SetHash','Setty','Signature','size_t','Slip',
+        'Stash','Str','StrDistance','Stringy','Sub','Submethod','Supplier',
+        'Supplier::Preserving','Supply','Systemic','Tap','Telemetry',
+        'Telemetry::Instrument::Thread','Telemetry::Instrument::Usage',
+        'Telemetry::Period','Telemetry::Sampler','Thread','ThreadPoolScheduler',
+        'UInt','uint16','uint32','uint64','uint8','Uni','utf8','Variable',
+        'Version','VM','Whatever','WhateverCode','WrapHandle'
     )
 
     PERL6_OPERATORS = (
@@ -311,7 +409,7 @@
         '~', '&', '^', 'but', 'does', '<=>', '..', '..^', '^..', '^..^',
         '!=', '==', '<', '<=', '>', '>=', '~~', '===', '!eqv',
         '&&', '||', '^^', '//', 'min', 'max', '??', '!!', 'ff', 'fff', 'so',
-        'not', '<==', '==>', '<<==', '==>>',
+        'not', '<==', '==>', '<<==', '==>>','unicmp',
     )
 
     # Perl 6 has a *lot* of possible bracketing characters
--- a/eric6/ThirdParty/Pygments/pygments/lexers/php.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/ThirdParty/Pygments/pygments/lexers/php.py	Sat May 02 13:51:07 2020 +0200
@@ -5,7 +5,7 @@
 
     Lexers for PHP and related languages.
 
-    :copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -15,7 +15,7 @@
     this, words
 from pygments.token import Text, Comment, Operator, Keyword, Name, String, \
     Number, Punctuation, Other
-from pygments.util import get_bool_opt, get_list_opt, iteritems
+from pygments.util import get_bool_opt, get_list_opt, shebang_matches
 
 __all__ = ['ZephirLexer', 'PhpLexer']
 
@@ -49,13 +49,14 @@
             include('commentsandwhitespace'),
             (r'/(\\.|[^[/\\\n]|\[(\\.|[^\]\\\n])*])+/'
              r'([gim]+\b|\B)', String.Regex, '#pop'),
+            (r'/', Operator, '#pop'),
             default('#pop')
         ],
         'badregex': [
             (r'\n', Text, '#pop')
         ],
         'root': [
-            (r'^(?=\s|/|<!--)', Text, 'slashstartsregex'),
+            (r'^(?=\s|/)', Text, 'slashstartsregex'),
             include('commentsandwhitespace'),
             (r'\+\+|--|~|&&|\?|:|\|\||\\(?=\n)|'
              r'(<<|>>>?|==?|!=?|->|[-<>+*%&|^/])=?', Operator, 'slashstartsregex'),
@@ -243,7 +244,7 @@
         self._functions = set()
         if self.funcnamehighlighting:
             from pygments.lexers._php_builtins import MODULES
-            for key, value in iteritems(MODULES):
+            for key, value in MODULES.items():
                 if key not in self.disabledmodules:
                     self._functions.update(value)
         RegexLexer.__init__(self, **options)
@@ -261,6 +262,8 @@
             yield index, token, value
 
     def analyse_text(text):
+        if shebang_matches(text, r'php'):
+            return True
         rv = 0.0
         if re.search(r'<\?(?!xml)', text):
             rv += 0.3
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/eric6/ThirdParty/Pygments/pygments/lexers/pony.py	Sat May 02 13:51:07 2020 +0200
@@ -0,0 +1,94 @@
+# -*- coding: utf-8 -*-
+"""
+    pygments.lexers.pony
+    ~~~~~~~~~~~~~~~~~~~~
+
+    Lexers for Pony and related languages.
+
+    :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
+    :license: BSD, see LICENSE for details.
+"""
+
+from pygments.lexer import RegexLexer, bygroups, words
+from pygments.token import Text, Comment, Operator, Keyword, Name, String, \
+    Number, Punctuation
+
+__all__ = ['PonyLexer']
+
+
+class PonyLexer(RegexLexer):
+    """
+    For Pony source code.
+
+    .. versionadded:: 2.4
+    """
+
+    name = 'Pony'
+    aliases = ['pony']
+    filenames = ['*.pony']
+
+    _caps = r'(iso|trn|ref|val|box|tag)'
+
+    tokens = {
+        'root': [
+            (r'\n', Text),
+            (r'[^\S\n]+', Text),
+            (r'//.*\n', Comment.Single),
+            (r'/\*', Comment.Multiline, 'nested_comment'),
+            (r'"""(?:.|\n)*?"""', String.Doc),
+            (r'"', String, 'string'),
+            (r'\'.*\'', String.Char),
+            (r'=>|[]{}:().~;,|&!^?[]', Punctuation),
+            (words((
+                'addressof', 'and', 'as', 'consume', 'digestof', 'is', 'isnt',
+                'not', 'or'),
+                suffix=r'\b'),
+             Operator.Word),
+            (r'!=|==|<<|>>|[-+/*%=<>]', Operator),
+            (words((
+                'box', 'break', 'compile_error', 'compile_intrinsic',
+                'continue', 'do', 'else', 'elseif', 'embed', 'end', 'error',
+                'for', 'if', 'ifdef', 'in', 'iso', 'lambda', 'let', 'match',
+                'object', 'recover', 'ref', 'repeat', 'return', 'tag', 'then',
+                'this', 'trn', 'try', 'until', 'use', 'var', 'val', 'where',
+                'while', 'with', '#any', '#read', '#send', '#share'),
+                suffix=r'\b'),
+             Keyword),
+            (r'(actor|class|struct|primitive|interface|trait|type)((?:\s)+)',
+             bygroups(Keyword, Text), 'typename'),
+            (r'(new|fun|be)((?:\s)+)', bygroups(Keyword, Text), 'methodname'),
+            (words((
+                'I8', 'U8', 'I16', 'U16', 'I32', 'U32', 'I64', 'U64', 'I128',
+                'U128', 'ILong', 'ULong', 'ISize', 'USize', 'F32', 'F64',
+                'Bool', 'Pointer', 'None', 'Any', 'Array', 'String',
+                'Iterator'),
+                suffix=r'\b'),
+             Name.Builtin.Type),
+            (r'_?[A-Z]\w*', Name.Type),
+            (r'(\d+\.\d*|\.\d+|\d+)[eE][+-]?\d+', Number.Float),
+            (r'0x[0-9a-fA-F]+', Number.Hex),
+            (r'\d+', Number.Integer),
+            (r'(true|false)\b', Name.Builtin),
+            (r'_\d*', Name),
+            (r'_?[a-z][\w\'_]*', Name)
+        ],
+        'typename': [
+            (_caps + r'?((?:\s)*)(_?[A-Z]\w*)',
+             bygroups(Keyword, Text, Name.Class), '#pop')
+        ],
+        'methodname': [
+            (_caps + r'?((?:\s)*)(_?[a-z]\w*)',
+             bygroups(Keyword, Text, Name.Function), '#pop')
+        ],
+        'nested_comment': [
+            (r'[^*/]+', Comment.Multiline),
+            (r'/\*', Comment.Multiline, '#push'),
+            (r'\*/', Comment.Multiline, '#pop'),
+            (r'[*/]', Comment.Multiline)
+        ],
+        'string': [
+            (r'"', String, '#pop'),
+            (r'\\"', String),
+            (r'[^\\"]+', String)
+        ]
+    }
--- a/eric6/ThirdParty/Pygments/pygments/lexers/praat.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/ThirdParty/Pygments/pygments/lexers/praat.py	Sat May 02 13:51:07 2020 +0200
@@ -5,7 +5,7 @@
 
     Lexer for Praat
 
-    :copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -55,7 +55,7 @@
         'exitScript', 'exp', 'extractNumber', 'fileReadable', 'fisherP', 'fisherQ',
         'floor', 'gaussP', 'gaussQ', 'hertzToBark', 'hertzToErb', 'hertzToMel',
         'hertzToSemitones', 'imax', 'imin', 'incompleteBeta', 'incompleteGammaP', 'index',
-        'index_regex', 'invBinomialP', 'invBinomialQ', 'invChiSquareQ', 'invFisherQ',
+        'index_regex', 'integer', 'invBinomialP', 'invBinomialQ', 'invChiSquareQ', 'invFisherQ',
         'invGaussQ', 'invSigmoid', 'invStudentQ', 'length', 'ln', 'lnBeta', 'lnGamma',
         'log10', 'log2', 'max', 'melToHertz', 'min', 'minusObject', 'natural', 'number',
         'numberOfColumns', 'numberOfRows', 'numberOfSelected', 'objectsAreIdentical',
@@ -63,9 +63,9 @@
         'positive', 'randomBinomial', 'randomGauss', 'randomInteger', 'randomPoisson',
         'randomUniform', 'real', 'readFile', 'removeObject', 'rindex', 'rindex_regex',
         'round', 'runScript', 'runSystem', 'runSystem_nocheck', 'selectObject',
-        'selected', 'semitonesToHertz', 'sentencetext', 'sigmoid', 'sin', 'sinc',
+        'selected', 'semitonesToHertz', 'sentence', 'sentencetext', 'sigmoid', 'sin', 'sinc',
         'sincpi', 'sinh', 'soundPressureToPhon', 'sqrt', 'startsWith', 'studentP',
-        'studentQ', 'tan', 'tanh', 'variableExists', 'word', 'writeFile', 'writeFileLine',
+        'studentQ', 'tan', 'tanh', 'text', 'variableExists', 'word', 'writeFile', 'writeFileLine',
         'writeInfo', 'writeInfoLine',
     )
 
@@ -90,9 +90,9 @@
         'KNN', 'KlattGrid', 'KlattTable', 'LFCC', 'LPC', 'Label', 'LegendreSeries',
         'LinearRegression', 'LogisticRegression', 'LongSound', 'Ltas', 'MFCC', 'MSpline',
         'ManPages', 'Manipulation', 'Matrix', 'MelFilter', 'MelSpectrogram',
-        'MixingMatrix', 'Movie', 'Network', 'OTGrammar', 'OTHistory', 'OTMulti', 'PCA',
-        'PairDistribution', 'ParamCurve', 'Pattern', 'Permutation', 'Photo', 'Pitch',
-        'PitchModeler', 'PitchTier', 'PointProcess', 'Polygon', 'Polynomial',
+        'MixingMatrix', 'Movie', 'Network', 'Object', 'OTGrammar', 'OTHistory', 'OTMulti',
+        'PCA', 'PairDistribution', 'ParamCurve', 'Pattern', 'Permutation', 'Photo',
+        'Pitch', 'PitchModeler', 'PitchTier', 'PointProcess', 'Polygon', 'Polynomial',
         'PowerCepstrogram', 'PowerCepstrum', 'Procrustes', 'RealPoint', 'RealTier',
         'ResultsMFC', 'Roots', 'SPINET', 'SSCP', 'SVD', 'Salience', 'ScalarProduct',
         'Similarity', 'SimpleString', 'SortedSetOfString', 'Sound', 'Speaker',
@@ -112,6 +112,10 @@
         'defaultDirectory',
     )
 
+    object_attributes = (
+        'ncol', 'nrow', 'xmin', 'ymin', 'xmax', 'ymax', 'nx', 'ny', 'dx', 'dy',
+    )
+
     tokens = {
         'root': [
             (r'(\s+)(#.*?$)',  bygroups(Text, Comment.Single)),
@@ -148,7 +152,9 @@
         ],
         'command': [
             (r'( ?[\w()-]+ ?)', Keyword),
-            (r"'(?=.*')", String.Interpol, 'string_interpolated'),
+
+            include('string_interpolated'),
+
             (r'\.{3}', Keyword, ('#pop', 'old_arguments')),
             (r':', Keyword, ('#pop', 'comma_list')),
             (r'\s', Text, '#pop'),
@@ -207,50 +213,49 @@
             (r'\n', Text, '#pop'),
             (r'\b\d+(\.\d*)?([eE][-+]?\d+)?%?', Number),
         ],
-        'object_attributes': [
-            (r'\.?(n(col|row)|[xy]min|[xy]max|[nd][xy])\b', Name.Builtin, '#pop'),
-            (r'(\.?(?:col|row)\$)(\[)',
-             bygroups(Name.Builtin, Text), 'variable_name'),
-            (r'(\$?)(\[)',
-             bygroups(Name.Builtin, Text), ('#pop', 'comma_list')),
+        'object_reference': [
+          include('string_interpolated'),
+          (r'([a-z][a-zA-Z0-9_]*|\d+)', Name.Builtin),
+
+          (words(object_attributes, prefix=r'\.'), Name.Builtin, '#pop'),
+
+          (r'\$', Name.Builtin),
+          (r'\[', Text, '#pop'),
         ],
         'variable_name': [
             include('operator'),
             include('number'),
 
             (words(variables_string,  suffix=r'\$'), Name.Variable.Global),
-            (words(variables_numeric, suffix=r'\b'), Name.Variable.Global),
-
-            (r'\bObject_\w+', Name.Builtin, 'object_attributes'),
-            (words(objects, prefix=r'\b', suffix=r'_\w+'),
-             Name.Builtin, 'object_attributes'),
+            (words(variables_numeric,
+             suffix=r'(?=[^a-zA-Z0-9\._"\'\$#\[:\(]|\s|^|$)'),
+             Name.Variable.Global),
 
-            (r"\b(Object_)(')",
-             bygroups(Name.Builtin, String.Interpol),
-             ('object_attributes', 'string_interpolated')),
-            (words(objects, prefix=r'\b', suffix=r"(_)(')"),
-             bygroups(Name.Builtin, Name.Builtin, String.Interpol),
-             ('object_attributes', 'string_interpolated')),
+            (words(objects, prefix=r'\b', suffix=r"(_)"),
+             bygroups(Name.Builtin, Name.Builtin),
+             'object_reference'),
 
             (r'\.?_?[a-z][\w.]*(\$|#)?', Text),
             (r'[\[\]]', Punctuation, 'comma_list'),
-            (r"'(?=.*')", String.Interpol, 'string_interpolated'),
+
+            include('string_interpolated'),
         ],
         'operator': [
             (r'([+\/*<>=!-]=?|[&*|][&*|]?|\^|<>)',       Operator),
             (r'(?<![\w.])(and|or|not|div|mod)(?![\w.])', Operator.Word),
         ],
         'string_interpolated': [
-            (r'\.?[_a-z][\w.]*[$#]?(?:\[[a-zA-Z0-9,]+\])?(:[0-9]+)?',
+            (r'\'[_a-z][^\[\]\'":]*(\[([\d,]+|"[\w\d,]+")\])?(:[0-9]+)?\'',
              String.Interpol),
-            (r"'",          String.Interpol, '#pop'),
         ],
         'string_unquoted': [
             (r'(\n\s*)(\.{3})', bygroups(Text, Punctuation)),
 
             (r'\n',       Text,            '#pop'),
             (r'\s',       Text),
-            (r"'(?=.*')", String.Interpol, 'string_interpolated'),
+
+            include('string_interpolated'),
+
             (r"'",        String),
             (r"[^'\n]+",  String),
         ],
@@ -258,11 +263,14 @@
             (r'(\n\s*)(\.{3})', bygroups(Text, Punctuation)),
 
             (r'"',          String,          '#pop'),
-            (r"'(?=.*')",   String.Interpol, 'string_interpolated'),
+
+            include('string_interpolated'),
+
             (r"'",          String),
             (r'[^\'"\n]+',  String),
         ],
         'old_form': [
+            (r'(\s+)(#.*?$)',  bygroups(Text, Comment.Single)),
             (r'\s+', Text),
 
             (r'(optionmenu|choice)([ \t]+\S+:[ \t]+)',
--- a/eric6/ThirdParty/Pygments/pygments/lexers/prolog.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/ThirdParty/Pygments/pygments/lexers/prolog.py	Sat May 02 13:51:07 2020 +0200
@@ -5,7 +5,7 @@
 
     Lexers for Prolog and Prolog-like languages.
 
-    :copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -31,7 +31,6 @@
 
     tokens = {
         'root': [
-            (r'^#.*', Comment.Single),
             (r'/\*', Comment.Multiline, 'nested-comment'),
             (r'%.*', Comment.Single),
             # character literal
@@ -108,19 +107,19 @@
             (r'\n', Text),
             (r'\s+', Text),
             # Numbers
-            (r"0'.", Number),
+            (r"0'[\\]?.", Number),
             (r'0b[01]+', Number.Bin),
             (r'0o[0-7]+', Number.Oct),
             (r'0x[0-9a-fA-F]+', Number.Hex),
             (r'\d+\.?\d*((e|E)(\+|-)?\d+)?', Number),
             # Variables
-            (r'([A-Z_]\w*)', Name.Variable),
+            (r'([A-Z_][a-zA-Z0-9_]*)', Name.Variable),
             # Event handlers
             (r'(after|before)(?=[(])', Keyword),
             # Message forwarding handler
             (r'forward(?=[(])', Keyword),
             # Execution-context methods
-            (r'(parameter|this|se(lf|nder))(?=[(])', Keyword),
+            (r'(context|parameter|this|se(lf|nder))(?=[(])', Keyword),
             # Reflection
             (r'(current_predicate|predicate_property)(?=[(])', Keyword),
             # DCGs and term expansion
@@ -136,20 +135,23 @@
             # Events
             (r'(current_event|(abolish|define)_events)(?=[(])', Keyword),
             # Flags
-            (r'(current|set)_logtalk_flag(?=[(])', Keyword),
+            (r'(create|current|set)_logtalk_flag(?=[(])', Keyword),
             # Compiling, loading, and library paths
-            (r'logtalk_(compile|l(ibrary_path|oad|oad_context)|make)(?=[(])', Keyword),
+            (r'logtalk_(compile|l(ibrary_path|oad|oad_context)|make(_target_action)?)(?=[(])', Keyword),
             (r'\blogtalk_make\b', Keyword),
             # Database
             (r'(clause|retract(all)?)(?=[(])', Keyword),
             (r'a(bolish|ssert(a|z))(?=[(])', Keyword),
             # Control constructs
             (r'(ca(ll|tch)|throw)(?=[(])', Keyword),
-            (r'(fa(il|lse)|true)\b', Keyword),
+            (r'(fa(il|lse)|true|(instantiation|system)_error)\b', Keyword),
+            (r'(type|domain|existence|permission|representation|evaluation|resource|syntax)_error(?=[(])', Keyword),
             # All solutions
             (r'((bag|set)of|f(ind|or)all)(?=[(])', Keyword),
-            # Multi-threading meta-predicates
-            (r'threaded(_(call|once|ignore|exit|peek|wait|notify))?(?=[(])', Keyword),
+            # Multi-threading predicates
+            (r'threaded(_(ca(ll|ncel)|once|ignore|exit|peek|wait|notify))?(?=[(])', Keyword),
+            # Engine predicates
+            (r'threaded_engine(_(create|destroy|self|next|next_reified|yield|post|fetch))?(?=[(])', Keyword),
             # Term unification
             (r'(subsumes_term|unify_with_occurs_check)(?=[(])', Keyword),
             # Term creation and decomposition
@@ -161,8 +163,7 @@
             # Other arithmetic functors
             (r'(cos|a(cos|sin|tan|tan2)|exp|log|s(in|qrt)|xor)(?=[(])', Keyword),
             # Term testing
-            (r'(var|atom(ic)?|integer|float|c(allable|ompound)|n(onvar|umber)|'
-             r'ground|acyclic_term)(?=[(])', Keyword),
+            (r'(var|atom(ic)?|integer|float|c(allable|ompound)|n(onvar|umber)|ground|acyclic_term)(?=[(])', Keyword),
             # Term comparison
             (r'compare(?=[(])', Keyword),
             # Stream selection and control
@@ -227,10 +228,10 @@
             (r'\^', Operator),
             # Strings
             (r'"(\\\\|\\"|[^"])*"', String),
-            # Ponctuation
+            # Punctuation
             (r'[()\[\],.|]', Text),
             # Atoms
-            (r"[a-z]\w*", Text),
+            (r"[a-z][a-zA-Z0-9_]*", Text),
             (r"'", String, 'quoted_atom'),
         ],
 
@@ -245,36 +246,35 @@
         'directive': [
             # Conditional compilation directives
             (r'(el)?if(?=[(])', Keyword, 'root'),
-            (r'(e(lse|ndif))[.]', Keyword, 'root'),
+            (r'(e(lse|ndif))(?=[.])', Keyword, 'root'),
             # Entity directives
             (r'(category|object|protocol)(?=[(])', Keyword, 'entityrelations'),
-            (r'(end_(category|object|protocol))[.]', Keyword, 'root'),
+            (r'(end_(category|object|protocol))(?=[.])', Keyword, 'root'),
             # Predicate scope directives
             (r'(public|protected|private)(?=[(])', Keyword, 'root'),
             # Other directives
             (r'e(n(coding|sure_loaded)|xport)(?=[(])', Keyword, 'root'),
             (r'in(clude|itialization|fo)(?=[(])', Keyword, 'root'),
-            (r'(built_in|dynamic|synchronized|threaded)[.]', Keyword, 'root'),
-            (r'(alias|d(ynamic|iscontiguous)|m(eta_(non_terminal|predicate)|ode|ultifile)|'
-             r's(et_(logtalk|prolog)_flag|ynchronized))(?=[(])', Keyword, 'root'),
+            (r'(built_in|dynamic|synchronized|threaded)(?=[.])', Keyword, 'root'),
+            (r'(alias|d(ynamic|iscontiguous)|m(eta_(non_terminal|predicate)|ode|ultifile)|s(et_(logtalk|prolog)_flag|ynchronized))(?=[(])', Keyword, 'root'),
             (r'op(?=[(])', Keyword, 'root'),
             (r'(c(alls|oinductive)|module|reexport|use(s|_module))(?=[(])', Keyword, 'root'),
-            (r'[a-z]\w*(?=[(])', Text, 'root'),
-            (r'[a-z]\w*[.]', Text, 'root'),
+            (r'[a-z][a-zA-Z0-9_]*(?=[(])', Text, 'root'),
+            (r'[a-z][a-zA-Z0-9_]*(?=[.])', Text, 'root'),
         ],
 
         'entityrelations': [
             (r'(complements|extends|i(nstantiates|mp(lements|orts))|specializes)(?=[(])', Keyword),
             # Numbers
-            (r"0'.", Number),
+            (r"0'[\\]?.", Number),
             (r'0b[01]+', Number.Bin),
             (r'0o[0-7]+', Number.Oct),
             (r'0x[0-9a-fA-F]+', Number.Hex),
             (r'\d+\.?\d*((e|E)(\+|-)?\d+)?', Number),
             # Variables
-            (r'([A-Z_]\w*)', Name.Variable),
+            (r'([A-Z_][a-zA-Z0-9_]*)', Name.Variable),
             # Atoms
-            (r"[a-z]\w*", Text),
+            (r"[a-z][a-zA-Z0-9_]*", Text),
             (r"'", String, 'quoted_atom'),
             # Strings
             (r'"(\\\\|\\"|[^"])*"', String),
@@ -282,7 +282,7 @@
             (r'([)]\.)', Text, 'root'),
             # Scope operator
             (r'(::)', Operator),
-            # Ponctuation
+            # Punctuation
             (r'[()\[\],.|]', Text),
             # Comments
             (r'%.*?\n', Comment),
--- a/eric6/ThirdParty/Pygments/pygments/lexers/python.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/ThirdParty/Pygments/pygments/lexers/python.py	Sat May 02 13:51:07 2020 +0200
@@ -5,7 +5,7 @@
 
     Lexers for Python and related languages.
 
-    :copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -19,21 +19,379 @@
 from pygments import unistring as uni
 
 __all__ = ['PythonLexer', 'PythonConsoleLexer', 'PythonTracebackLexer',
-           'Python3Lexer', 'Python3TracebackLexer', 'CythonLexer',
-           'DgLexer', 'NumPyLexer']
+           'Python2Lexer', 'Python2TracebackLexer',
+           'CythonLexer', 'DgLexer', 'NumPyLexer']
 
 line_re = re.compile('.*?\n')
 
 
 class PythonLexer(RegexLexer):
     """
-    For `Python <http://www.python.org>`_ source code.
+    For `Python <http://www.python.org>`_ source code (version 3.x).
+
+    .. versionadded:: 0.10
+
+    .. versionchanged:: 2.5
+       This is now the default ``PythonLexer``.  It is still available as the
+       alias ``Python3Lexer``.
     """
 
     name = 'Python'
-    aliases = ['python', 'py', 'sage']
-    filenames = ['*.py', '*.pyw', '*.sc', 'SConstruct', 'SConscript', '*.tac', '*.sage']
-    mimetypes = ['text/x-python', 'application/x-python']
+    aliases = ['python', 'py', 'sage', 'python3', 'py3']
+    filenames = [
+        '*.py',
+        '*.pyw',
+        # Jython
+        '*.jy',
+        # Sage
+        '*.sage',
+        # SCons
+        '*.sc',
+        'SConstruct',
+        'SConscript',
+        # Skylark/Starlark (used by Bazel, Buck, and Pants)
+        '*.bzl',
+        'BUCK',
+        'BUILD',
+        'BUILD.bazel',
+        'WORKSPACE',
+        # Twisted Application infrastructure
+        '*.tac',
+    ]
+    mimetypes = ['text/x-python', 'application/x-python',
+                 'text/x-python3', 'application/x-python3']
+
+    flags = re.MULTILINE | re.UNICODE
+
+    uni_name = "[%s][%s]*" % (uni.xid_start, uni.xid_continue)
+
+    def innerstring_rules(ttype):
+        return [
+            # the old style '%s' % (...) string formatting (still valid in Py3)
+            (r'%(\(\w+\))?[-#0 +]*([0-9]+|[*])?(\.([0-9]+|[*]))?'
+             '[hlL]?[E-GXc-giorsaux%]', String.Interpol),
+            # the new style '{}'.format(...) string formatting
+            (r'\{'
+             r'((\w+)((\.\w+)|(\[[^\]]+\]))*)?'  # field name
+             r'(\![sra])?'                       # conversion
+             r'(\:(.?[<>=\^])?[-+ ]?#?0?(\d+)?,?(\.\d+)?[E-GXb-gnosx%]?)?'
+             r'\}', String.Interpol),
+
+            # backslashes, quotes and formatting signs must be parsed one at a time
+            (r'[^\\\'"%{\n]+', ttype),
+            (r'[\'"\\]', ttype),
+            # unhandled string formatting sign
+            (r'%|(\{{1,2})', ttype)
+            # newlines are an error (use "nl" state)
+        ]
+
+    def fstring_rules(ttype):
+        return [
+            # Assuming that a '}' is the closing brace after format specifier.
+            # Sadly, this means that we won't detect syntax error. But it's
+            # more important to parse correct syntax correctly, than to
+            # highlight invalid syntax.
+            (r'\}', String.Interpol),
+            (r'\{', String.Interpol, 'expr-inside-fstring'),
+            # backslashes, quotes and formatting signs must be parsed one at a time
+            (r'[^\\\'"{}\n]+', ttype),
+            (r'[\'"\\]', ttype),
+            # newlines are an error (use "nl" state)
+        ]
+
+    tokens = {
+        'root': [
+            (r'\n', Text),
+            (r'^(\s*)([rRuUbB]{,2})("""(?:.|\n)*?""")',
+             bygroups(Text, String.Affix, String.Doc)),
+            (r"^(\s*)([rRuUbB]{,2})('''(?:.|\n)*?''')",
+             bygroups(Text, String.Affix, String.Doc)),
+            (r'\A#!.+$', Comment.Hashbang),
+            (r'#.*$', Comment.Single),
+            (r'\\\n', Text),
+            (r'\\', Text),
+            include('keywords'),
+            (r'(def)((?:\s|\\\s)+)', bygroups(Keyword, Text), 'funcname'),
+            (r'(class)((?:\s|\\\s)+)', bygroups(Keyword, Text), 'classname'),
+            (r'(from)((?:\s|\\\s)+)', bygroups(Keyword.Namespace, Text),
+             'fromimport'),
+            (r'(import)((?:\s|\\\s)+)', bygroups(Keyword.Namespace, Text),
+             'import'),
+            include('expr'),
+        ],
+        'expr': [
+            # raw f-strings
+            ('(?i)(rf|fr)(""")',
+             bygroups(String.Affix, String.Double), 'tdqf'),
+            ("(?i)(rf|fr)(''')",
+             bygroups(String.Affix, String.Single), 'tsqf'),
+            ('(?i)(rf|fr)(")',
+             bygroups(String.Affix, String.Double), 'dqf'),
+            ("(?i)(rf|fr)(')",
+             bygroups(String.Affix, String.Single), 'sqf'),
+            # non-raw f-strings
+            ('([fF])(""")', bygroups(String.Affix, String.Double),
+             combined('fstringescape', 'tdqf')),
+            ("([fF])(''')", bygroups(String.Affix, String.Single),
+             combined('fstringescape', 'tsqf')),
+            ('([fF])(")', bygroups(String.Affix, String.Double),
+             combined('fstringescape', 'dqf')),
+            ("([fF])(')", bygroups(String.Affix, String.Single),
+             combined('fstringescape', 'sqf')),
+            # raw strings
+            ('(?i)(rb|br|r)(""")',
+             bygroups(String.Affix, String.Double), 'tdqs'),
+            ("(?i)(rb|br|r)(''')",
+             bygroups(String.Affix, String.Single), 'tsqs'),
+            ('(?i)(rb|br|r)(")',
+             bygroups(String.Affix, String.Double), 'dqs'),
+            ("(?i)(rb|br|r)(')",
+             bygroups(String.Affix, String.Single), 'sqs'),
+            # non-raw strings
+            ('([uUbB]?)(""")', bygroups(String.Affix, String.Double),
+             combined('stringescape', 'tdqs')),
+            ("([uUbB]?)(''')", bygroups(String.Affix, String.Single),
+             combined('stringescape', 'tsqs')),
+            ('([uUbB]?)(")', bygroups(String.Affix, String.Double),
+             combined('stringescape', 'dqs')),
+            ("([uUbB]?)(')", bygroups(String.Affix, String.Single),
+             combined('stringescape', 'sqs')),
+            (r'[^\S\n]+', Text),
+            (r'!=|==|<<|>>|:=|[-~+/*%=<>&^|.]', Operator),
+            (r'[]{}:(),;[]', Punctuation),
+            (r'(in|is|and|or|not)\b', Operator.Word),
+            include('expr-keywords'),
+            include('builtins'),
+            include('magicfuncs'),
+            include('magicvars'),
+            include('name'),
+            include('numbers'),
+        ],
+        'expr-inside-fstring': [
+            (r'[{([]', Punctuation, 'expr-inside-fstring-inner'),
+            # without format specifier
+            (r'(=\s*)?'         # debug (https://bugs.python.org/issue36817)
+             r'(\![sraf])?'     # conversion
+             r'}', String.Interpol, '#pop'),
+            # with format specifier
+            # we'll catch the remaining '}' in the outer scope
+            (r'(=\s*)?'         # debug (https://bugs.python.org/issue36817)
+             r'(\![sraf])?'     # conversion
+             r':', String.Interpol, '#pop'),
+            (r'[^\S]+', Text),  # allow new lines
+            include('expr'),
+        ],
+        'expr-inside-fstring-inner': [
+            (r'[{([]', Punctuation, 'expr-inside-fstring-inner'),
+            (r'[])}]', Punctuation, '#pop'),
+            (r'[^\S]+', Text),  # allow new lines
+            include('expr'),
+        ],
+        'expr-keywords': [
+            # Based on https://docs.python.org/3/reference/expressions.html
+            (words((
+                'async for', 'await', 'else', 'for', 'if', 'lambda',
+                'yield', 'yield from'), suffix=r'\b'),
+             Keyword),
+            (words(('True', 'False', 'None'), suffix=r'\b'), Keyword.Constant),
+        ],
+        'keywords': [
+            (words((
+                'assert', 'async', 'await', 'break', 'continue', 'del', 'elif',
+                'else', 'except', 'finally', 'for', 'global', 'if', 'lambda',
+                'pass', 'raise', 'nonlocal', 'return', 'try', 'while', 'yield',
+                'yield from', 'as', 'with'), suffix=r'\b'),
+             Keyword),
+            (words(('True', 'False', 'None'), suffix=r'\b'), Keyword.Constant),
+        ],
+        'builtins': [
+            (words((
+                '__import__', 'abs', 'all', 'any', 'bin', 'bool', 'bytearray',
+                'bytes', 'chr', 'classmethod', 'cmp', 'compile', 'complex',
+                'delattr', 'dict', 'dir', 'divmod', 'enumerate', 'eval', 'filter',
+                'float', 'format', 'frozenset', 'getattr', 'globals', 'hasattr',
+                'hash', 'hex', 'id', 'input', 'int', 'isinstance', 'issubclass',
+                'iter', 'len', 'list', 'locals', 'map', 'max', 'memoryview',
+                'min', 'next', 'object', 'oct', 'open', 'ord', 'pow', 'print',
+                'property', 'range', 'repr', 'reversed', 'round', 'set', 'setattr',
+                'slice', 'sorted', 'staticmethod', 'str', 'sum', 'super', 'tuple',
+                'type', 'vars', 'zip'), prefix=r'(?<!\.)', suffix=r'\b'),
+             Name.Builtin),
+            (r'(?<!\.)(self|Ellipsis|NotImplemented|cls)\b', Name.Builtin.Pseudo),
+            (words((
+                'ArithmeticError', 'AssertionError', 'AttributeError',
+                'BaseException', 'BufferError', 'BytesWarning', 'DeprecationWarning',
+                'EOFError', 'EnvironmentError', 'Exception', 'FloatingPointError',
+                'FutureWarning', 'GeneratorExit', 'IOError', 'ImportError',
+                'ImportWarning', 'IndentationError', 'IndexError', 'KeyError',
+                'KeyboardInterrupt', 'LookupError', 'MemoryError', 'NameError',
+                'NotImplementedError', 'OSError', 'OverflowError',
+                'PendingDeprecationWarning', 'ReferenceError', 'ResourceWarning',
+                'RuntimeError', 'RuntimeWarning', 'StopIteration',
+                'SyntaxError', 'SyntaxWarning', 'SystemError', 'SystemExit',
+                'TabError', 'TypeError', 'UnboundLocalError', 'UnicodeDecodeError',
+                'UnicodeEncodeError', 'UnicodeError', 'UnicodeTranslateError',
+                'UnicodeWarning', 'UserWarning', 'ValueError', 'VMSError',
+                'Warning', 'WindowsError', 'ZeroDivisionError',
+                # new builtin exceptions from PEP 3151
+                'BlockingIOError', 'ChildProcessError', 'ConnectionError',
+                'BrokenPipeError', 'ConnectionAbortedError', 'ConnectionRefusedError',
+                'ConnectionResetError', 'FileExistsError', 'FileNotFoundError',
+                'InterruptedError', 'IsADirectoryError', 'NotADirectoryError',
+                'PermissionError', 'ProcessLookupError', 'TimeoutError',
+                # others new in Python 3
+                'StopAsyncIteration', 'ModuleNotFoundError', 'RecursionError'),
+                prefix=r'(?<!\.)', suffix=r'\b'),
+             Name.Exception),
+        ],
+        'magicfuncs': [
+            (words((
+                '__abs__', '__add__', '__aenter__', '__aexit__', '__aiter__',
+                '__and__', '__anext__', '__await__', '__bool__', '__bytes__',
+                '__call__', '__complex__', '__contains__', '__del__', '__delattr__',
+                '__delete__', '__delitem__', '__dir__', '__divmod__', '__enter__',
+                '__eq__', '__exit__', '__float__', '__floordiv__', '__format__',
+                '__ge__', '__get__', '__getattr__', '__getattribute__',
+                '__getitem__', '__gt__', '__hash__', '__iadd__', '__iand__',
+                '__ifloordiv__', '__ilshift__', '__imatmul__', '__imod__',
+                '__imul__', '__index__', '__init__', '__instancecheck__',
+                '__int__', '__invert__', '__ior__', '__ipow__', '__irshift__',
+                '__isub__', '__iter__', '__itruediv__', '__ixor__', '__le__',
+                '__len__', '__length_hint__', '__lshift__', '__lt__', '__matmul__',
+                '__missing__', '__mod__', '__mul__', '__ne__', '__neg__',
+                '__new__', '__next__', '__or__', '__pos__', '__pow__',
+                '__prepare__', '__radd__', '__rand__', '__rdivmod__', '__repr__',
+                '__reversed__', '__rfloordiv__', '__rlshift__', '__rmatmul__',
+                '__rmod__', '__rmul__', '__ror__', '__round__', '__rpow__',
+                '__rrshift__', '__rshift__', '__rsub__', '__rtruediv__',
+                '__rxor__', '__set__', '__setattr__', '__setitem__', '__str__',
+                '__sub__', '__subclasscheck__', '__truediv__',
+                '__xor__'), suffix=r'\b'),
+             Name.Function.Magic),
+        ],
+        'magicvars': [
+            (words((
+                '__annotations__', '__bases__', '__class__', '__closure__',
+                '__code__', '__defaults__', '__dict__', '__doc__', '__file__',
+                '__func__', '__globals__', '__kwdefaults__', '__module__',
+                '__mro__', '__name__', '__objclass__', '__qualname__',
+                '__self__', '__slots__', '__weakref__'), suffix=r'\b'),
+             Name.Variable.Magic),
+        ],
+        'numbers': [
+            (r'(\d(?:_?\d)*\.(?:\d(?:_?\d)*)?|(?:\d(?:_?\d)*)?\.\d(?:_?\d)*)'
+             r'([eE][+-]?\d(?:_?\d)*)?', Number.Float),
+            (r'\d(?:_?\d)*[eE][+-]?\d(?:_?\d)*j?', Number.Float),
+            (r'0[oO](?:_?[0-7])+', Number.Oct),
+            (r'0[bB](?:_?[01])+', Number.Bin),
+            (r'0[xX](?:_?[a-fA-F0-9])+', Number.Hex),
+            (r'\d(?:_?\d)*', Number.Integer),
+        ],
+        'name': [
+            (r'@' + uni_name, Name.Decorator),
+            (r'@', Operator),  # new matrix multiplication operator
+            (uni_name, Name),
+        ],
+        'funcname': [
+            include('magicfuncs'),
+            (uni_name, Name.Function, '#pop'),
+            default('#pop'),
+        ],
+        'classname': [
+            (uni_name, Name.Class, '#pop'),
+        ],
+        'import': [
+            (r'(\s+)(as)(\s+)', bygroups(Text, Keyword, Text)),
+            (r'\.', Name.Namespace),
+            (uni_name, Name.Namespace),
+            (r'(\s*)(,)(\s*)', bygroups(Text, Operator, Text)),
+            default('#pop')  # all else: go back
+        ],
+        'fromimport': [
+            (r'(\s+)(import)\b', bygroups(Text, Keyword.Namespace), '#pop'),
+            (r'\.', Name.Namespace),
+            # if None occurs here, it's "raise x from None", since None can
+            # never be a module name
+            (r'None\b', Name.Builtin.Pseudo, '#pop'),
+            (uni_name, Name.Namespace),
+            default('#pop'),
+        ],
+        'fstringescape': [
+            ('{{', String.Escape),
+            ('}}', String.Escape),
+            include('stringescape'),
+        ],
+        'stringescape': [
+            (r'\\([\\abfnrtv"\']|\n|N\{.*?\}|u[a-fA-F0-9]{4}|'
+             r'U[a-fA-F0-9]{8}|x[a-fA-F0-9]{2}|[0-7]{1,3})', String.Escape)
+        ],
+        'fstrings-single': fstring_rules(String.Single),
+        'fstrings-double': fstring_rules(String.Double),
+        'strings-single': innerstring_rules(String.Single),
+        'strings-double': innerstring_rules(String.Double),
+        'dqf': [
+            (r'"', String.Double, '#pop'),
+            (r'\\\\|\\"|\\\n', String.Escape),  # included here for raw strings
+            include('fstrings-double')
+        ],
+        'sqf': [
+            (r"'", String.Single, '#pop'),
+            (r"\\\\|\\'|\\\n", String.Escape),  # included here for raw strings
+            include('fstrings-single')
+        ],
+        'dqs': [
+            (r'"', String.Double, '#pop'),
+            (r'\\\\|\\"|\\\n', String.Escape),  # included here for raw strings
+            include('strings-double')
+        ],
+        'sqs': [
+            (r"'", String.Single, '#pop'),
+            (r"\\\\|\\'|\\\n", String.Escape),  # included here for raw strings
+            include('strings-single')
+        ],
+        'tdqf': [
+            (r'"""', String.Double, '#pop'),
+            include('fstrings-double'),
+            (r'\n', String.Double)
+        ],
+        'tsqf': [
+            (r"'''", String.Single, '#pop'),
+            include('fstrings-single'),
+            (r'\n', String.Single)
+        ],
+        'tdqs': [
+            (r'"""', String.Double, '#pop'),
+            include('strings-double'),
+            (r'\n', String.Double)
+        ],
+        'tsqs': [
+            (r"'''", String.Single, '#pop'),
+            include('strings-single'),
+            (r'\n', String.Single)
+        ],
+    }
+
+    def analyse_text(text):
+        return shebang_matches(text, r'pythonw?(3(\.\d)?)?')
+
+
+Python3Lexer = PythonLexer
+
+
+class Python2Lexer(RegexLexer):
+    """
+    For `Python 2.x <http://www.python.org>`_ source code.
+
+    .. versionchanged:: 2.5
+       This class has been renamed from ``PythonLexer``.  ``PythonLexer`` now
+       refers to the Python 3 variant.  File name patterns like ``*.py`` have
+       been moved to Python 3 as well.
+    """
+
+    name = 'Python 2.x'
+    aliases = ['python2', 'py2']
+    filenames = []  # now taken over by PythonLexer (3.x)
+    mimetypes = ['text/x-python2', 'application/x-python2']
 
     def innerstring_rules(ttype):
         return [
@@ -124,15 +482,15 @@
                 'Exception', 'FloatingPointError', 'FutureWarning', 'GeneratorExit',
                 'IOError', 'ImportError', 'ImportWarning', 'IndentationError',
                 'IndexError', 'KeyError', 'KeyboardInterrupt', 'LookupError',
-                'MemoryError', 'ModuleNotFoundError', 'NameError', 'NotImplemented', 'NotImplementedError',
-                'OSError', 'OverflowError', 'OverflowWarning', 'PendingDeprecationWarning',
-                'RecursionError', 'ReferenceError', 'RuntimeError', 'RuntimeWarning', 'StandardError',
-                'StopIteration', 'StopAsyncIteration', 'SyntaxError', 'SyntaxWarning', 'SystemError',
-                'SystemExit', 'TabError', 'TypeError', 'UnboundLocalError',
-                'UnicodeDecodeError', 'UnicodeEncodeError', 'UnicodeError',
-                'UnicodeTranslateError', 'UnicodeWarning', 'UserWarning',
-                'ValueError', 'VMSError', 'Warning', 'WindowsError',
-                'ZeroDivisionError'), prefix=r'(?<!\.)', suffix=r'\b'),
+                'MemoryError', 'NameError',
+                'NotImplementedError', 'OSError', 'OverflowError', 'OverflowWarning',
+                'PendingDeprecationWarning', 'ReferenceError',
+                'RuntimeError', 'RuntimeWarning', 'StandardError', 'StopIteration',
+                'SyntaxError', 'SyntaxWarning', 'SystemError', 'SystemExit',
+                'TabError', 'TypeError', 'UnboundLocalError', 'UnicodeDecodeError',
+                'UnicodeEncodeError', 'UnicodeError', 'UnicodeTranslateError',
+                'UnicodeWarning', 'UserWarning', 'ValueError', 'VMSError', 'Warning',
+                'WindowsError', 'ZeroDivisionError'), prefix=r'(?<!\.)', suffix=r'\b'),
              Name.Exception),
         ],
         'magicfuncs': [
@@ -238,169 +596,10 @@
     }
 
     def analyse_text(text):
-        return shebang_matches(text, r'pythonw?(2(\.\d)?)?') or \
+        return shebang_matches(text, r'pythonw?2(\.\d)?') or \
             'import ' in text[:1000]
 
 
-class Python3Lexer(RegexLexer):
-    """
-    For `Python <http://www.python.org>`_ source code (version 3.0).
-
-    .. versionadded:: 0.10
-    """
-
-    name = 'Python 3'
-    aliases = ['python3', 'py3']
-    filenames = []  # Nothing until Python 3 gets widespread
-    mimetypes = ['text/x-python3', 'application/x-python3']
-
-    flags = re.MULTILINE | re.UNICODE
-
-    uni_name = "[%s][%s]*" % (uni.xid_start, uni.xid_continue)
-
-    def innerstring_rules(ttype):
-        return [
-            # the old style '%s' % (...) string formatting (still valid in Py3)
-            (r'%(\(\w+\))?[-#0 +]*([0-9]+|[*])?(\.([0-9]+|[*]))?'
-             '[hlL]?[E-GXc-giorsaux%]', String.Interpol),
-            # the new style '{}'.format(...) string formatting
-            (r'\{'
-             r'((\w+)((\.\w+)|(\[[^\]]+\]))*)?'  # field name
-             r'(\![sra])?'                       # conversion
-             r'(\:(.?[<>=\^])?[-+ ]?#?0?(\d+)?,?(\.\d+)?[E-GXb-gnosx%]?)?'
-             r'\}', String.Interpol),
-
-            # backslashes, quotes and formatting signs must be parsed one at a time
-            (r'[^\\\'"%{\n]+', ttype),
-            (r'[\'"\\]', ttype),
-            # unhandled string formatting sign
-            (r'%|(\{{1,2})', ttype)
-            # newlines are an error (use "nl" state)
-        ]
-
-    tokens = PythonLexer.tokens.copy()
-    tokens['keywords'] = [
-        (words((
-            'assert', 'async', 'await', 'break', 'continue', 'del', 'elif',
-            'else', 'except', 'finally', 'for', 'global', 'if', 'lambda', 'pass',
-            'raise', 'nonlocal', 'return', 'try', 'while', 'yield', 'yield from',
-            'as', 'with'), suffix=r'\b'),
-         Keyword),
-        (words((
-            'True', 'False', 'None'), suffix=r'\b'),
-         Keyword.Constant),
-    ]
-    tokens['builtins'] = [
-        (words((
-            '__import__', 'abs', 'all', 'any', 'bin', 'bool', 'bytearray', 'bytes',
-            'chr', 'classmethod', 'cmp', 'compile', 'complex', 'delattr', 'dict',
-            'dir', 'divmod', 'enumerate', 'eval', 'filter', 'float', 'format',
-            'frozenset', 'getattr', 'globals', 'hasattr', 'hash', 'hex', 'id',
-            'input', 'int', 'isinstance', 'issubclass', 'iter', 'len', 'list',
-            'locals', 'map', 'max', 'memoryview', 'min', 'next', 'object', 'oct',
-            'open', 'ord', 'pow', 'print', 'property', 'range', 'repr', 'reversed',
-            'round', 'set', 'setattr', 'slice', 'sorted', 'staticmethod', 'str',
-            'sum', 'super', 'tuple', 'type', 'vars', 'zip'), prefix=r'(?<!\.)',
-            suffix=r'\b'),
-         Name.Builtin),
-        (r'(?<!\.)(self|Ellipsis|NotImplemented|cls)\b', Name.Builtin.Pseudo),
-        (words((
-            'ArithmeticError', 'AssertionError', 'AttributeError',
-            'BaseException', 'BufferError', 'BytesWarning', 'DeprecationWarning',
-            'EOFError', 'EnvironmentError', 'Exception', 'FloatingPointError',
-            'FutureWarning', 'GeneratorExit', 'IOError', 'ImportError',
-            'ImportWarning', 'IndentationError', 'IndexError', 'KeyError',
-            'KeyboardInterrupt', 'LookupError', 'MemoryError', 'NameError',
-            'NotImplementedError', 'OSError', 'OverflowError',
-            'PendingDeprecationWarning', 'ReferenceError', 'ResourceWarning',
-            'RuntimeError', 'RuntimeWarning', 'StopIteration',
-            'SyntaxError', 'SyntaxWarning', 'SystemError', 'SystemExit', 'TabError',
-            'TypeError', 'UnboundLocalError', 'UnicodeDecodeError',
-            'UnicodeEncodeError', 'UnicodeError', 'UnicodeTranslateError',
-            'UnicodeWarning', 'UserWarning', 'ValueError', 'VMSError', 'Warning',
-            'WindowsError', 'ZeroDivisionError',
-            # new builtin exceptions from PEP 3151
-            'BlockingIOError', 'ChildProcessError', 'ConnectionError',
-            'BrokenPipeError', 'ConnectionAbortedError', 'ConnectionRefusedError',
-            'ConnectionResetError', 'FileExistsError', 'FileNotFoundError',
-            'InterruptedError', 'IsADirectoryError', 'NotADirectoryError',
-            'PermissionError', 'ProcessLookupError', 'TimeoutError'),
-            prefix=r'(?<!\.)', suffix=r'\b'),
-         Name.Exception),
-    ]
-    tokens['magicfuncs'] = [
-        (words((
-            '__abs__', '__add__', '__aenter__', '__aexit__', '__aiter__', '__and__',
-            '__anext__', '__await__', '__bool__', '__bytes__', '__call__',
-            '__complex__', '__contains__', '__del__', '__delattr__', '__delete__',
-            '__delitem__', '__dir__', '__divmod__', '__enter__', '__eq__', '__exit__',
-            '__float__', '__floordiv__', '__format__', '__ge__', '__get__',
-            '__getattr__', '__getattribute__', '__getitem__', '__gt__', '__hash__',
-            '__iadd__', '__iand__', '__ifloordiv__', '__ilshift__', '__imatmul__',
-            '__imod__', '__import__', '__imul__', '__index__', '__init__',
-            '__instancecheck__', '__int__', '__invert__', '__ior__', '__ipow__',
-            '__irshift__', '__isub__', '__iter__', '__itruediv__', '__ixor__',
-            '__le__', '__len__', '__length_hint__', '__lshift__', '__lt__',
-            '__matmul__', '__missing__', '__mod__', '__mul__', '__ne__', '__neg__',
-            '__new__', '__next__', '__or__', '__pos__', '__pow__', '__prepare__',
-            '__radd__', '__rand__', '__rdivmod__', '__repr__', '__reversed__',
-            '__rfloordiv__', '__rlshift__', '__rmatmul__', '__rmod__', '__rmul__',
-            '__ror__', '__round__', '__rpow__', '__rrshift__', '__rshift__',
-            '__rsub__', '__rtruediv__', '__rxor__', '__set__', '__setattr__',
-            '__setitem__', '__str__', '__sub__', '__subclasscheck__', '__truediv__',
-            '__xor__'), suffix=r'\b'),
-         Name.Function.Magic),
-    ]
-    tokens['magicvars'] = [
-        (words((
-            '__annotations__', '__bases__', '__class__', '__closure__', '__code__',
-            '__defaults__', '__dict__', '__doc__', '__file__', '__func__',
-            '__globals__', '__kwdefaults__', '__module__', '__mro__', '__name__',
-            '__objclass__', '__qualname__', '__self__', '__slots__', '__weakref__'),
-            suffix=r'\b'),
-         Name.Variable.Magic),
-    ]
-    tokens['numbers'] = [
-        (r'(\d(?:_?\d)*\.(?:\d(?:_?\d)*)?|(?:\d(?:_?\d)*)?\.\d(?:_?\d)*)([eE][+-]?\d(?:_?\d)*)?', Number.Float),
-        (r'\d(?:_?\d)*[eE][+-]?\d(?:_?\d)*j?', Number.Float),
-        (r'0[oO](?:_?[0-7])+', Number.Oct),
-        (r'0[bB](?:_?[01])+', Number.Bin),
-        (r'0[xX](?:_?[a-fA-F0-9])+', Number.Hex),
-        (r'\d(?:_?\d)*', Number.Integer)
-    ]
-    tokens['backtick'] = []
-    tokens['name'] = [
-        (r'@\w+', Name.Decorator),
-        (r'@', Operator),  # new matrix multiplication operator
-        (uni_name, Name),
-    ]
-    tokens['funcname'] = [
-        (uni_name, Name.Function, '#pop')
-    ]
-    tokens['classname'] = [
-        (uni_name, Name.Class, '#pop')
-    ]
-    tokens['import'] = [
-        (r'(\s+)(as)(\s+)', bygroups(Text, Keyword, Text)),
-        (r'\.', Name.Namespace),
-        (uni_name, Name.Namespace),
-        (r'(\s*)(,)(\s*)', bygroups(Text, Operator, Text)),
-        default('#pop')  # all else: go back
-    ]
-    tokens['fromimport'] = [
-        (r'(\s+)(import)\b', bygroups(Text, Keyword), '#pop'),
-        (r'\.', Name.Namespace),
-        (uni_name, Name.Namespace),
-        default('#pop'),
-    ]
-    tokens['strings-single'] = innerstring_rules(String.Single)
-    tokens['strings-double'] = innerstring_rules(String.Double)
-
-
-    def analyse_text(text):
-        return shebang_matches(text, r'pythonw?3(\.\d)?')
-
-
 class PythonConsoleLexer(Lexer):
     """
     For Python console output or doctests, such as:
@@ -418,25 +617,27 @@
     Additional options:
 
     `python3`
-        Use Python 3 lexer for code.  Default is ``False``.
+        Use Python 3 lexer for code.  Default is ``True``.
 
         .. versionadded:: 1.0
+        .. versionchanged:: 2.5
+           Now defaults to ``True``.
     """
     name = 'Python console session'
     aliases = ['pycon']
     mimetypes = ['text/x-python-doctest']
 
     def __init__(self, **options):
-        self.python3 = get_bool_opt(options, 'python3', False)
+        self.python3 = get_bool_opt(options, 'python3', True)
         Lexer.__init__(self, **options)
 
     def get_tokens_unprocessed(self, text):
         if self.python3:
-            pylexer = Python3Lexer(**self.options)
-            tblexer = Python3TracebackLexer(**self.options)
-        else:
             pylexer = PythonLexer(**self.options)
             tblexer = PythonTracebackLexer(**self.options)
+        else:
+            pylexer = Python2Lexer(**self.options)
+            tblexer = Python2TracebackLexer(**self.options)
 
         curcode = ''
         insertions = []
@@ -491,23 +692,28 @@
 
 class PythonTracebackLexer(RegexLexer):
     """
-    For Python tracebacks.
+    For Python 3.x tracebacks, with support for chained exceptions.
+
+    .. versionadded:: 1.0
 
-    .. versionadded:: 0.7
+    .. versionchanged:: 2.5
+       This is now the default ``PythonTracebackLexer``.  It is still available
+       as the alias ``Python3TracebackLexer``.
     """
 
     name = 'Python Traceback'
-    aliases = ['pytb']
-    filenames = ['*.pytb']
-    mimetypes = ['text/x-python-traceback']
+    aliases = ['pytb', 'py3tb']
+    filenames = ['*.pytb', '*.py3tb']
+    mimetypes = ['text/x-python-traceback', 'text/x-python3-traceback']
 
     tokens = {
         'root': [
-            # Cover both (most recent call last) and (innermost last)
-            # The optional ^C allows us to catch keyboard interrupt signals.
-            (r'^(\^C)?(Traceback.*\n)',
-             bygroups(Text, Generic.Traceback), 'intb'),
-            # SyntaxError starts with this.
+            (r'\n', Text),
+            (r'^Traceback \(most recent call last\):\n', Generic.Traceback, 'intb'),
+            (r'^During handling of the above exception, another '
+             r'exception occurred:\n\n', Generic.Traceback),
+            (r'^The above exception was the direct cause of the '
+             r'following exception:\n\n', Generic.Traceback),
             (r'^(?=  File "[^"]+", line \d+)', Generic.Traceback, 'intb'),
             (r'^.*\n', Other),
         ],
@@ -528,27 +734,34 @@
     }
 
 
-class Python3TracebackLexer(RegexLexer):
+Python3TracebackLexer = PythonTracebackLexer
+
+
+class Python2TracebackLexer(RegexLexer):
     """
-    For Python 3.0 tracebacks, with support for chained exceptions.
+    For Python tracebacks.
+
+    .. versionadded:: 0.7
 
-    .. versionadded:: 1.0
+    .. versionchanged:: 2.5
+       This class has been renamed from ``PythonTracebackLexer``.
+       ``PythonTracebackLexer`` now refers to the Python 3 variant.
     """
 
-    name = 'Python 3.0 Traceback'
-    aliases = ['py3tb']
-    filenames = ['*.py3tb']
-    mimetypes = ['text/x-python3-traceback']
+    name = 'Python 2.x Traceback'
+    aliases = ['py2tb']
+    filenames = ['*.py2tb']
+    mimetypes = ['text/x-python2-traceback']
 
     tokens = {
         'root': [
-            (r'\n', Text),
-            (r'^Traceback \(most recent call last\):\n', Generic.Traceback, 'intb'),
-            (r'^During handling of the above exception, another '
-             r'exception occurred:\n\n', Generic.Traceback),
-            (r'^The above exception was the direct cause of the '
-             r'following exception:\n\n', Generic.Traceback),
+            # Cover both (most recent call last) and (innermost last)
+            # The optional ^C allows us to catch keyboard interrupt signals.
+            (r'^(\^C)?(Traceback.*\n)',
+             bygroups(Text, Generic.Traceback), 'intb'),
+            # SyntaxError starts with this.
             (r'^(?=  File "[^"]+", line \d+)', Generic.Traceback, 'intb'),
+            (r'^.*\n', Other),
         ],
         'intb': [
             (r'^(  File )("[^"]+")(, line )(\d+)(, in )(.+)(\n)',
@@ -556,7 +769,7 @@
             (r'^(  File )("[^"]+")(, line )(\d+)(\n)',
              bygroups(Text, Name.Builtin, Text, Number, Text)),
             (r'^(    )(.+)(\n)',
-             bygroups(Text, using(Python3Lexer), Text)),
+             bygroups(Text, using(Python2Lexer), Text)),
             (r'^([ \t]*)(\.\.\.)(\n)',
              bygroups(Text, Comment, Text)),  # for doctests...
             (r'^([^:]+)(: )(.+)(\n)',
@@ -859,7 +1072,7 @@
     mimetypes = []
     filenames = []
 
-    EXTRA_KEYWORDS = set((
+    EXTRA_KEYWORDS = {
         'abs', 'absolute', 'accumulate', 'add', 'alen', 'all', 'allclose',
         'alltrue', 'alterdot', 'amax', 'amin', 'angle', 'any', 'append',
         'apply_along_axis', 'apply_over_axes', 'arange', 'arccos', 'arccosh',
@@ -924,7 +1137,7 @@
         'typename', 'uniform', 'union1d', 'unique', 'unique1d', 'unravel_index',
         'unwrap', 'vander', 'var', 'vdot', 'vectorize', 'view', 'vonmises',
         'vsplit', 'vstack', 'weibull', 'where', 'who', 'zeros', 'zeros_like'
-    ))
+    }
 
     def get_tokens_unprocessed(self, text):
         for index, token, value in \
@@ -935,6 +1148,6 @@
                 yield index, token, value
 
     def analyse_text(text):
-        return (shebang_matches(text, r'pythonw?(2(\.\d)?)?') or
+        return (shebang_matches(text, r'pythonw?(3(\.\d)?)?') or
                 'import ' in text[:1000]) \
             and ('import numpy' in text or 'from numpy import' in text)
--- a/eric6/ThirdParty/Pygments/pygments/lexers/qvt.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/ThirdParty/Pygments/pygments/lexers/qvt.py	Sat May 02 13:51:07 2020 +0200
@@ -5,7 +5,7 @@
 
     Lexer for QVT Operational language.
 
-    :copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -18,7 +18,7 @@
 
 
 class QVToLexer(RegexLexer):
-    """
+    u"""
     For the `QVT Operational Mapping language <http://www.omg.org/spec/QVT/1.1/>`_.
 
     Reference for implementing this: «Meta Object Facility (MOF) 2.0
--- a/eric6/ThirdParty/Pygments/pygments/lexers/r.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/ThirdParty/Pygments/pygments/lexers/r.py	Sat May 02 13:51:07 2020 +0200
@@ -5,7 +5,7 @@
 
     Lexers for the R/S languages.
 
-    :copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -80,7 +80,7 @@
     mimetypes = ['text/S-plus', 'text/S', 'text/x-r-source', 'text/x-r',
                  'text/x-R', 'text/x-r-history', 'text/x-r-profile']
 
-    valid_name = r'(?:`[^`\\]*(?:\\.[^`\\]*)*`)|(?:(?:[a-zA-z]|[_.][^0-9])[\w_.]*)'
+    valid_name = r'`[^`\\]*(?:\\.[^`\\]*)*`|(?:[a-zA-Z]|\.[A-Za-z_.])[\w_.]*|\.'
     tokens = {
         'comments': [
             (r'#.*$', Comment.Single),
@@ -161,7 +161,7 @@
     This is a very minimal implementation, highlighting little more
     than the macros. A description of Rd syntax is found in `Writing R
     Extensions <http://cran.r-project.org/doc/manuals/R-exts.html>`_
-    and `Parsing Rd files <developer.r-project.org/parseRd.pdf>`_.
+    and `Parsing Rd files <http://developer.r-project.org/parseRd.pdf>`_.
 
     .. versionadded:: 1.6
     """
--- a/eric6/ThirdParty/Pygments/pygments/lexers/rdf.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/ThirdParty/Pygments/pygments/lexers/rdf.py	Sat May 02 13:51:07 2020 +0200
@@ -5,7 +5,7 @@
 
     Lexers for semantic web and RDF query languages and markup.
 
-    :copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -15,7 +15,7 @@
 from pygments.token import Keyword, Punctuation, String, Number, Operator, Generic, \
     Whitespace, Name, Literal, Comment, Text
 
-__all__ = ['SparqlLexer', 'TurtleLexer']
+__all__ = ['SparqlLexer', 'TurtleLexer', 'ShExCLexer']
 
 
 class SparqlLexer(RegexLexer):
@@ -268,3 +268,156 @@
 
         ],
     }
+
+    # Turtle and Tera Term macro files share the same file extension
+    # but each has a recognizable and distinct syntax.
+    def analyse_text(text):
+        for t in ('@base ', 'BASE ', '@prefix ', 'PREFIX '):
+            if re.search(r'^\s*%s' % t, text):
+                return 0.80
+
+
+class ShExCLexer(RegexLexer):
+    """
+    Lexer for `ShExC <https://shex.io/shex-semantics/#shexc>`_ shape expressions language syntax.
+    """
+    name = 'ShExC'
+    aliases = ['shexc', 'shex']
+    filenames = ['*.shex']
+    mimetypes = ['text/shex']
+
+    # character group definitions ::
+
+    PN_CHARS_BASE_GRP = (u'a-zA-Z'
+                         u'\u00c0-\u00d6'
+                         u'\u00d8-\u00f6'
+                         u'\u00f8-\u02ff'
+                         u'\u0370-\u037d'
+                         u'\u037f-\u1fff'
+                         u'\u200c-\u200d'
+                         u'\u2070-\u218f'
+                         u'\u2c00-\u2fef'
+                         u'\u3001-\ud7ff'
+                         u'\uf900-\ufdcf'
+                         u'\ufdf0-\ufffd')
+
+    PN_CHARS_U_GRP = (PN_CHARS_BASE_GRP + '_')
+
+    PN_CHARS_GRP = (PN_CHARS_U_GRP +
+                    r'\-' +
+                    r'0-9' +
+                    u'\u00b7' +
+                    u'\u0300-\u036f' +
+                    u'\u203f-\u2040')
+
+    HEX_GRP = '0-9A-Fa-f'
+
+    PN_LOCAL_ESC_CHARS_GRP = r"_~.\-!$&'()*+,;=/?#@%"
+
+    # terminal productions ::
+
+    PN_CHARS_BASE = '[' + PN_CHARS_BASE_GRP + ']'
+
+    PN_CHARS_U = '[' + PN_CHARS_U_GRP + ']'
+
+    PN_CHARS = '[' + PN_CHARS_GRP + ']'
+
+    HEX = '[' + HEX_GRP + ']'
+
+    PN_LOCAL_ESC_CHARS = '[' + PN_LOCAL_ESC_CHARS_GRP + ']'
+
+    UCHAR_NO_BACKSLASH = '(?:u' + HEX + '{4}|U' + HEX + '{8})'
+
+    UCHAR = r'\\' + UCHAR_NO_BACKSLASH
+
+    IRIREF = r'<(?:[^\x00-\x20<>"{}|^`\\]|' + UCHAR + ')*>'
+
+    BLANK_NODE_LABEL = '_:[0-9' + PN_CHARS_U_GRP + '](?:[' + PN_CHARS_GRP + \
+                       '.]*' + PN_CHARS + ')?'
+
+    PN_PREFIX = PN_CHARS_BASE + '(?:[' + PN_CHARS_GRP + '.]*' + PN_CHARS + ')?'
+
+    PERCENT = '%' + HEX + HEX
+
+    PN_LOCAL_ESC = r'\\' + PN_LOCAL_ESC_CHARS
+
+    PLX = '(?:' + PERCENT + ')|(?:' + PN_LOCAL_ESC + ')'
+
+    PN_LOCAL = ('(?:[' + PN_CHARS_U_GRP + ':0-9' + ']|' + PLX + ')' +
+                '(?:(?:[' + PN_CHARS_GRP + '.:]|' + PLX + ')*(?:[' +
+                PN_CHARS_GRP + ':]|' + PLX + '))?')
+
+    EXPONENT = r'[eE][+-]?\d+'
+
+    # Lexer token definitions ::
+
+    tokens = {
+        'root': [
+            (r'\s+', Text),
+            # keywords ::
+            (r'(?i)(base|prefix|start|external|'
+             r'literal|iri|bnode|nonliteral|length|minlength|maxlength|'
+             r'mininclusive|minexclusive|maxinclusive|maxexclusive|'
+             r'totaldigits|fractiondigits|'
+             r'closed|extra)\b', Keyword),
+            (r'(a)\b', Keyword),
+            # IRIs ::
+            ('(' + IRIREF + ')', Name.Label),
+            # blank nodes ::
+            ('(' + BLANK_NODE_LABEL + ')', Name.Label),
+            # prefixed names ::
+            (r'(' + PN_PREFIX + r')?(\:)(' + PN_LOCAL + ')?',
+             bygroups(Name.Namespace, Punctuation, Name.Tag)),
+            # boolean literals ::
+            (r'(true|false)', Keyword.Constant),
+            # double literals ::
+            (r'[+\-]?(\d+\.\d*' + EXPONENT + r'|\.?\d+' + EXPONENT + ')', Number.Float),
+            # decimal literals ::
+            (r'[+\-]?(\d+\.\d*|\.\d+)', Number.Float),
+            # integer literals ::
+            (r'[+\-]?\d+', Number.Integer),
+            # operators ::
+            (r'[@|$&=*+?^\-~]', Operator),
+            # operator keywords ::
+            (r'(?i)(and|or|not)\b', Operator.Word),
+            # punctuation characters ::
+            (r'[(){}.;,:^\[\]]', Punctuation),
+            # line comments ::
+            (r'#[^\n]*', Comment),
+            # strings ::
+            (r'"""', String, 'triple-double-quoted-string'),
+            (r'"', String, 'single-double-quoted-string'),
+            (r"'''", String, 'triple-single-quoted-string'),
+            (r"'", String, 'single-single-quoted-string'),
+        ],
+        'triple-double-quoted-string': [
+            (r'"""', String, 'end-of-string'),
+            (r'[^\\]+', String),
+            (r'\\', String, 'string-escape'),
+        ],
+        'single-double-quoted-string': [
+            (r'"', String, 'end-of-string'),
+            (r'[^"\\\n]+', String),
+            (r'\\', String, 'string-escape'),
+        ],
+        'triple-single-quoted-string': [
+            (r"'''", String, 'end-of-string'),
+            (r'[^\\]+', String),
+            (r'\\', String.Escape, 'string-escape'),
+        ],
+        'single-single-quoted-string': [
+            (r"'", String, 'end-of-string'),
+            (r"[^'\\\n]+", String),
+            (r'\\', String, 'string-escape'),
+        ],
+        'string-escape': [
+            (UCHAR_NO_BACKSLASH, String.Escape, '#pop'),
+            (r'.', String.Escape, '#pop'),
+        ],
+        'end-of-string': [
+            (r'(@)([a-zA-Z]+(?:-[a-zA-Z0-9]+)*)',
+             bygroups(Operator, Name.Function), '#pop:2'),
+            (r'\^\^', Operator, '#pop:2'),
+            default('#pop:2'),
+        ],
+    }
--- a/eric6/ThirdParty/Pygments/pygments/lexers/rebol.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/ThirdParty/Pygments/pygments/lexers/rebol.py	Sat May 02 13:51:07 2020 +0200
@@ -5,7 +5,7 @@
 
     Lexers for the REBOL and related languages.
 
-    :copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -239,7 +239,7 @@
         if re.match(r'^\s*REBOL\s*\[', text, re.IGNORECASE):
             # The code starts with REBOL header
             return 1.0
-        elif re.search(r'\s*REBOL\s*[', text, re.IGNORECASE):
+        elif re.search(r'\s*REBOL\s*\[', text, re.IGNORECASE):
             # The code contains REBOL header but also some text before it
             return 0.5
 
--- a/eric6/ThirdParty/Pygments/pygments/lexers/resource.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/ThirdParty/Pygments/pygments/lexers/resource.py	Sat May 02 13:51:07 2020 +0200
@@ -5,7 +5,7 @@
 
     Lexer for resource definition files.
 
-    :copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -26,7 +26,7 @@
     """
     name = 'ResourceBundle'
     aliases = ['resource', 'resourcebundle']
-    filenames = ['*.txt']
+    filenames = []
 
     _types = (':table', ':array', ':string', ':bin', ':import', ':intvector',
               ':int', ':alias')
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/eric6/ThirdParty/Pygments/pygments/lexers/ride.py	Sat May 02 13:51:07 2020 +0200
@@ -0,0 +1,139 @@
+# -*- coding: utf-8 -*-
+"""
+    pygments.lexers.ride
+    ~~~~~~~~~~~~~~~~~~~~
+
+    Lexer for the Ride programming language.
+
+    :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
+    :license: BSD, see LICENSE for details.
+"""
+
+from pygments.lexer import RegexLexer, words, include
+from pygments.token import Comment, Keyword, Name, Number, Punctuation, String, Text
+
+__all__ = ['RideLexer']
+
+
+class RideLexer(RegexLexer):
+    """
+    For `Ride <https://docs.wavesplatform.com/en/ride/about-ride.html>`_
+    source code.
+
+    .. versionadded:: 2.6
+    """
+
+    name = 'Ride'
+    aliases = ['ride']
+    filenames = ['*.ride']
+    mimetypes = ['text/x-ride']
+
+    validName = r'[a-zA-Z_][a-zA-Z0-9_\']*'
+
+    builtinOps = (
+        '||', '|', '>=', '>', '==', '!',
+        '=', '<=', '<', '::', ':+', ':', '!=', '/',
+        '.', '=>', '-', '+', '*', '&&', '%', '++',
+    )
+
+    globalVariablesName = (
+        'NOALG', 'MD5', 'SHA1', 'SHA224', 'SHA256', 'SHA384', 'SHA512',
+        'SHA3224', 'SHA3256', 'SHA3384', 'SHA3512', 'nil', 'this', 'unit',
+        'height', 'lastBlock', 'Buy', 'Sell', 'CEILING', 'FLOOR', 'DOWN',
+        'HALFDOWN', 'HALFEVEN', 'HALFUP', 'UP',
+    )
+
+    typesName = (
+        'Unit', 'Int', 'Boolean', 'ByteVector', 'String', 'Address', 'Alias',
+        'Transfer', 'AssetPair', 'DataEntry', 'Order', 'Transaction',
+        'GenesisTransaction', 'PaymentTransaction', 'ReissueTransaction',
+        'BurnTransaction', 'MassTransferTransaction', 'ExchangeTransaction',
+        'TransferTransaction', 'SetAssetScriptTransaction',
+        'InvokeScriptTransaction', 'IssueTransaction', 'LeaseTransaction',
+        'LeaseCancelTransaction', 'CreateAliasTransaction',
+        'SetScriptTransaction', 'SponsorFeeTransaction', 'DataTransaction',
+        'WriteSet', 'AttachedPayment', 'ScriptTransfer', 'TransferSet',
+        'ScriptResult', 'Invocation', 'Asset', 'BlockInfo', 'Issue', 'Reissue',
+        'Burn', 'NoAlg', 'Md5', 'Sha1', 'Sha224', 'Sha256', 'Sha384', 'Sha512',
+        'Sha3224', 'Sha3256', 'Sha3384', 'Sha3512', 'BinaryEntry',
+        'BooleanEntry', 'IntegerEntry', 'StringEntry', 'List', 'Ceiling',
+        'Down', 'Floor', 'HalfDown', 'HalfEven', 'HalfUp', 'Up',
+    )
+
+    functionsName = (
+        'fraction', 'size', 'toBytes', 'take', 'drop', 'takeRight', 'dropRight',
+        'toString', 'isDefined', 'extract', 'throw', 'getElement', 'value',
+        'cons', 'toUtf8String', 'toInt', 'indexOf', 'lastIndexOf', 'split',
+        'parseInt', 'parseIntValue', 'keccak256', 'blake2b256', 'sha256',
+        'sigVerify', 'toBase58String', 'fromBase58String', 'toBase64String',
+        'fromBase64String', 'transactionById', 'transactionHeightById',
+        'getInteger', 'getBoolean', 'getBinary', 'getString',
+        'addressFromPublicKey', 'addressFromString', 'addressFromRecipient',
+        'assetBalance', 'wavesBalance', 'getIntegerValue', 'getBooleanValue',
+        'getBinaryValue', 'getStringValue', 'addressFromStringValue',
+        'assetInfo', 'rsaVerify', 'checkMerkleProof', 'median',
+        'valueOrElse', 'valueOrErrorMessage', 'contains', 'log', 'pow',
+        'toBase16String', 'fromBase16String', 'blockInfoByHeight',
+        'transferTransactionById',
+    )
+
+    reservedWords = words((
+        'match', 'case', 'else', 'func', 'if',
+        'let', 'then', '@Callable', '@Verifier',
+    ), suffix=r'\b')
+
+    tokens = {
+        'root': [
+            # Comments
+            (r'#.*', Comment.Single),
+            # Whitespace
+            (r'\s+', Text),
+            # Strings
+            (r'"', String, 'doublequote'),
+            (r'utf8\'', String, 'utf8quote'),
+            (r'base(58|64|16)\'', String, 'singlequote'),
+            # Keywords
+            (reservedWords, Keyword.Reserved),
+            (r'\{-#.*?#-\}', Keyword.Reserved),
+            (r'FOLD<\d+>', Keyword.Reserved),
+            # Types
+            (words(typesName), Keyword.Type),
+            # Main
+            # (specialName, Keyword.Reserved),
+            # Prefix Operators
+            (words(builtinOps, prefix=r'\(', suffix=r'\)'), Name.Function),
+            # Infix Operators
+            (words(builtinOps), Name.Function),
+            (words(globalVariablesName), Name.Function),
+            (words(functionsName), Name.Function),
+            # Numbers
+            include('numbers'),
+            # Variable Names
+            (validName, Name.Variable),
+            # Parens
+            (r'[,()\[\]{}]', Punctuation),
+        ],
+
+        'doublequote': [
+            (r'\\u[0-9a-fA-F]{4}', String.Escape),
+            (r'\\[nrfvb\\"]', String.Escape),
+            (r'[^"]', String),
+            (r'"', String, '#pop'),
+        ],
+
+        'utf8quote': [
+            (r'\\u[0-9a-fA-F]{4}', String.Escape),
+            (r'\\[nrfvb\\\']', String.Escape),
+            (r'[^\']', String),
+            (r'\'', String, '#pop'),
+        ],
+
+        'singlequote': [
+            (r'[^\']', String),
+            (r'\'', String, '#pop'),
+        ],
+
+        'numbers': [
+            (r'_?\d+', Number.Integer),
+        ],
+    }
--- a/eric6/ThirdParty/Pygments/pygments/lexers/rnc.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/ThirdParty/Pygments/pygments/lexers/rnc.py	Sat May 02 13:51:07 2020 +0200
@@ -5,7 +5,7 @@
 
     Lexer for Relax-NG Compact syntax
 
-    :copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
--- a/eric6/ThirdParty/Pygments/pygments/lexers/roboconf.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/ThirdParty/Pygments/pygments/lexers/roboconf.py	Sat May 02 13:51:07 2020 +0200
@@ -5,7 +5,7 @@
 
     Lexers for Roboconf DSL.
 
-    :copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
--- a/eric6/ThirdParty/Pygments/pygments/lexers/robotframework.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/ThirdParty/Pygments/pygments/lexers/robotframework.py	Sat May 02 13:51:07 2020 +0200
@@ -5,7 +5,7 @@
 
     Lexer for Robot Framework.
 
-    :copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -27,7 +27,6 @@
 
 from pygments.lexer import Lexer
 from pygments.token import Token
-from pygments.util import text_type
 
 __all__ = ['RobotFrameworkLexer']
 
@@ -64,7 +63,7 @@
     """
     name = 'RobotFramework'
     aliases = ['robotframework']
-    filenames = ['*.txt', '*.robot']
+    filenames = ['*.robot']
     mimetypes = ['text/x-robotframework']
 
     def __init__(self, **options):
@@ -80,11 +79,11 @@
             for value, token in row_tokenizer.tokenize(row):
                 for value, token in var_tokenizer.tokenize(value, token):
                     if value:
-                        yield index, token, text_type(value)
+                        yield index, token, str(value)
                         index += len(value)
 
 
-class VariableTokenizer(object):
+class VariableTokenizer:
 
     def tokenize(self, string, token):
         var = VariableSplitter(string, identifiers='$@%&')
@@ -111,7 +110,7 @@
             yield value, token
 
 
-class RowTokenizer(object):
+class RowTokenizer:
 
     def __init__(self):
         self._table = UnknownTable()
@@ -159,7 +158,7 @@
                 yield value, token
 
 
-class RowSplitter(object):
+class RowSplitter:
     _space_splitter = re.compile('( {2,})')
     _pipe_splitter = re.compile(r'((?:^| +)\|(?: +|$))')
 
@@ -185,7 +184,7 @@
         yield rest
 
 
-class Tokenizer(object):
+class Tokenizer:
     _tokens = None
 
     def __init__(self):
@@ -292,7 +291,7 @@
         return GherkinTokenizer().tokenize(value, KEYWORD)
 
 
-class GherkinTokenizer(object):
+class GherkinTokenizer:
     _gherkin_prefix = re.compile('^(Given|When|Then|And) ', re.IGNORECASE)
 
     def tokenize(self, value, token):
@@ -320,7 +319,7 @@
         return token
 
 
-class _Table(object):
+class _Table:
     _tokenizer_class = None
 
     def __init__(self, prev_tokenizer=None):
--- a/eric6/ThirdParty/Pygments/pygments/lexers/ruby.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/ThirdParty/Pygments/pygments/lexers/ruby.py	Sat May 02 13:51:07 2020 +0200
@@ -5,7 +5,7 @@
 
     Lexers for Ruby and related languages.
 
-    :copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -43,17 +43,17 @@
 
     def heredoc_callback(self, match, ctx):
         # okay, this is the hardest part of parsing Ruby...
-        # match: 1 = <<-?, 2 = quote? 3 = name 4 = quote? 5 = rest of line
+        # match: 1 = <<[-~]?, 2 = quote? 3 = name 4 = quote? 5 = rest of line
 
         start = match.start(1)
-        yield start, Operator, match.group(1)        # <<-?
+        yield start, Operator, match.group(1)        # <<[-~]?
         yield match.start(2), String.Heredoc, match.group(2)   # quote ", ', `
         yield match.start(3), String.Delimiter, match.group(3) # heredoc name
         yield match.start(4), String.Heredoc, match.group(4)   # quote again
 
         heredocstack = ctx.__dict__.setdefault('heredocstack', [])
         outermost = not bool(heredocstack)
-        heredocstack.append((match.group(1) == '<<-', match.group(3)))
+        heredocstack.append((match.group(1) in ('<<-', '<<~'), match.group(3)))
 
         ctx.pos = match.start(5)
         ctx.end = match.end(5)
@@ -247,10 +247,10 @@
              Name.Builtin),
             (r'__(FILE|LINE)__\b', Name.Builtin.Pseudo),
             # normal heredocs
-            (r'(?<!\w)(<<-?)(["`\']?)([a-zA-Z_]\w*)(\2)(.*?\n)',
+            (r'(?<!\w)(<<[-~]?)(["`\']?)([a-zA-Z_]\w*)(\2)(.*?\n)',
              heredoc_callback),
             # empty string heredocs
-            (r'(<<-?)("|\')()(\2)(.*?\n)', heredoc_callback),
+            (r'(<<[-~]?)("|\')()(\2)(.*?\n)', heredoc_callback),
             (r'__END__', Comment.Preproc, 'end-part'),
             # multiline regex (after keywords or assignments)
             (r'(?:^|(?<=[=<>~!:])|'
--- a/eric6/ThirdParty/Pygments/pygments/lexers/rust.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/ThirdParty/Pygments/pygments/lexers/rust.py	Sat May 02 13:51:07 2020 +0200
@@ -5,7 +5,7 @@
 
     Lexers for the Rust language.
 
-    :copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -18,48 +18,47 @@
 
 class RustLexer(RegexLexer):
     """
-    Lexer for the Rust programming language (version 1.10).
+    Lexer for the Rust programming language (version 1.40).
 
     .. versionadded:: 1.6
     """
     name = 'Rust'
     filenames = ['*.rs', '*.rs.in']
     aliases = ['rust', 'rs']
-    mimetypes = ['text/rust']
+    mimetypes = ['text/rust', 'text/x-rust']
 
-    keyword_types = (
-        words(('u8', 'u16', 'u32', 'u64', 'i8', 'i16', 'i32', 'i64',
-               'usize', 'isize', 'f32', 'f64', 'str', 'bool'),
-              suffix=r'\b'),
-        Keyword.Type)
+    keyword_types = (words((
+        'u8', 'u16', 'u32', 'u64', 'u128', 'i8', 'i16', 'i32', 'i64', 'i128',
+        'usize', 'isize', 'f32', 'f64', 'char', 'str', 'bool',
+    ), suffix=r'\b'), Keyword.Type)
 
     builtin_types = (words((
-        # Reexported core operators
-        'Copy', 'Send', 'Sized', 'Sync',
+        'Send', 'Sized', 'Sync', 'Unpin',
         'Drop', 'Fn', 'FnMut', 'FnOnce',
-
-        # Reexported types and traits
-        'Box',
-        'ToOwned',
-        'Clone',
-        'PartialEq', 'PartialOrd', 'Eq', 'Ord',
         'AsRef', 'AsMut', 'Into', 'From',
-        'Default',
-        'Iterator', 'Extend', 'IntoIterator',
-        'DoubleEndedIterator', 'ExactSizeIterator',
-        'Option',
-        'Some', 'None',
-        'Result',
-        'Ok', 'Err',
-        'SliceConcatExt',
-        'String', 'ToString',
-        'Vec'), suffix=r'\b'),
-        Name.Builtin)
+        'Iterator', 'Extend', 'IntoIterator', 'DoubleEndedIterator',
+        'ExactSizeIterator', 'Option', 'Result',
+        'Box', 'ToOwned', 'String', 'ToString', 'Vec',
+        'Clone', 'Copy', 'Default', 'Eq', 'Hash', 'Ord', 'PartialEq',
+        'PartialOrd', 'Eq', 'Ord',
+    ), suffix=r'\b'), Name.Builtin)
+
+    builtin_funcs_macros = (words((
+        'drop', 'Some', 'None', 'Ok', 'Err',
+        'asm!', 'assert!', 'assert_eq!', 'assert_ne!', 'cfg!', 'column!',
+        'compile_error!', 'concat!', 'concat_idents!', 'dbg!', 'debug_assert!',
+        'debug_assert_eq!', 'debug_assert_ne!', 'env!', 'eprint!', 'eprintln!',
+        'file!', 'format_args!', 'format_args_nl!', 'global_asm!', 'include!',
+        'include_bytes!', 'include_str!', 'line!', 'log_syntax!',
+        'module_path!', 'option_env!', 'panic!', 'print!', 'println!',
+        'stringify!', 'thread_local!', 'todo!', 'trace_macros!',
+        'unimplemented!', 'unreachable!', 'vec!', 'write!', 'writeln!',
+    ), suffix=r'\b'), Name.Builtin)
 
     tokens = {
         'root': [
             # rust allows a file to start with a shebang, but if the first line
-            # starts with #![ then it’s not a shebang but a crate attribute.
+            # starts with #![ then it's not a shebang but a crate attribute.
             (r'#![^[\r\n].*$', Comment.Preproc),
             default('base'),
         ],
@@ -78,11 +77,11 @@
             (r"""\$([a-zA-Z_]\w*|\(,?|\),?|,?)""", Comment.Preproc),
             # Keywords
             (words((
-                'as', 'box', 'const', 'crate', 'else', 'extern',
-                'for', 'if', 'impl', 'in', 'loop', 'match', 'move',
-                'mut', 'pub', 'ref', 'return', 'static', 'super',
-                'trait', 'unsafe', 'use', 'where', 'while'), suffix=r'\b'),
-             Keyword),
+                'as', 'async', 'await', 'box', 'const', 'crate', 'dyn', 'else',
+                'extern', 'for', 'if', 'impl', 'in', 'loop', 'match', 'move',
+                'mut', 'pub', 'ref', 'return', 'static', 'super', 'trait',
+                'try', 'unsafe', 'use', 'where', 'while', 'macro_rules!',
+            ), suffix=r'\b'), Keyword),
             (words(('abstract', 'alignof', 'become', 'do', 'final', 'macro',
                     'offsetof', 'override', 'priv', 'proc', 'pure', 'sizeof',
                     'typeof', 'unsized', 'virtual', 'yield'), suffix=r'\b'),
@@ -94,9 +93,10 @@
             (r'(struct|enum|type|union)\b', Keyword, 'typename'),
             (r'(default)(\s+)(type|fn)\b', bygroups(Keyword, Text, Keyword)),
             keyword_types,
-            (r'self\b', Name.Builtin.Pseudo),
-            # Prelude (taken from Rust’s src/libstd/prelude.rs)
+            (r'[sS]elf\b', Name.Builtin.Pseudo),
+            # Prelude (taken from Rust's src/libstd/prelude.rs)
             builtin_types,
+            builtin_funcs_macros,
             # Path seperators, so types don't catch them.
             (r'::\b', Text),
             # Types in positions.
@@ -104,49 +104,48 @@
             # Labels
             (r'(break|continue)(\s*)(\'[A-Za-z_]\w*)?',
              bygroups(Keyword, Text.Whitespace, Name.Label)),
-            # Character Literal
+
+            # Character literals
             (r"""'(\\['"\\nrt]|\\x[0-7][0-9a-fA-F]|\\0"""
              r"""|\\u\{[0-9a-fA-F]{1,6}\}|.)'""",
              String.Char),
             (r"""b'(\\['"\\nrt]|\\x[0-9a-fA-F]{2}|\\0"""
              r"""|\\u\{[0-9a-fA-F]{1,6}\}|.)'""",
              String.Char),
-            # Binary Literal
+
+            # Binary literals
             (r'0b[01_]+', Number.Bin, 'number_lit'),
-            # Octal Literal
+            # Octal literals
             (r'0o[0-7_]+', Number.Oct, 'number_lit'),
-            # Hexadecimal Literal
+            # Hexadecimal literals
             (r'0[xX][0-9a-fA-F_]+', Number.Hex, 'number_lit'),
-            # Decimal Literal
+            # Decimal literals
             (r'[0-9][0-9_]*(\.[0-9_]+[eE][+\-]?[0-9_]+|'
              r'\.[0-9_]*(?!\.)|[eE][+\-]?[0-9_]+)', Number.Float,
              'number_lit'),
             (r'[0-9][0-9_]*', Number.Integer, 'number_lit'),
-            # String Literal
+
+            # String literals
             (r'b"', String, 'bytestring'),
             (r'"', String, 'string'),
             (r'b?r(#*)".*?"\1', String),
 
-            # Lifetime
-            (r"""'static""", Name.Builtin),
-            (r"""'[a-zA-Z_]\w*""", Name.Attribute),
+            # Lifetime names
+            (r"'(static|_)", Name.Builtin),
+            (r"'[a-zA-Z_]\w*", Name.Attribute),
 
             # Operators and Punctuation
+            (r'\.\.=?', Operator),
             (r'[{}()\[\],.;]', Punctuation),
             (r'[+\-*/%&|<>^!~@=:?]', Operator),
 
-            # Identifier
+            # Identifiers
             (r'[a-zA-Z_]\w*', Name),
+            # Raw identifiers
+            (r'r#[a-zA-Z_]\w*', Name),
 
             # Attributes
             (r'#!?\[', Comment.Preproc, 'attribute['),
-            # Macros
-            (r'([A-Za-z_]\w*)(!)(\s*)([A-Za-z_]\w*)?(\s*)(\{)',
-             bygroups(Comment.Preproc, Punctuation, Whitespace, Name,
-                      Whitespace, Punctuation), 'macro{'),
-            (r'([A-Za-z_]\w*)(!)(\s*)([A-Za-z_]\w*)?(\()',
-             bygroups(Comment.Preproc, Punctuation, Whitespace, Name,
-                      Punctuation), 'macro('),
         ],
         'comment': [
             (r'[^*/]+', Comment.Multiline),
@@ -194,14 +193,6 @@
             (r"""\\x[89a-fA-F][0-9a-fA-F]""", String.Escape),
             include('string'),
         ],
-        'macro{': [
-            (r'\{', Operator, '#push'),
-            (r'\}', Operator, '#pop'),
-        ],
-        'macro(': [
-            (r'\(', Operator, '#push'),
-            (r'\)', Operator, '#pop'),
-        ],
         'attribute_common': [
             (r'"', String, 'string'),
             (r'\[', Comment.Preproc, 'attribute['),
--- a/eric6/ThirdParty/Pygments/pygments/lexers/sas.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/ThirdParty/Pygments/pygments/lexers/sas.py	Sat May 02 13:51:07 2020 +0200
@@ -5,7 +5,7 @@
 
     Lexer for SAS.
 
-    :copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/eric6/ThirdParty/Pygments/pygments/lexers/scdoc.py	Sat May 02 13:51:07 2020 +0200
@@ -0,0 +1,70 @@
+# -*- coding: utf-8 -*-
+"""
+    pygments.lexers.scdoc
+    ~~~~~~~~~~~~~~~~~~~~~
+
+    Lexer for scdoc, a simple man page generator.
+
+    :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
+    :license: BSD, see LICENSE for details.
+"""
+
+import re
+
+from pygments.lexer import RegexLexer, include, bygroups, \
+    using, this
+from pygments.token import Text, Comment, Keyword, String, \
+    Generic
+
+
+__all__ = ['ScdocLexer']
+
+
+class ScdocLexer(RegexLexer):
+    """
+    `scdoc` is a simple man page generator for POSIX systems written in C99.
+    https://git.sr.ht/~sircmpwn/scdoc
+
+    .. versionadded:: 2.5
+    """
+    name = 'scdoc'
+    aliases = ['scdoc', 'scd']
+    filenames = ['*.scd', '*.scdoc']
+    flags = re.MULTILINE
+
+    tokens = {
+        'root': [
+            # comment
+            (r'^(;.+\n)', bygroups(Comment)),
+
+            # heading with pound prefix
+            (r'^(#)([^#].+\n)', bygroups(Generic.Heading, Text)),
+            (r'^(#{2})(.+\n)', bygroups(Generic.Subheading, Text)),
+            # bulleted lists
+            (r'^(\s*)([*-])(\s)(.+\n)',
+            bygroups(Text, Keyword, Text, using(this, state='inline'))),
+            # numbered lists
+            (r'^(\s*)(\.+\.)( .+\n)',
+            bygroups(Text, Keyword, using(this, state='inline'))),
+            # quote
+            (r'^(\s*>\s)(.+\n)', bygroups(Keyword, Generic.Emph)),
+            # text block
+            (r'^(```\n)([\w\W]*?)(^```$)', bygroups(String, Text, String)),
+
+            include('inline'),
+        ],
+        'inline': [
+            # escape
+            (r'\\.', Text),
+            # underlines
+            (r'(\s)(_[^_]+_)(\W|\n)', bygroups(Text, Generic.Emph, Text)),
+            # bold
+            (r'(\s)(\*[^\*]+\*)(\W|\n)', bygroups(Text, Generic.Strong, Text)),
+            # inline code
+            (r'`[^`]+`', String.Backtick),
+
+            # general text, must come last!
+            (r'[^\\\s]+', Text),
+            (r'.', Text),
+        ],
+    }
--- a/eric6/ThirdParty/Pygments/pygments/lexers/scripting.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/ThirdParty/Pygments/pygments/lexers/scripting.py	Sat May 02 13:51:07 2020 +0200
@@ -5,7 +5,7 @@
 
     Lexer for scripting and embedded languages.
 
-    :copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -15,11 +15,11 @@
     words
 from pygments.token import Text, Comment, Operator, Keyword, Name, String, \
     Number, Punctuation, Error, Whitespace, Other
-from pygments.util import get_bool_opt, get_list_opt, iteritems
+from pygments.util import get_bool_opt, get_list_opt
 
 __all__ = ['LuaLexer', 'MoonScriptLexer', 'ChaiscriptLexer', 'LSLLexer',
            'AppleScriptLexer', 'RexxLexer', 'MOOCodeLexer', 'HybrisLexer',
-           'EasytrieveLexer', 'JclLexer']
+           'EasytrieveLexer', 'JclLexer', 'MiniScriptLexer']
 
 
 class LuaLexer(RegexLexer):
@@ -142,7 +142,7 @@
         self._functions = set()
         if self.func_name_highlighting:
             from pygments.lexers._lua_builtins import MODULES
-            for mod, func in iteritems(MODULES):
+            for mod, func in MODULES.items():
                 if mod not in self.disabled_modules:
                     self._functions.update(func)
         RegexLexer.__init__(self, **options)
@@ -162,7 +162,6 @@
                     continue
             yield index, token, value
 
-
 class MoonScriptLexer(LuaLexer):
     """
     For `MoonScript <http://moonscript.org>`_ source code.
@@ -1220,3 +1219,57 @@
                 result = 1.0
         assert 0.0 <= result <= 1.0
         return result
+
+
+class MiniScriptLexer(RegexLexer):
+    """
+    For `MiniScript <https://miniscript.org>`_ source code.
+
+    .. versionadded:: 2.6
+    """
+
+    name = "MiniScript"
+    aliases = ["ms", "miniscript"]
+    filenames = ["*.ms"]
+    mimetypes = ['text/x-minicript', 'application/x-miniscript']
+
+    tokens = {
+        'root': [
+            (r'#!(.*?)$', Comment.Preproc),
+            default('base'),
+        ],
+        'base': [
+            ('//.*$', Comment.Single),
+            (r'(?i)(\d*\.\d+|\d+\.\d*)(e[+-]?\d+)?', Number),
+            (r'(?i)\d+e[+-]?\d+', Number),
+            (r'\d+', Number),
+            (r'\n', Text),
+            (r'[^\S\n]+', Text),
+            (r'"', String, 'string_double'),
+            (r'(==|!=|<=|>=|[=+\-*/%^<>.:])', Operator),
+            (r'[;,\[\]{}()]', Punctuation),
+            (words((
+                'break', 'continue', 'else', 'end', 'for', 'function', 'if',
+                'in', 'isa', 'then', 'repeat', 'return', 'while'), suffix=r'\b'),
+             Keyword),
+            (words((
+            	'abs', 'acos', 'asin', 'atan', 'ceil', 'char', 'cos', 'floor',
+            	'log', 'round', 'rnd', 'pi', 'sign', 'sin', 'sqrt', 'str', 'tan',
+            	'hasIndex', 'indexOf', 'len', 'val', 'code', 'remove', 'lower',
+            	'upper', 'replace', 'split', 'indexes', 'values', 'join', 'sum',
+            	'sort', 'shuffle', 'push', 'pop', 'pull', 'range',
+            	'print', 'input', 'time', 'wait', 'locals', 'globals', 'outer',
+            	'yield'), suffix=r'\b'),
+             Name.Builtin),
+            (r'(true|false|null)\b', Keyword.Constant),
+            (r'(and|or|not|new)\b', Operator.Word),
+            (r'(self|super|__isa)\b', Name.Builtin.Pseudo),
+            (r'[a-zA-Z_]\w*', Name.Variable)
+        ],
+        'string_double': [
+            (r'[^"\n]+', String),
+            (r'""', String),
+            (r'"', String, '#pop'),
+            (r'\n', Text, '#pop'),  # Stray linefeed also terminates strings.
+        ]
+    }
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/eric6/ThirdParty/Pygments/pygments/lexers/sgf.py	Sat May 02 13:51:07 2020 +0200
@@ -0,0 +1,61 @@
+# -*- coding: utf-8 -*-
+"""
+    pygments.lexers.sgf
+    ~~~~~~~~~~~~~~~~~~~
+
+    Lexer for Smart Game Format (sgf) file format.
+
+    :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
+    :license: BSD, see LICENSE for details.
+"""
+
+from pygments.lexer import RegexLexer, bygroups
+from pygments.token import Name, Literal, String, Text, Punctuation
+
+__all__ = ["SmartGameFormatLexer"]
+
+
+class SmartGameFormatLexer(RegexLexer):
+    """
+    Lexer for Smart Game Format (sgf) file format.
+
+    The format is used to store game records of board games for two players
+    (mainly Go game).
+    For more information about the definition of the format, see:
+    https://www.red-bean.com/sgf/
+
+    .. versionadded:: 2.4
+    """
+    name = 'SmartGameFormat'
+    aliases = ['sgf']
+    filenames = ['*.sgf']
+
+    tokens = {
+        'root': [
+            (r'[\s():;]', Punctuation),
+            # tokens:
+            (r'(A[BW]|AE|AN|AP|AR|AS|[BW]L|BM|[BW]R|[BW]S|[BW]T|CA|CH|CP|CR|'
+             r'DD|DM|DO|DT|EL|EV|EX|FF|FG|G[BW]|GC|GM|GN|HA|HO|ID|IP|IT|IY|KM|'
+             r'KO|LB|LN|LT|L|MA|MN|M|N|OB|OM|ON|OP|OT|OV|P[BW]|PC|PL|PM|RE|RG|'
+             r'RO|RU|SO|SC|SE|SI|SL|SO|SQ|ST|SU|SZ|T[BW]|TC|TE|TM|TR|UC|US|VW|'
+             r'V|[BW]|C)',
+             Name.Builtin),
+            # number:
+            (r'(\[)([0-9.]+)(\])',
+             bygroups(Punctuation, Literal.Number, Punctuation)),
+            # date:
+            (r'(\[)([0-9]{4}-[0-9]{2}-[0-9]{2})(\])',
+             bygroups(Punctuation, Literal.Date, Punctuation)),
+            # point:
+            (r'(\[)([a-z]{2})(\])',
+             bygroups(Punctuation, String, Punctuation)),
+            # double points:
+            (r'(\[)([a-z]{2})(:)([a-z]{2})(\])',
+             bygroups(Punctuation, String, Punctuation, String, Punctuation)),
+
+            (r'(\[)([\w\s#()+,\-.:?]+)(\])',
+             bygroups(Punctuation, String, Punctuation)),
+            (r'(\[)(\s.*)(\])',
+             bygroups(Punctuation, Text, Punctuation)),
+        ],
+    }
--- a/eric6/ThirdParty/Pygments/pygments/lexers/shell.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/ThirdParty/Pygments/pygments/lexers/shell.py	Sat May 02 13:51:07 2020 +0200
@@ -5,7 +5,7 @@
 
     Lexers for various shells.
 
-    :copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -19,7 +19,7 @@
 
 
 __all__ = ['BashLexer', 'BashSessionLexer', 'TcshLexer', 'BatchLexer',
-           'MSDOSSessionLexer', 'PowerShellLexer',
+           'SlurmBashLexer', 'MSDOSSessionLexer', 'PowerShellLexer',
            'PowerShellSessionLexer', 'TcshSessionLexer', 'FishShellLexer']
 
 line_re = re.compile('.*?\n')
@@ -38,7 +38,7 @@
                  '*.exheres-0', '*.exlib', '*.zsh',
                  '.bashrc', 'bashrc', '.bash_*', 'bash_*', 'zshrc', '.zshrc',
                  'PKGBUILD']
-    mimetypes = ['application/x-sh', 'application/x-shellscript']
+    mimetypes = ['application/x-sh', 'application/x-shellscript', 'text/x-shellscript']
 
     tokens = {
         'root': [
@@ -76,7 +76,7 @@
             (r'&&|\|\|', Operator),
         ],
         'data': [
-            (r'(?s)\$?"(\\\\|\\[0-7]+|\\.|[^"\\$])*"', String.Double),
+            (r'(?s)\$?"(\\.|[^"\\$])*"', String.Double),
             (r'"', String.Double, 'string'),
             (r"(?s)\$'(\\\\|\\[0-7]+|\\.|[^'\\])*'", String.Single),
             (r"(?s)'.*?'", String.Single),
@@ -126,12 +126,37 @@
             return 0.2
 
 
+class SlurmBashLexer(BashLexer):
+    """
+    Lexer for (ba|k|z|)sh Slurm scripts.
+
+    .. versionadded:: 2.4
+    """
+
+    name = 'Slurm'
+    aliases = ['slurm', 'sbatch']
+    filenames = ['*.sl']
+    mimetypes = []
+    EXTRA_KEYWORDS = {'srun'}
+
+    def get_tokens_unprocessed(self, text):
+        for index, token, value in BashLexer.get_tokens_unprocessed(self, text):
+            if token is Text and value in self.EXTRA_KEYWORDS:
+                yield index, Name.Builtin, value
+            elif token is Comment.Single and 'SBATCH' in value:
+                yield index, Keyword.Pseudo, value
+            else:
+                yield index, token, value
+
 class ShellSessionBaseLexer(Lexer):
     """
     Base lexer for simplistic shell sessions.
 
     .. versionadded:: 2.1
     """
+
+    _venv = re.compile(r'^(\([^)]*\))(\s*)')
+
     def get_tokens_unprocessed(self, text):
         innerlexer = self._innerLexerCls(**self.options)
 
@@ -142,11 +167,24 @@
 
         for match in line_re.finditer(text):
             line = match.group()
-            m = re.match(self._ps1rgx, line)
             if backslash_continuation:
                 curcode += line
                 backslash_continuation = curcode.endswith('\\\n')
-            elif m:
+                continue
+            
+            venv_match = self._venv.match(line)
+            if venv_match:
+                venv = venv_match.group(1)
+                venv_whitespace = venv_match.group(2)
+                insertions.append((len(curcode),
+                    [(0, Generic.Prompt.VirtualEnv, venv)]))
+                if venv_whitespace:
+                    insertions.append((len(curcode),
+                        [(0, Text, venv_whitespace)]))
+                line = line[venv_match.end():]
+
+            m = self._ps1rgx.match(line)
+            if m:
                 # To support output lexers (say diff output), the output
                 # needs to be broken by prompts whenever the output lexer
                 # changes.
@@ -189,9 +227,9 @@
     mimetypes = ['application/x-shell-session', 'application/x-sh-session']
 
     _innerLexerCls = BashLexer
-    _ps1rgx = \
+    _ps1rgx = re.compile(
         r'^((?:(?:\[.*?\])|(?:\(\S+\))?(?:| |sh\S*?|\w+\S+[@:]\S+(?:\s+\S+)' \
-        r'?|\[\S+[@:][^\n]+\].+))\s*[$#%])(.*\n?)'
+        r'?|\[\S+[@:][^\n]+\].+))\s*[$#%])(.*\n?)')
     _ps2 = '>'
 
 
@@ -518,7 +556,7 @@
     mimetypes = []
 
     _innerLexerCls = BatchLexer
-    _ps1rgx = r'^([^>]+>)(.*\n?)'
+    _ps1rgx = re.compile(r'^([^>]*>)(.*\n?)')
     _ps2 = 'More? '
 
 
@@ -603,7 +641,7 @@
     mimetypes = []
 
     _innerLexerCls = TcshLexer
-    _ps1rgx = r'^([^>]+>)(.*\n?)'
+    _ps1rgx = re.compile(r'^([^>]+>)(.*\n?)')
     _ps2 = '? '
 
 
@@ -650,7 +688,7 @@
         'convertfrom convert connect confirm compress complete compare close '
         'clear checkpoint block backup assert approve aggregate add').split()
 
-    aliases = (
+    aliases_ = (
         'ac asnp cat cd cfs chdir clc clear clhy cli clp cls clv cnsn '
         'compare copy cp cpi cpp curl cvpa dbp del diff dir dnsn ebp echo epal '
         'epcsv epsn erase etsn exsn fc fhx fl foreach ft fw gal gbp gc gci gcm '
@@ -688,7 +726,7 @@
             (r'(%s)\b' % '|'.join(keywords), Keyword),
             (r'-(%s)\b' % '|'.join(operators), Operator),
             (r'(%s)-[a-z_]\w*\b' % '|'.join(verbs), Name.Builtin),
-            (r'(%s)\s' % '|'.join(aliases), Name.Builtin),
+            (r'(%s)\s' % '|'.join(aliases_), Name.Builtin),
             (r'\[[a-z_\[][\w. `,\[\]]*\]', Name.Constant),  # .net [type]s
             (r'-[a-z_]\w*', Name),
             (r'\w+', Name),
@@ -734,7 +772,7 @@
     mimetypes = []
 
     _innerLexerCls = PowerShellLexer
-    _ps1rgx = r'^(PS [^>]+> )(.*\n?)'
+    _ps1rgx = re.compile(r'^(PS [^>]+> )(.*\n?)')
     _ps2 = '>> '
 
 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/eric6/ThirdParty/Pygments/pygments/lexers/sieve.py	Sat May 02 13:51:07 2020 +0200
@@ -0,0 +1,69 @@
+# -*- coding: utf-8 -*-
+"""
+    pygments.lexers.sieve
+    ~~~~~~~~~~~~~~~~~~~~~
+
+    Lexer for Sieve file format.
+
+    https://tools.ietf.org/html/rfc5228
+    https://tools.ietf.org/html/rfc5173
+    https://tools.ietf.org/html/rfc5229
+    https://tools.ietf.org/html/rfc5230
+    https://tools.ietf.org/html/rfc5232
+    https://tools.ietf.org/html/rfc5235
+    https://tools.ietf.org/html/rfc5429
+    https://tools.ietf.org/html/rfc8580
+
+    :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
+    :license: BSD, see LICENSE for details.
+"""
+
+from pygments.lexer import RegexLexer, bygroups
+from pygments.token import Comment, Name, Literal, String, Text, Punctuation, Keyword
+
+__all__ = ["SieveLexer"]
+
+
+class SieveLexer(RegexLexer):
+    """
+    Lexer for sieve format.
+    """
+    name = 'Sieve'
+    filenames = ['*.siv', '*.sieve']
+    aliases = ['sieve']
+
+    tokens = {
+        'root': [
+            (r'\s+', Text),
+            (r'[();,{}\[\]]', Punctuation),
+            # import:
+            (r'(?i)require',
+             Keyword.Namespace),
+            # tags:
+            (r'(?i)(:)(addresses|all|contains|content|create|copy|comparator|count|days|detail|domain|fcc|flags|from|handle|importance|is|localpart|length|lowerfirst|lower|matches|message|mime|options|over|percent|quotewildcard|raw|regex|specialuse|subject|text|under|upperfirst|upper|value)',
+             bygroups(Name.Tag, Name.Tag)),
+            # tokens:
+            (r'(?i)(address|addflag|allof|anyof|body|discard|elsif|else|envelope|ereject|exists|false|fileinto|if|hasflag|header|keep|notify_method_capability|notify|not|redirect|reject|removeflag|setflag|size|spamtest|stop|string|true|vacation|virustest)',
+             Name.Builtin),
+            (r'(?i)set',
+             Keyword.Declaration),
+            # number:
+            (r'([0-9.]+)([kmgKMG])?',
+             bygroups(Literal.Number, Literal.Number)),
+            # comment:
+            (r'#.*$',
+             Comment.Single),
+            (r'/\*.*\*/',
+             Comment.Multiline),
+            # string:
+            (r'"[^"]*?"',
+             String),
+            # text block:
+            (r'text:',
+             Name.Tag, 'text'),
+        ],
+        'text': [
+            (r'[^.].*?\n', String),
+            (r'^\.', Punctuation, "#pop"),
+        ]
+    }
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/eric6/ThirdParty/Pygments/pygments/lexers/slash.py	Sat May 02 13:51:07 2020 +0200
@@ -0,0 +1,185 @@
+# -*- coding: utf-8 -*-
+"""
+    pygments.lexers.slash
+    ~~~~~~~~~~~~~~~~~~~~~
+
+    Lexer for the `Slash <https://github.com/arturadib/Slash-A>`_ programming
+    language.
+
+    :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
+    :license: BSD, see LICENSE for details.
+"""
+
+from pygments.lexer import ExtendedRegexLexer, bygroups, DelegatingLexer
+from pygments.token import Name, Number, String, Comment, Punctuation, \
+    Other, Keyword, Operator, Whitespace
+
+__all__ = ['SlashLexer']
+
+
+class SlashLanguageLexer(ExtendedRegexLexer):
+    _nkw = r'(?=[^a-zA-Z_0-9])'
+
+    def move_state(new_state):
+        return ("#pop", new_state)
+
+    def right_angle_bracket(lexer, match, ctx):
+        if len(ctx.stack) > 1 and ctx.stack[-2] == "string":
+            ctx.stack.pop()
+        yield match.start(), String.Interpol, u"}"
+        ctx.pos = match.end()
+        pass
+
+    tokens = {
+        "root": [
+            (r"<%=",        Comment.Preproc,    move_state("slash")),
+            (r"<%!!",       Comment.Preproc,    move_state("slash")),
+            (r"<%#.*?%>",   Comment.Multiline),
+            (r"<%",         Comment.Preproc,    move_state("slash")),
+            (r".|\n",       Other),
+        ],
+        "string": [
+            (r"\\",         String.Escape,      move_state("string_e")),
+            (r"\"",         String,             move_state("slash")),
+            (r"#\{",        String.Interpol,    "slash"),
+            (r'.|\n',       String),
+        ],
+        "string_e": [
+            (r'n',                  String.Escape,      move_state("string")),
+            (r't',                  String.Escape,      move_state("string")),
+            (r'r',                  String.Escape,      move_state("string")),
+            (r'e',                  String.Escape,      move_state("string")),
+            (r'x[a-fA-F0-9]{2}',    String.Escape,      move_state("string")),
+            (r'.',                  String.Escape,      move_state("string")),
+        ],
+        "regexp": [
+            (r'}[a-z]*',            String.Regex,       move_state("slash")),
+            (r'\\(.|\n)',           String.Regex),
+            (r'{',                  String.Regex,       "regexp_r"),
+            (r'.|\n',               String.Regex),
+        ],
+        "regexp_r": [
+            (r'}[a-z]*',            String.Regex,       "#pop"),
+            (r'\\(.|\n)',           String.Regex),
+            (r'{',                  String.Regex,       "regexp_r"),
+        ],
+        "slash": [
+            (r"%>",                     Comment.Preproc,    move_state("root")),
+            (r"\"",                     String,             move_state("string")),
+            (r"'[a-zA-Z0-9_]+",         String),
+            (r'%r{',                    String.Regex,       move_state("regexp")),
+            (r'/\*.*?\*/',              Comment.Multiline),
+            (r"(#|//).*?\n",            Comment.Single),
+            (r'-?[0-9]+e[+-]?[0-9]+',   Number.Float),
+            (r'-?[0-9]+\.[0-9]+(e[+-]?[0-9]+)?', Number.Float),
+            (r'-?[0-9]+',               Number.Integer),
+            (r'nil'+_nkw,               Name.Builtin),
+            (r'true'+_nkw,              Name.Builtin),
+            (r'false'+_nkw,             Name.Builtin),
+            (r'self'+_nkw,              Name.Builtin),
+            (r'(class)(\s+)([A-Z][a-zA-Z0-9_\']*)',
+                bygroups(Keyword, Whitespace, Name.Class)),
+            (r'class'+_nkw,             Keyword),
+            (r'extends'+_nkw,           Keyword),
+            (r'(def)(\s+)(self)(\s*)(\.)(\s*)([a-z_][a-zA-Z0-9_\']*=?|<<|>>|==|<=>|<=|<|>=|>|\+|-(self)?|~(self)?|\*|/|%|^|&&|&|\||\[\]=?)',
+                bygroups(Keyword, Whitespace, Name.Builtin, Whitespace, Punctuation, Whitespace, Name.Function)),
+            (r'(def)(\s+)([a-z_][a-zA-Z0-9_\']*=?|<<|>>|==|<=>|<=|<|>=|>|\+|-(self)?|~(self)?|\*|/|%|^|&&|&|\||\[\]=?)',
+                bygroups(Keyword, Whitespace, Name.Function)),
+            (r'def'+_nkw,               Keyword),
+            (r'if'+_nkw,                Keyword),
+            (r'elsif'+_nkw,             Keyword),
+            (r'else'+_nkw,              Keyword),
+            (r'unless'+_nkw,            Keyword),
+            (r'for'+_nkw,               Keyword),
+            (r'in'+_nkw,                Keyword),
+            (r'while'+_nkw,             Keyword),
+            (r'until'+_nkw,             Keyword),
+            (r'and'+_nkw,               Keyword),
+            (r'or'+_nkw,                Keyword),
+            (r'not'+_nkw,               Keyword),
+            (r'lambda'+_nkw,            Keyword),
+            (r'try'+_nkw,               Keyword),
+            (r'catch'+_nkw,             Keyword),
+            (r'return'+_nkw,            Keyword),
+            (r'next'+_nkw,              Keyword),
+            (r'last'+_nkw,              Keyword),
+            (r'throw'+_nkw,             Keyword),
+            (r'use'+_nkw,               Keyword),
+            (r'switch'+_nkw,            Keyword),
+            (r'\\',                     Keyword),
+            (r'λ',                      Keyword),
+            (r'__FILE__'+_nkw,          Name.Builtin.Pseudo),
+            (r'__LINE__'+_nkw,          Name.Builtin.Pseudo),
+            (r'[A-Z][a-zA-Z0-9_\']*'+_nkw, Name.Constant),
+            (r'[a-z_][a-zA-Z0-9_\']*'+_nkw, Name),
+            (r'@[a-z_][a-zA-Z0-9_\']*'+_nkw, Name.Variable.Instance),
+            (r'@@[a-z_][a-zA-Z0-9_\']*'+_nkw, Name.Variable.Class),
+            (r'\(',                     Punctuation),
+            (r'\)',                     Punctuation),
+            (r'\[',                     Punctuation),
+            (r'\]',                     Punctuation),
+            (r'\{',                     Punctuation),
+            (r'\}',                     right_angle_bracket),
+            (r';',                      Punctuation),
+            (r',',                      Punctuation),
+            (r'<<=',                    Operator),
+            (r'>>=',                    Operator),
+            (r'<<',                     Operator),
+            (r'>>',                     Operator),
+            (r'==',                     Operator),
+            (r'!=',                     Operator),
+            (r'=>',                     Operator),
+            (r'=',                      Operator),
+            (r'<=>',                    Operator),
+            (r'<=',                     Operator),
+            (r'>=',                     Operator),
+            (r'<',                      Operator),
+            (r'>',                      Operator),
+            (r'\+\+',                   Operator),
+            (r'\+=',                    Operator),
+            (r'-=',                     Operator),
+            (r'\*\*=',                  Operator),
+            (r'\*=',                    Operator),
+            (r'\*\*',                   Operator),
+            (r'\*',                     Operator),
+            (r'/=',                     Operator),
+            (r'\+',                     Operator),
+            (r'-',                      Operator),
+            (r'/',                      Operator),
+            (r'%=',                     Operator),
+            (r'%',                      Operator),
+            (r'^=',                     Operator),
+            (r'&&=',                    Operator),
+            (r'&=',                     Operator),
+            (r'&&',                     Operator),
+            (r'&',                      Operator),
+            (r'\|\|=',                  Operator),
+            (r'\|=',                    Operator),
+            (r'\|\|',                   Operator),
+            (r'\|',                     Operator),
+            (r'!',                      Operator),
+            (r'\.\.\.',                 Operator),
+            (r'\.\.',                   Operator),
+            (r'\.',                     Operator),
+            (r'::',                     Operator),
+            (r':',                      Operator),
+            (r'(\s|\n)+',               Whitespace),
+            (r'[a-z_][a-zA-Z0-9_\']*',  Name.Variable),
+        ],
+    }
+
+
+class SlashLexer(DelegatingLexer):
+    """
+    Lexer for the Slash programming language.
+
+    .. versionadded:: 2.4
+    """
+
+    name = 'Slash'
+    aliases = ['slash']
+    filenames = ['*.sl']
+
+    def __init__(self, **options):
+        from pygments.lexers.web import HtmlLexer
+        super(SlashLexer, self).__init__(HtmlLexer, SlashLanguageLexer, **options)
--- a/eric6/ThirdParty/Pygments/pygments/lexers/smalltalk.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/ThirdParty/Pygments/pygments/lexers/smalltalk.py	Sat May 02 13:51:07 2020 +0200
@@ -5,7 +5,7 @@
 
     Lexers for Smalltalk and related languages.
 
-    :copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
--- a/eric6/ThirdParty/Pygments/pygments/lexers/smv.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/ThirdParty/Pygments/pygments/lexers/smv.py	Sat May 02 13:51:07 2020 +0200
@@ -5,13 +5,13 @@
 
     Lexers for the SMV languages.
 
-    :copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
 from pygments.lexer import RegexLexer, words
-from pygments.token import Comment, Generic, Keyword, Name, Number, \
-    Operator, Punctuation, Text
+from pygments.token import Comment, Keyword, Name, Number, Operator, \
+    Punctuation, Text
 
 __all__ = ['NuSMVLexer']
 
--- a/eric6/ThirdParty/Pygments/pygments/lexers/snobol.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/ThirdParty/Pygments/pygments/lexers/snobol.py	Sat May 02 13:51:07 2020 +0200
@@ -5,7 +5,7 @@
 
     Lexers for the SNOBOL language.
 
-    :copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/eric6/ThirdParty/Pygments/pygments/lexers/solidity.py	Sat May 02 13:51:07 2020 +0200
@@ -0,0 +1,93 @@
+# -*- coding: utf-8 -*-
+"""
+    pygments.lexers.solidity
+    ~~~~~~~~~~~~~~~~~~~~~~~~
+
+    Lexers for Solidity.
+
+    :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
+    :license: BSD, see LICENSE for details.
+"""
+
+import re
+
+from pygments.lexer import RegexLexer, bygroups, include, words
+from pygments.token import Text, Comment, Operator, Keyword, Name, String, \
+    Number, Punctuation
+
+__all__ = ['SolidityLexer']
+
+
+class SolidityLexer(RegexLexer):
+    """
+    For Solidity source code.
+
+    .. versionadded:: 2.5
+    """
+
+    name = 'Solidity'
+    aliases = ['solidity']
+    filenames = ['*.sol']
+    mimetypes = []
+
+    flags = re.MULTILINE | re.UNICODE
+
+    datatype = (
+        r'\b(address|bool|((bytes|hash|int|string|uint)(8|16|24|32|40|48|56|64'
+        r'|72|80|88|96|104|112|120|128|136|144|152|160|168|176|184|192|200|208'
+        r'|216|224|232|240|248|256)?))\b'
+    )
+
+    tokens = {
+        'root': [
+            include('whitespace'),
+            include('comments'),
+            (r'\bpragma\s+solidity\b', Keyword, 'pragma'),
+            (r'\b(contract)(\s+)([a-zA-Z_]\w*)',
+             bygroups(Keyword, Text.WhiteSpace, Name.Entity)),
+            (datatype + r'(\s+)((external|public|internal|private)\s+)?' +
+             r'([a-zA-Z_]\w*)',
+             bygroups(Keyword.Type, None, None, None, Text.WhiteSpace, Keyword,
+                      None, Name.Variable)),
+            (r'\b(enum|event|function|struct)(\s+)([a-zA-Z_]\w*)',
+             bygroups(Keyword.Type, Text.WhiteSpace, Name.Variable)),
+            (r'\b(msg|block|tx)\.([A-Za-z_][A-Za-z0-9_]*)\b', Keyword),
+            (words((
+                'block', 'break', 'constant', 'constructor', 'continue',
+                'contract', 'do', 'else', 'external', 'false', 'for',
+                'function', 'if', 'import', 'inherited', 'internal', 'is',
+                'library', 'mapping', 'memory', 'modifier', 'msg', 'new',
+                'payable', 'private', 'public', 'require', 'return',
+                'returns', 'struct', 'suicide', 'throw', 'this', 'true',
+                'tx', 'var', 'while'), prefix=r'\b', suffix=r'\b'),
+             Keyword.Type),
+            (words(('keccak256',), prefix=r'\b', suffix=r'\b'), Name.Builtin),
+            (datatype, Keyword.Type),
+            include('constants'),
+            (r'[a-zA-Z_]\w*', Text),
+            (r'[!<=>+*/-]', Operator),
+            (r'[.;:{}(),\[\]]', Punctuation)
+        ],
+        'comments': [
+            (r'//(\n|[\w\W]*?[^\\]\n)', Comment.Single),
+            (r'/(\\\n)?[*][\w\W]*?[*](\\\n)?/', Comment.Multiline),
+            (r'/(\\\n)?[*][\w\W]*', Comment.Multiline)
+        ],
+        'constants': [
+            (r'("([\\]"|.)*?")', String.Double),
+            (r"('([\\]'|.)*?')", String.Single),
+            (r'\b0[xX][0-9a-fA-F]+\b', Number.Hex),
+            (r'\b\d+\b', Number.Decimal),
+        ],
+        'pragma': [
+            include('whitespace'),
+            include('comments'),
+            (r'(\^|>=|<)(\s*)(\d+\.\d+\.\d+)',
+             bygroups(Operator, Text.WhiteSpace, Keyword)),
+            (r';', Punctuation, '#pop')
+        ],
+        'whitespace': [
+            (r'\s+', Text.WhiteSpace),
+            (r'\n', Text.WhiteSpace)
+        ]
+    }
--- a/eric6/ThirdParty/Pygments/pygments/lexers/special.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/ThirdParty/Pygments/pygments/lexers/special.py	Sat May 02 13:51:07 2020 +0200
@@ -5,15 +5,16 @@
 
     Special lexers.
 
-    :copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
 import re
+from io import BytesIO
 
 from pygments.lexer import Lexer
 from pygments.token import Token, Error, Text
-from pygments.util import get_choice_opt, text_type, BytesIO
+from pygments.util import get_choice_opt
 
 
 __all__ = ['TextLexer', 'RawTokenLexer']
@@ -35,6 +36,7 @@
     def analyse_text(text):
         return TextLexer.priority
 
+
 _ttype_cache = {}
 
 line_re = re.compile(b'.*?\n')
@@ -63,7 +65,7 @@
         Lexer.__init__(self, **options)
 
     def get_tokens(self, text):
-        if isinstance(text, text_type):
+        if isinstance(text, str):
             # raw token stream never has any non-ASCII characters
             text = text.encode('ascii')
         if self.compress == 'gz':
--- a/eric6/ThirdParty/Pygments/pygments/lexers/sql.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/ThirdParty/Pygments/pygments/lexers/sql.py	Sat May 02 13:51:07 2020 +0200
@@ -34,17 +34,16 @@
     The ``tests/examplefiles`` contains a few test files with data to be
     parsed by these lexers.
 
-    :copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
 import re
 
 from pygments.lexer import Lexer, RegexLexer, do_insertions, bygroups, words
-from pygments.token import Punctuation, Whitespace, Error, \
-    Text, Comment, Operator, Keyword, Name, String, Number, Generic
+from pygments.token import Punctuation, Whitespace, Text, Comment, Operator, \
+    Keyword, Name, String, Number, Generic
 from pygments.lexers import get_lexer_by_name, ClassNotFound
-from pygments.util import iteritems
 
 from pygments.lexers._postgres_builtins import KEYWORDS, DATATYPES, \
     PSEUDO_TYPES, PLPGSQL_KEYWORDS
@@ -59,7 +58,14 @@
 
 language_re = re.compile(r"\s+LANGUAGE\s+'?(\w+)'?", re.IGNORECASE)
 
-do_re = re.compile(r'\bDO\b', re.IGNORECASE) 
+do_re = re.compile(r'\bDO\b', re.IGNORECASE)
+
+# Regular expressions for analyse_text()
+name_between_bracket_re = re.compile(r'\[[a-zA-Z_]\w*\]')
+name_between_backtick_re = re.compile(r'`[a-zA-Z_]\w*`')
+tsql_go_re = re.compile(r'\bgo\b', re.IGNORECASE)
+tsql_declare_re = re.compile(r'\bdeclare\s+@', re.IGNORECASE)
+tsql_variable_re = re.compile(r'@[a-zA-Z_]\w*\b')
 
 
 def language_callback(lexer, match):
@@ -68,28 +74,28 @@
     The lexer is chosen looking for a nearby LANGUAGE or assumed as
     plpgsql if inside a DO statement and no LANGUAGE has been found.
     """
-    l = None
+    lx = None
     m = language_re.match(lexer.text[match.end():match.end()+100])
     if m is not None:
-        l = lexer._get_lexer(m.group(1))
+        lx = lexer._get_lexer(m.group(1))
     else:
         m = list(language_re.finditer(
             lexer.text[max(0, match.start()-100):match.start()]))
         if m:
-            l = lexer._get_lexer(m[-1].group(1))
+            lx = lexer._get_lexer(m[-1].group(1))
         else:
             m = list(do_re.finditer(
                 lexer.text[max(0, match.start()-25):match.start()]))
             if m:
-                l = lexer._get_lexer('plpgsql')
-    
+                lx = lexer._get_lexer('plpgsql')
+
     # 1 = $, 2 = delimiter, 3 = $
     yield (match.start(1), String, match.group(1))
     yield (match.start(2), String.Delimiter, match.group(2))
     yield (match.start(3), String, match.group(3))
     # 4 = string contents
-    if l:
-        for x in l.get_tokens_unprocessed(match.group(4)):
+    if lx:
+        for x in lx.get_tokens_unprocessed(match.group(4)):
             yield x
     else:
         yield (match.start(4), String, match.group(4))
@@ -99,7 +105,7 @@
     yield (match.start(7), String, match.group(7))
 
 
-class PostgresBase(object):
+class PostgresBase:
     """Base class for Postgres-related lexers.
 
     This is implemented as a mixin to avoid the Lexer metaclass kicking in.
@@ -127,9 +133,9 @@
         if lang.startswith('pl') and lang.endswith('u'):
             tries.append(lang[2:-1])
 
-        for l in tries:
+        for lx in tries:
             try:
-                return get_lexer_by_name(l, **self.options)
+                return get_lexer_by_name(lx, **self.options)
             except ClassNotFound:
                 pass
         else:
@@ -156,8 +162,8 @@
             (r'--.*\n?', Comment.Single),
             (r'/\*', Comment.Multiline, 'multiline-comments'),
             (r'(' + '|'.join(s.replace(" ", r"\s+")
-                             for s in DATATYPES + PSEUDO_TYPES)
-             + r')\b', Name.Builtin),
+                             for s in DATATYPES + PSEUDO_TYPES) + r')\b',
+             Name.Builtin),
             (words(KEYWORDS, suffix=r'\b'), Keyword),
             (r'[+*/<>=~!@#%^&|`?-]+', Operator),
             (r'::', Operator),  # cast
@@ -205,7 +211,7 @@
     mimetypes = ['text/x-plpgsql']
 
     flags = re.IGNORECASE
-    tokens = dict((k, l[:]) for (k, l) in iteritems(PostgresLexer.tokens))
+    tokens = {k: l[:] for (k, l) in PostgresLexer.tokens.items()}
 
     # extend the keywords list
     for i, pattern in enumerate(tokens['root']):
@@ -239,7 +245,7 @@
     aliases = []    # not public
 
     flags = re.IGNORECASE
-    tokens = dict((k, l[:]) for (k, l) in iteritems(PostgresLexer.tokens))
+    tokens = {k: l[:] for (k, l) in PostgresLexer.tokens.items()}
 
     tokens['root'].append(
         (r'\\[^\s]+', Keyword.Pseudo, 'psql-command'))
@@ -253,6 +259,7 @@
         (r"[^\s]+", String.Symbol),
     ]
 
+
 re_prompt = re.compile(r'^(\S.*?)??[=\-\(\$\'\"][#>]')
 re_psql_command = re.compile(r'\s*\\')
 re_end_command = re.compile(r';\s*(--.*?)?$')
@@ -263,7 +270,7 @@
     r'FATAL|HINT|DETAIL|CONTEXT|LINE [0-9]+):)(.*?\n)')
 
 
-class lookahead(object):
+class lookahead:
     """Wrap an iterator and allow pushing back an item."""
     def __init__(self, x):
         self.iter = iter(x)
@@ -377,86 +384,99 @@
             (r'--.*\n?', Comment.Single),
             (r'/\*', Comment.Multiline, 'multiline-comments'),
             (words((
-                'ABORT', 'ABS', 'ABSOLUTE', 'ACCESS', 'ADA', 'ADD', 'ADMIN', 'AFTER', 'AGGREGATE',
-                'ALIAS', 'ALL', 'ALLOCATE', 'ALTER', 'ANALYSE', 'ANALYZE', 'AND', 'ANY', 'ARE', 'AS',
-                'ASC', 'ASENSITIVE', 'ASSERTION', 'ASSIGNMENT', 'ASYMMETRIC', 'AT', 'ATOMIC',
-                'AUTHORIZATION', 'AVG', 'BACKWARD', 'BEFORE', 'BEGIN', 'BETWEEN', 'BITVAR',
-                'BIT_LENGTH', 'BOTH', 'BREADTH', 'BY', 'C', 'CACHE', 'CALL', 'CALLED', 'CARDINALITY',
-                'CASCADE', 'CASCADED', 'CASE', 'CAST', 'CATALOG', 'CATALOG_NAME', 'CHAIN',
+                'ABORT', 'ABS', 'ABSOLUTE', 'ACCESS', 'ADA', 'ADD', 'ADMIN', 'AFTER',
+                'AGGREGATE', 'ALIAS', 'ALL', 'ALLOCATE', 'ALTER', 'ANALYSE', 'ANALYZE',
+                'AND', 'ANY', 'ARE', 'AS', 'ASC', 'ASENSITIVE', 'ASSERTION', 'ASSIGNMENT',
+                'ASYMMETRIC', 'AT', 'ATOMIC', 'AUTHORIZATION', 'AVG', 'BACKWARD',
+                'BEFORE', 'BEGIN', 'BETWEEN', 'BITVAR', 'BIT_LENGTH', 'BOTH', 'BREADTH',
+                'BY', 'C', 'CACHE', 'CALL', 'CALLED', 'CARDINALITY', 'CASCADE',
+                'CASCADED', 'CASE', 'CAST', 'CATALOG', 'CATALOG_NAME', 'CHAIN',
                 'CHARACTERISTICS', 'CHARACTER_LENGTH', 'CHARACTER_SET_CATALOG',
                 'CHARACTER_SET_NAME', 'CHARACTER_SET_SCHEMA', 'CHAR_LENGTH', 'CHECK',
-                'CHECKED', 'CHECKPOINT', 'CLASS', 'CLASS_ORIGIN', 'CLOB', 'CLOSE', 'CLUSTER',
-                'COALSECE', 'COBOL', 'COLLATE', 'COLLATION', 'COLLATION_CATALOG',
-                'COLLATION_NAME', 'COLLATION_SCHEMA', 'COLUMN', 'COLUMN_NAME',
-                'COMMAND_FUNCTION', 'COMMAND_FUNCTION_CODE', 'COMMENT', 'COMMIT',
-                'COMMITTED', 'COMPLETION', 'CONDITION_NUMBER', 'CONNECT', 'CONNECTION',
-                'CONNECTION_NAME', 'CONSTRAINT', 'CONSTRAINTS', 'CONSTRAINT_CATALOG',
-                'CONSTRAINT_NAME', 'CONSTRAINT_SCHEMA', 'CONSTRUCTOR', 'CONTAINS',
-                'CONTINUE', 'CONVERSION', 'CONVERT', 'COPY', 'CORRESPONTING', 'COUNT',
-                'CREATE', 'CREATEDB', 'CREATEUSER', 'CROSS', 'CUBE', 'CURRENT', 'CURRENT_DATE',
-                'CURRENT_PATH', 'CURRENT_ROLE', 'CURRENT_TIME', 'CURRENT_TIMESTAMP',
-                'CURRENT_USER', 'CURSOR', 'CURSOR_NAME', 'CYCLE', 'DATA', 'DATABASE',
+                'CHECKED', 'CHECKPOINT', 'CLASS', 'CLASS_ORIGIN', 'CLOB', 'CLOSE',
+                'CLUSTER', 'COALSECE', 'COBOL', 'COLLATE', 'COLLATION',
+                'COLLATION_CATALOG', 'COLLATION_NAME', 'COLLATION_SCHEMA', 'COLUMN',
+                'COLUMN_NAME', 'COMMAND_FUNCTION', 'COMMAND_FUNCTION_CODE', 'COMMENT',
+                'COMMIT', 'COMMITTED', 'COMPLETION', 'CONDITION_NUMBER', 'CONNECT',
+                'CONNECTION', 'CONNECTION_NAME', 'CONSTRAINT', 'CONSTRAINTS',
+                'CONSTRAINT_CATALOG', 'CONSTRAINT_NAME', 'CONSTRAINT_SCHEMA',
+                'CONSTRUCTOR', 'CONTAINS', 'CONTINUE', 'CONVERSION', 'CONVERT',
+                'COPY', 'CORRESPONTING', 'COUNT', 'CREATE', 'CREATEDB', 'CREATEUSER',
+                'CROSS', 'CUBE', 'CURRENT', 'CURRENT_DATE', 'CURRENT_PATH',
+                'CURRENT_ROLE', 'CURRENT_TIME', 'CURRENT_TIMESTAMP', 'CURRENT_USER',
+                'CURSOR', 'CURSOR_NAME', 'CYCLE', 'DATA', 'DATABASE',
                 'DATETIME_INTERVAL_CODE', 'DATETIME_INTERVAL_PRECISION', 'DAY',
-                'DEALLOCATE', 'DECLARE', 'DEFAULT', 'DEFAULTS', 'DEFERRABLE', 'DEFERRED',
-                'DEFINED', 'DEFINER', 'DELETE', 'DELIMITER', 'DELIMITERS', 'DEREF', 'DESC',
-                'DESCRIBE', 'DESCRIPTOR', 'DESTROY', 'DESTRUCTOR', 'DETERMINISTIC',
-                'DIAGNOSTICS', 'DICTIONARY', 'DISCONNECT', 'DISPATCH', 'DISTINCT', 'DO',
-                'DOMAIN', 'DROP', 'DYNAMIC', 'DYNAMIC_FUNCTION', 'DYNAMIC_FUNCTION_CODE', 'EACH',
-                'ELSE', 'ELSIF', 'ENCODING', 'ENCRYPTED', 'END', 'END-EXEC', 'EQUALS', 'ESCAPE', 'EVERY',
-                'EXCEPTION', 'EXCEPT', 'EXCLUDING', 'EXCLUSIVE', 'EXEC', 'EXECUTE', 'EXISTING',
-                'EXISTS', 'EXPLAIN', 'EXTERNAL', 'EXTRACT', 'FALSE', 'FETCH', 'FINAL', 'FIRST', 'FOR',
-                'FORCE', 'FOREIGN', 'FORTRAN', 'FORWARD', 'FOUND', 'FREE', 'FREEZE', 'FROM', 'FULL',
-                'FUNCTION', 'G', 'GENERAL', 'GENERATED', 'GET', 'GLOBAL', 'GO', 'GOTO', 'GRANT', 'GRANTED',
-                'GROUP', 'GROUPING', 'HANDLER', 'HAVING', 'HIERARCHY', 'HOLD', 'HOST', 'IDENTITY', 'IF',
-                'IGNORE', 'ILIKE', 'IMMEDIATE', 'IMMUTABLE', 'IMPLEMENTATION', 'IMPLICIT', 'IN',
-                'INCLUDING', 'INCREMENT', 'INDEX', 'INDITCATOR', 'INFIX', 'INHERITS', 'INITIALIZE',
-                'INITIALLY', 'INNER', 'INOUT', 'INPUT', 'INSENSITIVE', 'INSERT', 'INSTANTIABLE',
-                'INSTEAD', 'INTERSECT', 'INTO', 'INVOKER', 'IS', 'ISNULL', 'ISOLATION', 'ITERATE', 'JOIN',
-                'KEY', 'KEY_MEMBER', 'KEY_TYPE', 'LANCOMPILER', 'LANGUAGE', 'LARGE', 'LAST',
-                'LATERAL', 'LEADING', 'LEFT', 'LENGTH', 'LESS', 'LEVEL', 'LIKE', 'LIMIT', 'LISTEN', 'LOAD',
-                'LOCAL', 'LOCALTIME', 'LOCALTIMESTAMP', 'LOCATION', 'LOCATOR', 'LOCK', 'LOWER',
-                'MAP', 'MATCH', 'MAX', 'MAXVALUE', 'MESSAGE_LENGTH', 'MESSAGE_OCTET_LENGTH',
-                'MESSAGE_TEXT', 'METHOD', 'MIN', 'MINUTE', 'MINVALUE', 'MOD', 'MODE', 'MODIFIES',
-                'MODIFY', 'MONTH', 'MORE', 'MOVE', 'MUMPS', 'NAMES', 'NATIONAL', 'NATURAL', 'NCHAR',
-                'NCLOB', 'NEW', 'NEXT', 'NO', 'NOCREATEDB', 'NOCREATEUSER', 'NONE', 'NOT', 'NOTHING',
-                'NOTIFY', 'NOTNULL', 'NULL', 'NULLABLE', 'NULLIF', 'OBJECT', 'OCTET_LENGTH', 'OF', 'OFF',
-                'OFFSET', 'OIDS', 'OLD', 'ON', 'ONLY', 'OPEN', 'OPERATION', 'OPERATOR', 'OPTION', 'OPTIONS',
-                'OR', 'ORDER', 'ORDINALITY', 'OUT', 'OUTER', 'OUTPUT', 'OVERLAPS', 'OVERLAY', 'OVERRIDING',
-                'OWNER', 'PAD', 'PARAMETER', 'PARAMETERS', 'PARAMETER_MODE', 'PARAMATER_NAME',
-                'PARAMATER_ORDINAL_POSITION', 'PARAMETER_SPECIFIC_CATALOG',
-                'PARAMETER_SPECIFIC_NAME', 'PARAMATER_SPECIFIC_SCHEMA', 'PARTIAL',
-                'PASCAL', 'PENDANT', 'PLACING', 'PLI', 'POSITION', 'POSTFIX', 'PRECISION', 'PREFIX',
-                'PREORDER', 'PREPARE', 'PRESERVE', 'PRIMARY', 'PRIOR', 'PRIVILEGES', 'PROCEDURAL',
-                'PROCEDURE', 'PUBLIC', 'READ', 'READS', 'RECHECK', 'RECURSIVE', 'REF', 'REFERENCES',
-                'REFERENCING', 'REINDEX', 'RELATIVE', 'RENAME', 'REPEATABLE', 'REPLACE', 'RESET',
-                'RESTART', 'RESTRICT', 'RESULT', 'RETURN', 'RETURNED_LENGTH',
-                'RETURNED_OCTET_LENGTH', 'RETURNED_SQLSTATE', 'RETURNS', 'REVOKE', 'RIGHT',
-                'ROLE', 'ROLLBACK', 'ROLLUP', 'ROUTINE', 'ROUTINE_CATALOG', 'ROUTINE_NAME',
-                'ROUTINE_SCHEMA', 'ROW', 'ROWS', 'ROW_COUNT', 'RULE', 'SAVE_POINT', 'SCALE', 'SCHEMA',
-                'SCHEMA_NAME', 'SCOPE', 'SCROLL', 'SEARCH', 'SECOND', 'SECURITY', 'SELECT', 'SELF',
-                'SENSITIVE', 'SERIALIZABLE', 'SERVER_NAME', 'SESSION', 'SESSION_USER', 'SET',
-                'SETOF', 'SETS', 'SHARE', 'SHOW', 'SIMILAR', 'SIMPLE', 'SIZE', 'SOME', 'SOURCE', 'SPACE',
-                'SPECIFIC', 'SPECIFICTYPE', 'SPECIFIC_NAME', 'SQL', 'SQLCODE', 'SQLERROR',
-                'SQLEXCEPTION', 'SQLSTATE', 'SQLWARNINIG', 'STABLE', 'START', 'STATE', 'STATEMENT',
-                'STATIC', 'STATISTICS', 'STDIN', 'STDOUT', 'STORAGE', 'STRICT', 'STRUCTURE', 'STYPE',
-                'SUBCLASS_ORIGIN', 'SUBLIST', 'SUBSTRING', 'SUM', 'SYMMETRIC', 'SYSID', 'SYSTEM',
-                'SYSTEM_USER', 'TABLE', 'TABLE_NAME', ' TEMP', 'TEMPLATE', 'TEMPORARY', 'TERMINATE',
-                'THAN', 'THEN', 'TIMESTAMP', 'TIMEZONE_HOUR', 'TIMEZONE_MINUTE', 'TO', 'TOAST',
-                'TRAILING', 'TRANSATION', 'TRANSACTIONS_COMMITTED',
-                'TRANSACTIONS_ROLLED_BACK', 'TRANSATION_ACTIVE', 'TRANSFORM',
-                'TRANSFORMS', 'TRANSLATE', 'TRANSLATION', 'TREAT', 'TRIGGER', 'TRIGGER_CATALOG',
-                'TRIGGER_NAME', 'TRIGGER_SCHEMA', 'TRIM', 'TRUE', 'TRUNCATE', 'TRUSTED', 'TYPE',
-                'UNCOMMITTED', 'UNDER', 'UNENCRYPTED', 'UNION', 'UNIQUE', 'UNKNOWN', 'UNLISTEN',
-                'UNNAMED', 'UNNEST', 'UNTIL', 'UPDATE', 'UPPER', 'USAGE', 'USER',
-                'USER_DEFINED_TYPE_CATALOG', 'USER_DEFINED_TYPE_NAME',
-                'USER_DEFINED_TYPE_SCHEMA', 'USING', 'VACUUM', 'VALID', 'VALIDATOR', 'VALUES',
-                'VARIABLE', 'VERBOSE', 'VERSION', 'VIEW', 'VOLATILE', 'WHEN', 'WHENEVER', 'WHERE',
-                'WITH', 'WITHOUT', 'WORK', 'WRITE', 'YEAR', 'ZONE'), suffix=r'\b'),
+                'DEALLOCATE', 'DECLARE', 'DEFAULT', 'DEFAULTS', 'DEFERRABLE',
+                'DEFERRED', 'DEFINED', 'DEFINER', 'DELETE', 'DELIMITER', 'DELIMITERS',
+                'DEREF', 'DESC', 'DESCRIBE', 'DESCRIPTOR', 'DESTROY', 'DESTRUCTOR',
+                'DETERMINISTIC', 'DIAGNOSTICS', 'DICTIONARY', 'DISCONNECT', 'DISPATCH',
+                'DISTINCT', 'DO', 'DOMAIN', 'DROP', 'DYNAMIC', 'DYNAMIC_FUNCTION',
+                'DYNAMIC_FUNCTION_CODE', 'EACH', 'ELSE', 'ELSIF', 'ENCODING',
+                'ENCRYPTED', 'END', 'END-EXEC', 'EQUALS', 'ESCAPE', 'EVERY', 'EXCEPTION',
+                'EXCEPT', 'EXCLUDING', 'EXCLUSIVE', 'EXEC', 'EXECUTE', 'EXISTING',
+                'EXISTS', 'EXPLAIN', 'EXTERNAL', 'EXTRACT', 'FALSE', 'FETCH', 'FINAL',
+                'FIRST', 'FOR', 'FORCE', 'FOREIGN', 'FORTRAN', 'FORWARD', 'FOUND', 'FREE',
+                'FREEZE', 'FROM', 'FULL', 'FUNCTION', 'G', 'GENERAL', 'GENERATED', 'GET',
+                'GLOBAL', 'GO', 'GOTO', 'GRANT', 'GRANTED', 'GROUP', 'GROUPING',
+                'HANDLER', 'HAVING', 'HIERARCHY', 'HOLD', 'HOST', 'IDENTITY', 'IF',
+                'IGNORE', 'ILIKE', 'IMMEDIATE', 'IMMEDIATELY', 'IMMUTABLE', 'IMPLEMENTATION', 'IMPLICIT',
+                'IN', 'INCLUDING', 'INCREMENT', 'INDEX', 'INDITCATOR', 'INFIX',
+                'INHERITS', 'INITIALIZE', 'INITIALLY', 'INNER', 'INOUT', 'INPUT',
+                'INSENSITIVE', 'INSERT', 'INSTANTIABLE', 'INSTEAD', 'INTERSECT', 'INTO',
+                'INVOKER', 'IS', 'ISNULL', 'ISOLATION', 'ITERATE', 'JOIN', 'KEY',
+                'KEY_MEMBER', 'KEY_TYPE', 'LANCOMPILER', 'LANGUAGE', 'LARGE', 'LAST',
+                'LATERAL', 'LEADING', 'LEFT', 'LENGTH', 'LESS', 'LEVEL', 'LIKE', 'LIMIT',
+                'LISTEN', 'LOAD', 'LOCAL', 'LOCALTIME', 'LOCALTIMESTAMP', 'LOCATION',
+                'LOCATOR', 'LOCK', 'LOWER', 'MAP', 'MATCH', 'MAX', 'MAXVALUE',
+                'MESSAGE_LENGTH', 'MESSAGE_OCTET_LENGTH', 'MESSAGE_TEXT', 'METHOD', 'MIN',
+                'MINUTE', 'MINVALUE', 'MOD', 'MODE', 'MODIFIES', 'MODIFY', 'MONTH',
+                'MORE', 'MOVE', 'MUMPS', 'NAMES', 'NATIONAL', 'NATURAL', 'NCHAR', 'NCLOB',
+                'NEW', 'NEXT', 'NO', 'NOCREATEDB', 'NOCREATEUSER', 'NONE', 'NOT',
+                'NOTHING', 'NOTIFY', 'NOTNULL', 'NULL', 'NULLABLE', 'NULLIF', 'OBJECT',
+                'OCTET_LENGTH', 'OF', 'OFF', 'OFFSET', 'OIDS', 'OLD', 'ON', 'ONLY',
+                'OPEN', 'OPERATION', 'OPERATOR', 'OPTION', 'OPTIONS', 'OR', 'ORDER',
+                'ORDINALITY', 'OUT', 'OUTER', 'OUTPUT', 'OVERLAPS', 'OVERLAY',
+                'OVERRIDING', 'OWNER', 'PAD', 'PARAMETER', 'PARAMETERS', 'PARAMETER_MODE',
+                'PARAMATER_NAME', 'PARAMATER_ORDINAL_POSITION',
+                'PARAMETER_SPECIFIC_CATALOG', 'PARAMETER_SPECIFIC_NAME',
+                'PARAMATER_SPECIFIC_SCHEMA', 'PARTIAL', 'PASCAL', 'PENDANT', 'PERIOD', 'PLACING',
+                'PLI', 'POSITION', 'POSTFIX', 'PRECEEDS', 'PRECISION', 'PREFIX', 'PREORDER',
+                'PREPARE', 'PRESERVE', 'PRIMARY', 'PRIOR', 'PRIVILEGES', 'PROCEDURAL',
+                'PROCEDURE', 'PUBLIC', 'READ', 'READS', 'RECHECK', 'RECURSIVE', 'REF',
+                'REFERENCES', 'REFERENCING', 'REINDEX', 'RELATIVE', 'RENAME',
+                'REPEATABLE', 'REPLACE', 'RESET', 'RESTART', 'RESTRICT', 'RESULT',
+                'RETURN', 'RETURNED_LENGTH', 'RETURNED_OCTET_LENGTH', 'RETURNED_SQLSTATE',
+                'RETURNS', 'REVOKE', 'RIGHT', 'ROLE', 'ROLLBACK', 'ROLLUP', 'ROUTINE',
+                'ROUTINE_CATALOG', 'ROUTINE_NAME', 'ROUTINE_SCHEMA', 'ROW', 'ROWS',
+                'ROW_COUNT', 'RULE', 'SAVE_POINT', 'SCALE', 'SCHEMA', 'SCHEMA_NAME',
+                'SCOPE', 'SCROLL', 'SEARCH', 'SECOND', 'SECURITY', 'SELECT', 'SELF',
+                'SENSITIVE', 'SERIALIZABLE', 'SERVER_NAME', 'SESSION', 'SESSION_USER',
+                'SET', 'SETOF', 'SETS', 'SHARE', 'SHOW', 'SIMILAR', 'SIMPLE', 'SIZE',
+                'SOME', 'SOURCE', 'SPACE', 'SPECIFIC', 'SPECIFICTYPE', 'SPECIFIC_NAME',
+                'SQL', 'SQLCODE', 'SQLERROR', 'SQLEXCEPTION', 'SQLSTATE', 'SQLWARNINIG',
+                'STABLE', 'START', 'STATE', 'STATEMENT', 'STATIC', 'STATISTICS', 'STDIN',
+                'STDOUT', 'STORAGE', 'STRICT', 'STRUCTURE', 'STYPE', 'SUBCLASS_ORIGIN',
+                'SUBLIST', 'SUBSTRING', 'SUCCEEDS', 'SUM', 'SYMMETRIC', 'SYSID', 'SYSTEM',
+                'SYSTEM_USER', 'TABLE', 'TABLE_NAME', ' TEMP', 'TEMPLATE', 'TEMPORARY',
+                'TERMINATE', 'THAN', 'THEN', 'TIME', 'TIMESTAMP', 'TIMEZONE_HOUR',
+                'TIMEZONE_MINUTE', 'TO', 'TOAST', 'TRAILING', 'TRANSATION',
+                'TRANSACTIONS_COMMITTED', 'TRANSACTIONS_ROLLED_BACK', 'TRANSATION_ACTIVE',
+                'TRANSFORM', 'TRANSFORMS', 'TRANSLATE', 'TRANSLATION', 'TREAT', 'TRIGGER',
+                'TRIGGER_CATALOG', 'TRIGGER_NAME', 'TRIGGER_SCHEMA', 'TRIM', 'TRUE',
+                'TRUNCATE', 'TRUSTED', 'TYPE', 'UNCOMMITTED', 'UNDER', 'UNENCRYPTED',
+                'UNION', 'UNIQUE', 'UNKNOWN', 'UNLISTEN', 'UNNAMED', 'UNNEST', 'UNTIL',
+                'UPDATE', 'UPPER', 'USAGE', 'USER', 'USER_DEFINED_TYPE_CATALOG',
+                'USER_DEFINED_TYPE_NAME', 'USER_DEFINED_TYPE_SCHEMA', 'USING', 'VACUUM',
+                'VALID', 'VALIDATOR', 'VALUES', 'VARIABLE', 'VERBOSE',
+                'VERSION', 'VERSIONS', 'VERSIONING', 'VIEW',
+                'VOLATILE', 'WHEN', 'WHENEVER', 'WHERE', 'WITH', 'WITHOUT', 'WORK',
+                'WRITE', 'YEAR', 'ZONE'), suffix=r'\b'),
              Keyword),
             (words((
-                'ARRAY', 'BIGINT', 'BINARY', 'BIT', 'BLOB', 'BOOLEAN', 'CHAR', 'CHARACTER', 'DATE',
-                'DEC', 'DECIMAL', 'FLOAT', 'INT', 'INTEGER', 'INTERVAL', 'NUMBER', 'NUMERIC', 'REAL',
-                'SERIAL', 'SMALLINT', 'VARCHAR', 'VARYING', 'INT8', 'SERIAL8', 'TEXT'), suffix=r'\b'),
+                'ARRAY', 'BIGINT', 'BINARY', 'BIT', 'BLOB', 'BOOLEAN', 'CHAR',
+                'CHARACTER', 'DATE', 'DEC', 'DECIMAL', 'FLOAT', 'INT', 'INTEGER',
+                'INTERVAL', 'NUMBER', 'NUMERIC', 'REAL', 'SERIAL', 'SMALLINT',
+                'VARCHAR', 'VARYING', 'INT8', 'SERIAL8', 'TEXT'), suffix=r'\b'),
              Name.Builtin),
             (r'[+*/<>=~!@#%^&|`?-]', Operator),
             (r'[0-9]+', Number.Integer),
@@ -474,6 +494,9 @@
         ]
     }
 
+    def analyse_text(text):
+        return 0.01
+
 
 class TransactSqlLexer(RegexLexer):
     """
@@ -530,6 +553,34 @@
         ]
     }
 
+    def analyse_text(text):
+        rating = 0
+        if tsql_declare_re.search(text):
+            # Found T-SQL variable declaration.
+            rating = 1.0
+        else:
+            name_between_backtick_count = len(
+                name_between_backtick_re.findall(text))
+            name_between_bracket_count = len(
+                name_between_bracket_re.findall(text))
+            # We need to check if there are any names using
+            # backticks or brackets, as otherwise both are 0
+            # and 0 >= 2 * 0, so we would always assume it's true
+            dialect_name_count = name_between_backtick_count + name_between_bracket_count
+            if dialect_name_count >= 1 and \
+               name_between_bracket_count >= 2 * name_between_backtick_count:
+                # Found at least twice as many [name] as `name`.
+                rating += 0.5
+            elif name_between_bracket_count > name_between_backtick_count:
+                rating += 0.2
+            elif name_between_bracket_count > 0:
+                rating += 0.1
+            if tsql_variable_re.search(text) is not None:
+                rating += 0.1
+            if tsql_go_re.search(text) is not None:
+                rating += 0.1
+        return rating
+
 
 class MySqlLexer(RegexLexer):
     """
@@ -603,6 +654,24 @@
         ]
     }
 
+    def analyse_text(text):
+        rating = 0
+        name_between_backtick_count = len(
+            name_between_backtick_re.findall(text))
+        name_between_bracket_count = len(
+            name_between_bracket_re.findall(text))
+        # Same logic as above in the TSQL analysis
+        dialect_name_count = name_between_backtick_count + name_between_bracket_count
+        if dialect_name_count >= 1 and \
+           name_between_backtick_count >= 2 * name_between_bracket_count:
+            # Found at least twice as many `name` as [name].
+            rating += 0.5
+        elif name_between_backtick_count > name_between_bracket_count:
+            rating += 0.2
+        elif name_between_backtick_count > 0:
+            rating += 0.1
+        return rating
+
 
 class SqliteConsoleLexer(Lexer):
     """
--- a/eric6/ThirdParty/Pygments/pygments/lexers/stata.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/ThirdParty/Pygments/pygments/lexers/stata.py	Sat May 02 13:51:07 2020 +0200
@@ -5,10 +5,11 @@
 
     Lexer for Stata
 
-    :copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
+import re
 from pygments.lexer import RegexLexer, include, words
 from pygments.token import Comment, Keyword, Name, Number, \
     String, Text, Operator
@@ -26,63 +27,125 @@
     """
     # Syntax based on
     # - http://fmwww.bc.edu/RePEc/bocode/s/synlightlist.ado
-    # - http://github.com/isagalaev/highlight.js/blob/master/src/languages/stata.js
-    # - http://github.com/jpitblado/vim-stata/blob/master/syntax/stata.vim
+    # - https://github.com/isagalaev/highlight.js/blob/master/src/languages/stata.js
+    # - https://github.com/jpitblado/vim-stata/blob/master/syntax/stata.vim
 
     name      = 'Stata'
     aliases   = ['stata', 'do']
     filenames = ['*.do', '*.ado']
     mimetypes = ['text/x-stata', 'text/stata', 'application/x-stata']
+    flags     = re.MULTILINE | re.DOTALL
 
     tokens = {
         'root': [
             include('comments'),
-            include('vars-strings'),
+            include('strings'),
+            include('macros'),
             include('numbers'),
             include('keywords'),
+            include('operators'),
+            include('format'),
             (r'.', Text),
         ],
-        # Global and local macros; regular and special strings
-        'vars-strings': [
-            (r'\$[\w{]', Name.Variable.Global, 'var_validglobal'),
-            (r'`\w{0,31}\'', Name.Variable),
-            (r'"', String, 'string_dquote'),
-            (r'`"', String, 'string_mquote'),
+        # Comments are a complicated beast in Stata because they can be
+        # nested and there are a few corner cases with that. See:
+        # - github.com/kylebarron/language-stata/issues/90
+        # - statalist.org/forums/forum/general-stata-discussion/general/1448244
+        'comments': [
+            (r'(^//|(?<=\s)//)(?!/)', Comment.Single, 'comments-double-slash'),
+            (r'^\s*\*', Comment.Single, 'comments-star'),
+            (r'/\*', Comment.Multiline, 'comments-block'),
+            (r'(^///|(?<=\s)///)', Comment.Special, 'comments-triple-slash')
+        ],
+        'comments-block': [
+            (r'/\*', Comment.Multiline, '#push'),
+            # this ends and restarts a comment block. but need to catch this so
+            # that it doesn\'t start _another_ level of comment blocks
+            (r'\*/\*', Comment.Multiline),
+            (r'(\*/\s+\*(?!/)[^\n]*)|(\*/)', Comment.Multiline, '#pop'),
+            # Match anything else as a character inside the comment
+            (r'.', Comment.Multiline),
         ],
-        # For either string type, highlight macros as macros
-        'string_dquote': [
-            (r'"', String, '#pop'),
-            (r'\\\\|\\"|\\\n', String.Escape),
-            (r'\$', Name.Variable.Global, 'var_validglobal'),
-            (r'`', Name.Variable, 'var_validlocal'),
-            (r'[^$`"\\]+', String),
-            (r'[$"\\]', String),
+        'comments-star': [
+            (r'///.*?\n', Comment.Single,
+                ('#pop', 'comments-triple-slash')),
+            (r'(^//|(?<=\s)//)(?!/)', Comment.Single,
+                ('#pop', 'comments-double-slash')),
+            (r'/\*', Comment.Multiline, 'comments-block'),
+            (r'.(?=\n)', Comment.Single, '#pop'),
+            (r'.', Comment.Single),
         ],
-        'string_mquote': [
+        'comments-triple-slash': [
+            (r'\n', Comment.Special, '#pop'),
+            # A // breaks out of a comment for the rest of the line
+            (r'//.*?(?=\n)', Comment.Single, '#pop'),
+            (r'.', Comment.Special),
+        ],
+        'comments-double-slash': [
+            (r'\n', Text, '#pop'),
+            (r'.', Comment.Single),
+        ],
+        # `"compound string"' and regular "string"; note the former are
+        # nested.
+        'strings': [
+            (r'`"', String, 'string-compound'),
+            (r'(?<!`)"', String, 'string-regular'),
+        ],
+        'string-compound': [
+            (r'`"', String, '#push'),
             (r'"\'', String, '#pop'),
-            (r'\\\\|\\"|\\\n', String.Escape),
-            (r'\$', Name.Variable.Global, 'var_validglobal'),
-            (r'`', Name.Variable, 'var_validlocal'),
-            (r'[^$`"\\]+', String),
-            (r'[$"\\]', String),
+            (r'\\\\|\\"|\\\$|\\`|\\\n', String.Escape),
+            include('macros'),
+            (r'.', String)
         ],
-        'var_validglobal': [
-            (r'\{\w{0,32}\}', Name.Variable.Global, '#pop'),
-            (r'\w{1,32}', Name.Variable.Global, '#pop'),
+        'string-regular': [
+            (r'(")(?!\')|(?=\n)', String, '#pop'),
+            (r'\\\\|\\"|\\\$|\\`|\\\n', String.Escape),
+            include('macros'),
+            (r'.', String)
         ],
-        'var_validlocal': [
-            (r'\w{0,31}\'', Name.Variable, '#pop'),
+        # A local is usually
+        #     `\w{0,31}'
+        #     `:extended macro'
+        #     `=expression'
+        #     `[rsen](results)'
+        #     `(++--)scalar(++--)'
+        #
+        # However, there are all sorts of weird rules wrt edge
+        # cases. Instead of writing 27 exceptions, anything inside
+        # `' is a local.
+        #
+        # A global is more restricted, so we do follow rules. Note only
+        # locals explicitly enclosed ${} can be nested.
+        'macros': [
+            (r'\$(\{|(?=[\$`]))', Name.Variable.Global, 'macro-global-nested'),
+            (r'\$', Name.Variable.Global,  'macro-global-name'),
+            (r'`', Name.Variable, 'macro-local'),
         ],
-        # * only OK at line start, // OK anywhere
-        'comments': [
-            (r'^\s*\*.*$', Comment),
-            (r'//.*', Comment.Single),
-            (r'/\*.*?\*/', Comment.Multiline),
-            (r'/[*](.|\n)*?[*]/', Comment.Multiline),
+        'macro-local': [
+            (r'`', Name.Variable, '#push'),
+            (r"'", Name.Variable, '#pop'),
+            (r'\$(\{|(?=[\$`]))', Name.Variable.Global, 'macro-global-nested'),
+            (r'\$', Name.Variable.Global, 'macro-global-name'),
+            (r'.', Name.Variable),  # fallback
+        ],
+        'macro-global-nested': [
+            (r'\$(\{|(?=[\$`]))', Name.Variable.Global, '#push'),
+            (r'\}', Name.Variable.Global, '#pop'),
+            (r'\$', Name.Variable.Global, 'macro-global-name'),
+            (r'`', Name.Variable, 'macro-local'),
+            (r'\w', Name.Variable.Global),  # fallback
+            (r'(?!\w)', Name.Variable.Global, '#pop'),
+        ],
+        'macro-global-name': [
+            (r'\$(\{|(?=[\$`]))', Name.Variable.Global, 'macro-global-nested', '#pop'),
+            (r'\$', Name.Variable.Global, 'macro-global-name', '#pop'),
+            (r'`', Name.Variable, 'macro-local', '#pop'),
+            (r'\w{1,32}', Name.Variable.Global, '#pop'),
         ],
         # Built in functions and statements
         'keywords': [
-            (words(builtins_functions, prefix = r'\b', suffix = r'\('),
+            (words(builtins_functions, prefix = r'\b', suffix = r'(?=\()'),
              Name.Function),
             (words(builtins_base, prefix = r'(^\s*|\s)', suffix = r'\b'),
              Keyword),
@@ -100,9 +163,9 @@
         ],
         # Stata formats
         'format': [
-            (r'%-?\d{1,2}(\.\d{1,2})?[gfe]c?', Name.Variable),
-            (r'%(21x|16H|16L|8H|8L)', Name.Variable),
-            (r'%-?(tc|tC|td|tw|tm|tq|th|ty|tg).{0,32}', Name.Variable),
-            (r'%[-~]?\d{1,4}s', Name.Variable),
+            (r'%-?\d{1,2}(\.\d{1,2})?[gfe]c?', Name.Other),
+            (r'%(21x|16H|16L|8H|8L)', Name.Other),
+            (r'%-?(tc|tC|td|tw|tm|tq|th|ty|tg)\S{0,32}', Name.Other),
+            (r'%[-~]?\d{1,4}s', Name.Other),
         ]
     }
--- a/eric6/ThirdParty/Pygments/pygments/lexers/supercollider.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/ThirdParty/Pygments/pygments/lexers/supercollider.py	Sat May 02 13:51:07 2020 +0200
@@ -5,7 +5,7 @@
 
     Lexer for SuperCollider
 
-    :copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
--- a/eric6/ThirdParty/Pygments/pygments/lexers/tcl.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/ThirdParty/Pygments/pygments/lexers/tcl.py	Sat May 02 13:51:07 2020 +0200
@@ -5,7 +5,7 @@
 
     Lexers for Tcl and related languages.
 
-    :copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
--- a/eric6/ThirdParty/Pygments/pygments/lexers/templates.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/ThirdParty/Pygments/pygments/lexers/templates.py	Sat May 02 13:51:07 2020 +0200
@@ -5,7 +5,7 @@
 
     Lexers for various template engines' markup.
 
-    :copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -226,7 +226,7 @@
              'directiveparams'),
             (r'(#\{?)(' + identifier + r')(\}|\b)',
              bygroups(Comment.Preproc, Name.Function, Comment.Preproc)),
-            (r'\$\{?', Punctuation, 'variable')
+            (r'\$!?\{?', Punctuation, 'variable')
         ],
         'variable': [
             (identifier, Name.Variable),
@@ -249,7 +249,7 @@
             (r'\]', Operator, '#pop')
         ],
         'funcparams': [
-            (r'\$\{?', Punctuation, 'variable'),
+            (r'\$!?\{?', Punctuation, 'variable'),
             (r'\s+', Text),
             (r'[,:]', Punctuation),
             (r'"(\\\\|\\"|[^"])*"', String.Double),
@@ -274,7 +274,7 @@
             rv += 0.15
         if re.search(r'#\{?foreach\}?\(.+?\).*?#\{?end\}?', text):
             rv += 0.15
-        if re.search(r'\$\{?[a-zA-Z_]\w*(\([^)]*\))?'
+        if re.search(r'\$!?\{?[a-zA-Z_]\w*(\([^)]*\))?'
                      r'(\.\w+(\([^)]*\))?)*\}?', text):
             rv += 0.01
         return rv
@@ -323,7 +323,7 @@
 class DjangoLexer(RegexLexer):
     """
     Generic `django <http://www.djangoproject.com/documentation/templates/>`_
-    and `jinja <http://wsgiarea.pocoo.org/jinja/>`_ template lexer.
+    and `jinja <https://jinja.pocoo.org/jinja/>`_ template lexer.
 
     It just highlights django/jinja code between the preprocessor directives,
     other data is left untouched by the lexer.
@@ -375,7 +375,7 @@
             (r'\.\w+', Name.Variable),
             (r':?"(\\\\|\\"|[^"])*"', String.Double),
             (r":?'(\\\\|\\'|[^'])*'", String.Single),
-            (r'([{}()\[\]+\-*/,:~]|[><=]=?)', Operator),
+            (r'([{}()\[\]+\-*/%,:~]|[><=]=?|!=)', Operator),
             (r"[0-9](\.[0-9]*)?(eE[+-][0-9])?[flFLdD]?|"
              r"0[xX][0-9a-fA-F]+[Ll]?", Number),
         ],
@@ -1802,27 +1802,27 @@
         'root': [
             (r'[^{]+', Other),
 
+            # Comment start {{!  }} or {{!--
             (r'\{\{!.*\}\}', Comment),
 
+            # HTML Escaping open {{{expression
             (r'(\{\{\{)(\s*)', bygroups(Comment.Special, Text), 'tag'),
+
+            # {{blockOpen {{#blockOpen {{/blockClose with optional tilde ~
+            (r'(\{\{)([#~/]+)([^\s}]*)',
+             bygroups(Comment.Preproc, Number.Attribute, Number.Attribute), 'tag'),
             (r'(\{\{)(\s*)', bygroups(Comment.Preproc, Text), 'tag'),
         ],
 
         'tag': [
             (r'\s+', Text),
+            # HTML Escaping close }}}
             (r'\}\}\}', Comment.Special, '#pop'),
-            (r'\}\}', Comment.Preproc, '#pop'),
-
-            # Handlebars
-            (r'([#/]*)(each|if|unless|else|with|log|in(line)?)', bygroups(Keyword,
-             Keyword)),
-            (r'#\*inline', Keyword),
-
-            # General {{#block}}
-            (r'([#/])([\w-]+)', bygroups(Name.Function, Name.Function)),
+            # blockClose}}, includes optional tilde ~
+            (r'(~?)(\}\})', bygroups(Number, Comment.Preproc), '#pop'),
 
             # {{opt=something}}
-            (r'([\w-]+)(=)', bygroups(Name.Attribute, Operator)),
+            (r'([^\s}]+)(=)', bygroups(Name.Attribute, Operator)),
 
             # Partials {{> ...}}
             (r'(>)(\s*)(@partial-block)', bygroups(Keyword, Text, Keyword)),
@@ -1845,7 +1845,7 @@
             include('generic'),
         ],
         'variable': [
-            (r'[a-zA-Z][\w-]*', Name.Variable),
+            (r'[()/@a-zA-Z][\w-]*', Name.Variable),
             (r'\.[\w-]+', Name.Variable),
             (r'(this\/|\.\/|(\.\.\/)+)[\w-]+', Name.Variable),
         ],
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/eric6/ThirdParty/Pygments/pygments/lexers/teraterm.py	Sat May 02 13:51:07 2020 +0200
@@ -0,0 +1,158 @@
+# -*- coding: utf-8 -*-
+"""
+    pygments.lexers.teraterm
+    ~~~~~~~~~~~~~~~~~~~~~~~~
+
+    Lexer for Tera Term macro files.
+
+    :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
+    :license: BSD, see LICENSE for details.
+"""
+
+import re
+
+from pygments.lexer import RegexLexer, include, bygroups
+from pygments.token import Text, Comment, Operator, Name, String, \
+    Number, Keyword
+
+__all__ = ['TeraTermLexer']
+
+
+class TeraTermLexer(RegexLexer):
+    """
+    For `Tera Term <https://ttssh2.osdn.jp/>`_ macro source code.
+
+    .. versionadded:: 2.4
+    """
+    name = 'Tera Term macro'
+    aliases = ['ttl', 'teraterm', 'teratermmacro']
+    filenames = ['*.ttl']
+    mimetypes = ['text/x-teratermmacro']
+
+    tokens = {
+        'root': [
+            include('comments'),
+            include('labels'),
+            include('commands'),
+            include('builtin-variables'),
+            include('user-variables'),
+            include('operators'),
+            include('numeric-literals'),
+            include('string-literals'),
+            include('all-whitespace'),
+            (r'[^\s]', Text),
+        ],
+        'comments': [
+            (r';[^\r\n]*', Comment.Single),
+            (r'/\*', Comment.Multiline, 'in-comment'),
+        ],
+        'in-comment': [
+            (r'\*/', Comment.Multiline, '#pop'),
+            (r'[^*/]+', Comment.Multiline),
+            (r'[*/]', Comment.Multiline)
+        ],
+        'labels': [
+            (r'(?i)^(\s*)(:[0-9a-z_]+)', bygroups(Text, Name.Label)),
+        ],
+        'commands': [
+            (
+                r'(?i)\b('
+                r'basename|beep|bplusrecv|bplussend|break|bringupbox|'
+                r'callmenu|changedir|checksum16|checksum16file|'
+                r'checksum32|checksum32file|checksum8|checksum8file|'
+                r'clearscreen|clipb2var|closesbox|closett|code2str|'
+                r'connect|continue|crc16|crc16file|crc32|crc32file|'
+                r'cygconnect|delpassword|dirname|dirnamebox|disconnect|'
+                r'dispstr|do|else|elseif|enablekeyb|end|endif|enduntil|'
+                r'endwhile|exec|execcmnd|exit|expandenv|fileclose|'
+                r'fileconcat|filecopy|filecreate|filedelete|filelock|'
+                r'filemarkptr|filenamebox|fileopen|fileread|filereadln|'
+                r'filerename|filesearch|fileseek|fileseekback|filestat|'
+                r'filestrseek|filestrseek2|filetruncate|fileunlock|'
+                r'filewrite|filewriteln|findclose|findfirst|findnext|'
+                r'flushrecv|foldercreate|folderdelete|foldersearch|for|'
+                r'getdate|getdir|getenv|getfileattr|gethostname|'
+                r'getipv4addr|getipv6addr|getmodemstatus|getpassword|'
+                r'getspecialfolder|gettime|gettitle|getttdir|getver|'
+                r'if|ifdefined|include|inputbox|int2str|intdim|'
+                r'ispassword|kmtfinish|kmtget|kmtrecv|kmtsend|listbox|'
+                r'loadkeymap|logautoclosemode|logclose|loginfo|logopen|'
+                r'logpause|logrotate|logstart|logwrite|loop|makepath|'
+                r'messagebox|mpause|next|passwordbox|pause|quickvanrecv|'
+                r'quickvansend|random|recvln|regexoption|restoresetup|'
+                r'return|rotateleft|rotateright|scprecv|scpsend|send|'
+                r'sendbreak|sendbroadcast|sendfile|sendkcode|sendln|'
+                r'sendlnbroadcast|sendlnmulticast|sendmulticast|setbaud|'
+                r'setdate|setdebug|setdir|setdlgpos|setdtr|setecho|'
+                r'setenv|setexitcode|setfileattr|setflowctrl|'
+                r'setmulticastname|setpassword|setrts|setsync|settime|'
+                r'settitle|show|showtt|sprintf|sprintf2|statusbox|'
+                r'str2code|str2int|strcompare|strconcat|strcopy|strdim|'
+                r'strinsert|strjoin|strlen|strmatch|strremove|'
+                r'strreplace|strscan|strspecial|strsplit|strtrim|'
+                r'testlink|then|tolower|toupper|unlink|until|uptime|'
+                r'var2clipb|wait|wait4all|waitevent|waitln|waitn|'
+                r'waitrecv|waitregex|while|xmodemrecv|xmodemsend|'
+                r'yesnobox|ymodemrecv|ymodemsend|zmodemrecv|zmodemsend'
+                r')\b',
+                Keyword,
+            ),
+            (
+                r'(?i)(call|goto)([ \t]+)([0-9a-z_]+)',
+                bygroups(Keyword, Text, Name.Label),
+            )
+        ],
+        'builtin-variables': [
+            (
+                r'(?i)('
+                r'groupmatchstr1|groupmatchstr2|groupmatchstr3|'
+                r'groupmatchstr4|groupmatchstr5|groupmatchstr6|'
+                r'groupmatchstr7|groupmatchstr8|groupmatchstr9|'
+                r'param1|param2|param3|param4|param5|param6|'
+                r'param7|param8|param9|paramcnt|params|'
+                r'inputstr|matchstr|mtimeout|result|timeout'
+                r')\b',
+                Name.Builtin
+            ),
+        ],
+        'user-variables': [
+            (r'(?i)[A-Z_][A-Z0-9_]*', Name.Variable),
+        ],
+        'numeric-literals': [
+            (r'(-?)([0-9]+)', bygroups(Operator, Number.Integer)),
+            (r'(?i)\$[0-9a-f]+', Number.Hex),
+        ],
+        'string-literals': [
+            (r'(?i)#(?:[0-9]+|\$[0-9a-f]+)', String.Char),
+            (r"'", String.Single, 'in-single-string'),
+            (r'"', String.Double, 'in-double-string'),
+        ],
+        'in-general-string': [
+            (r'[\\][\\nt]', String.Escape),  # Only three escapes are supported.
+            (r'.', String),
+        ],
+        'in-single-string': [
+            (r"'", String.Single, '#pop'),
+            include('in-general-string'),
+        ],
+        'in-double-string': [
+            (r'"', String.Double, '#pop'),
+            include('in-general-string'),
+        ],
+        'operators': [
+            (r'and|not|or|xor', Operator.Word),
+            (r'[!%&*+<=>^~\|\/-]+', Operator),
+            (r'[()]', String.Symbol),
+        ],
+        'all-whitespace': [
+            (r'[\s]+', Text),
+        ],
+    }
+
+    # Turtle and Tera Term macro files share the same file extension
+    # but each has a recognizable and distinct syntax.
+    def analyse_text(text):
+        result = 0.0
+        if re.search(TeraTermLexer.tokens['commands'][0][0], text):
+            result += 0.01
+        return result
--- a/eric6/ThirdParty/Pygments/pygments/lexers/testing.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/ThirdParty/Pygments/pygments/lexers/testing.py	Sat May 02 13:51:07 2020 +0200
@@ -5,7 +5,7 @@
 
     Lexers for testing languages.
 
-    :copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -17,7 +17,7 @@
 
 class GherkinLexer(RegexLexer):
     """
-    For `Gherkin <http://github.com/aslakhellesoy/gherkin/>` syntax.
+    For `Gherkin <https://github.com/aslakhellesoy/gherkin/>` syntax.
 
     .. versionadded:: 1.2
     """
--- a/eric6/ThirdParty/Pygments/pygments/lexers/text.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/ThirdParty/Pygments/pygments/lexers/text.py	Sat May 02 13:51:07 2020 +0200
@@ -5,7 +5,7 @@
 
     Lexers for non-source code file types.
 
-    :copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -18,6 +18,7 @@
 from pygments.lexers.installers import DebianControlLexer, SourcesListLexer
 from pygments.lexers.make import MakefileLexer, BaseMakefileLexer, CMakeLexer
 from pygments.lexers.haxe import HxmlLexer
+from pygments.lexers.sgf import SmartGameFormatLexer
 from pygments.lexers.diff import DiffLexer, DarcsPatchLexer
 from pygments.lexers.data import YamlLexer
 from pygments.lexers.textfmts import IrcLogsLexer, GettextLexer, HttpLexer
--- a/eric6/ThirdParty/Pygments/pygments/lexers/textedit.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/ThirdParty/Pygments/pygments/lexers/textedit.py	Sat May 02 13:51:07 2020 +0200
@@ -5,7 +5,7 @@
 
     Lexers for languages related to text processing.
 
-    :copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -102,9 +102,9 @@
 
             (r'[ \t]+', Text),
             # TODO: regexes can have other delims
-            (r'/(\\\\|\\/|[^\n/])*/', String.Regex),
-            (r'"(\\\\|\\"|[^\n"])*"', String.Double),
-            (r"'(''|[^\n'])*'", String.Single),
+            (r'/[^/\\\n]*(?:\\[\s\S][^/\\\n]*)*/', String.Regex),
+            (r'"[^"\\\n]*(?:\\[\s\S][^"\\\n]*)*"', String.Double),
+            (r"'[^\n']*(?:''[^\n']*)*'", String.Single),
 
             # Who decided that doublequote was a good comment character??
             (r'(?<=\s)"[^\-:.%#=*].*', Comment),
--- a/eric6/ThirdParty/Pygments/pygments/lexers/textfmts.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/ThirdParty/Pygments/pygments/lexers/textfmts.py	Sat May 02 13:51:07 2020 +0200
@@ -5,18 +5,20 @@
 
     Lexers for various text formats.
 
-    :copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
 import re
 
-from pygments.lexer import RegexLexer, bygroups
+from pygments.lexers import guess_lexer, get_lexer_by_name
+from pygments.lexer import RegexLexer, bygroups, default, include
 from pygments.token import Text, Comment, Operator, Keyword, Name, String, \
-    Number, Generic, Literal
+    Number, Generic, Literal, Punctuation
 from pygments.util import ClassNotFound
 
-__all__ = ['IrcLogsLexer', 'TodotxtLexer', 'HttpLexer', 'GettextLexer']
+__all__ = ['IrcLogsLexer', 'TodotxtLexer', 'HttpLexer', 'GettextLexer',
+           'NotmuchLexer', 'KernelLogLexer']
 
 
 class IrcLogsLexer(RegexLexer):
@@ -173,13 +175,13 @@
     tokens = {
         'root': [
             (r'(GET|POST|PUT|DELETE|HEAD|OPTIONS|TRACE|PATCH)( +)([^ ]+)( +)'
-             r'(HTTP)(/)(1\.[01])(\r?\n|\Z)',
+             r'(HTTP)(/)(1\.[01]|2|3)(\r?\n|\Z)',
              bygroups(Name.Function, Text, Name.Namespace, Text,
                       Keyword.Reserved, Operator, Number, Text),
              'headers'),
-            (r'(HTTP)(/)(1\.[01])( +)(\d{3})( +)([^\r\n]+)(\r?\n|\Z)',
-             bygroups(Keyword.Reserved, Operator, Number, Text, Number,
-                      Text, Name.Exception, Text),
+            (r'(HTTP)(/)(1\.[01]|2|3)( +)(\d{3})(?:( +)([^\r\n]+))?(\r?\n|\Z)',
+             bygroups(Keyword.Reserved, Operator, Number, Text, Number, Text,
+                      Name.Exception, Text),
              'headers'),
         ],
         'headers': [
@@ -295,3 +297,135 @@
             (r'\s+', IncompleteTaskText),
         ],
     }
+
+
+class NotmuchLexer(RegexLexer):
+    """
+    For `Notmuch <https://notmuchmail.org/>`_ email text format.
+
+    .. versionadded:: 2.5
+
+    Additional options accepted:
+
+    `body_lexer`
+        If given, highlight the contents of the message body with the specified
+        lexer, else guess it according to the body content (default: ``None``).
+    """
+
+    name = 'Notmuch'
+    aliases = ['notmuch']
+
+    def _highlight_code(self, match):
+        code = match.group(1)
+
+        try:
+            if self.body_lexer:
+                lexer = get_lexer_by_name(self.body_lexer)
+            else:
+                lexer = guess_lexer(code.strip())
+        except ClassNotFound:
+            lexer = get_lexer_by_name('text')
+
+        for item in lexer.get_tokens_unprocessed(code):
+            yield item
+
+    tokens = {
+        'root': [
+            (r'\fmessage{\s*', Keyword, ('message', 'message-attr')),
+        ],
+        'message-attr': [
+            (r'(\s*id:\s*)([^\s]+)', bygroups(Name.Attribute, String)),
+            (r'(\s*(?:depth|match|excluded):\s*)(\d+)',
+             bygroups(Name.Attribute, Number.Integer)),
+            (r'(\s*filename:\s*)(.+\n)',
+             bygroups(Name.Attribute, String)),
+            default('#pop'),
+        ],
+        'message': [
+            (r'\fmessage}\n', Keyword, '#pop'),
+            (r'\fheader{\n', Keyword, 'header'),
+            (r'\fbody{\n', Keyword, 'body'),
+        ],
+        'header': [
+            (r'\fheader}\n', Keyword, '#pop'),
+            (r'((?:Subject|From|To|Cc|Date):\s*)(.*\n)',
+             bygroups(Name.Attribute, String)),
+            (r'(.*)(\s*\(.*\))(\s*\(.*\)\n)',
+             bygroups(Generic.Strong, Literal, Name.Tag)),
+        ],
+        'body': [
+            (r'\fpart{\n', Keyword, 'part'),
+            (r'\f(part|attachment){\s*', Keyword, ('part', 'part-attr')),
+            (r'\fbody}\n', Keyword, '#pop'),
+        ],
+        'part-attr': [
+            (r'(ID:\s*)(\d+)', bygroups(Name.Attribute, Number.Integer)),
+            (r'(,\s*)((?:Filename|Content-id):\s*)([^,]+)',
+             bygroups(Punctuation, Name.Attribute, String)),
+            (r'(,\s*)(Content-type:\s*)(.+\n)',
+             bygroups(Punctuation, Name.Attribute, String)),
+            default('#pop'),
+        ],
+        'part': [
+            (r'\f(?:part|attachment)}\n', Keyword, '#pop'),
+            (r'\f(?:part|attachment){\s*', Keyword, ('#push', 'part-attr')),
+            (r'^Non-text part: .*\n', Comment),
+            (r'(?s)(.*?(?=\f(?:part|attachment)}\n))', _highlight_code),
+        ],
+    }
+
+    def analyse_text(text):
+        return 1.0 if text.startswith('\fmessage{') else 0.0
+
+    def __init__(self, **options):
+        self.body_lexer = options.get('body_lexer', None)
+        RegexLexer.__init__(self, **options)
+
+
+class KernelLogLexer(RegexLexer):
+    """
+    For Linux Kernel log ("dmesg") output.
+
+    .. versionadded:: 2.6
+    """
+    name = 'Kernel log'
+    aliases = ['kmsg', 'dmesg']
+    filenames = ['*.kmsg', '*.dmesg']
+
+    tokens = {
+        'root': [
+            (r'^[^:]+:debug : (?=\[)', Text, 'debug'),
+            (r'^[^:]+:info  : (?=\[)', Text, 'info'),
+            (r'^[^:]+:warn  : (?=\[)', Text, 'warn'),
+            (r'^[^:]+:notice: (?=\[)', Text, 'warn'),
+            (r'^[^:]+:err   : (?=\[)', Text, 'error'),
+            (r'^[^:]+:crit  : (?=\[)', Text, 'error'),
+            (r'^(?=\[)', Text, 'unknown'),
+        ],
+        'unknown': [
+            (r'^(?=.+(warning|notice|audit|deprecated))', Text, 'warn'),
+            (r'^(?=.+(error|critical|fail|Bug))', Text, 'error'),
+            default('info'),
+        ],
+        'base': [
+            (r'\[[0-9\. ]+\] ', Number),
+            (r'(?<=\] ).+?:', Keyword),
+            (r'\n', Text, '#pop'),
+        ],
+        'debug': [
+            include('base'),
+            (r'.+\n', Comment, '#pop')
+        ],
+        'info': [
+            include('base'),
+            (r'.+\n', Text, '#pop')
+        ],
+        'warn': [
+            include('base'),
+            (r'.+\n', Generic.Strong, '#pop')
+        ],
+        'error': [
+            include('base'),
+            (r'.+\n', Generic.Error, '#pop')
+        ]
+    }
--- a/eric6/ThirdParty/Pygments/pygments/lexers/theorem.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/ThirdParty/Pygments/pygments/lexers/theorem.py	Sat May 02 13:51:07 2020 +0200
@@ -5,7 +5,7 @@
 
     Lexers for theorem-proving languages.
 
-    :copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -98,7 +98,6 @@
     operators = r'[!$%&*+\./:<=>?@^|~-]'
     prefix_syms = r'[!?~]'
     infix_syms = r'[=<>@^|&+\*/$%-]'
-    primitives = ('unit', 'nat', 'bool', 'string', 'ascii', 'list')
 
     tokens = {
         'root': [
@@ -115,7 +114,6 @@
             (r'\b([A-Z][\w\']*)', Name),
             (r'(%s)' % '|'.join(keyopts[::-1]), Operator),
             (r'(%s|%s)?%s' % (infix_syms, prefix_syms, operators), Operator),
-            (r'\b(%s)\b' % '|'.join(primitives), Keyword.Type),
 
             (r"[^\W\d][\w']*", Name),
 
@@ -420,7 +418,7 @@
         u'<-', u'=', u'==', u'>', u'_', u'|', u'||', u'~', u'=>', u'<=', u'>=',
         u'/\\', u'\\/', u'∀', u'Π', u'λ', u'↔', u'∧', u'∨', u'≠', u'≤', u'≥',
         u'¬', u'⁻¹', u'⬝', u'▸', u'→', u'∃', u'ℕ', u'ℤ', u'≈', u'×', u'⌞',
-        u'⌟', u'≡', u'⟨', u'⟩',
+        u'⌟', u'≡', u'⟨', u'⟩', u'^',
     )
 
     punctuation = (u'(', u')', u':', u'{', u'}', u'[', u']', u'⦃', u'⦄',
--- a/eric6/ThirdParty/Pygments/pygments/lexers/trafficscript.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/ThirdParty/Pygments/pygments/lexers/trafficscript.py	Sat May 02 13:51:07 2020 +0200
@@ -5,7 +5,7 @@
 
     Lexer for RiverBed's TrafficScript (RTS) language.
 
-    :copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
--- a/eric6/ThirdParty/Pygments/pygments/lexers/typoscript.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/ThirdParty/Pygments/pygments/lexers/typoscript.py	Sat May 02 13:51:07 2020 +0200
@@ -14,7 +14,7 @@
     `TypoScriptHtmlDataLexer`
         Lexer that highlights markers, constants and registers within html tags.
 
-    :copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -108,14 +108,11 @@
 
     name = 'TypoScript'
     aliases = ['typoscript']
-    filenames = ['*.ts', '*.txt']
+    filenames = ['*.typoscript']
     mimetypes = ['text/x-typoscript']
 
     flags = re.DOTALL | re.MULTILINE
 
-    # Slightly higher than TypeScript (which is 0).
-    priority = 0.1
-
     tokens = {
         'root': [
             include('comment'),
@@ -220,7 +217,3 @@
             (r'[\w"\-!/&;]+', Text),
         ],
     }
-
-    def analyse_text(text):
-        if '<INCLUDE_TYPOSCRIPT:' in text:
-            return 1.0
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/eric6/ThirdParty/Pygments/pygments/lexers/unicon.py	Sat May 02 13:51:07 2020 +0200
@@ -0,0 +1,390 @@
+# -*- coding: utf-8 -*-
+"""
+    pygments.lexers.unicon
+    ~~~~~~~~~~~~~~~~~~~~~~
+
+    Lexers for the Icon and Unicon languages, including ucode VM.
+
+    :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
+    :license: BSD, see LICENSE for details.
+"""
+
+import re
+
+from pygments.lexer import RegexLexer, include, bygroups, words, using, this
+from pygments.token import Text, Comment, Operator, Keyword, Name, String, \
+    Number, Punctuation
+
+__all__ = ['IconLexer', 'UcodeLexer', 'UniconLexer']
+
+
+class UniconLexer(RegexLexer):
+    """
+    For Unicon source code.
+
+    .. versionadded:: 2.4
+    """
+
+    name = 'Unicon'
+    aliases = ['unicon']
+    filenames = ['*.icn']
+    mimetypes = ['text/unicon']
+
+    flags = re.MULTILINE
+
+    tokens = {
+        'root': [
+            (r'[^\S\n]+', Text),
+            (r'#.*?\n', Comment.Single),
+            (r'[^\S\n]+', Text),
+            (r'class|method|procedure', Keyword.Declaration, 'subprogram'),
+            (r'(record)(\s+)(\w+)',
+             bygroups(Keyword.Declaration, Text, Keyword.Type), 'type_def'),
+            (r'(#line|\$C|\$Cend|\$define|\$else|\$endif|\$error|\$ifdef|'
+             r'\$ifndef|\$include|\$line|\$undef)\b', Keyword.PreProc),
+            (r'(&null|&fail)\b', Keyword.Constant),
+            (r'&allocated|&ascii|&clock|&collections|&column|&col|&control|'
+             r'&cset|&current|&dateline|&date|&digits|&dump|'
+             r'&errno|&errornumber|&errortext|&errorvalue|&error|&errout|'
+             r'&eventcode|&eventvalue|&eventsource|&e|'
+             r'&features|&file|&host|&input|&interval|&lcase|&letters|'
+             r'&level|&line|&ldrag|&lpress|&lrelease|'
+             r'&main|&mdrag|&meta|&mpress|&mrelease|&now|&output|'
+             r'&phi|&pick|&pi|&pos|&progname|'
+             r'&random|&rdrag|&regions|&resize|&row|&rpress|&rrelease|'
+             r'&shift|&source|&storage|&subject|'
+             r'&time|&trace|&ucase|&version|'
+             r'&window|&x|&y', Keyword.Reserved),
+            (r'(by|of|not|to)\b', Keyword.Reserved),
+            (r'(global|local|static|abstract)\b', Keyword.Reserved),
+            (r'package|link|import', Keyword.Declaration),
+            (words((
+                'break', 'case', 'create', 'critical', 'default', 'end', 'all',
+                'do', 'else', 'every', 'fail', 'if', 'import', 'initial',
+                'initially', 'invocable', 'next',
+                'repeat', 'return', 'suspend',
+                'then', 'thread', 'until', 'while'), prefix=r'\b', suffix=r'\b'),
+             Keyword.Reserved),
+            (words((
+                'Abort', 'abs', 'acos', 'Active', 'Alert', 'any', 'Any', 'Arb',
+                'Arbno', 'args', 'array', 'asin', 'atan', 'atanh', 'Attrib',
+                'Bal', 'bal', 'Bg', 'Break', 'Breakx',
+                'callout', 'center', 'char', 'chdir', 'chmod', 'chown', 'chroot',
+                'classname', 'Clip', 'Clone', 'close', 'cofail', 'collect',
+                'Color', 'ColorValue', 'condvar', 'constructor', 'copy',
+                'CopyArea', 'cos', 'Couple', 'crypt', 'cset', 'ctime',
+                'dbcolumns', 'dbdriver', 'dbkeys', 'dblimits', 'dbproduct',
+                'dbtables', 'delay', 'delete', 'detab', 'display', 'DrawArc',
+                'DrawCircle', 'DrawCube', 'DrawCurve', 'DrawCylinder',
+                'DrawDisk', 'DrawImage', 'DrawLine', 'DrawPoint', 'DrawPolygon',
+                'DrawRectangle', 'DrawSegment', 'DrawSphere', 'DrawString',
+                'DrawTorus', 'dtor',
+                'entab', 'EraseArea', 'errorclear', 'Event', 'eventmask',
+                'EvGet', 'EvSend', 'exec', 'exit', 'exp', 'Eye',
+                'Fail', 'fcntl', 'fdup', 'Fence', 'fetch', 'Fg', 'fieldnames',
+                'filepair', 'FillArc', 'FillCircle', 'FillPolygon',
+                'FillRectangle', 'find', 'flock', 'flush', 'Font', 'fork',
+                'FreeColor', 'FreeSpace', 'function',
+                'get', 'getch', 'getche', 'getegid', 'getenv', 'geteuid',
+                'getgid', 'getgr', 'gethost', 'getpgrp', 'getpid', 'getppid',
+                'getpw', 'getrusage', 'getserv', 'GetSpace', 'gettimeofday',
+                'getuid', 'globalnames', 'GotoRC', 'GotoXY', 'gtime', 'hardlink',
+                'iand', 'icom', 'IdentityMatrix', 'image', 'InPort', 'insert',
+                'Int86', 'integer', 'ioctl', 'ior', 'ishift', 'istate', 'ixor',
+                'kbhit', 'key', 'keyword', 'kill',
+                'left', 'Len', 'list', 'load', 'loadfunc', 'localnames',
+                'lock', 'log', 'Lower', 'lstat',
+                'many', 'map', 'match', 'MatrixMode', 'max', 'member',
+                'membernames', 'methodnames', 'methods', 'min', 'mkdir', 'move',
+                'MultMatrix', 'mutex',
+                'name', 'NewColor', 'Normals', 'NotAny', 'numeric',
+                'open', 'opencl', 'oprec', 'ord', 'OutPort',
+                'PaletteChars', 'PaletteColor', 'PaletteKey', 'paramnames',
+                'parent', 'Pattern', 'Peek', 'Pending', 'pipe', 'Pixel',
+                'PlayAudio', 'Poke', 'pop', 'PopMatrix', 'Pos', 'pos',
+                'proc', 'pull', 'push', 'PushMatrix', 'PushRotate', 'PushScale',
+                'PushTranslate', 'put',
+                'QueryPointer',
+                'Raise', 'read', 'ReadImage', 'readlink', 'reads', 'ready',
+                'real', 'receive', 'Refresh', 'Rem', 'remove', 'rename',
+                'repl', 'reverse', 'right', 'rmdir', 'Rotate', 'Rpos',
+                'Rtab', 'rtod', 'runerr',
+                'save', 'Scale', 'seek', 'select', 'send', 'seq',
+                'serial', 'set', 'setenv', 'setgid', 'setgrent',
+                'sethostent', 'setpgrp', 'setpwent', 'setservent',
+                'setuid', 'signal', 'sin', 'sort', 'sortf', 'Span',
+                'spawn', 'sql', 'sqrt', 'stat', 'staticnames', 'stop',
+                'StopAudio', 'string', 'structure', 'Succeed', 'Swi',
+                'symlink', 'sys_errstr', 'system', 'syswrite',
+                'Tab', 'tab', 'table', 'tan',
+                'Texcoord', 'Texture', 'TextWidth', 'Translate',
+                'trap', 'trim', 'truncate', 'trylock', 'type',
+                'umask', 'Uncouple', 'unlock', 'upto', 'utime',
+                'variable', 'VAttrib',
+                'wait', 'WAttrib', 'WDefault', 'WFlush', 'where',
+                'WinAssociate', 'WinButton', 'WinColorDialog', 'WindowContents',
+                'WinEditRegion', 'WinFontDialog', 'WinMenuBar', 'WinOpenDialog',
+                'WinPlayMedia', 'WinSaveDialog', 'WinScrollBar', 'WinSelectDialog',
+                'write', 'WriteImage', 'writes', 'WSection',
+                'WSync'), prefix=r'\b', suffix=r'\b'),
+             Name.Function),
+            include('numbers'),
+            (r'<@|<<@|>@|>>@|\.>|\->', Operator),
+            (r'\*\*|\+\+|\-\-|\.|\=|\~\=|<\=|>\=|\=\=|\~\=\=|<<|<<\=|>>|>>\=', Operator),
+            (r':\=|:\=:|\->|<\->|\+:\=|\|', Operator),
+            (r'\=\=\=|\~\=\=\=', Operator),
+            (r'"(?:[^\\"]|\\.)*"', String),
+            (r"'(?:[^\\']|\\.)*'", String.Character),
+            (r'[*<>+=/&!?@~\\-]', Operator),
+            (r'\^', Operator),
+            (r'(\w+)(\s*|[(,])', bygroups(Name, using(this))),
+            (r"([\[\]])", Punctuation),
+            (r"(<>|=>|[()|:;,.'`]|[{}]|[%]|[&?])", Punctuation),
+            (r'\n+', Text),
+        ],
+        'numbers': [
+            (r'\b([+-]?([2-9]|[12][0-9]|3[0-6])[rR][0-9a-zA-Z]+)\b', Number.Hex),
+            (r'[+-]?[0-9]*\.([0-9]*)([Ee][+-]?[0-9]*)?', Number.Float),
+            (r'\b([+-]?[0-9]+[KMGTPkmgtp]?)\b', Number.Integer),
+        ],
+        'subprogram': [
+            (r'\(', Punctuation, ('#pop', 'formal_part')),
+            (r';', Punctuation, '#pop'),
+            (r'"[^"]+"|\w+', Name.Function),
+            include('root'),
+        ],
+        'type_def': [
+            (r'\(', Punctuation, 'formal_part'),
+        ],
+        'formal_part': [
+            (r'\)', Punctuation, '#pop'),
+            (r'\w+', Name.Variable),
+            (r',', Punctuation),
+            (r'(:string|:integer|:real)\b', Keyword.Reserved),
+            include('root'),
+        ],
+    }
+
+
+class IconLexer(RegexLexer):
+    """
+    Lexer for Icon.
+
+    .. versionadded:: 1.6
+    """
+    name = 'Icon'
+    aliases = ['icon']
+    filenames = ['*.icon', '*.ICON']
+    mimetypes = []
+    flags = re.MULTILINE
+
+    tokens = {
+        'root': [
+            (r'[^\S\n]+', Text),
+            (r'#.*?\n', Comment.Single),
+            (r'[^\S\n]+', Text),
+            (r'class|method|procedure', Keyword.Declaration, 'subprogram'),
+            (r'(record)(\s+)(\w+)',
+             bygroups(Keyword.Declaration, Text, Keyword.Type), 'type_def'),
+            (r'(#line|\$C|\$Cend|\$define|\$else|\$endif|\$error|\$ifdef|'
+             r'\$ifndef|\$include|\$line|\$undef)\b', Keyword.PreProc),
+            (r'(&null|&fail)\b', Keyword.Constant),
+            (r'&allocated|&ascii|&clock|&collections|&column|&col|&control|'
+             r'&cset|&current|&dateline|&date|&digits|&dump|'
+             r'&errno|&errornumber|&errortext|&errorvalue|&error|&errout|'
+             r'&eventcode|&eventvalue|&eventsource|&e|'
+             r'&features|&file|&host|&input|&interval|&lcase|&letters|'
+             r'&level|&line|&ldrag|&lpress|&lrelease|'
+             r'&main|&mdrag|&meta|&mpress|&mrelease|&now|&output|'
+             r'&phi|&pick|&pi|&pos|&progname|'
+             r'&random|&rdrag|&regions|&resize|&row|&rpress|&rrelease|'
+             r'&shift|&source|&storage|&subject|'
+             r'&time|&trace|&ucase|&version|'
+             r'&window|&x|&y', Keyword.Reserved),
+            (r'(by|of|not|to)\b', Keyword.Reserved),
+            (r'(global|local|static)\b', Keyword.Reserved),
+            (r'link', Keyword.Declaration),
+            (words((
+                'break', 'case', 'create', 'default', 'end', 'all',
+                'do', 'else', 'every', 'fail', 'if', 'initial',
+                'invocable', 'next',
+                'repeat', 'return', 'suspend',
+                'then', 'until', 'while'), prefix=r'\b', suffix=r'\b'),
+             Keyword.Reserved),
+            (words((
+                'abs', 'acos', 'Active', 'Alert', 'any',
+                'args', 'array', 'asin', 'atan', 'atanh', 'Attrib',
+                'bal', 'Bg',
+                'callout', 'center', 'char', 'chdir', 'chmod', 'chown', 'chroot',
+                'Clip', 'Clone', 'close', 'cofail', 'collect',
+                'Color', 'ColorValue', 'condvar', 'copy',
+                'CopyArea', 'cos', 'Couple', 'crypt', 'cset', 'ctime',
+                'delay', 'delete', 'detab', 'display', 'DrawArc',
+                'DrawCircle', 'DrawCube', 'DrawCurve', 'DrawCylinder',
+                'DrawDisk', 'DrawImage', 'DrawLine', 'DrawPoint', 'DrawPolygon',
+                'DrawRectangle', 'DrawSegment', 'DrawSphere', 'DrawString',
+                'DrawTorus', 'dtor',
+                'entab', 'EraseArea', 'errorclear', 'Event', 'eventmask',
+                'EvGet', 'EvSend', 'exec', 'exit', 'exp', 'Eye',
+                'fcntl', 'fdup', 'fetch', 'Fg', 'fieldnames',
+                'FillArc', 'FillCircle', 'FillPolygon',
+                'FillRectangle', 'find', 'flock', 'flush', 'Font',
+                'FreeColor', 'FreeSpace', 'function',
+                'get', 'getch', 'getche', 'getenv',
+                'GetSpace', 'gettimeofday',
+                'getuid', 'globalnames', 'GotoRC', 'GotoXY', 'gtime', 'hardlink',
+                'iand', 'icom', 'IdentityMatrix', 'image', 'InPort', 'insert',
+                'Int86', 'integer', 'ioctl', 'ior', 'ishift', 'istate', 'ixor',
+                'kbhit', 'key', 'keyword', 'kill',
+                'left', 'Len', 'list', 'load', 'loadfunc', 'localnames',
+                'lock', 'log', 'Lower', 'lstat',
+                'many', 'map', 'match', 'MatrixMode', 'max', 'member',
+                'membernames', 'methodnames', 'methods', 'min', 'mkdir', 'move',
+                'MultMatrix', 'mutex',
+                'name', 'NewColor', 'Normals', 'numeric',
+                'open', 'opencl', 'oprec', 'ord', 'OutPort',
+                'PaletteChars', 'PaletteColor', 'PaletteKey', 'paramnames',
+                'parent', 'Pattern', 'Peek', 'Pending', 'pipe', 'Pixel',
+                'Poke', 'pop', 'PopMatrix', 'Pos', 'pos',
+                'proc', 'pull', 'push', 'PushMatrix', 'PushRotate', 'PushScale',
+                'PushTranslate', 'put',
+                'QueryPointer',
+                'Raise', 'read', 'ReadImage', 'readlink', 'reads', 'ready',
+                'real', 'receive', 'Refresh', 'Rem', 'remove', 'rename',
+                'repl', 'reverse', 'right', 'rmdir', 'Rotate', 'Rpos',
+                'rtod', 'runerr',
+                'save', 'Scale', 'seek', 'select', 'send', 'seq',
+                'serial', 'set', 'setenv',
+                'setuid', 'signal', 'sin', 'sort', 'sortf',
+                'spawn', 'sql', 'sqrt', 'stat', 'staticnames', 'stop',
+                'string', 'structure', 'Swi',
+                'symlink', 'sys_errstr', 'system', 'syswrite',
+                'tab', 'table', 'tan',
+                'Texcoord', 'Texture', 'TextWidth', 'Translate',
+                'trap', 'trim', 'truncate', 'trylock', 'type',
+                'umask', 'Uncouple', 'unlock', 'upto', 'utime',
+                'variable',
+                'wait', 'WAttrib', 'WDefault', 'WFlush', 'where',
+                'WinAssociate', 'WinButton', 'WinColorDialog', 'WindowContents',
+                'WinEditRegion', 'WinFontDialog', 'WinMenuBar', 'WinOpenDialog',
+                'WinPlayMedia', 'WinSaveDialog', 'WinScrollBar', 'WinSelectDialog',
+                'write', 'WriteImage', 'writes', 'WSection',
+                'WSync'), prefix=r'\b', suffix=r'\b'),
+             Name.Function),
+            include('numbers'),
+            (r'\*\*|\+\+|\-\-|\.|\=|\~\=|<\=|>\=|\=\=|\~\=\=|<<|<<\=|>>|>>\=', Operator),
+            (r':\=|:\=:|<\-|<\->|\+:\=|\||\|\|', Operator),
+            (r'\=\=\=|\~\=\=\=', Operator),
+            (r'"(?:[^\\"]|\\.)*"', String),
+            (r"'(?:[^\\']|\\.)*'", String.Character),
+            (r'[*<>+=/&!?@~\\-]', Operator),
+            (r'(\w+)(\s*|[(,])', bygroups(Name, using(this))),
+            (r"([\[\]])", Punctuation),
+            (r"(<>|=>|[()|:;,.'`]|[{}]|[%^]|[&?])", Punctuation),
+            (r'\n+', Text),
+        ],
+        'numbers': [
+            (r'\b([+-]?([2-9]|[12][0-9]|3[0-6])[rR][0-9a-zA-Z]+)\b', Number.Hex),
+            (r'[+-]?[0-9]*\.([0-9]*)([Ee][+-]?[0-9]*)?', Number.Float),
+            (r'\b([+-]?[0-9]+[KMGTPkmgtp]?)\b', Number.Integer),
+        ],
+        'subprogram': [
+            (r'\(', Punctuation, ('#pop', 'formal_part')),
+            (r';', Punctuation, '#pop'),
+            (r'"[^"]+"|\w+', Name.Function),
+            include('root'),
+        ],
+        'type_def': [
+            (r'\(', Punctuation, 'formal_part'),
+        ],
+        'formal_part': [
+            (r'\)', Punctuation, '#pop'),
+            (r'\w+', Name.Variable),
+            (r',', Punctuation),
+            (r'(:string|:integer|:real)\b', Keyword.Reserved),
+            include('root'),
+        ],
+    }
+
+
+class UcodeLexer(RegexLexer):
+    """
+    Lexer for Icon ucode files.
+
+    .. versionadded:: 2.4
+    """
+    name = 'ucode'
+    aliases = ['ucode']
+    filenames = ['*.u', '*.u1', '*.u2']
+    mimetypes = []
+    flags = re.MULTILINE
+
+    tokens = {
+        'root': [
+            (r'(#.*\n)', Comment),
+            (words((
+                'con', 'declend', 'end',
+                'global',
+                'impl', 'invocable',
+                'lab', 'link', 'local',
+                'record',
+                'uid', 'unions',
+                'version'),
+                prefix=r'\b', suffix=r'\b'),
+             Name.Function),
+            (words((
+                'colm', 'filen', 'line', 'synt'),
+                prefix=r'\b', suffix=r'\b'),
+             Comment),
+            (words((
+                'asgn',
+                'bang', 'bscan',
+                'cat', 'ccase', 'chfail',
+                'coact', 'cofail', 'compl',
+                'coret', 'create', 'cset',
+                'diff', 'div', 'dup',
+                'efail', 'einit', 'end', 'eqv', 'eret',
+                'error', 'escan', 'esusp',
+                'field',
+                'goto',
+                'init', 'int', 'inter',
+                'invoke',
+                'keywd',
+                'lconcat', 'lexeq', 'lexge',
+                'lexgt', 'lexle', 'lexlt', 'lexne',
+                'limit', 'llist', 'lsusp',
+                'mark', 'mark0', 'minus', 'mod', 'mult',
+                'neg', 'neqv', 'nonnull', 'noop', 'null',
+                'number', 'numeq', 'numge', 'numgt',
+                'numle', 'numlt', 'numne',
+                'pfail', 'plus', 'pnull', 'pop', 'power',
+                'pret', 'proc', 'psusp', 'push1', 'pushn1',
+                'random', 'rasgn', 'rcv', 'rcvbk', 'real',
+                'refresh', 'rswap',
+                'sdup', 'sect', 'size', 'snd', 'sndbk',
+                'str', 'subsc', 'swap',
+                'tabmat', 'tally', 'toby', 'trace',
+                'unmark',
+                'value', 'var'), prefix=r'\b', suffix=r'\b'),
+             Keyword.Declaration),
+            (words((
+                'any',
+                'case',
+                'endcase', 'endevery', 'endif',
+                'endifelse', 'endrepeat', 'endsuspend',
+                'enduntil', 'endwhile', 'every',
+                'if', 'ifelse',
+                'repeat',
+                'suspend',
+                'until',
+                'while'),
+             prefix=r'\b', suffix=r'\b'),
+             Name.Constant),
+            (r'\d+(\s*|\.$|$)', Number.Integer),
+            (r'[+-]?\d*\.\d+(E[-+]?\d+)?', Number.Float),
+            (r'[+-]?\d+\.\d*(E[-+]?\d+)?', Number.Float),
+            (r"(<>|=>|[()|:;,.'`]|[{}]|[%^]|[&?])", Punctuation),
+            (r'\s+\b', Text),
+            (r'[\w-]+', Text),
+        ],
+    }
--- a/eric6/ThirdParty/Pygments/pygments/lexers/urbi.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/ThirdParty/Pygments/pygments/lexers/urbi.py	Sat May 02 13:51:07 2020 +0200
@@ -5,7 +5,7 @@
 
     Lexers for UrbiScript language.
 
-    :copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/eric6/ThirdParty/Pygments/pygments/lexers/usd.py	Sat May 02 13:51:07 2020 +0200
@@ -0,0 +1,90 @@
+# -*- coding: utf-8 -*-
+"""
+    pygments.lexers.usd
+    ~~~~~~~~~~~~~~~~~~~
+
+    The module that parses Pixar's Universal Scene Description file format.
+
+    :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
+    :license: BSD, see LICENSE for details.
+"""
+
+from pygments.lexer import RegexLexer, bygroups
+from pygments.lexer import words as words_
+from pygments.lexers._usd_builtins import COMMON_ATTRIBUTES, KEYWORDS, \
+    OPERATORS, SPECIAL_NAMES, TYPES
+from pygments.token import Comment, Keyword, Name, Number, Operator, \
+    Punctuation, String, Text, Whitespace
+
+__all__ = ["UsdLexer"]
+
+
+def _keywords(words, type_):
+    return [(words_(words, prefix=r"\b", suffix=r"\b"), type_)]
+
+
+_TYPE = r"(\w+(?:\[\])?)"
+_BASE_ATTRIBUTE = r"([\w_]+(?:\:[\w_]+)*)(?:(\.)(timeSamples))?"
+_WHITESPACE = r"([ \t]+)"
+
+
+class UsdLexer(RegexLexer):
+    """
+    A lexer that parses Pixar's Universal Scene Description file format.
+
+    .. versionadded:: 2.6
+    """
+
+    name = "USD"
+    aliases = ["usd", "usda"]
+    filenames = ["*.usd", "*.usda"]
+
+    tokens = {
+        "root": [
+            (r"(custom){_WHITESPACE}(uniform)(\s+){}(\s+){}(\s*)(=)".format(
+                _TYPE, _BASE_ATTRIBUTE, _WHITESPACE=_WHITESPACE),
+             bygroups(Keyword.Token, Whitespace, Keyword.Token, Whitespace,
+                      Keyword.Type, Whitespace, Name.Attribute, Text,
+                      Name.Keyword.Tokens, Whitespace, Operator)),
+            (r"(custom){_WHITESPACE}{}(\s+){}(\s*)(=)".format(
+                _TYPE, _BASE_ATTRIBUTE, _WHITESPACE=_WHITESPACE),
+             bygroups(Keyword.Token, Whitespace, Keyword.Type, Whitespace,
+                      Name.Attribute, Text, Name.Keyword.Tokens, Whitespace,
+                      Operator)),
+            (r"(uniform){_WHITESPACE}{}(\s+){}(\s*)(=)".format(
+                _TYPE, _BASE_ATTRIBUTE, _WHITESPACE=_WHITESPACE),
+             bygroups(Keyword.Token, Whitespace, Keyword.Type, Whitespace,
+                      Name.Attribute, Text, Name.Keyword.Tokens, Whitespace,
+                      Operator)),
+            (r"{}{_WHITESPACE}{}(\s*)(=)".format(
+                _TYPE, _BASE_ATTRIBUTE, _WHITESPACE=_WHITESPACE),
+             bygroups(Keyword.Type, Whitespace, Name.Attribute, Text,
+                      Name.Keyword.Tokens, Whitespace, Operator)),
+        ] +
+        _keywords(KEYWORDS, Keyword.Tokens) +
+        _keywords(SPECIAL_NAMES, Name.Builtins) +
+        _keywords(COMMON_ATTRIBUTES, Name.Attribute) +
+        [(r"\b\w+:[\w:]+\b", Name.Attribute)] +
+        _keywords(OPERATORS, Operator) +  # more attributes
+        [(type_ + r"\[\]", Keyword.Type) for type_ in TYPES] +
+        _keywords(TYPES, Keyword.Type) +
+        [
+            (r"[\(\)\[\]{}]", Punctuation),
+            ("#.*?$", Comment.Single),
+            (",", Punctuation),
+            (";", Punctuation),  # ";"s are allowed to combine separate metadata lines
+            ("=", Operator),
+            (r"[-]*([0-9]*[.])?[0-9]+(?:e[+-]*\d+)?", Number),
+            (r"'''(?:.|\n)*?'''", String),
+            (r'"""(?:.|\n)*?"""', String),
+            (r"'.*?'", String),
+            (r'".*?"', String),
+            (r"<(\.\./)*([\w/]+|[\w/]+\.\w+[\w:]*)>", Name.Namespace),
+            (r"@.*?@", String.Interpol),
+            (r'\(.*"[.\\n]*".*\)', String.Doc),
+            (r"\A#usda .+$", Comment.Hashbang),
+            (r"\s+", Whitespace),
+            (r"[\w_]+", Text),
+            (r"[_:\.]+", Punctuation),
+        ],
+    }
--- a/eric6/ThirdParty/Pygments/pygments/lexers/varnish.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/ThirdParty/Pygments/pygments/lexers/varnish.py	Sat May 02 13:51:07 2020 +0200
@@ -5,7 +5,7 @@
 
     Lexers for Varnish configuration
 
-    :copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
--- a/eric6/ThirdParty/Pygments/pygments/lexers/verification.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/ThirdParty/Pygments/pygments/lexers/verification.py	Sat May 02 13:51:07 2020 +0200
@@ -5,13 +5,13 @@
 
     Lexer for Intermediate Verification Languages (IVLs).
 
-    :copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
 from pygments.lexer import RegexLexer, include, words
 from pygments.token import Comment, Operator, Keyword, Name, Number, \
-    Punctuation, Whitespace
+    Punctuation, Text, Generic
 
 __all__ = ['BoogieLexer', 'SilverLexer']
 
@@ -29,8 +29,9 @@
     tokens = {
         'root': [
             # Whitespace and Comments
-            (r'\n', Whitespace),
-            (r'\s+', Whitespace),
+            (r'\n', Text),
+            (r'\s+', Text),
+            (r'\\\n', Text),  # line continuation
             (r'//[/!](.*?)\n', Comment.Doc),
             (r'//(.*?)\n', Comment.Single),
             (r'/\*', Comment.Multiline, 'comment'),
@@ -45,6 +46,7 @@
             (words(('bool', 'int', 'ref'), suffix=r'\b'), Keyword.Type),
             include('numbers'),
             (r"(>=|<=|:=|!=|==>|&&|\|\||[+/\-=>*<\[\]])", Operator),
+            (r'\{.*?\}', Generic.Emph), #triggers
             (r"([{}():;,.])", Punctuation),
             # Identifier
             (r'[a-zA-Z_]\w*', Name),
@@ -74,8 +76,9 @@
     tokens = {
         'root': [
             # Whitespace and Comments
-            (r'\n', Whitespace),
-            (r'\s+', Whitespace),
+            (r'\n', Text),
+            (r'\s+', Text),
+            (r'\\\n', Text),  # line continuation
             (r'//[/!](.*?)\n', Comment.Doc),
             (r'//(.*?)\n', Comment.Single),
             (r'/\*', Comment.Multiline, 'comment'),
@@ -83,18 +86,18 @@
             (words((
                 'result', 'true', 'false', 'null', 'method', 'function',
                 'predicate', 'program', 'domain', 'axiom', 'var', 'returns',
-                'field', 'define', 'requires', 'ensures', 'invariant',
-                'fold', 'unfold', 'inhale', 'exhale', 'new', 'assert',
+                'field', 'define', 'fold', 'unfold', 'inhale', 'exhale', 'new', 'assert',
                 'assume', 'goto', 'while', 'if', 'elseif', 'else', 'fresh',
                 'constraining', 'Seq', 'Set', 'Multiset', 'union', 'intersection',
                 'setminus', 'subset', 'unfolding', 'in', 'old', 'forall', 'exists',
                 'acc', 'wildcard', 'write', 'none', 'epsilon', 'perm', 'unique',
                 'apply', 'package', 'folding', 'label', 'forperm'),
              suffix=r'\b'), Keyword),
-            (words(('Int', 'Perm', 'Bool', 'Ref'), suffix=r'\b'), Keyword.Type),
+            (words(('requires', 'ensures', 'invariant'), suffix=r'\b'), Name.Decorator),
+            (words(('Int', 'Perm', 'Bool', 'Ref', 'Rational'), suffix=r'\b'), Keyword.Type),
             include('numbers'),
-
             (r'[!%&*+=|?:<>/\-\[\]]', Operator),
+            (r'\{.*?\}', Generic.Emph), #triggers
             (r'([{}():;,.])', Punctuation),
             # Identifier
             (r'[\w$]\w*', Name),
--- a/eric6/ThirdParty/Pygments/pygments/lexers/web.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/ThirdParty/Pygments/pygments/lexers/web.py	Sat May 02 13:51:07 2020 +0200
@@ -5,7 +5,7 @@
 
     Just export previously exported lexers.
 
-    :copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/eric6/ThirdParty/Pygments/pygments/lexers/webidl.py	Sat May 02 13:51:07 2020 +0200
@@ -0,0 +1,297 @@
+# -*- coding: utf-8 -*-
+"""
+    pygments.lexers.webidl
+    ~~~~~~~~~~~~~~~~~~~
+
+    Lexers for Web IDL, including some extensions.
+
+    :copyright: Copyright 2006-2016 by the Pygments team, see AUTHORS.
+    :license: BSD, see LICENSE for details.
+"""
+
+from pygments.lexer import RegexLexer, default, include, words
+from pygments.token import Comment, Keyword, Name, Number, Punctuation, \
+    String, Text
+
+__all__ = ['WebIDLLexer']
+
+_builtin_types = (
+    # primitive types
+    'byte', 'octet', 'boolean',
+    r'(?:unsigned\s+)?(?:short|long(?:\s+long)?)',
+    r'(?:unrestricted\s+)?(?:float|double)',
+    # string types
+    'DOMString', 'ByteString', 'USVString',
+    # exception types
+    'Error', 'DOMException',
+    # typed array types
+    'Uint8Array', 'Uint16Array', 'Uint32Array', 'Uint8ClampedArray',
+    'Float32Array', 'Float64Array',
+    # buffer source types
+    'ArrayBuffer', 'DataView', 'Int8Array', 'Int16Array', 'Int32Array',
+    # other
+    'any', 'void', 'object', 'RegExp',
+)
+_identifier = r'_?[A-Za-z][0-9A-Z_a-z-]*'
+_keyword_suffix = r'(?![\w-])'
+_string = r'"[^"]*"'
+
+class WebIDLLexer(RegexLexer):
+    """
+    For Web IDL.
+
+    .. versionadded:: 2.6
+    """
+
+    name = 'Web IDL'
+    aliases = ['webidl']
+    filenames = ['*.webidl']
+
+    tokens = {
+        'common': [
+            (r'\s+', Text),
+            (r'(?s)/\*.*?\*/', Comment.Multiline),
+            (r'//.*', Comment.Single),
+            (r'^#.*', Comment.Preproc),
+        ],
+        'root': [
+            include('common'),
+            (r'\[', Punctuation, 'extended_attributes'),
+            (r'partial' + _keyword_suffix, Keyword),
+            (r'typedef' + _keyword_suffix, Keyword, ('typedef', 'type')),
+            (r'interface' + _keyword_suffix, Keyword, 'interface_rest'),
+            (r'enum' + _keyword_suffix, Keyword, 'enum_rest'),
+            (r'callback' + _keyword_suffix, Keyword, 'callback_rest'),
+            (r'dictionary' + _keyword_suffix, Keyword, 'dictionary_rest'),
+            (r'namespace' + _keyword_suffix, Keyword, 'namespace_rest'),
+            (_identifier, Name.Class, 'implements_rest'),
+        ],
+        'extended_attributes': [
+            include('common'),
+            (r',', Punctuation),
+            (_identifier, Name.Decorator),
+            (r'=', Punctuation, 'extended_attribute_rest'),
+            (r'\(', Punctuation, 'argument_list'),
+            (r'\]', Punctuation, '#pop'),
+        ],
+        'extended_attribute_rest': [
+            include('common'),
+            (_identifier, Name, 'extended_attribute_named_rest'),
+            (_string, String),
+            (r'\(', Punctuation, 'identifier_list'),
+            default('#pop'),
+        ],
+        'extended_attribute_named_rest': [
+            include('common'),
+            (r'\(', Punctuation, 'argument_list'),
+            default('#pop'),
+        ],
+        'argument_list': [
+            include('common'),
+            (r'\)', Punctuation, '#pop'),
+            default('argument'),
+        ],
+        'argument': [
+            include('common'),
+            (r'optional' + _keyword_suffix, Keyword),
+            (r'\[', Punctuation, 'extended_attributes'),
+            (r',', Punctuation, '#pop'),
+            (r'\)', Punctuation, '#pop:2'),
+            default(('argument_rest', 'type'))
+        ],
+        'argument_rest': [
+            include('common'),
+            (_identifier, Name.Variable),
+            (r'\.\.\.', Punctuation),
+            (r'=', Punctuation, 'default_value'),
+            default('#pop'),
+        ],
+        'identifier_list': [
+            include('common'),
+            (_identifier, Name.Class),
+            (r',', Punctuation),
+            (r'\)', Punctuation, '#pop'),
+        ],
+        'type': [
+            include('common'),
+            (r'(?:' + r'|'.join(_builtin_types) + r')' + _keyword_suffix,
+             Keyword.Type, 'type_null'),
+            (words(('sequence', 'Promise', 'FrozenArray'),
+                   suffix=_keyword_suffix), Keyword.Type, 'type_identifier'),
+            (_identifier, Name.Class, 'type_identifier'),
+            (r'\(', Punctuation, 'union_type'),
+        ],
+        'union_type': [
+            include('common'),
+            (r'or' + _keyword_suffix, Keyword),
+            (r'\)', Punctuation, ('#pop', 'type_null')),
+            default('type'),
+        ],
+        'type_identifier': [
+            (r'<', Punctuation, 'type_list'),
+            default(('#pop', 'type_null'))
+        ],
+        'type_null': [
+            (r'\??', Punctuation, '#pop:2'),
+        ],
+        'default_value': [
+            include('common'),
+            include('const_value'),
+            (_string, String, '#pop'),
+            (r'\[\s*\]', Punctuation, '#pop'),
+        ],
+        'const_value': [
+            include('common'),
+            (words(('true', 'false', '-Infinity', 'Infinity', 'NaN', 'null'),
+                   suffix=_keyword_suffix), Keyword.Constant, '#pop'),
+            (r'-?(?:(?:[0-9]+\.[0-9]*|[0-9]*\.[0-9]+)(?:[Ee][+-]?[0-9]+)?' +
+             r'|[0-9]+[Ee][+-]?[0-9]+)', Number.Float, '#pop'),
+            (r'-?[1-9][0-9]*', Number.Integer, '#pop'),
+            (r'-?0[Xx][0-9A-Fa-f]+', Number.Hex, '#pop'),
+            (r'-?0[0-7]*', Number.Oct, '#pop'),
+        ],
+        'typedef': [
+            include('common'),
+            (_identifier, Name.Class),
+            (r';', Punctuation, '#pop'),
+        ],
+        'namespace_rest': [
+            include('common'),
+            (_identifier, Name.Namespace),
+            (r'\{', Punctuation, 'namespace_body'),
+            (r';', Punctuation, '#pop'),
+        ],
+        'namespace_body': [
+            include('common'),
+            (r'\[', Punctuation, 'extended_attributes'),
+            (r'readonly' + _keyword_suffix, Keyword),
+            (r'attribute' + _keyword_suffix,
+             Keyword, ('attribute_rest', 'type')),
+            (r'const' + _keyword_suffix, Keyword, ('const_rest', 'type')),
+            (r'\}', Punctuation, '#pop'),
+            default(('operation_rest', 'type')),
+        ],
+        'interface_rest': [
+            include('common'),
+            (_identifier, Name.Class),
+            (r':', Punctuation),
+            (r'\{', Punctuation, 'interface_body'),
+            (r';', Punctuation, '#pop'),
+        ],
+        'interface_body': [
+            (words(('iterable', 'maplike', 'setlike'), suffix=_keyword_suffix),
+             Keyword, 'iterable_maplike_setlike_rest'),
+            (words(('setter', 'getter', 'creator', 'deleter', 'legacycaller',
+                    'inherit', 'static', 'stringifier', 'jsonifier'),
+                   suffix=_keyword_suffix), Keyword),
+            (r'serializer' + _keyword_suffix, Keyword, 'serializer_rest'),
+            (r';', Punctuation),
+            include('namespace_body'),
+        ],
+        'attribute_rest': [
+            include('common'),
+            (_identifier, Name.Variable),
+            (r';', Punctuation, '#pop'),
+        ],
+        'const_rest': [
+            include('common'),
+            (_identifier, Name.Constant),
+            (r'=', Punctuation, 'const_value'),
+            (r';', Punctuation, '#pop'),
+        ],
+        'operation_rest': [
+            include('common'),
+            (r';', Punctuation, '#pop'),
+            default('operation'),
+        ],
+        'operation': [
+            include('common'),
+            (_identifier, Name.Function),
+            (r'\(', Punctuation, 'argument_list'),
+            (r';', Punctuation, '#pop:2'),
+        ],
+        'iterable_maplike_setlike_rest': [
+            include('common'),
+            (r'<', Punctuation, 'type_list'),
+            (r';', Punctuation, '#pop'),
+        ],
+        'type_list': [
+            include('common'),
+            (r',', Punctuation),
+            (r'>', Punctuation, '#pop'),
+            default('type'),
+        ],
+        'serializer_rest': [
+            include('common'),
+            (r'=', Punctuation, 'serialization_pattern'),
+            (r';', Punctuation, '#pop'),
+            default('operation'),
+        ],
+        'serialization_pattern': [
+            include('common'),
+            (_identifier, Name.Variable, '#pop'),
+            (r'\{', Punctuation, 'serialization_pattern_map'),
+            (r'\[', Punctuation, 'serialization_pattern_list'),
+        ],
+        'serialization_pattern_map': [
+            include('common'),
+            (words(('getter', 'inherit', 'attribute'),
+                   suffix=_keyword_suffix), Keyword),
+            (r',', Punctuation),
+            (_identifier, Name.Variable),
+            (r'\}', Punctuation, '#pop:2'),
+        ],
+        'serialization_pattern_list': [
+            include('common'),
+            (words(('getter', 'attribute'), suffix=_keyword_suffix), Keyword),
+            (r',', Punctuation),
+            (_identifier, Name.Variable),
+            (r']', Punctuation, '#pop:2'),
+        ],
+        'enum_rest': [
+            include('common'),
+            (_identifier, Name.Class),
+            (r'\{', Punctuation, 'enum_body'),
+            (r';', Punctuation, '#pop'),
+        ],
+        'enum_body': [
+            include('common'),
+            (_string, String),
+            (r',', Punctuation),
+            (r'\}', Punctuation, '#pop'),
+        ],
+        'callback_rest': [
+            include('common'),
+            (r'interface' + _keyword_suffix,
+             Keyword, ('#pop', 'interface_rest')),
+            (_identifier, Name.Class),
+            (r'=', Punctuation, ('operation', 'type')),
+            (r';', Punctuation, '#pop'),
+        ],
+        'dictionary_rest': [
+            include('common'),
+            (_identifier, Name.Class),
+            (r':', Punctuation),
+            (r'\{', Punctuation, 'dictionary_body'),
+            (r';', Punctuation, '#pop'),
+        ],
+        'dictionary_body': [
+            include('common'),
+            (r'\[', Punctuation, 'extended_attributes'),
+            (r'required' + _keyword_suffix, Keyword),
+            (r'\}', Punctuation, '#pop'),
+            default(('dictionary_item', 'type')),
+        ],
+        'dictionary_item': [
+            include('common'),
+            (_identifier, Name.Variable),
+            (r'=', Punctuation, 'default_value'),
+            (r';', Punctuation, '#pop'),
+        ],
+        'implements_rest': [
+            include('common'),
+            (r'implements' + _keyword_suffix, Keyword),
+            (_identifier, Name.Class),
+            (r';', Punctuation, '#pop'),
+        ],
+    }
--- a/eric6/ThirdParty/Pygments/pygments/lexers/webmisc.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/ThirdParty/Pygments/pygments/lexers/webmisc.py	Sat May 02 13:51:07 2020 +0200
@@ -5,7 +5,7 @@
 
     Lexers for misc. web stuff.
 
-    :copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -158,6 +158,9 @@
         # state stack
         if len(lexer.xquery_parse_state) == 0:
             ctx.stack.pop()
+            if not ctx.stack:
+                # make sure we have at least the root state on invalid inputs
+                ctx.stack = ['root']
         elif len(ctx.stack) > 1:
             ctx.stack.append(lexer.xquery_parse_state.pop())
         else:
--- a/eric6/ThirdParty/Pygments/pygments/lexers/whiley.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/ThirdParty/Pygments/pygments/lexers/whiley.py	Sat May 02 13:51:07 2020 +0200
@@ -5,7 +5,7 @@
 
     Lexers for the Whiley language.
 
-    :copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
--- a/eric6/ThirdParty/Pygments/pygments/lexers/x10.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/ThirdParty/Pygments/pygments/lexers/x10.py	Sat May 02 13:51:07 2020 +0200
@@ -5,7 +5,7 @@
 
     Lexers for the X10 programming language.
 
-    :copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
--- a/eric6/ThirdParty/Pygments/pygments/lexers/xorg.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/ThirdParty/Pygments/pygments/lexers/xorg.py	Sat May 02 13:51:07 2020 +0200
@@ -5,7 +5,7 @@
 
     Lexers for Xorg configs.
 
-    :copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/eric6/ThirdParty/Pygments/pygments/lexers/zig.py	Sat May 02 13:51:07 2020 +0200
@@ -0,0 +1,129 @@
+# -*- coding: utf-8 -*-
+"""
+    pygments.lexers.zig
+    ~~~~~~~~~~~~~~~~~~~
+
+    Lexers for Zig.
+
+    :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
+    :license: BSD, see LICENSE for details.
+"""
+
+from pygments.lexer import RegexLexer, words
+from pygments.token import Comment, Operator, Keyword, Name, String, \
+    Number, Punctuation, Whitespace
+
+__all__ = ['ZigLexer']
+
+
+class ZigLexer(RegexLexer):
+    """
+    For `Zig <http://www.ziglang.org>`_ source code.
+
+    grammar: https://ziglang.org/documentation/master/#Grammar
+    """
+    name = 'Zig'
+    aliases = ['zig']
+    filenames = ['*.zig']
+    mimetypes = ['text/zig']
+
+    type_keywords = (
+        words(('bool', 'f16', 'f32', 'f64', 'f128', 'void', 'noreturn', 'type',
+               'anyerror', 'promise', 'i0', 'u0', 'isize',  'usize', 'comptime_int',
+               'comptime_float', 'c_short', 'c_ushort', 'c_int', 'c_uint', 'c_long',
+               'c_ulong', 'c_longlong', 'c_ulonglong', 'c_longdouble', 'c_void'
+               'i8', 'u8', 'i16', 'u16', 'i32', 'u32', 'i64', 'u64', 'i128',
+               'u128'), suffix=r'\b'),
+        Keyword.Type)
+
+    storage_keywords = (
+        words(('const', 'var', 'extern', 'packed', 'export', 'pub', 'noalias',
+               'inline', 'comptime', 'nakedcc', 'stdcallcc', 'volatile', 'allowzero',
+               'align', 'linksection', 'threadlocal'), suffix=r'\b'),
+        Keyword.Reserved)
+
+    structure_keywords = (
+        words(('struct', 'enum', 'union', 'error'), suffix=r'\b'),
+        Keyword)
+
+    statement_keywords = (
+        words(('break', 'return', 'continue', 'asm', 'defer', 'errdefer',
+               'unreachable', 'try', 'catch', 'async', 'await', 'suspend',
+               'resume', 'cancel'), suffix=r'\b'),
+        Keyword)
+
+    conditional_keywords = (
+        words(('if', 'else', 'switch', 'and', 'or', 'orelse'), suffix=r'\b'),
+        Keyword)
+
+    repeat_keywords = (
+        words(('while', 'for'), suffix=r'\b'),
+        Keyword)
+
+    other_keywords = (
+        words(('fn', 'usingnamespace', 'test'), suffix=r'\b'),
+        Keyword)
+
+    constant_keywords = (
+        words(('true', 'false', 'null', 'undefined'), suffix=r'\b'),
+        Keyword.Constant)
+
+    tokens = {
+        'root': [
+            (r'\n', Whitespace),
+            (r'\s+', Whitespace),
+            (r'//.*?\n', Comment.Single),
+
+            # Keywords
+            statement_keywords,
+            storage_keywords,
+            structure_keywords,
+            repeat_keywords,
+            type_keywords,
+            constant_keywords,
+            conditional_keywords,
+            other_keywords,
+
+            # Floats
+            (r'0x[0-9a-fA-F]+\.[0-9a-fA-F]+([pP][\-+]?[0-9a-fA-F]+)?', Number.Float),
+            (r'0x[0-9a-fA-F]+\.?[pP][\-+]?[0-9a-fA-F]+', Number.Float),
+            (r'[0-9]+\.[0-9]+([eE][-+]?[0-9]+)?', Number.Float),
+            (r'[0-9]+\.?[eE][-+]?[0-9]+', Number.Float),
+
+            # Integers
+            (r'0b[01]+', Number.Bin),
+            (r'0o[0-7]+', Number.Oct),
+            (r'0x[0-9a-fA-F]+', Number.Hex),
+            (r'[0-9]+', Number.Integer),
+
+            # Identifier
+            (r'@[a-zA-Z_]\w*', Name.Builtin),
+            (r'[a-zA-Z_]\w*', Name),
+
+            # Characters
+            (r'\'\\\'\'', String.Escape),
+            (r'\'\\(|x[a-fA-F0-9]{2}|u[a-fA-F0-9]{4}|U[a-fA-F0-9]{6}|[nr\\t\'"])\'',
+             String.Escape),
+            (r'\'[^\\\']\'', String),
+
+            # Strings
+            (r'\\\\[^\n]*', String.Heredoc),
+            (r'c\\\\[^\n]*', String.Heredoc),
+            (r'c?"', String, 'string'),
+
+            # Operators, Punctuation
+            (r'[+%=><|^!?/\-*&~:]', Operator),
+            (r'[{}()\[\],.;]', Punctuation)
+        ],
+        'string': [
+            (r'\\(x[a-fA-F0-9]{2}|u[a-fA-F0-9]{4}|U[a-fA-F0-9]{6}|[nr\\t\'"])',
+             String.Escape),
+            (r'[^\\"\n]+', String),
+            (r'"', String, '#pop')
+        ]
+    }
+
+    def get_tokens_unprocessed(self, text):
+        for index, token, value in \
+                RegexLexer.get_tokens_unprocessed(self, text):
+            yield index, token, value
--- a/eric6/ThirdParty/Pygments/pygments/modeline.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/ThirdParty/Pygments/pygments/modeline.py	Sat May 02 13:51:07 2020 +0200
@@ -5,7 +5,7 @@
 
     A simple modeline parser (based on pymodeline).
 
-    :copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
--- a/eric6/ThirdParty/Pygments/pygments/plugin.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/ThirdParty/Pygments/pygments/plugin.py	Sat May 02 13:51:07 2020 +0200
@@ -32,7 +32,7 @@
         yourfilter = yourfilter:YourFilter
 
 
-    :copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 LEXER_ENTRY_POINT = 'pygments.lexers'
--- a/eric6/ThirdParty/Pygments/pygments/regexopt.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/ThirdParty/Pygments/pygments/regexopt.py	Sat May 02 13:51:07 2020 +0200
@@ -6,7 +6,7 @@
     An algorithm that generates optimized regexes for matching long lists of
     literal strings.
 
-    :copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
--- a/eric6/ThirdParty/Pygments/pygments/scanner.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/ThirdParty/Pygments/pygments/scanner.py	Sat May 02 13:51:07 2020 +0200
@@ -12,7 +12,7 @@
     Have a look at the `DelphiLexer` to get an idea of how to use
     this scanner.
 
-    :copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 import re
@@ -25,7 +25,7 @@
     """
 
 
-class Scanner(object):
+class Scanner:
     """
     Simple scanner
 
--- a/eric6/ThirdParty/Pygments/pygments/sphinxext.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/ThirdParty/Pygments/pygments/sphinxext.py	Sat May 02 13:51:07 2020 +0200
@@ -6,12 +6,10 @@
     Sphinx extension to generate automatic documentation of lexers,
     formatters and filters.
 
-    :copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
-from __future__ import print_function
-
 import sys
 
 from docutils import nodes
--- a/eric6/ThirdParty/Pygments/pygments/style.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/ThirdParty/Pygments/pygments/style.py	Sat May 02 13:51:07 2020 +0200
@@ -5,33 +5,53 @@
 
     Basic style object.
 
-    :copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
 from pygments.token import Token, STANDARD_TYPES
-from pygments.util import add_metaclass
 
-# Default mapping of #ansixxx to RGB colors.
+# Default mapping of ansixxx to RGB colors.
 _ansimap = {
     # dark
-    '#ansiblack': '000000',
-    '#ansidarkred': '7f0000',
-    '#ansidarkgreen': '007f00',
-    '#ansibrown': '7f7fe0',
-    '#ansidarkblue': '00007f',
-    '#ansipurple': '7f007f',
-    '#ansiteal': '007f7f',
-    '#ansilightgray': 'e5e5e5',
+    'ansiblack': '000000',
+    'ansired': '7f0000',
+    'ansigreen': '007f00',
+    'ansiyellow': '7f7fe0',
+    'ansiblue': '00007f',
+    'ansimagenta': '7f007f',
+    'ansicyan': '007f7f',
+    'ansigray': 'e5e5e5',
     # normal
-    '#ansidarkgray': '555555',
-    '#ansired': 'ff0000',
-    '#ansigreen': '00ff00',
-    '#ansiyellow': 'ffff00',
-    '#ansiblue': '0000ff',
-    '#ansifuchsia': 'ff00ff',
-    '#ansiturquoise': '00ffff',
-    '#ansiwhite': 'ffffff',
+    'ansibrightblack': '555555',
+    'ansibrightred': 'ff0000',
+    'ansibrightgreen': '00ff00',
+    'ansibrightyellow': 'ffff00',
+    'ansibrightblue': '0000ff',
+    'ansibrightmagenta': 'ff00ff',
+    'ansibrightcyan': '00ffff',
+    'ansiwhite': 'ffffff',
+}
+# mapping of deprecated #ansixxx colors to new color names
+_deprecated_ansicolors = {
+    # dark
+    '#ansiblack': 'ansiblack',
+    '#ansidarkred': 'ansired',
+    '#ansidarkgreen': 'ansigreen',
+    '#ansibrown': 'ansiyellow',
+    '#ansidarkblue': 'ansiblue',
+    '#ansipurple': 'ansimagenta',
+    '#ansiteal': 'ansicyan',
+    '#ansilightgray': 'ansigray',
+    # normal
+    '#ansidarkgray': 'ansibrightblack',
+    '#ansired': 'ansibrightred',
+    '#ansigreen': 'ansibrightgreen',
+    '#ansiyellow': 'ansibrightyellow',
+    '#ansiblue': 'ansibrightblue',
+    '#ansifuchsia': 'ansibrightmagenta',
+    '#ansiturquoise': 'ansibrightcyan',
+    '#ansiwhite': 'ansiwhite',
 }
 ansicolors = set(_ansimap)
 
@@ -52,9 +72,11 @@
                 if len(col) == 6:
                     return col
                 elif len(col) == 3:
-                    return col[0]*2 + col[1]*2 + col[2]*2
+                    return col[0] * 2 + col[1] * 2 + col[2] * 2
             elif text == '':
                 return ''
+            elif text.startswith('var') or text.startswith('calc'):
+                return text
             assert False, "wrong color format %r" % text
 
         _styles = obj._styles = {}
@@ -106,11 +128,15 @@
         t = cls._styles[token]
         ansicolor = bgansicolor = None
         color = t[0]
-        if color.startswith('#ansi'):
+        if color in _deprecated_ansicolors:
+            color = _deprecated_ansicolors[color]
+        if color in ansicolors:
             ansicolor = color
             color = _ansimap[color]
         bgcolor = t[4]
-        if bgcolor.startswith('#ansi'):
+        if bgcolor in _deprecated_ansicolors:
+            bgcolor = _deprecated_ansicolors[color]
+        if bgcolor in ansicolors:
             bgansicolor = bgcolor
             bgcolor = _ansimap[bgcolor]
 
@@ -142,8 +168,7 @@
         return len(cls._styles)
 
 
-@add_metaclass(StyleMeta)
-class Style(object):
+class Style(metaclass=StyleMeta):
 
     #: overall background color (``None`` means transparent)
     background_color = '#ffffff'
--- a/eric6/ThirdParty/Pygments/pygments/styles/__init__.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/ThirdParty/Pygments/pygments/styles/__init__.py	Sat May 02 13:51:07 2020 +0200
@@ -5,7 +5,7 @@
 
     Contains built-in styles.
 
-    :copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -44,6 +44,13 @@
     'arduino':  'arduino::ArduinoStyle',
     'rainbow_dash': 'rainbow_dash::RainbowDashStyle',
     'abap':     'abap::AbapStyle',
+    'solarized-dark': 'solarized::SolarizedDarkStyle',
+    'solarized-light': 'solarized::SolarizedLightStyle',
+    'sas':         'sas::SasStyle',
+    'stata':       'stata_light::StataLightStyle',
+    'stata-light': 'stata_light::StataLightStyle',
+    'stata-dark':  'stata_dark::StataDarkStyle',
+    'inkpot':      'inkpot::InkPotStyle',
 }
 
 
--- a/eric6/ThirdParty/Pygments/pygments/styles/abap.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/ThirdParty/Pygments/pygments/styles/abap.py	Sat May 02 13:51:07 2020 +0200
@@ -5,7 +5,7 @@
 
     ABAP workbench like style.
 
-    :copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
--- a/eric6/ThirdParty/Pygments/pygments/styles/algol.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/ThirdParty/Pygments/pygments/styles/algol.py	Sat May 02 13:51:07 2020 +0200
@@ -26,7 +26,7 @@
 
     [1] `Revised Report on the Algorithmic Language Algol-60 <http://www.masswerk.at/algol60/report.htm>`
 
-    :copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
--- a/eric6/ThirdParty/Pygments/pygments/styles/algol_nu.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/ThirdParty/Pygments/pygments/styles/algol_nu.py	Sat May 02 13:51:07 2020 +0200
@@ -26,7 +26,7 @@
 
     [1] `Revised Report on the Algorithmic Language Algol-60 <http://www.masswerk.at/algol60/report.htm>`
 
-    :copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
--- a/eric6/ThirdParty/Pygments/pygments/styles/arduino.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/ThirdParty/Pygments/pygments/styles/arduino.py	Sat May 02 13:51:07 2020 +0200
@@ -5,17 +5,17 @@
 
     Arduino® Syntax highlighting style.
 
-    :copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
 from pygments.style import Style
 from pygments.token import Keyword, Name, Comment, String, Error, \
-     Number, Operator, Generic, Whitespace
+    Number, Operator, Generic, Whitespace
 
 
 class ArduinoStyle(Style):
-    """
+    u"""
     The Arduino® language style. This style is designed to highlight the
     Arduino source code, so exepect the best results with it.
     """
--- a/eric6/ThirdParty/Pygments/pygments/styles/autumn.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/ThirdParty/Pygments/pygments/styles/autumn.py	Sat May 02 13:51:07 2020 +0200
@@ -5,7 +5,7 @@
 
     A colorful style, inspired by the terminal highlighting style.
 
-    :copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
--- a/eric6/ThirdParty/Pygments/pygments/styles/borland.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/ThirdParty/Pygments/pygments/styles/borland.py	Sat May 02 13:51:07 2020 +0200
@@ -5,7 +5,7 @@
 
     Style similar to the style used in the Borland IDEs.
 
-    :copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
--- a/eric6/ThirdParty/Pygments/pygments/styles/bw.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/ThirdParty/Pygments/pygments/styles/bw.py	Sat May 02 13:51:07 2020 +0200
@@ -5,7 +5,7 @@
 
     Simple black/white only style.
 
-    :copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
--- a/eric6/ThirdParty/Pygments/pygments/styles/colorful.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/ThirdParty/Pygments/pygments/styles/colorful.py	Sat May 02 13:51:07 2020 +0200
@@ -5,7 +5,7 @@
 
     A colorful style, inspired by CodeRay.
 
-    :copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
--- a/eric6/ThirdParty/Pygments/pygments/styles/default.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/ThirdParty/Pygments/pygments/styles/default.py	Sat May 02 13:51:07 2020 +0200
@@ -5,7 +5,7 @@
 
     The default highlighting style.
 
-    :copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
--- a/eric6/ThirdParty/Pygments/pygments/styles/emacs.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/ThirdParty/Pygments/pygments/styles/emacs.py	Sat May 02 13:51:07 2020 +0200
@@ -5,7 +5,7 @@
 
     A highlighting style for Pygments, inspired by Emacs.
 
-    :copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
--- a/eric6/ThirdParty/Pygments/pygments/styles/friendly.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/ThirdParty/Pygments/pygments/styles/friendly.py	Sat May 02 13:51:07 2020 +0200
@@ -5,7 +5,7 @@
 
     A modern style based on the VIM pyte theme.
 
-    :copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
--- a/eric6/ThirdParty/Pygments/pygments/styles/fruity.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/ThirdParty/Pygments/pygments/styles/fruity.py	Sat May 02 13:51:07 2020 +0200
@@ -5,7 +5,7 @@
 
     pygments version of my "fruity" vim theme.
 
-    :copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
--- a/eric6/ThirdParty/Pygments/pygments/styles/igor.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/ThirdParty/Pygments/pygments/styles/igor.py	Sat May 02 13:51:07 2020 +0200
@@ -5,7 +5,7 @@
 
     Igor Pro default style.
 
-    :copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/eric6/ThirdParty/Pygments/pygments/styles/inkpot.py	Sat May 02 13:51:07 2020 +0200
@@ -0,0 +1,67 @@
+# -*- coding: utf-8 -*-
+"""
+    pygments.styles.inkpot
+    ~~~~~~~~~~~~~~~~~~~~~~
+
+    A highlighting style for Pygments, inspired by the Inkpot theme for VIM.
+
+    :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
+    :license: BSD, see LICENSE for details.
+"""
+
+from pygments.style import Style
+from pygments.token import Text, Other, Keyword, Name, Comment, String, \
+    Error, Number, Operator, Generic, Whitespace, Punctuation
+
+
+class InkPotStyle(Style):
+    background_color = "#1e1e27"
+    default_style = ""
+    styles = {
+        Text:                      "#cfbfad",
+        Other:                     "#cfbfad",
+        Whitespace:                "#434357",
+        Comment:                   "#cd8b00",
+        Comment.Preproc:           "#409090",
+        Comment.PreprocFile:       "bg:#404040 #ffcd8b",
+        Comment.Special:           "#808bed",
+
+        Keyword:                   "#808bed",
+        Keyword.Pseudo:            "nobold",
+        Keyword.Type:              "#ff8bff",
+
+        Operator:                  "#666666",
+
+        Punctuation:               "#cfbfad",
+
+        Name:                      "#cfbfad",
+        Name.Attribute:            "#cfbfad",
+        Name.Builtin.Pseudo:       '#ffff00',
+        Name.Builtin:              "#808bed",
+        Name.Class:                "#ff8bff",
+        Name.Constant:             "#409090",
+        Name.Decorator:            "#409090",
+        Name.Exception:            "#ff0000",
+        Name.Function:             "#c080d0",
+        Name.Label:                "#808bed",
+        Name.Namespace:            "#ff0000",
+        Name.Variable:             "#cfbfad",
+
+        String:                    "bg:#404040 #ffcd8b",
+        String.Doc:                "#808bed",
+
+        Number:                    "#f0ad6d",
+
+        Generic.Heading:           "bold #000080",
+        Generic.Subheading:        "bold #800080",
+        Generic.Deleted:           "#A00000",
+        Generic.Inserted:          "#00A000",
+        Generic.Error:             "#FF0000",
+        Generic.Emph:              "italic",
+        Generic.Strong:            "bold",
+        Generic.Prompt:            "bold #000080",
+        Generic.Output:            "#888",
+        Generic.Traceback:         "#04D",
+
+        Error:                     "bg:#6e2e2e #ffffff"
+    }
--- a/eric6/ThirdParty/Pygments/pygments/styles/lovelace.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/ThirdParty/Pygments/pygments/styles/lovelace.py	Sat May 02 13:51:07 2020 +0200
@@ -9,7 +9,7 @@
     A desaturated, somewhat subdued style created for the Lovelace interactive
     learning environment.
 
-    :copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
--- a/eric6/ThirdParty/Pygments/pygments/styles/manni.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/ThirdParty/Pygments/pygments/styles/manni.py	Sat May 02 13:51:07 2020 +0200
@@ -8,7 +8,7 @@
     This is a port of the style used in the `php port`_ of pygments
     by Manni. The style is called 'default' there.
 
-    :copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
--- a/eric6/ThirdParty/Pygments/pygments/styles/monokai.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/ThirdParty/Pygments/pygments/styles/monokai.py	Sat May 02 13:51:07 2020 +0200
@@ -7,7 +7,7 @@
 
     http://www.monokai.nl/blog/2006/07/15/textmate-color-theme/
 
-    :copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -92,14 +92,15 @@
         String.Single:             "",        # class: 's1'
         String.Symbol:             "",        # class: 'ss'
 
+
         Generic:                   "",        # class: 'g'
         Generic.Deleted:           "#f92672", # class: 'gd',
         Generic.Emph:              "italic",  # class: 'ge'
         Generic.Error:             "",        # class: 'gr'
         Generic.Heading:           "",        # class: 'gh'
         Generic.Inserted:          "#a6e22e", # class: 'gi'
-        Generic.Output:            "",        # class: 'go'
-        Generic.Prompt:            "",        # class: 'gp'
+        Generic.Output:            "#66d9ef", # class: 'go'
+        Generic.Prompt:            "bold #f92672", # class: 'gp'
         Generic.Strong:            "bold",    # class: 'gs'
         Generic.Subheading:        "#75715e", # class: 'gu'
         Generic.Traceback:         "",        # class: 'gt'
--- a/eric6/ThirdParty/Pygments/pygments/styles/murphy.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/ThirdParty/Pygments/pygments/styles/murphy.py	Sat May 02 13:51:07 2020 +0200
@@ -5,7 +5,7 @@
 
     Murphy's style from CodeRay.
 
-    :copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
--- a/eric6/ThirdParty/Pygments/pygments/styles/native.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/ThirdParty/Pygments/pygments/styles/native.py	Sat May 02 13:51:07 2020 +0200
@@ -5,7 +5,7 @@
 
     pygments version of my "native" vim theme.
 
-    :copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
--- a/eric6/ThirdParty/Pygments/pygments/styles/paraiso_dark.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/ThirdParty/Pygments/pygments/styles/paraiso_dark.py	Sat May 02 13:51:07 2020 +0200
@@ -9,7 +9,7 @@
     Created with Base16 Builder by Chris Kempson
     (https://github.com/chriskempson/base16-builder).
 
-    :copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
--- a/eric6/ThirdParty/Pygments/pygments/styles/paraiso_light.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/ThirdParty/Pygments/pygments/styles/paraiso_light.py	Sat May 02 13:51:07 2020 +0200
@@ -9,7 +9,7 @@
     Created with Base16 Builder by Chris Kempson
     (https://github.com/chriskempson/base16-builder).
 
-    :copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
--- a/eric6/ThirdParty/Pygments/pygments/styles/pastie.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/ThirdParty/Pygments/pygments/styles/pastie.py	Sat May 02 13:51:07 2020 +0200
@@ -7,7 +7,7 @@
 
     .. _pastie: http://pastie.caboo.se/
 
-    :copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
--- a/eric6/ThirdParty/Pygments/pygments/styles/perldoc.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/ThirdParty/Pygments/pygments/styles/perldoc.py	Sat May 02 13:51:07 2020 +0200
@@ -7,7 +7,7 @@
 
     .. _perldoc: http://perldoc.perl.org/
 
-    :copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
--- a/eric6/ThirdParty/Pygments/pygments/styles/rainbow_dash.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/ThirdParty/Pygments/pygments/styles/rainbow_dash.py	Sat May 02 13:51:07 2020 +0200
@@ -7,7 +7,7 @@
 
     .. _theme: http://sanssecours.github.io/Rainbow-Dash.tmbundle
 
-    :copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
--- a/eric6/ThirdParty/Pygments/pygments/styles/rrt.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/ThirdParty/Pygments/pygments/styles/rrt.py	Sat May 02 13:51:07 2020 +0200
@@ -5,7 +5,7 @@
 
     pygments "rrt" theme, based on Zap and Emacs defaults.
 
-    :copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
--- a/eric6/ThirdParty/Pygments/pygments/styles/sas.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/ThirdParty/Pygments/pygments/styles/sas.py	Sat May 02 13:51:07 2020 +0200
@@ -7,7 +7,7 @@
     meant to be a complete style. It's merely meant to mimic SAS'
     program editor syntax highlighting.
 
-    :copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/eric6/ThirdParty/Pygments/pygments/styles/solarized.py	Sat May 02 13:51:07 2020 +0200
@@ -0,0 +1,130 @@
+# -*- coding: utf-8 -*-
+"""
+    pygments.styles.solarized
+    ~~~~~~~~~~~~~~~~~~~~~~~~~
+
+    Solarized by Camil Staps
+
+    A Pygments style for the Solarized themes (licensed under MIT).
+    See: https://github.com/altercation/solarized
+
+    :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
+    :license: BSD, see LICENSE for details.
+"""
+
+from pygments.style import Style
+from pygments.token import Comment, Error, Generic, Keyword, Name, Number, \
+    Operator, String, Token
+
+
+def make_style(colors):
+    return {
+        Token:               colors['base0'],
+
+        Comment:             'italic ' + colors['base01'],
+        Comment.Hashbang:    colors['base01'],
+        Comment.Multiline:   colors['base01'],
+        Comment.Preproc:     'noitalic ' + colors['magenta'],
+        Comment.PreprocFile: 'noitalic ' + colors['base01'],
+
+        Keyword:             colors['green'],
+        Keyword.Constant:    colors['cyan'],
+        Keyword.Declaration: colors['cyan'],
+        Keyword.Namespace:   colors['orange'],
+        Keyword.Type:        colors['yellow'],
+
+        Operator:            colors['base01'],
+        Operator.Word:       colors['green'],
+
+        Name.Builtin:        colors['blue'],
+        Name.Builtin.Pseudo: colors['blue'],
+        Name.Class:          colors['blue'],
+        Name.Constant:       colors['blue'],
+        Name.Decorator:      colors['blue'],
+        Name.Entity:         colors['blue'],
+        Name.Exception:      colors['blue'],
+        Name.Function:       colors['blue'],
+        Name.Function.Magic: colors['blue'],
+        Name.Label:          colors['blue'],
+        Name.Namespace:      colors['blue'],
+        Name.Tag:            colors['blue'],
+        Name.Variable:       colors['blue'],
+        Name.Variable.Global:colors['blue'],
+        Name.Variable.Magic: colors['blue'],
+
+        String:              colors['cyan'],
+        String.Doc:          colors['base01'],
+        String.Regex:        colors['orange'],
+
+        Number:              colors['cyan'],
+
+        Generic.Deleted:     colors['red'],
+        Generic.Emph:        'italic',
+        Generic.Error:       colors['red'],
+        Generic.Heading:     'bold',
+        Generic.Subheading:  'underline',
+        Generic.Inserted:    colors['green'],
+        Generic.Strong:      'bold',
+        Generic.Traceback:   colors['blue'],
+
+        Error:               'bg:' + colors['red'],
+    }
+
+
+DARK_COLORS = {
+    'base03':  '#002b36',
+    'base02':  '#073642',
+    'base01':  '#586e75',
+    'base00':  '#657b83',
+    'base0':   '#839496',
+    'base1':   '#93a1a1',
+    'base2':   '#eee8d5',
+    'base3':   '#fdf6e3',
+    'yellow':  '#b58900',
+    'orange':  '#cb4b16',
+    'red':     '#dc322f',
+    'magenta': '#d33682',
+    'violet':  '#6c71c4',
+    'blue':    '#268bd2',
+    'cyan':    '#2aa198',
+    'green':   '#859900',
+}
+
+LIGHT_COLORS = {
+    'base3':   '#002b36',
+    'base2':   '#073642',
+    'base1':   '#586e75',
+    'base0':   '#657b83',
+    'base00':  '#839496',
+    'base01':  '#93a1a1',
+    'base02':  '#eee8d5',
+    'base03':  '#fdf6e3',
+    'yellow':  '#b58900',
+    'orange':  '#cb4b16',
+    'red':     '#dc322f',
+    'magenta': '#d33682',
+    'violet':  '#6c71c4',
+    'blue':    '#268bd2',
+    'cyan':    '#2aa198',
+    'green':   '#859900',
+}
+
+
+class SolarizedDarkStyle(Style):
+    """
+    The solarized style, dark.
+    """
+
+    styles = make_style(DARK_COLORS)
+    background_color = DARK_COLORS['base03']
+    highlight_color = DARK_COLORS['base02']
+
+
+class SolarizedLightStyle(SolarizedDarkStyle):
+    """
+    The solarized style, light.
+    """
+
+    styles = make_style(LIGHT_COLORS)
+    background_color = LIGHT_COLORS['base03']
+    highlight_color = LIGHT_COLORS['base02']
--- a/eric6/ThirdParty/Pygments/pygments/styles/stata.py	Sun Apr 05 18:17:08 2020 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,40 +0,0 @@
-# -*- coding: utf-8 -*-
-"""
-    pygments.styles.stata
-    ~~~~~~~~~~~~~~~~~~~~~
-
-    Style inspired by Stata's do-file editor. Note this is not meant
-    to be a complete style. It's merely meant to mimic Stata's do file
-    editor syntax highlighting.
-
-    :copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS.
-    :license: BSD, see LICENSE for details.
-"""
-
-from pygments.style import Style
-from pygments.token import Keyword, Name, Comment, String, Error, \
-    Number, Operator, Whitespace
-
-
-class StataStyle(Style):
-    """
-    Style inspired by Stata's do-file editor. Note this is not meant
-    to be a complete style. It's merely meant to mimic Stata's do file
-    editor syntax highlighting.
-    """
-
-    default_style = ''
-
-    styles = {
-        Whitespace:            '#bbbbbb',
-        Comment:               'italic #008800',
-        String:                '#7a2424',
-        Number:                '#2c2cff',
-        Operator:              '',
-        Keyword:               'bold #353580',
-        Keyword.Constant:      '',
-        Name.Function:         '#2c2cff',
-        Name.Variable:         'bold #35baba',
-        Name.Variable.Global:  'bold #b5565e',
-        Error:                 'bg:#e3d2d2 #a61717'
-    }
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/eric6/ThirdParty/Pygments/pygments/styles/stata_dark.py	Sat May 02 13:51:07 2020 +0200
@@ -0,0 +1,41 @@
+# -*- coding: utf-8 -*-
+"""
+    pygments.styles.stata_dark
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+    Dark style inspired by Stata's do-file editor. Note this is not
+    meant to be a complete style, just for Stata's file formats.
+
+
+    :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
+    :license: BSD, see LICENSE for details.
+"""
+
+from pygments.style import Style
+from pygments.token import Keyword, Name, Comment, String, Error, \
+    Number, Operator, Whitespace, Generic, Text
+
+
+class StataDarkStyle(Style):
+
+    default_style = ''
+
+    background_color = "#232629"
+    highlight_color = "#49483e"
+
+    styles = {
+        Whitespace:            '#bbbbbb',
+        Error:                 'bg:#e3d2d2 #a61717',
+        Text:                  '#cccccc',
+        String:                '#51cc99',
+        Number:                '#4FB8CC',
+        Operator:              '',
+        Name.Function:         '#6a6aff',
+        Name.Other:            '#e2828e',
+        Keyword:               'bold #7686bb',
+        Keyword.Constant:      '',
+        Comment:               'italic #777777',
+        Name.Variable:         'bold #7AB4DB',
+        Name.Variable.Global:  'bold #BE646C',
+        Generic.Prompt:        '#ffffff',
+    }
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/eric6/ThirdParty/Pygments/pygments/styles/stata_light.py	Sat May 02 13:51:07 2020 +0200
@@ -0,0 +1,39 @@
+# -*- coding: utf-8 -*-
+"""
+    pygments.styles.stata_light
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+    Light Style inspired by Stata's do-file editor. Note this is not
+    meant to be a complete style, just for Stata's file formats.
+
+    :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
+    :license: BSD, see LICENSE for details.
+"""
+
+from pygments.style import Style
+from pygments.token import Keyword, Name, Comment, String, Error, \
+    Number, Operator, Whitespace, Text
+
+
+class StataLightStyle(Style):
+    """
+    Light mode style inspired by Stata's do-file editor. This is not
+    meant to be a complete style, just for use with Stata.
+    """
+
+    default_style = ''
+    styles = {
+        Text:                  '#111111',
+        Whitespace:            '#bbbbbb',
+        Error:                 'bg:#e3d2d2 #a61717',
+        String:                '#7a2424',
+        Number:                '#2c2cff',
+        Operator:              '',
+        Name.Function:         '#2c2cff',
+        Name.Other:            '#be646c',
+        Keyword:               'bold #353580',
+        Keyword.Constant:      '',
+        Comment:               'italic #008800',
+        Name.Variable:         'bold #35baba',
+        Name.Variable.Global:  'bold #b5565e',
+    }
--- a/eric6/ThirdParty/Pygments/pygments/styles/tango.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/ThirdParty/Pygments/pygments/styles/tango.py	Sat May 02 13:51:07 2020 +0200
@@ -33,7 +33,7 @@
     have been chosen to have the same style.  Similarly, keywords (Keyword.*),
     and Operator.Word (and, or, in) have been assigned the same style.
 
-    :copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
--- a/eric6/ThirdParty/Pygments/pygments/styles/trac.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/ThirdParty/Pygments/pygments/styles/trac.py	Sat May 02 13:51:07 2020 +0200
@@ -5,7 +5,7 @@
 
     Port of the default trac highlighter design.
 
-    :copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
--- a/eric6/ThirdParty/Pygments/pygments/styles/vim.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/ThirdParty/Pygments/pygments/styles/vim.py	Sat May 02 13:51:07 2020 +0200
@@ -5,7 +5,7 @@
 
     A highlighting style for Pygments, inspired by vim.
 
-    :copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
--- a/eric6/ThirdParty/Pygments/pygments/styles/vs.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/ThirdParty/Pygments/pygments/styles/vs.py	Sat May 02 13:51:07 2020 +0200
@@ -5,7 +5,7 @@
 
     Simple style with MS Visual Studio colors.
 
-    :copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
--- a/eric6/ThirdParty/Pygments/pygments/styles/xcode.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/ThirdParty/Pygments/pygments/styles/xcode.py	Sat May 02 13:51:07 2020 +0200
@@ -5,7 +5,7 @@
 
     Style similar to the `Xcode` default theme.
 
-    :copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
--- a/eric6/ThirdParty/Pygments/pygments/token.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/ThirdParty/Pygments/pygments/token.py	Sat May 02 13:51:07 2020 +0200
@@ -5,7 +5,7 @@
 
     Basic token types and the standard tokens.
 
-    :copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
--- a/eric6/ThirdParty/Pygments/pygments/unistring.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/ThirdParty/Pygments/pygments/unistring.py	Sat May 02 13:51:07 2020 +0200
@@ -8,7 +8,7 @@
 
     Inspired by chartypes_create.py from the MoinMoin project.
 
-    :copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -156,10 +156,6 @@
 if __name__ == '__main__':  # pragma: no cover
     import unicodedata
 
-    # we need Py3 for the determination of the XID_* properties
-    if sys.version_info[:2] < (3, 3):
-        raise RuntimeError('this file must be regenerated with Python 3.3+')
-
     categories_bmp = {'xid_start': [], 'xid_continue': []}
     categories_nonbmp = {'xid_start': [], 'xid_continue': []}
 
--- a/eric6/ThirdParty/Pygments/pygments/util.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/ThirdParty/Pygments/pygments/util.py	Sat May 02 13:51:07 2020 +0200
@@ -5,12 +5,13 @@
 
     Utility functions.
 
-    :copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
 import re
 import sys
+from io import TextIOWrapper
 
 
 split_path_re = re.compile(r'[/\\ ]')
@@ -53,7 +54,7 @@
         return string
     elif isinstance(string, int):
         return bool(string)
-    elif not isinstance(string, string_types):
+    elif not isinstance(string, str):
         raise OptionError('Invalid type %r for option %s; use '
                           '1/0, yes/no, true/false, on/off' % (
                               string, optname))
@@ -83,7 +84,7 @@
 
 def get_list_opt(options, optname, default=None):
     val = options.get(optname, default)
-    if isinstance(val, string_types):
+    if isinstance(val, str):
         return val.split()
     elif isinstance(val, (list, tuple)):
         return list(val)
@@ -173,7 +174,7 @@
     Note that this method only checks the first part of a DOCTYPE.
     eg: 'html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"'
     """
-    m = doctype_lookup_re.match(text)
+    m = doctype_lookup_re.search(text)
     if m is None:
         return False
     doctype = m.group(2)
@@ -196,7 +197,7 @@
     try:
         return _looks_like_xml_cache[key]
     except KeyError:
-        m = doctype_lookup_re.match(text)
+        m = doctype_lookup_re.search(text)
         if m is not None:
             return True
         rv = tag_re.search(text[:1000]) is not None
@@ -224,7 +225,7 @@
 
     if sys.maxunicode > 0xffff:
         # wide build
-        return u'[%s-%s]' % (unichr(a), unichr(b))
+        return u'[%s-%s]' % (chr(a), chr(b))
     else:
         # narrow build stores surrogates, and the 're' module handles them
         # (incorrectly) as characters.  Since there is still ordering among
@@ -232,24 +233,23 @@
         # background in http://bugs.python.org/issue3665 and
         # http://bugs.python.org/issue12749
         #
-        # Additionally, the lower constants are using unichr rather than
+        # Additionally, the lower constants are using chr rather than
         # literals because jython [which uses the wide path] can't load this
         # file if they are literals.
         ah, al = _surrogatepair(a)
         bh, bl = _surrogatepair(b)
         if ah == bh:
-            return u'(?:%s[%s-%s])' % (unichr(ah), unichr(al), unichr(bl))
+            return u'(?:%s[%s-%s])' % (chr(ah), chr(al), chr(bl))
         else:
             buf = []
-            buf.append(u'%s[%s-%s]' %
-                       (unichr(ah), unichr(al),
-                        ah == bh and unichr(bl) or unichr(0xdfff)))
+            buf.append(u'%s[%s-%s]' % (chr(ah), chr(al),
+                                       ah == bh and chr(bl) or chr(0xdfff)))
             if ah - bh > 1:
                 buf.append(u'[%s-%s][%s-%s]' %
-                           unichr(ah+1), unichr(bh-1), unichr(0xdc00), unichr(0xdfff))
+                           chr(ah+1), chr(bh-1), chr(0xdc00), chr(0xdfff))
             if ah != bh:
                 buf.append(u'%s[%s-%s]' %
-                           (unichr(bh), unichr(0xdc00), unichr(bl)))
+                           (chr(bh), chr(0xdc00), chr(bl)))
 
             return u'(?:' + u'|'.join(buf) + u')'
 
@@ -289,7 +289,7 @@
     return lst
 
 
-class Future(object):
+class Future:
     """Generic class to defer some work.
 
     Handled specially in RegexLexerMeta, to support regex string construction at
@@ -345,44 +345,7 @@
     return locale.getpreferredencoding()
 
 
-# Python 2/3 compatibility
-
-if sys.version_info < (3, 0):
-    unichr = unichr
-    xrange = xrange
-    string_types = (str, unicode)
-    text_type = unicode
-    u_prefix = 'u'
-    iteritems = dict.iteritems
-    itervalues = dict.itervalues
-    import StringIO
-    import cStringIO
-    # unfortunately, io.StringIO in Python 2 doesn't accept str at all
-    StringIO = StringIO.StringIO
-    BytesIO = cStringIO.StringIO
-else:
-    unichr = chr
-    xrange = range
-    string_types = (str,)
-    text_type = str
-    u_prefix = ''
-    iteritems = dict.items
-    itervalues = dict.values
-    from io import StringIO, BytesIO, TextIOWrapper
-
-    class UnclosingTextIOWrapper(TextIOWrapper):
-        # Don't close underlying buffer on destruction.
-        def close(self):
-            self.flush()
-
-
-def add_metaclass(metaclass):
-    """Class decorator for creating a class with a metaclass."""
-    def wrapper(cls):
-        orig_vars = cls.__dict__.copy()
-        orig_vars.pop('__dict__', None)
-        orig_vars.pop('__weakref__', None)
-        for slots_var in orig_vars.get('__slots__', ()):
-            orig_vars.pop(slots_var)
-        return metaclass(cls.__name__, cls.__bases__, orig_vars)
-    return wrapper
+class UnclosingTextIOWrapper(TextIOWrapper):
+    # Don't close underlying buffer on destruction.
+    def close(self):
+        self.flush()
--- a/eric6/Toolbox/Startup.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/Toolbox/Startup.py	Sat May 02 13:51:07 2020 +0200
@@ -123,25 +123,7 @@
     """
     import Preferences
     
-    # TODO: make default icon set configurable
-    #   - automatic (w.r.t. lightness)
-    #   - breeze-light
-    #   - breeze-dark
-    #   - oxygen (formerly default)
-    if application.usesDarkPalette():
-        # dark desktop
-        iconPath = "breeze-dark"
-    else:
-        # light desktop
-        iconPath = "breeze-light"
-    defaultIconPaths = [
-        # add paths for vector graphics
-        os.path.join(getConfig('ericIconDir'), iconPath),
-        os.path.join(getConfig('ericIconDir'), iconPath, "languages"),
-        # add old default pixel icons
-##        os.path.join(getConfig('ericIconDir'), "default"),
-##        os.path.join(getConfig('ericIconDir'), "default", "languages"),
-    ]
+    defaultIconPaths = getDefaultIconPaths(application)
     iconPaths = Preferences.getIcons("Path")
     for iconPath in iconPaths:
         if iconPath:
@@ -151,6 +133,32 @@
             UI.PixmapCache.addSearchPath(defaultIconPath)
 
 
+def getDefaultIconPaths(application):
+    """
+    Module function to determine the default icon paths.
+    
+    @param application reference to the application object
+    @type E5Application
+    @return list of default icon paths
+    @rtype list of str
+    """
+    import Preferences
+    
+    defaultIconsPath = Preferences.getIcons("DefaultIconsPath")
+    if defaultIconsPath == "automatic":
+        if application.usesDarkPalette():
+            # dark desktop
+            defaultIconsPath = "breeze-dark"
+        else:
+            # light desktop
+            defaultIconsPath = "breeze-light"
+    
+    return [
+        os.path.join(getConfig('ericIconDir'), defaultIconsPath),
+        os.path.join(getConfig('ericIconDir'), defaultIconsPath, "languages"),
+    ]
+
+
 def setLibraryPaths():
     """
     Module function to set the Qt library paths correctly for windows systems.
@@ -251,7 +259,7 @@
     import Preferences
     
     initializeResourceSearchPath(app)
-    QApplication.setWindowIcon(UI.PixmapCache.getIcon("eric.png"))
+    QApplication.setWindowIcon(UI.PixmapCache.getIcon("eric"))
     
     qtTransDir = Preferences.getQtTranslationsDir()
     if not qtTransDir:
--- a/eric6/Tools/TRPreviewer.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/Tools/TRPreviewer.py	Sat May 02 13:51:07 2020 +0200
@@ -62,7 +62,7 @@
         self.resize(QSize(800, 600).expandedTo(self.minimumSizeHint()))
         self.statusBar()
         
-        self.setWindowIcon(UI.PixmapCache.getIcon("eric.png"))
+        self.setWindowIcon(UI.PixmapCache.getIcon("eric"))
         self.setWindowTitle(self.tr("Translations Previewer"))
 
         self.cw = QWidget(self)
@@ -162,7 +162,7 @@
         Private method to define the user interface actions.
         """
         self.openUIAct = QAction(
-            UI.PixmapCache.getIcon("openUI.png"),
+            UI.PixmapCache.getIcon("openUI"),
             self.tr('&Open UI Files...'), self)
         self.openUIAct.setStatusTip(self.tr('Open UI files for display'))
         self.openUIAct.setWhatsThis(self.tr(
@@ -172,7 +172,7 @@
         self.openUIAct.triggered.connect(self.__openWidget)
         
         self.openQMAct = QAction(
-            UI.PixmapCache.getIcon("openQM.png"),
+            UI.PixmapCache.getIcon("openQM"),
             self.tr('Open &Translation Files...'), self)
         self.openQMAct.setStatusTip(self.tr(
             'Open Translation files for display'))
@@ -183,7 +183,7 @@
         self.openQMAct.triggered.connect(self.__openTranslation)
         
         self.reloadAct = QAction(
-            UI.PixmapCache.getIcon("reload.png"),
+            UI.PixmapCache.getIcon("reload"),
             self.tr('&Reload Translations'), self)
         self.reloadAct.setStatusTip(self.tr(
             'Reload the loaded translations'))
@@ -195,7 +195,7 @@
         self.reloadAct.triggered.connect(self.translations.reload)
         
         self.exitAct = QAction(
-            UI.PixmapCache.getIcon("exit.png"), self.tr('&Quit'), self)
+            UI.PixmapCache.getIcon("exit"), self.tr('&Quit'), self)
         self.exitAct.setShortcut(QKeySequence(
             self.tr("Ctrl+Q", "File|Quit")))
         self.exitAct.setStatusTip(self.tr('Quit the application'))
@@ -206,7 +206,7 @@
         self.exitAct.triggered.connect(qApp.closeAllWindows)
         
         self.whatsThisAct = QAction(
-            UI.PixmapCache.getIcon("whatsThis.png"),
+            UI.PixmapCache.getIcon("whatsThis"),
             self.tr('&What\'s This?'), self)
         self.whatsThisAct.setShortcut(QKeySequence(self.tr("Shift+F1")))
         self.whatsThisAct.setStatusTip(self.tr('Context sensitive help'))
@@ -257,7 +257,7 @@
         self.cascadeAct.triggered.connect(self.preview.cascadeSubWindows)
         
         self.closeAct = QAction(
-            UI.PixmapCache.getIcon("close.png"), self.tr('&Close'), self)
+            UI.PixmapCache.getIcon("close"), self.tr('&Close'), self)
         self.closeAct.setShortcut(QKeySequence(self.tr(
             "Ctrl+W", "File|Close")))
         self.closeAct.setStatusTip(self.tr('Close the current window'))
--- a/eric6/Tools/TrayStarter.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/Tools/TrayStarter.py	Sat May 02 13:51:07 2020 +0200
@@ -97,72 +97,72 @@
         self.__menu.addSeparator()
         
         self.__menu.addAction(
-            UI.PixmapCache.getIcon("uiPreviewer.png"),
+            UI.PixmapCache.getIcon("uiPreviewer"),
             self.tr("UI Previewer"), self.__startUIPreviewer)
         self.__menu.addAction(
-            UI.PixmapCache.getIcon("trPreviewer.png"),
+            UI.PixmapCache.getIcon("trPreviewer"),
             self.tr("Translations Previewer"), self.__startTRPreviewer)
         self.__menu.addAction(
-            UI.PixmapCache.getIcon("unittest.png"),
+            UI.PixmapCache.getIcon("unittest"),
             self.tr("Unittest"), self.__startUnittest)
         self.__menu.addSeparator()
         
         self.__menu.addAction(
-            UI.PixmapCache.getIcon("diffFiles.png"),
+            UI.PixmapCache.getIcon("diffFiles"),
             self.tr("Compare Files"), self.__startDiff)
         self.__menu.addAction(
-            UI.PixmapCache.getIcon("compareFiles.png"),
+            UI.PixmapCache.getIcon("compareFiles"),
             self.tr("Compare Files side by side"), self.__startCompare)
         self.__menu.addSeparator()
         
         self.__menu.addAction(
-            UI.PixmapCache.getIcon("sqlBrowser.png"),
+            UI.PixmapCache.getIcon("sqlBrowser"),
             self.tr("SQL Browser"), self.__startSqlBrowser)
         self.__menu.addSeparator()
         
         self.__menu.addAction(
-            UI.PixmapCache.getIcon("ericSnap.png"),
+            UI.PixmapCache.getIcon("ericSnap"),
             self.tr("Snapshot"), self.__startSnapshot)
         self.__menu.addAction(
-            UI.PixmapCache.getIcon("iconEditor.png"),
+            UI.PixmapCache.getIcon("iconEditor"),
             self.tr("Icon Editor"), self.__startIconEditor)
         self.__menu.addSeparator()
         
         self.__menu.addAction(
-            UI.PixmapCache.getIcon("pluginInstall.png"),
+            UI.PixmapCache.getIcon("pluginInstall"),
             self.tr("Install Plugin"), self.__startPluginInstall)
         self.__menu.addAction(
-            UI.PixmapCache.getIcon("pluginUninstall.png"),
+            UI.PixmapCache.getIcon("pluginUninstall"),
             self.tr("Uninstall Plugin"), self.__startPluginUninstall)
         self.__menu.addAction(
-            UI.PixmapCache.getIcon("pluginRepository.png"),
+            UI.PixmapCache.getIcon("pluginRepository"),
             self.tr("Plugin Repository"), self.__startPluginRepository)
         self.__menu.addSeparator()
         
         self.__menu.addAction(
-            UI.PixmapCache.getIcon("configure.png"),
+            UI.PixmapCache.getIcon("configure"),
             self.tr('Preferences'), self.__startPreferences)
         self.__menu.addSeparator()
         
         self.__menu.addAction(
-            UI.PixmapCache.getIcon("erict.png"),
+            UI.PixmapCache.getIcon("erict"),
             self.tr("eric6 IDE"), self.__startEric)
         self.__menu.addAction(
-            UI.PixmapCache.getIcon("editor.png"),
+            UI.PixmapCache.getIcon("editor"),
             self.tr("eric6 Mini Editor"), self.__startMiniEditor)
         self.__menu.addAction(
-            UI.PixmapCache.getIcon("hexEditor.png"),
+            UI.PixmapCache.getIcon("hexEditor"),
             self.tr("eric6 Hex Editor"), self.__startHexEditor)
         self.__menu.addAction(
-            UI.PixmapCache.getIcon("ericWeb.png"),
+            UI.PixmapCache.getIcon("ericWeb"),
             self.tr("eric6 Web Browser"), self.__startHelpViewer)
         self.__menu.addAction(
-            UI.PixmapCache.getIcon("shell.png"),
+            UI.PixmapCache.getIcon("shell"),
             self.tr("eric6 Shell Window"), self.__startShell)
         self.__menu.addSeparator()
         
         self.__menu.addAction(
-            UI.PixmapCache.getIcon("configure.png"),
+            UI.PixmapCache.getIcon("configure"),
             self.tr('Configure Tray Starter'), self.__showPreferences)
         self.__menu.addSeparator()
         
@@ -177,7 +177,7 @@
         self.__menu.addSeparator()
         
         self.__menu.addAction(
-            UI.PixmapCache.getIcon("exit.png"),
+            UI.PixmapCache.getIcon("exit"),
             self.tr('Quit'), qApp.quit)
     
     def __loadRecentProjects(self):
--- a/eric6/Tools/UIPreviewer.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/Tools/UIPreviewer.py	Sat May 02 13:51:07 2020 +0200
@@ -54,7 +54,7 @@
         self.resize(QSize(600, 480).expandedTo(self.minimumSizeHint()))
         self.statusBar()
         
-        self.setWindowIcon(UI.PixmapCache.getIcon("eric.png"))
+        self.setWindowIcon(UI.PixmapCache.getIcon("eric"))
         self.setWindowTitle(self.tr("UI Previewer"))
 
         self.cw = QWidget(self)
@@ -128,7 +128,7 @@
         Private method to define the user interface actions.
         """
         self.openAct = QAction(
-            UI.PixmapCache.getIcon("openUI.png"),
+            UI.PixmapCache.getIcon("openUI"),
             self.tr('&Open File'), self)
         self.openAct.setShortcut(
             QKeySequence(self.tr("Ctrl+O", "File|Open")))
@@ -140,7 +140,7 @@
         self.openAct.triggered.connect(self.__openFile)
         
         self.printAct = QAction(
-            UI.PixmapCache.getIcon("print.png"),
+            UI.PixmapCache.getIcon("print"),
             self.tr('&Print'), self)
         self.printAct.setShortcut(
             QKeySequence(self.tr("Ctrl+P", "File|Print")))
@@ -152,7 +152,7 @@
         self.printAct.triggered.connect(self.__printImage)
         
         self.printPreviewAct = QAction(
-            UI.PixmapCache.getIcon("printPreview.png"),
+            UI.PixmapCache.getIcon("printPreview"),
             self.tr('Print Preview'), self)
         self.printPreviewAct.setStatusTip(self.tr(
             'Print preview a screen capture'))
@@ -163,7 +163,7 @@
         self.printPreviewAct.triggered.connect(self.__printPreviewImage)
         
         self.imageAct = QAction(
-            UI.PixmapCache.getIcon("screenCapture.png"),
+            UI.PixmapCache.getIcon("screenCapture"),
             self.tr('&Screen Capture'), self)
         self.imageAct.setShortcut(
             QKeySequence(self.tr("Ctrl+S", "File|Screen Capture")))
@@ -176,7 +176,7 @@
         self.imageAct.triggered.connect(self.__saveImage)
         
         self.exitAct = QAction(
-            UI.PixmapCache.getIcon("exit.png"), self.tr('&Quit'), self)
+            UI.PixmapCache.getIcon("exit"), self.tr('&Quit'), self)
         self.exitAct.setShortcut(
             QKeySequence(self.tr("Ctrl+Q", "File|Quit")))
         self.exitAct.setStatusTip(self.tr('Quit the application'))
@@ -187,7 +187,7 @@
         self.exitAct.triggered.connect(qApp.closeAllWindows)
         
         self.copyAct = QAction(
-            UI.PixmapCache.getIcon("editCopy.png"), self.tr('&Copy'), self)
+            UI.PixmapCache.getIcon("editCopy"), self.tr('&Copy'), self)
         self.copyAct.setShortcut(
             QKeySequence(self.tr("Ctrl+C", "Edit|Copy")))
         self.copyAct.setStatusTip(
@@ -199,7 +199,7 @@
         self.copyAct.triggered.connect(self.__copyImageToClipboard)
         
         self.whatsThisAct = QAction(
-            UI.PixmapCache.getIcon("whatsThis.png"),
+            UI.PixmapCache.getIcon("whatsThis"),
             self.tr('&What\'s This?'), self)
         self.whatsThisAct.setShortcut(QKeySequence(self.tr("Shift+F1")))
         self.whatsThisAct.setStatusTip(self.tr('Context sensitive help'))
--- a/eric6/UI/Browser.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/UI/Browser.py	Sat May 02 13:51:07 2020 +0200
@@ -89,7 +89,7 @@
         
         self.setWindowTitle(QCoreApplication.translate('Browser',
                                                        'File-Browser'))
-        self.setWindowIcon(UI.PixmapCache.getIcon("eric.png"))
+        self.setWindowIcon(UI.PixmapCache.getIcon("eric"))
         
         self.__model = BrowserModel()
         self.__sortModel = BrowserSortFilterProxyModel()
--- a/eric6/UI/BrowserModel.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/UI/BrowserModel.py	Sat May 02 13:51:07 2020 +0200
@@ -51,14 +51,15 @@
         super(BrowserModel, self).__init__(parent)
         
         self.progDir = None
-        self.watchedItems = {}
-        self.watcher = QFileSystemWatcher(self)
-        self.watcher.directoryChanged.connect(self.directoryChanged)
         
         self.__sysPathInterpreter = ""
         self.__sysPathItem = None
         
         if not nopopulate:
+            self.watchedItems = {}
+            self.watcher = QFileSystemWatcher(self)
+            self.watcher.directoryChanged.connect(self.directoryChanged)
+            
             rootData = QCoreApplication.translate("BrowserModel", "Name")
             self.rootItem = BrowserItem(None, rootData)
             
@@ -825,7 +826,7 @@
         self.parentItem = parent
         self.itemData = [data]
         self.type_ = BrowserItemRoot
-        self.icon = UI.PixmapCache.getIcon("empty.png")
+        self.icon = UI.PixmapCache.getIcon("empty")
         self._populated = True
         self._lazyPopulation = False
         self.symlink = False
@@ -1005,9 +1006,9 @@
             os.path.islink(self._dirName)
         ):
             self.symlink = True
-            self.icon = UI.PixmapCache.getSymlinkIcon("dirClosed.png")
+            self.icon = UI.PixmapCache.getSymlinkIcon("dirClosed")
         else:
-            self.icon = UI.PixmapCache.getIcon("dirClosed.png")
+            self.icon = UI.PixmapCache.getIcon("dirClosed")
         self._populated = False
         self._lazyPopulation = True
 
@@ -1071,7 +1072,7 @@
         BrowserItem.__init__(self, parent, "sys.path")
         
         self.type_ = BrowserItemSysPath
-        self.icon = UI.PixmapCache.getIcon("filePython.png")
+        self.icon = UI.PixmapCache.getIcon("filePython")
         self._populated = False
         self._lazyPopulation = True
     
@@ -1110,58 +1111,58 @@
         pixName = ""
         if self.isPython2File():
             if self.fileext == '.py':
-                pixName = "filePython.png"
+                pixName = "filePython"
             else:
-                pixName = "filePython2.png"
+                pixName = "filePython2"
             self._populated = False
             self._lazyPopulation = True
             self._moduleName = os.path.basename(finfo)
         elif self.isPython3File():
-            pixName = "filePython.png"
+            pixName = "filePython"
             self._populated = False
             self._lazyPopulation = True
             self._moduleName = os.path.basename(finfo)
         elif self.isRubyFile():
-            pixName = "fileRuby.png"
+            pixName = "fileRuby"
             self._populated = False
             self._lazyPopulation = True
             self._moduleName = os.path.basename(finfo)
         elif self.isDesignerFile():
-            pixName = "fileDesigner.png"
+            pixName = "fileDesigner"
         elif self.isLinguistFile():
             if self.fileext == '.ts':
-                pixName = "fileLinguist.png"
+                pixName = "fileLinguist"
             else:
-                pixName = "fileLinguist2.png"
+                pixName = "fileLinguist2"
         elif self.isResourcesFile():
-            pixName = "fileResource.png"
+            pixName = "fileResource"
         elif self.isProjectFile():
-            pixName = "fileProject.png"
+            pixName = "fileProject"
         elif self.isMultiProjectFile():
-            pixName = "fileMultiProject.png"
+            pixName = "fileMultiProject"
         elif self.isIdlFile():
-            pixName = "fileIDL.png"
+            pixName = "fileIDL"
             self._populated = False
             self._lazyPopulation = True
             self._moduleName = os.path.basename(finfo)
         elif self.isProtobufFile():
-            pixName = "protobuf.png"
+            pixName = "protobuf"
             self._populated = False
             self._lazyPopulation = True
             self._moduleName = os.path.basename(finfo)
         elif self.isSvgFile():
-            pixName = "fileSvg.png"
+            pixName = "fileSvg"
         elif self.isPixmapFile():
-            pixName = "filePixmap.png"
+            pixName = "filePixmap"
         elif self.isDFile():
-            pixName = "fileD.png"
+            pixName = "fileD"
         elif self.isJavaScriptFile():
-            pixName = "fileJavascript.png"
+            pixName = "fileJavascript"
             self._populated = False
             self._lazyPopulation = True
             self._moduleName = os.path.basename(finfo)
         else:
-            pixName = "fileMisc.png"
+            pixName = "fileMisc"
         
         if os.path.lexists(self._filename) and os.path.islink(self._filename):
             self.symlink = True
@@ -1423,11 +1424,11 @@
             Utilities.ClassBrowsers.ClbrBaseClasses.Enum)
         if self.isfunction:
             if cl.isPrivate():
-                self.icon = UI.PixmapCache.getIcon("method_private.png")
+                self.icon = UI.PixmapCache.getIcon("method_private")
             elif cl.isProtected():
-                self.icon = UI.PixmapCache.getIcon("method_protected.png")
+                self.icon = UI.PixmapCache.getIcon("method_protected")
             else:
-                self.icon = UI.PixmapCache.getIcon("method.png")
+                self.icon = UI.PixmapCache.getIcon("method")
             self.itemData[0] = "{0}({1})".format(
                 name, ", ".join(self._classObject.parameters))
             if self._classObject.annotation:
@@ -1438,16 +1439,16 @@
             ##            ", ".join([e.split('=')[0].strip() \
             ##                       for e in self._classObject.parameters]))
         elif self.ismodule:
-            self.icon = UI.PixmapCache.getIcon("module.png")
+            self.icon = UI.PixmapCache.getIcon("module")
         elif self.isenum:
-            self.icon = UI.PixmapCache.getIcon("attribute.png")
+            self.icon = UI.PixmapCache.getIcon("attribute")
         else:
             if cl.isPrivate():
-                self.icon = UI.PixmapCache.getIcon("class_private.png")
+                self.icon = UI.PixmapCache.getIcon("class_private")
             elif cl.isProtected():
-                self.icon = UI.PixmapCache.getIcon("class_protected.png")
+                self.icon = UI.PixmapCache.getIcon("class_protected")
             else:
-                self.icon = UI.PixmapCache.getIcon("class.png")
+                self.icon = UI.PixmapCache.getIcon("class")
         if (
             self._classObject and
             (self._classObject.methods or
@@ -1556,18 +1557,18 @@
             self._functionObject.modifier ==
             Utilities.ClassBrowsers.ClbrBaseClasses.Function.Static
         ):
-            self.icon = UI.PixmapCache.getIcon("method_static.png")
+            self.icon = UI.PixmapCache.getIcon("method_static")
         elif (
             self._functionObject.modifier ==
             Utilities.ClassBrowsers.ClbrBaseClasses.Function.Class
         ):
-            self.icon = UI.PixmapCache.getIcon("method_class.png")
+            self.icon = UI.PixmapCache.getIcon("method_class")
         elif self._functionObject.isPrivate():
-            self.icon = UI.PixmapCache.getIcon("method_private.png")
+            self.icon = UI.PixmapCache.getIcon("method_private")
         elif self._functionObject.isProtected():
-            self.icon = UI.PixmapCache.getIcon("method_protected.png")
+            self.icon = UI.PixmapCache.getIcon("method_protected")
         else:
-            self.icon = UI.PixmapCache.getIcon("method.png")
+            self.icon = UI.PixmapCache.getIcon("method")
         self.itemData[0] = "{0}({1})".format(
             name, ", ".join(self._functionObject.parameters))
         if self._functionObject.annotation:
@@ -1681,9 +1682,9 @@
         self._populated = False
         self._lazyPopulation = True
         if isClass:
-            self.icon = UI.PixmapCache.getIcon("attributes_class.png")
+            self.icon = UI.PixmapCache.getIcon("attributes_class")
         else:
-            self.icon = UI.PixmapCache.getIcon("attributes.png")
+            self.icon = UI.PixmapCache.getIcon("attributes")
         self.__isClass = isClass
     
     def name(self):
@@ -1748,13 +1749,13 @@
         self._attributeObject = attribute
         self.__public = attribute.isPublic()
         if isClass:
-            self.icon = UI.PixmapCache.getIcon("attribute_class.png")
+            self.icon = UI.PixmapCache.getIcon("attribute_class")
         elif attribute.isPrivate():
-            self.icon = UI.PixmapCache.getIcon("attribute_private.png")
+            self.icon = UI.PixmapCache.getIcon("attribute_private")
         elif attribute.isProtected():
-            self.icon = UI.PixmapCache.getIcon("attribute_protected.png")
+            self.icon = UI.PixmapCache.getIcon("attribute_protected")
         else:
-            self.icon = UI.PixmapCache.getIcon("attribute.png")
+            self.icon = UI.PixmapCache.getIcon("attribute")
     
     def isPublic(self):
         """
@@ -1846,7 +1847,7 @@
         BrowserItem.__init__(self, parent, text)
         
         self.type_ = BrowserItemCoding
-        self.icon = UI.PixmapCache.getIcon("textencoding.png")
+        self.icon = UI.PixmapCache.getIcon("textencoding")
     
     def lessThan(self, other, column, order):
         """
@@ -1880,7 +1881,7 @@
         BrowserItem.__init__(self, parent, text)
         
         self.type_ = BrowserItemImports
-        self.icon = UI.PixmapCache.getIcon("imports.png")
+        self.icon = UI.PixmapCache.getIcon("imports")
     
     def lessThan(self, other, column, order):
         """
@@ -1923,9 +1924,9 @@
         
         self.type_ = BrowserItemImport
         if isModule:
-            self.icon = UI.PixmapCache.getIcon("importedModule.png")
+            self.icon = UI.PixmapCache.getIcon("importedModule")
         else:
-            self.icon = UI.PixmapCache.getIcon("importedName.png")
+            self.icon = UI.PixmapCache.getIcon("importedName")
     
     def fileName(self):
         """
--- a/eric6/UI/CodeDocumentationViewer.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/UI/CodeDocumentationViewer.py	Sat May 02 13:51:07 2020 +0200
@@ -17,6 +17,7 @@
 )
 
 from E5Gui.E5TextEditSearchWidget import E5TextEditSearchWidget
+from E5Gui.E5Application import e5App
 
 import Preferences
 
@@ -29,11 +30,43 @@
 from .data import codeDocumentationViewer_rc    # __IGNORE_WARNING__
 
 
-# TODO: complete the support for color schemes as soon as Qt 5.14 is released
 class DocumentationViewerWidget(QWidget):
     """
     Class implementing a rich text documentation viewer.
     """
+    EmpytDocument_Light = (
+        '''<!DOCTYPE html>\n'''
+        '''<html lang="EN">\n'''
+        '''<head>\n'''
+        '''<style type="text/css">\n'''
+        '''html {background-color: #ffffff;}\n'''
+        '''body {background-color: #ffffff;\n'''
+        '''      color: #000000;\n'''
+        '''      margin: 0px 10px 10px 10px;\n'''
+        '''}\n'''
+        '''</style'''
+        '''</head>\n'''
+        '''<body>\n'''
+        '''</body>\n'''
+        '''</html>'''
+    )
+    EmpytDocument_Dark = (
+        '''<!DOCTYPE html>\n'''
+        '''<html lang="EN">\n'''
+        '''<head>\n'''
+        '''<style type="text/css">\n'''
+        '''html {background-color: #262626;}\n'''
+        '''body {background-color: #262626;\n'''
+        '''      color: #ffffff;\n'''
+        '''      margin: 0px 10px 10px 10px;\n'''
+        '''}\n'''
+        '''</style'''
+        '''</head>\n'''
+        '''<body>\n'''
+        '''</body>\n'''
+        '''</html>'''
+    )
+    
     def __init__(self, parent=None):
         """
         Constructor
@@ -113,7 +146,10 @@
         if self.__viewerType == "QTextEdit":
             self.__contents.clear()
         else:
-            self.__contents.setHtml("")
+            if e5App().usesDarkPalette():
+                self.__contents.setHtml(self.EmpytDocument_Dark)
+            else:
+                self.__contents.setHtml(self.EmpytDocument_Light)
 
     
 class CodeDocumentationViewer(QWidget):
--- a/eric6/UI/CodeDocumentationViewerTemplate.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/UI/CodeDocumentationViewerTemplate.py	Sat May 02 13:51:07 2020 +0200
@@ -10,6 +10,8 @@
 
 from PyQt5.QtCore import QCoreApplication
 
+from E5Gui.E5Application import e5App
+
 import Utilities
 
 
@@ -28,7 +30,7 @@
         <html>
         <head>
         <meta http-equiv="content-type" content="text/html; charset=utf-8">
-        <link rel="stylesheet" href="qrc:documentViewerStyle.css"
+        <link rel="stylesheet" href="qrc:documentViewerStyle-{0}.css"
             type="text/css" />
         </head>
         <body>
@@ -142,7 +144,7 @@
         )
     
     return (
-        mainTemplate
+        mainTemplate.format("dark" if e5App().usesDarkPalette() else "light")
         .replace("@HEADER@", header)
         .replace("@DOCSTRING@", docstring)
     )
@@ -162,7 +164,7 @@
         <html>
         <head>
         <meta http-equiv="content-type" content="text/html; charset=utf-8">
-        <link rel="stylesheet" href="qrc:documentViewerStyle.css"
+        <link rel="stylesheet" href="qrc:documentViewerStyle-{0}.css"
             type="text/css" />
         </head>
         <body>
@@ -171,7 +173,10 @@
         </html>
     """
     
-    return mainTemplate.replace("@TEXT@", text)
+    return (
+        mainTemplate.format("dark" if e5App().usesDarkPalette() else "light")
+        .replace("@TEXT@", text)
+    )
 
 
 def prepareDocumentationViewerHtmlWarningDocument(text):
@@ -188,7 +193,7 @@
         <html>
         <head>
         <meta http-equiv="content-type" content="text/html; charset=utf-8">
-        <link rel="stylesheet" href="qrc:documentViewerStyle.css"
+        <link rel="stylesheet" href="qrc:documentViewerStyle-{0}.css"
             type="text/css" />
         </head>
         <body>
@@ -197,4 +202,7 @@
         </html>
     """
     
-    return mainTemplate.replace("@TEXT@", text)
+    return (
+        mainTemplate.format("dark" if e5App().usesDarkPalette() else "light")
+        .replace("@TEXT@", text)
+    )
--- a/eric6/UI/CompareDialog.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/UI/CompareDialog.py	Sat May 02 13:51:07 2020 +0200
@@ -111,10 +111,10 @@
         self.diffButton.setEnabled(False)
         self.diffButton.setDefault(True)
         
-        self.firstButton.setIcon(UI.PixmapCache.getIcon("2uparrow.png"))
-        self.upButton.setIcon(UI.PixmapCache.getIcon("1uparrow.png"))
-        self.downButton.setIcon(UI.PixmapCache.getIcon("1downarrow.png"))
-        self.lastButton.setIcon(UI.PixmapCache.getIcon("2downarrow.png"))
+        self.firstButton.setIcon(UI.PixmapCache.getIcon("2uparrow"))
+        self.upButton.setIcon(UI.PixmapCache.getIcon("1uparrow"))
+        self.downButton.setIcon(UI.PixmapCache.getIcon("1downarrow"))
+        self.lastButton.setIcon(UI.PixmapCache.getIcon("2downarrow"))
         
         self.totalLabel.setText(self.tr('Total: {0}').format(0))
         self.changedLabel.setText(self.tr('Changed: {0}').format(0))
--- a/eric6/UI/LogView.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/UI/LogView.py	Sat May 02 13:51:07 2020 +0200
@@ -34,7 +34,7 @@
         """
         super(LogViewer, self).__init__(parent)
         
-        self.setWindowIcon(UI.PixmapCache.getIcon("eric.png"))
+        self.setWindowIcon(UI.PixmapCache.getIcon("eric"))
         
         self.__ui = ui
         
--- a/eric6/UI/NumbersWidget.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/UI/NumbersWidget.py	Sat May 02 13:51:07 2020 +0200
@@ -169,18 +169,18 @@
         super(NumbersWidget, self).__init__(parent)
         self.setupUi(self)
         
-        self.setWindowIcon(UI.PixmapCache.getIcon("eric.png"))
+        self.setWindowIcon(UI.PixmapCache.getIcon("eric"))
         
         self.__badNumberSheet = "background-color: #ffa0a0;"
         
-        self.binInButton.setIcon(UI.PixmapCache.getIcon("2downarrow.png"))
-        self.binOutButton.setIcon(UI.PixmapCache.getIcon("2uparrow.png"))
-        self.octInButton.setIcon(UI.PixmapCache.getIcon("2downarrow.png"))
-        self.octOutButton.setIcon(UI.PixmapCache.getIcon("2uparrow.png"))
-        self.decInButton.setIcon(UI.PixmapCache.getIcon("2downarrow.png"))
-        self.decOutButton.setIcon(UI.PixmapCache.getIcon("2uparrow.png"))
-        self.hexInButton.setIcon(UI.PixmapCache.getIcon("2downarrow.png"))
-        self.hexOutButton.setIcon(UI.PixmapCache.getIcon("2uparrow.png"))
+        self.binInButton.setIcon(UI.PixmapCache.getIcon("2downarrow"))
+        self.binOutButton.setIcon(UI.PixmapCache.getIcon("2uparrow"))
+        self.octInButton.setIcon(UI.PixmapCache.getIcon("2downarrow"))
+        self.octOutButton.setIcon(UI.PixmapCache.getIcon("2uparrow"))
+        self.decInButton.setIcon(UI.PixmapCache.getIcon("2downarrow"))
+        self.decOutButton.setIcon(UI.PixmapCache.getIcon("2uparrow"))
+        self.hexInButton.setIcon(UI.PixmapCache.getIcon("2downarrow"))
+        self.hexOutButton.setIcon(UI.PixmapCache.getIcon("2uparrow"))
         
         self.formatBox.addItem(self.tr("Auto"), 0)
         self.formatBox.addItem(self.tr("Dec"), 10)
--- a/eric6/UI/PixmapCache.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/UI/PixmapCache.py	Sat May 02 13:51:07 2020 +0200
@@ -140,7 +140,7 @@
     @rtype QIcon
     """
     pix1 = QPixmap(cache.getPixmap(key, size=size))
-    pix2 = cache.getPixmap("symlink.png")
+    pix2 = cache.getPixmap("symlink")
     painter = QPainter(pix1)
     painter.drawPixmap(0, 10, pix2)
     painter.end()
--- a/eric6/UI/Previewers/MarkdownExtensions.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/UI/Previewers/MarkdownExtensions.py	Sat May 02 13:51:07 2020 +0200
@@ -86,9 +86,6 @@
 
         if is_mermaid:
             new_lines.append('')
-            new_lines.append(
-                '<script>mermaid.initialize({startOnLoad:true});</script>'
-            )
 
         return new_lines
 
--- a/eric6/UI/Previewers/PreviewerHTML.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/UI/Previewers/PreviewerHTML.py	Sat May 02 13:51:07 2020 +0200
@@ -743,12 +743,37 @@
                 " src='https://unpkg.com/mermaid@8/dist/mermaid.min.js'>\n"
                 "</script>\n"
             )
+            if e5App().usesDarkPalette():
+                mermaid_initialize = (
+                    "<script>mermaid.initialize({"
+                    "theme: 'dark', "
+                    "startOnLoad:true"
+                    "});</script>"
+                )
+            else:
+                mermaid_initialize = (
+                    "<script>mermaid.initialize({"
+                    "theme: 'default', "
+                    "startOnLoad:true"
+                    "});</script>"
+                )
         else:
             mermaid = ""
+            mermaid_initialize = ""
         
         htmlFormat = Preferences.getEditor("PreviewMarkdownHTMLFormat").lower()
         body = markdown.markdown(text, extensions=extensions,
                                  output_format=htmlFormat.lower())
+        if e5App().usesDarkPalette():
+            style = (
+                PreviewerHTMLStyles.css_markdown_dark +
+                PreviewerHTMLStyles.css_pygments_dark
+            )
+        else:
+            style = (
+                PreviewerHTMLStyles.css_markdown_light +
+                PreviewerHTMLStyles.css_pygments_light
+            )
         
         if htmlFormat == "xhtml1":
             head = (
@@ -777,12 +802,8 @@
             '''</style>\n'''
             '''</head>\n'''
             '''<body>\n'''
-        ).format(
-            mathjax, mermaid,
-            PreviewerHTMLStyles.css_markdown +
-            PreviewerHTMLStyles.css_pygments
-        )
+        ).format(mathjax, mermaid, style)
         
         foot = '''\n</body>\n</html>\n'''
         
-        return head + body + foot
+        return head + body + mermaid_initialize + foot
--- a/eric6/UI/Previewers/PreviewerHTMLStyles.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/UI/Previewers/PreviewerHTMLStyles.py	Sat May 02 13:51:07 2020 +0200
@@ -7,33 +7,18 @@
 Module implementing CSS styles for the Markdown preview.
 """
 
-
-css_markdown = """
-@media (prefers-color-scheme: light) {
-    :root {
-        --font-color: #000;
-        --background-color: #fff;
-        --alt-backgroundcolor: #f8f8f8;
-        --frame-color: #333;
-    }
-}
+###########################################################################
+## Styles for light window schemes below
+###########################################################################
 
-@media (prefers-color-scheme: dark) {
-    :root {
-        --font-color: #fff;
-        --background-color: #000;
-        --alt-backgroundcolor: #707070;
-        --frame-color: #ccc;
-    }
-}
-
+css_markdown_light = """
 html {
-    background-color: var(--background-color, #fff);
+    background-color: #ffffff;
 }
 
 body {
-    background-color: var(--background-color, #fff);
-    color: var(--font-color, #000);
+    background-color: #ffffff;
+    color: #000000;
     font-family: sans-serif;
     font-size:12px;
     line-height:1.7;
@@ -85,7 +70,7 @@
 h1 .octicon-link, h2 .octicon-link, h3 .octicon-link, h4 .octicon-link,
 h5 .octicon-link, h6 .octicon-link {
     display:none;
-    color: var(--font-color, #000);
+    color: #000000;
 }
 
 h1:hover a.anchor, h2:hover a.anchor, h3:hover a.anchor, h4:hover a.anchor,
@@ -211,11 +196,11 @@
 
 table tr {
     border-top:1px solid #ccc;
-    background-color: var(--background-color, #fff);
+    background-color: #ffffff;
 }
 
 table tr:nth-child(2n) {
-    background-color:var(--alt-background-color, #f8f8f8);
+    background-color:#f8f8f8;
 }
 
 img {
@@ -246,7 +231,7 @@
 
 span.frame span span {
     clear:both;
-    color:var(--frame-color, #333);
+    color:#333333;
     display:block;
     padding:5px 0 0
 }
@@ -315,7 +300,7 @@
 code, tt {
     margin:0;
     border:1px solid #ddd;
-    background-color:var(--alt-background-color, #f8f8f8);
+    background-color:#f8f8f8;
     border-radius:3px;
     max-width:100%;
     display:inline-block;
@@ -342,7 +327,7 @@
 }
 
 .highlight pre, pre {
-    background-color:var(--alt-background-color, #f8f8f8);
+    background-color:#f8f8f8;
     border:1px solid #ddd;
     font-size:12px;
     line-height:16px;
@@ -386,7 +371,7 @@
 """
 
 
-css_pygments = """
+css_pygments_light = """
 pre .hll { background-color: #ffffcc }
 
 /* Comment */
@@ -570,3 +555,556 @@
 pre .il { color: #009999 }
 
 """
+
+###########################################################################
+## Styles for dark window schemes below
+###########################################################################
+
+css_markdown_dark = """
+html {
+    background-color: #262626;
+}
+
+body {
+    background-color: #262626);
+    color: #ffffff;
+    font-family: sans-serif;
+    font-size:12px;
+    line-height:1.7;
+    word-wrap:break-word
+}
+
+body>*:first-child {
+    margin-top:0 !important
+}
+
+body>*:last-child {
+    margin-bottom:0 !important
+}
+
+a {
+    color:#8ebfff
+}
+
+a.absent {
+    color:#dd0000
+}
+
+a.anchor {
+    display:block;
+    padding-right:6px;
+    padding-left:30px;
+    margin-left:-30px;
+    cursor:pointer;
+    position:absolute;
+    top:0;
+    left:0;
+    bottom:0
+}
+
+a.anchor:focus {
+    outline:none
+}
+
+tt, code, pre {
+    font-family: Consolas, "Liberation Mono", Courier, monospace;
+    font-size: 12px;
+}
+
+h1, h2, h3, h4, h5, h6 {
+    margin:1em 0 6px;
+    padding:0;
+    font-weight:bold;
+    line-height:1.7;
+    cursor:text;
+    position:relative
+}
+
+h1 .octicon-link, h2 .octicon-link, h3 .octicon-link, h4 .octicon-link,
+h5 .octicon-link, h6 .octicon-link {
+    display:none;
+    color: #ffffff;
+}
+
+h1:hover a.anchor, h2:hover a.anchor, h3:hover a.anchor, h4:hover a.anchor,
+h5:hover a.anchor, h6:hover a.anchor {
+    text-decoration:none;
+    line-height:1;
+    padding-left:8px;
+    margin-left:-30px;
+    top:15%
+}
+
+h1:hover a.anchor .octicon-link, h2:hover a.anchor .octicon-link,
+h3:hover a.anchor .octicon-link, h4:hover a.anchor .octicon-link,
+h5:hover a.anchor .octicon-link, h6:hover a.anchor .octicon-link {
+    display:inline-block
+}
+
+h1 tt, h1 code, h2 tt, h2 code, h3 tt, h3 code, h4 tt, h4 code,
+h5 tt, h5 code, h6 tt, h6 code {
+    font-size:inherit
+}
+
+h1 {
+    font-size:2em;
+    border-bottom:1px solid #ddd
+}
+
+h2 {
+    font-size:1.6em;
+    border-bottom:1px solid #eee
+}
+
+h3 {
+    font-size:1.4em
+}
+
+h4 {
+    font-size:1.2em
+}
+
+h5 {
+    font-size:1em
+}
+
+h6 {
+    color:#aaaaaa;
+    font-size:1em
+}
+
+p, blockquote, ul, ol, dl, table, pre {
+    margin:8px 0
+}
+
+hr {
+    background: rgba(120, 120, 120, 1);
+    border: 0 none;
+    color: #ccc;
+    height: 2px;
+    padding: 0;
+    margin: 8px 0;
+}
+
+ul, ol {
+    padding-left:15px
+}
+
+ul.no-list, ul.task-list, ol.no-list, ol.task-list {
+    list-style-type:none;
+}
+
+ul ul, ul ol, ol ol, ol ul {
+    margin-top:0;
+    margin-bottom:0
+}
+
+
+dl {
+    padding:0
+}
+
+dl dt {
+    font-size:14px;
+    font-weight:bold;
+    font-style:italic;
+    padding:0;
+    margin-top:8px
+}
+
+dl dd {
+    margin-bottom:15px;
+    padding:0 8px
+}
+
+blockquote {
+    border-left:4px solid #DDD;
+    padding:0 8px;
+    color:#aaaaaa
+}
+
+blockquote>:first-child {
+    margin-top:0px
+}
+
+blockquote>:last-child {
+    margin-bottom:0px
+}
+
+table {
+    border-collapse: collapse;
+    border-spacing: 0;
+    overflow:auto;
+    display:block
+}
+
+table th {
+    font-weight:bold
+}
+
+table th, table td {
+    border:1px solid #ddd;
+    padding:3px 3px
+}
+
+table tr {
+    border-top:1px solid #cccccc;
+    background-color: #262626;
+}
+
+table tr:nth-child(2n) {
+    background-color:#404040;
+}
+
+img {
+    max-width:100%;
+    -moz-box-sizing:border-box;
+    box-sizing:border-box
+}
+
+span.frame {
+    display:block;
+    overflow:hidden
+}
+
+span.frame>span {
+    border:1px solid #464646;
+    display:block;
+    float:left;
+    overflow:hidden;
+    margin:6px 0 0;
+    padding:7px;
+    width:auto
+}
+
+span.frame span img {
+    display:block;
+    float:left
+}
+
+span.frame span span {
+    clear:both;
+    color:#565656;
+    display:block;
+    padding:5px 0 0
+}
+
+span.align-center {
+    display:block;
+    overflow:hidden;
+    clear:both
+}
+
+span.align-center>span {
+    display:block;
+    overflow:hidden;
+    margin:6px auto 0;
+    text-align:center
+}
+
+span.align-center span img {
+    margin:0 auto;
+    text-align:center
+}
+
+span.align-right {
+    display:block;
+    overflow:hidden;
+    clear:both
+}
+
+span.align-right>span {
+    display:block;
+    overflow:hidden;
+    margin:6px 0 0;
+    text-align:right
+}
+
+span.align-right span img {
+    margin:0;
+    text-align:right
+}
+
+span.float-left {
+    display:block;
+    margin-right:6px;
+    overflow:hidden;
+    float:left
+}
+
+span.float-left span {
+    margin:6px 0 0
+}
+
+span.float-right {
+    display:block;
+    margin-left:6px;
+    overflow:hidden;
+    float:right
+}
+
+span.float-right>span {
+    display:block;
+    overflow:hidden;
+    margin:6px auto 0;
+    text-align:right
+}
+
+code, tt {
+    margin:0;
+    border:1px solid #ddd;
+    background-color:#404040;
+    border-radius:3px;
+    max-width:100%;
+    display:inline-block;
+    overflow:auto;
+    vertical-align:middle;
+    line-height:1.1;
+    padding:0
+}
+
+code:before, code:after, tt:before, tt:after {
+    content:"\00a0"
+}
+
+code {
+    white-space:nowrap
+}
+
+pre>code {
+    margin:0;
+    padding:0;
+    white-space:pre;
+    border:none;
+    background:transparent
+}
+
+.highlight pre, pre {
+    background-color:#404040;
+    border:1px solid #ddd;
+    font-size:12px;
+    line-height:16px;
+    overflow:auto;
+    padding:6px 6px;
+    border-radius:3px
+}
+
+pre {
+    word-wrap:normal
+}
+
+pre code, pre tt {
+    margin:0;
+    padding:0;
+    background-color:transparent;
+    border:none;
+    word-wrap:normal;
+    max-width:initial;
+    display:inline;
+    overflow:initial;
+    line-height:inherit
+}
+
+pre code:before, pre code:after, pre tt:before, pre tt:after {
+    content:normal
+}
+
+kbd {
+    border:1px solid gray;
+    font-size:1.2em;
+    box-shadow:1px 0 1px 0 #eee, 0 1px 0 1px #ccc, 0 2px 0 2px #444;
+    -webkit-border-radius:2px;
+    -moz-border-radius:2px;
+    border-radius:2px;
+    margin:2px 3px;
+    padding:1px 5px;
+    color: #000;
+    background-color: #fff
+}
+"""
+
+
+css_pygments_dark = """
+pre .hll { background-color: #464646 }
+
+/* Comment */
+pre .c { color: #74cc66; font-style: italic }
+
+/* Error */
+pre .err { color: #a61717; background-color: #e3d2d2 }
+
+/* Keyword */
+pre .k { font-weight: bold }
+
+/* Operator */
+pre .o { font-weight: bold }
+
+/* Comment.Multiline */
+pre .cm { color: #74cc66; font-style: italic }
+
+/* Comment.Preproc */
+pre .cp { color: #74cc66; font-weight: bold; font-style: italic }
+
+/* Comment.Single */
+pre .c1 { color: #74cc66; font-style: italic }
+
+/* Comment.Special */
+pre .cs { color: #74cc66; font-weight: bold; font-style: italic }
+
+/* Generic.Deleted */
+pre .gd { color: #ffffff; background-color: #843d3d }
+
+/* Generic.Emph */
+pre .ge { font-style: italic }
+
+/* Generic.Error */
+pre .gr { color: #ff0000 }
+
+/* Generic.Heading */
+pre .gh { color: #dadada }
+
+/* Generic.Inserted */
+pre .gi { color: #ffffff; background-color: #4e8750 }
+
+/* Generic.Output */
+pre .go { color: #bbbbbb }
+
+/* Generic.Prompt */
+pre .gp { color: #999999 }
+
+/* Generic.Strong */
+pre .gs { font-weight: bold }
+
+/* Generic.Subheading */
+pre .gu { color: #dd60dd }
+
+/* Generic.Traceback */
+pre .gt { color: #ff0000 }
+
+/* Keyword.Constant */
+pre .kc { font-weight: bold }
+
+/* Keyword.Declaration */
+pre .kd { font-weight: bold }
+
+/* Keyword.Namespace */
+pre .kn { font-weight: bold }
+
+/* Keyword.Pseudo */
+pre .kp { font-weight: bold }
+
+/* Keyword.Reserved */
+pre .kr { font-weight: bold }
+
+/* Keyword.Type */
+pre .kt { color: #b3efad; font-weight: bold }
+
+/* Literal.Number */
+pre .m { color: #00c8c8 }
+
+/* Literal.String */
+pre .s { color: #f46b6b }
+
+/* Name.Attribute */
+pre .na { color: #b6d13b }
+
+/* Name.Builtin */
+pre .nb { color: #b3efad }
+
+/* Name.Class */
+pre .nc { color: #00aaff; font-weight: bold }
+
+/* Name.Constant */
+pre .no { color: #dd3131 }
+
+/* Name.Decorator */
+pre .nd { color: #e19bff; font-weight: bold }
+
+/* Name.Entity */
+pre .ni { color: #dedede }
+
+/* Name.Exception */
+pre .ne { color: #e75555; font-weight: bold }
+
+/* Name.Function */
+pre .nf { color: #00aaff; font-weight: bold }
+
+/* Name.Label */
+pre .nl { color: #e1e100; font-weight: bold }
+
+/* Name.Namespace */
+pre .nn { color: #00aaff }
+
+/* Name.Tag */
+pre .nt { color: #b3efad }
+
+/* Name.Variable */
+pre .nv { color: #00aaff }
+
+/* Operator.Word */
+pre .ow { font-weight: bold }
+
+/* Text.Whitespace */
+pre .w { color: #bbbbbb }
+
+/* Literal.Number.Float */
+pre .mf { color: #00aaff }
+
+/* Literal.Number.Hex */
+pre .mh { color: #00aaff }
+
+/* Literal.Number.Integer */
+pre .mi { color: #00aaff }
+
+/* Literal.Number.Oct */
+pre .mo { color: #00aaff }
+
+/* Literal.String.Backtick */
+pre .sb { color: #f46b6b }
+
+/* Literal.String.Char */
+pre .sc { color: #f46b6b }
+
+/* Literal.String.Doc */
+pre .sd { color: #f46b6b }
+
+/* Literal.String.Double */
+pre .s2 { color: #f46b6b }
+
+/* Literal.String.Escape */
+pre .se { color: #f46b6b }
+
+/* Literal.String.Heredoc */
+pre .sh { color: #f46b6b }
+
+/* Literal.String.Interpol */
+pre .si { color: #f46b6b }
+
+/* Literal.String.Other */
+pre .sx { color: #f46b6b }
+
+/* Literal.String.Regex */
+pre .sr { color: #bb6688 }
+
+/* Literal.String.Single */
+pre .s1 { color: #f46b6b }
+
+/* Literal.String.Symbol */
+pre .ss { color: #00aaff }
+
+/* Name.Builtin.Pseudo */
+pre .bp { color: #b3efad }
+
+/* Name.Variable.Class */
+pre .vc { color: #00aaff }
+
+/* Name.Variable.Global */
+pre .vg { color: #00aaff }
+
+/* Name.Variable.Instance */
+pre .vi { color: #00aaff }
+
+/* Literal.Number.Integer.Long */
+pre .il { color: #00c8c8 }
+
+"""
--- a/eric6/UI/Previewers/PreviewerQSS.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/UI/Previewers/PreviewerQSS.py	Sat May 02 13:51:07 2020 +0200
@@ -53,9 +53,9 @@
         
         # icon list widget
         for iconName, labelText in (
-            ("filePython.png", self.tr("Python")),
-            ("fileRuby.png", self.tr("Ruby")),
-            ("fileJavascript.png", self.tr("JavaScript")),
+            ("filePython", self.tr("Python")),
+            ("fileRuby", self.tr("Ruby")),
+            ("fileJavascript", self.tr("JavaScript")),
         ):
             self.iconsListWidget.addItem(QListWidgetItem(
                 UI.PixmapCache.getIcon(iconName), labelText))
--- a/eric6/UI/SearchWidget.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/UI/SearchWidget.py	Sat May 02 13:51:07 2020 +0200
@@ -66,11 +66,11 @@
         self.__findBackwards = True
         
         self.__ui.closeButton.setIcon(
-            UI.PixmapCache.getIcon("close.png"))
+            UI.PixmapCache.getIcon("close"))
         self.__ui.findPrevButton.setIcon(
-            UI.PixmapCache.getIcon("1leftarrow.png"))
+            UI.PixmapCache.getIcon("1leftarrow"))
         self.__ui.findNextButton.setIcon(
-            UI.PixmapCache.getIcon("1rightarrow.png"))
+            UI.PixmapCache.getIcon("1rightarrow"))
         
         self.findHistory = []
         
--- a/eric6/UI/SymbolsWidget.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/UI/SymbolsWidget.py	Sat May 02 13:51:07 2020 +0200
@@ -494,7 +494,7 @@
         super(SymbolsWidget, self).__init__(parent)
         self.setupUi(self)
         
-        self.setWindowIcon(UI.PixmapCache.getIcon("eric.png"))
+        self.setWindowIcon(UI.PixmapCache.getIcon("eric"))
         
         self.__model = SymbolsModel(self)
         self.symbolsTable.setModel(self.__model)
--- a/eric6/UI/UserInterface.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/UI/UserInterface.py	Sat May 02 13:51:07 2020 +0200
@@ -225,8 +225,8 @@
         self.capEditor = ""
         self.captionShowsFilename = Preferences.getUI("CaptionShowsFilename")
         
-        QApplication.setWindowIcon(UI.PixmapCache.getIcon("eric.png"))
-        self.setWindowIcon(UI.PixmapCache.getIcon("eric.png"))
+        QApplication.setWindowIcon(UI.PixmapCache.getIcon("eric"))
+        self.setWindowIcon(UI.PixmapCache.getIcon("eric"))
         self.__setWindowCaption()
         
         # load the view profiles
@@ -833,7 +833,7 @@
         from Project.ProjectBrowser import ProjectBrowser
         self.projectBrowser = ProjectBrowser(self.project)
         self.lToolbox.addItem(self.projectBrowser,
-                              UI.PixmapCache.getIcon("projectViewer.png"),
+                              UI.PixmapCache.getIcon("projectViewer"),
                               self.tr("Project-Viewer"))
 
         # Create the multi project browser
@@ -842,7 +842,7 @@
         self.multiProjectBrowser = MultiProjectBrowser(self.multiProject,
                                                        self.project)
         self.lToolbox.addItem(self.multiProjectBrowser,
-                              UI.PixmapCache.getIcon("multiProjectViewer.png"),
+                              UI.PixmapCache.getIcon("multiProjectViewer"),
                               self.tr("Multiproject-Viewer"))
         
         if Preferences.getUI("ShowTemplateViewer"):
@@ -852,7 +852,7 @@
             self.templateViewer = TemplateViewer(None,
                                                  self.viewmanager)
             self.lToolbox.addItem(self.templateViewer,
-                                  UI.PixmapCache.getIcon("templateViewer.png"),
+                                  UI.PixmapCache.getIcon("templateViewer"),
                                   self.tr("Template-Viewer"))
         
         ####################################################
@@ -865,7 +865,7 @@
             from .CodeDocumentationViewer import CodeDocumentationViewer
             self.codeDocumentationViewer = CodeDocumentationViewer(self)
             self.rToolbox.addItem(self.codeDocumentationViewer,
-                                  UI.PixmapCache.getIcon("codeDocuViewer.png"),
+                                  UI.PixmapCache.getIcon("codeDocuViewer"),
                                   self.tr("Code Documentation Viewer"))
         
         # Create the debug viewer
@@ -873,7 +873,7 @@
         from Debugger.DebugViewer import DebugViewer
         self.debugViewer = DebugViewer(debugServer)
         self.rToolbox.addItem(self.debugViewer,
-                              UI.PixmapCache.getIcon("debugViewer.png"),
+                              UI.PixmapCache.getIcon("debugViewer"),
                               self.tr("Debug-Viewer"))
         
         if Preferences.getUI("ShowPyPIPackageManager"):
@@ -891,7 +891,7 @@
             from CondaInterface.CondaPackagesWidget import CondaPackagesWidget
             self.condaWidget = CondaPackagesWidget(self.condaInterface)
             self.rToolbox.addItem(self.condaWidget,
-                                  UI.PixmapCache.getIcon("miniconda.png"),
+                                  UI.PixmapCache.getIcon("miniconda"),
                                   self.tr("Conda"))
         
         if Preferences.getUI("ShowCooperation"):
@@ -900,7 +900,7 @@
             from Cooperation.ChatWidget import ChatWidget
             self.cooperation = ChatWidget(self)
             self.rToolbox.addItem(self.cooperation,
-                                  UI.PixmapCache.getIcon("cooperation.png"),
+                                  UI.PixmapCache.getIcon("cooperation"),
                                   self.tr("Cooperation"))
         
         if Preferences.getUI("ShowIrc"):
@@ -909,7 +909,7 @@
             from Network.IRC.IrcWidget import IrcWidget
             self.irc = IrcWidget(self)
             self.rToolbox.addItem(self.irc,
-                                  UI.PixmapCache.getIcon("irc.png"),
+                                  UI.PixmapCache.getIcon("irc"),
                                   self.tr("IRC"))
         
         if Preferences.getUI("ShowMicroPython"):
@@ -930,7 +930,7 @@
         from Tasks.TaskViewer import TaskViewer
         self.taskViewer = TaskViewer(None, self.project)
         self.hToolbox.addItem(self.taskViewer,
-                              UI.PixmapCache.getIcon("task.png"),
+                              UI.PixmapCache.getIcon("task"),
                               self.tr("Task-Viewer"))
 
         # Create the log viewer part of the user interface
@@ -938,7 +938,7 @@
         from .LogView import LogViewer
         self.logViewer = LogViewer(self)
         self.hToolbox.addItem(self.logViewer,
-                              UI.PixmapCache.getIcon("logViewer.png"),
+                              UI.PixmapCache.getIcon("logViewer"),
                               self.tr("Log-Viewer"))
 
         if Preferences.getUI("ShowFileBrowser"):
@@ -947,7 +947,7 @@
             from .Browser import Browser
             self.browser = Browser()
             self.lToolbox.addItem(self.browser,
-                                  UI.PixmapCache.getIcon("browser.png"),
+                                  UI.PixmapCache.getIcon("browser"),
                                   self.tr("File-Browser"))
         
         if Preferences.getUI("ShowSymbolsViewer"):
@@ -956,7 +956,7 @@
             from .SymbolsWidget import SymbolsWidget
             self.symbolsViewer = SymbolsWidget()
             self.lToolbox.addItem(self.symbolsViewer,
-                                  UI.PixmapCache.getIcon("symbols.png"),
+                                  UI.PixmapCache.getIcon("symbols"),
                                   self.tr("Symbols"))
         
         if Preferences.getUI("ShowNumbersViewer"):
@@ -965,7 +965,7 @@
             from .NumbersWidget import NumbersWidget
             self.numbersViewer = NumbersWidget()
             self.hToolbox.addItem(self.numbersViewer,
-                                  UI.PixmapCache.getIcon("numbers.png"),
+                                  UI.PixmapCache.getIcon("numbers"),
                                   self.tr("Numbers"))
         
         ####################################################
@@ -986,7 +986,7 @@
             debugServer, self.viewmanager, self.project, True)
         self.shell = self.shellAssembly.shell()
         self.__shellParent.widget().insertItem(
-            0, self.shellAssembly, UI.PixmapCache.getIcon("shell.png"),
+            0, self.shellAssembly, UI.PixmapCache.getIcon("shell"),
             self.tr("Shell"))
         
         ####################################################
@@ -1027,7 +1027,7 @@
         self.projectBrowser = ProjectBrowser(self.project)
         self.leftSidebar.addTab(
             self.projectBrowser,
-            UI.PixmapCache.getIcon("projectViewer.png"),
+            UI.PixmapCache.getIcon("projectViewer"),
             self.tr("Project-Viewer"))
 
         # Create the multi project browser
@@ -1037,7 +1037,7 @@
                                                        self.project)
         self.leftSidebar.addTab(
             self.multiProjectBrowser,
-            UI.PixmapCache.getIcon("multiProjectViewer.png"),
+            UI.PixmapCache.getIcon("multiProjectViewer"),
             self.tr("Multiproject-Viewer"))
 
         if Preferences.getUI("ShowTemplateViewer"):
@@ -1048,7 +1048,7 @@
                                                  self.viewmanager)
             self.leftSidebar.addTab(
                 self.templateViewer,
-                UI.PixmapCache.getIcon("templateViewer.png"),
+                UI.PixmapCache.getIcon("templateViewer"),
                 self.tr("Template-Viewer"))
 
         ####################################################
@@ -1062,7 +1062,7 @@
             self.codeDocumentationViewer = CodeDocumentationViewer(self)
             self.rightSidebar.addTab(
                 self.codeDocumentationViewer,
-                UI.PixmapCache.getIcon("codeDocuViewer.png"),
+                UI.PixmapCache.getIcon("codeDocuViewer"),
                 self.tr("Code Documentation Viewer"))
         
         # Create the debug viewer
@@ -1070,7 +1070,7 @@
         from Debugger.DebugViewer import DebugViewer
         self.debugViewer = DebugViewer(debugServer)
         self.rightSidebar.addTab(
-            self.debugViewer, UI.PixmapCache.getIcon("debugViewer.png"),
+            self.debugViewer, UI.PixmapCache.getIcon("debugViewer"),
             self.tr("Debug-Viewer"))
 
         if Preferences.getUI("ShowPyPIPackageManager"):
@@ -1088,7 +1088,7 @@
             from CondaInterface.CondaPackagesWidget import CondaPackagesWidget
             self.condaWidget = CondaPackagesWidget(self.condaInterface)
             self.rightSidebar.addTab(
-                self.condaWidget, UI.PixmapCache.getIcon("miniconda.png"),
+                self.condaWidget, UI.PixmapCache.getIcon("miniconda"),
                 self.tr("Conda"))
 
         if Preferences.getUI("ShowCooperation"):
@@ -1097,7 +1097,7 @@
             from Cooperation.ChatWidget import ChatWidget
             self.cooperation = ChatWidget(self)
             self.rightSidebar.addTab(
-                self.cooperation, UI.PixmapCache.getIcon("cooperation.png"),
+                self.cooperation, UI.PixmapCache.getIcon("cooperation"),
                 self.tr("Cooperation"))
         
         if Preferences.getUI("ShowIrc"):
@@ -1106,7 +1106,7 @@
             from Network.IRC.IrcWidget import IrcWidget
             self.irc = IrcWidget(self)
             self.rightSidebar.addTab(
-                self.irc, UI.PixmapCache.getIcon("irc.png"),
+                self.irc, UI.PixmapCache.getIcon("irc"),
                 self.tr("IRC"))
         
         if Preferences.getUI("ShowMicroPython"):
@@ -1127,7 +1127,7 @@
         from Tasks.TaskViewer import TaskViewer
         self.taskViewer = TaskViewer(None, self.project)
         self.bottomSidebar.addTab(self.taskViewer,
-                                  UI.PixmapCache.getIcon("task.png"),
+                                  UI.PixmapCache.getIcon("task"),
                                   self.tr("Task-Viewer"))
 
         # Create the log viewer part of the user interface
@@ -1135,7 +1135,7 @@
         from .LogView import LogViewer
         self.logViewer = LogViewer(self)
         self.bottomSidebar.addTab(self.logViewer,
-                                  UI.PixmapCache.getIcon("logViewer.png"),
+                                  UI.PixmapCache.getIcon("logViewer"),
                                   self.tr("Log-Viewer"))
 
         if Preferences.getUI("ShowFileBrowser"):
@@ -1144,7 +1144,7 @@
             from .Browser import Browser
             self.browser = Browser()
             self.leftSidebar.addTab(self.browser,
-                                    UI.PixmapCache.getIcon("browser.png"),
+                                    UI.PixmapCache.getIcon("browser"),
                                     self.tr("File-Browser"))
         
         if Preferences.getUI("ShowSymbolsViewer"):
@@ -1153,7 +1153,7 @@
             from .SymbolsWidget import SymbolsWidget
             self.symbolsViewer = SymbolsWidget()
             self.leftSidebar.addTab(self.symbolsViewer,
-                                    UI.PixmapCache.getIcon("symbols.png"),
+                                    UI.PixmapCache.getIcon("symbols"),
                                     self.tr("Symbols"))
         
         if Preferences.getUI("ShowNumbersViewer"):
@@ -1162,7 +1162,7 @@
             from .NumbersWidget import NumbersWidget
             self.numbersViewer = NumbersWidget()
             self.bottomSidebar.addTab(self.numbersViewer,
-                                      UI.PixmapCache.getIcon("numbers.png"),
+                                      UI.PixmapCache.getIcon("numbers"),
                                       self.tr("Numbers"))
         
         ####################################################
@@ -1183,7 +1183,7 @@
             debugServer, self.viewmanager, self.project, True)
         self.shell = self.shellAssembly.shell()
         self.__shellParent.insertTab(0, self.shellAssembly,
-                                     UI.PixmapCache.getIcon("shell.png"),
+                                     UI.PixmapCache.getIcon("shell"),
                                      self.tr("Shell"))
         
         ####################################################
@@ -1520,7 +1520,7 @@
         
         self.exitAct = E5Action(
             self.tr('Quit'),
-            UI.PixmapCache.getIcon("exit.png"),
+            UI.PixmapCache.getIcon("exit"),
             self.tr('&Quit'),
             QKeySequence(self.tr("Ctrl+Q", "File|Quit")),
             0, self, 'quit')
@@ -1537,7 +1537,7 @@
 
         self.restartAct = E5Action(
             self.tr('Restart'),
-            UI.PixmapCache.getIcon("restart.png"),
+            UI.PixmapCache.getIcon("restart"),
             self.tr('Restart'),
             QKeySequence(self.tr("Ctrl+Shift+Q", "File|Quit")),
             0, self, 'restart_eric')
@@ -1579,7 +1579,7 @@
 
         self.newWindowAct = E5Action(
             self.tr('New Window'),
-            UI.PixmapCache.getIcon("newWindow.png"),
+            UI.PixmapCache.getIcon("newWindow"),
             self.tr('New &Window'),
             QKeySequence(self.tr("Ctrl+Shift+N", "File|New Window")),
             0, self, 'new_window')
@@ -1598,7 +1598,7 @@
         
         self.setEditProfileAct = E5Action(
             self.tr('Edit Profile'),
-            UI.PixmapCache.getIcon("viewProfileEdit.png"),
+            UI.PixmapCache.getIcon("viewProfileEdit"),
             self.tr('Edit Profile'),
             0, 0,
             self.viewProfileActGrp, 'edit_profile', True)
@@ -1615,7 +1615,7 @@
         
         self.setDebugProfileAct = E5Action(
             self.tr('Debug Profile'),
-            UI.PixmapCache.getIcon("viewProfileDebug.png"),
+            UI.PixmapCache.getIcon("viewProfileDebug"),
             self.tr('Debug Profile'),
             0, 0,
             self.viewProfileActGrp, 'debug_profile', True)
@@ -2004,7 +2004,7 @@
         
         self.whatsThisAct = E5Action(
             self.tr('What\'s This?'),
-            UI.PixmapCache.getIcon("whatsThis.png"),
+            UI.PixmapCache.getIcon("whatsThis"),
             self.tr('&What\'s This?'),
             QKeySequence(self.tr("Shift+F1")),
             0, self, 'whatsThis')
@@ -2022,7 +2022,7 @@
 
         self.helpviewerAct = E5Action(
             self.tr('Helpviewer'),
-            UI.PixmapCache.getIcon("help.png"),
+            UI.PixmapCache.getIcon("help"),
             self.tr('&Helpviewer...'),
             QKeySequence(self.tr("F1")),
             0, self, 'helpviewer')
@@ -2126,7 +2126,7 @@
         
         self.utDialogAct = E5Action(
             self.tr('Unittest'),
-            UI.PixmapCache.getIcon("unittest.png"),
+            UI.PixmapCache.getIcon("unittest"),
             self.tr('&Unittest...'),
             0, 0, self.utActGrp, 'unittest')
         self.utDialogAct.setStatusTip(self.tr('Start unittest dialog'))
@@ -2140,7 +2140,7 @@
 
         self.utRestartAct = E5Action(
             self.tr('Unittest Restart'),
-            UI.PixmapCache.getIcon("unittestRestart.png"),
+            UI.PixmapCache.getIcon("unittestRestart"),
             self.tr('&Restart Unittest...'),
             0, 0, self.utActGrp, 'unittest_restart')
         self.utRestartAct.setStatusTip(self.tr('Restart last unittest'))
@@ -2154,7 +2154,7 @@
         
         self.utRerunFailedAct = E5Action(
             self.tr('Unittest Rerun Failed'),
-            UI.PixmapCache.getIcon("unittestRerunFailed.png"),
+            UI.PixmapCache.getIcon("unittestRerunFailed"),
             self.tr('Rerun Failed Tests...'),
             0, 0, self.utActGrp, 'unittest_rerun_failed')
         self.utRerunFailedAct.setStatusTip(self.tr(
@@ -2170,7 +2170,7 @@
         
         self.utScriptAct = E5Action(
             self.tr('Unittest Script'),
-            UI.PixmapCache.getIcon("unittestScript.png"),
+            UI.PixmapCache.getIcon("unittestScript"),
             self.tr('Unittest &Script...'),
             0, 0, self.utActGrp, 'unittest_script')
         self.utScriptAct.setStatusTip(self.tr(
@@ -2185,7 +2185,7 @@
         
         self.utProjectAct = E5Action(
             self.tr('Unittest Project'),
-            UI.PixmapCache.getIcon("unittestProject.png"),
+            UI.PixmapCache.getIcon("unittestProject"),
             self.tr('Unittest &Project...'),
             0, 0, self.utActGrp, 'unittest_project')
         self.utProjectAct.setStatusTip(self.tr(
@@ -2212,7 +2212,7 @@
         if os.path.exists(designerExe):
             self.designer4Act = E5Action(
                 self.tr('Qt-Designer'),
-                UI.PixmapCache.getIcon("designer4.png"),
+                UI.PixmapCache.getIcon("designer4"),
                 self.tr('Qt-&Designer...'),
                 0, 0, self, 'qt_designer4')
             self.designer4Act.setStatusTip(self.tr('Start Qt-Designer'))
@@ -2238,7 +2238,7 @@
         if os.path.exists(linguistExe):
             self.linguist4Act = E5Action(
                 self.tr('Qt-Linguist'),
-                UI.PixmapCache.getIcon("linguist4.png"),
+                UI.PixmapCache.getIcon("linguist4"),
                 self.tr('Qt-&Linguist...'),
                 0, 0, self, 'qt_linguist4')
             self.linguist4Act.setStatusTip(self.tr('Start Qt-Linguist'))
@@ -2253,7 +2253,7 @@
     
         self.uipreviewerAct = E5Action(
             self.tr('UI Previewer'),
-            UI.PixmapCache.getIcon("uiPreviewer.png"),
+            UI.PixmapCache.getIcon("uiPreviewer"),
             self.tr('&UI Previewer...'),
             0, 0, self, 'ui_previewer')
         self.uipreviewerAct.setStatusTip(self.tr('Start the UI Previewer'))
@@ -2266,7 +2266,7 @@
         
         self.trpreviewerAct = E5Action(
             self.tr('Translations Previewer'),
-            UI.PixmapCache.getIcon("trPreviewer.png"),
+            UI.PixmapCache.getIcon("trPreviewer"),
             self.tr('&Translations Previewer...'),
             0, 0, self, 'tr_previewer')
         self.trpreviewerAct.setStatusTip(self.tr(
@@ -2280,7 +2280,7 @@
         
         self.diffAct = E5Action(
             self.tr('Compare Files'),
-            UI.PixmapCache.getIcon("diffFiles.png"),
+            UI.PixmapCache.getIcon("diffFiles"),
             self.tr('&Compare Files...'),
             0, 0, self, 'diff_files')
         self.diffAct.setStatusTip(self.tr('Compare two files'))
@@ -2293,7 +2293,7 @@
 
         self.compareAct = E5Action(
             self.tr('Compare Files side by side'),
-            UI.PixmapCache.getIcon("compareFiles.png"),
+            UI.PixmapCache.getIcon("compareFiles"),
             self.tr('Compare &Files side by side...'),
             0, 0, self, 'compare_files')
         self.compareAct.setStatusTip(self.tr('Compare two files'))
@@ -2307,7 +2307,7 @@
 
         self.sqlBrowserAct = E5Action(
             self.tr('SQL Browser'),
-            UI.PixmapCache.getIcon("sqlBrowser.png"),
+            UI.PixmapCache.getIcon("sqlBrowser"),
             self.tr('SQL &Browser...'),
             0, 0, self, 'sql_browser')
         self.sqlBrowserAct.setStatusTip(self.tr('Browse a SQL database'))
@@ -2320,7 +2320,7 @@
 
         self.miniEditorAct = E5Action(
             self.tr('Mini Editor'),
-            UI.PixmapCache.getIcon("editor.png"),
+            UI.PixmapCache.getIcon("editor"),
             self.tr('Mini &Editor...'),
             0, 0, self, 'mini_editor')
         self.miniEditorAct.setStatusTip(self.tr('Mini Editor'))
@@ -2333,7 +2333,7 @@
 
         self.hexEditorAct = E5Action(
             self.tr('Hex Editor'),
-            UI.PixmapCache.getIcon("hexEditor.png"),
+            UI.PixmapCache.getIcon("hexEditor"),
             self.tr('&Hex Editor...'),
             0, 0, self, 'hex_editor')
         self.hexEditorAct.setStatusTip(self.tr(
@@ -2348,7 +2348,7 @@
 
         self.webBrowserAct = E5Action(
             self.tr('eric6 Web Browser'),
-            UI.PixmapCache.getIcon("ericWeb.png"),
+            UI.PixmapCache.getIcon("ericWeb"),
             self.tr('eric6 &Web Browser...'),
             0, 0, self, 'web_browser')
         self.webBrowserAct.setStatusTip(self.tr(
@@ -2364,7 +2364,7 @@
 
         self.iconEditorAct = E5Action(
             self.tr('Icon Editor'),
-            UI.PixmapCache.getIcon("iconEditor.png"),
+            UI.PixmapCache.getIcon("iconEditor"),
             self.tr('&Icon Editor...'),
             0, 0, self, 'icon_editor')
         self.iconEditorAct.setStatusTip(self.tr(
@@ -2378,7 +2378,7 @@
 
         self.snapshotAct = E5Action(
             self.tr('Snapshot'),
-            UI.PixmapCache.getIcon("ericSnap.png"),
+            UI.PixmapCache.getIcon("ericSnap"),
             self.tr('&Snapshot...'),
             0, 0, self, 'snapshot')
         self.snapshotAct.setStatusTip(self.tr(
@@ -2393,7 +2393,7 @@
 
         self.prefAct = E5Action(
             self.tr('Preferences'),
-            UI.PixmapCache.getIcon("configure.png"),
+            UI.PixmapCache.getIcon("configure"),
             self.tr('&Preferences...'),
             0, 0, self, 'preferences')
         self.prefAct.setStatusTip(self.tr(
@@ -2409,7 +2409,7 @@
 
         self.prefExportAct = E5Action(
             self.tr('Export Preferences'),
-            UI.PixmapCache.getIcon("configureExport.png"),
+            UI.PixmapCache.getIcon("configureExport"),
             self.tr('E&xport Preferences...'),
             0, 0, self, 'export_preferences')
         self.prefExportAct.setStatusTip(self.tr(
@@ -2423,7 +2423,7 @@
 
         self.prefImportAct = E5Action(
             self.tr('Import Preferences'),
-            UI.PixmapCache.getIcon("configureImport.png"),
+            UI.PixmapCache.getIcon("configureImport"),
             self.tr('I&mport Preferences...'),
             0, 0, self, 'import_preferences')
         self.prefImportAct.setStatusTip(self.tr(
@@ -2450,7 +2450,7 @@
 
         self.showExternalToolsAct = E5Action(
             self.tr('Show external tools'),
-            UI.PixmapCache.getIcon("showPrograms.png"),
+            UI.PixmapCache.getIcon("showPrograms"),
             self.tr('Show external &tools'),
             0, 0, self, 'show_external_tools')
         self.showExternalToolsAct.setStatusTip(self.tr(
@@ -2466,7 +2466,7 @@
 
         self.configViewProfilesAct = E5Action(
             self.tr('View Profiles'),
-            UI.PixmapCache.getIcon("configureViewProfiles.png"),
+            UI.PixmapCache.getIcon("configureViewProfiles"),
             self.tr('&View Profiles...'),
             0, 0, self, 'view_profiles')
         self.configViewProfilesAct.setStatusTip(self.tr(
@@ -2483,7 +2483,7 @@
 
         self.configToolBarsAct = E5Action(
             self.tr('Toolbars'),
-            UI.PixmapCache.getIcon("toolbarsConfigure.png"),
+            UI.PixmapCache.getIcon("toolbarsConfigure"),
             self.tr('Tool&bars...'),
             0, 0, self, 'configure_toolbars')
         self.configToolBarsAct.setStatusTip(self.tr('Configure toolbars'))
@@ -2498,7 +2498,7 @@
 
         self.shortcutsAct = E5Action(
             self.tr('Keyboard Shortcuts'),
-            UI.PixmapCache.getIcon("configureShortcuts.png"),
+            UI.PixmapCache.getIcon("configureShortcuts"),
             self.tr('Keyboard &Shortcuts...'),
             0, 0, self, 'keyboard_shortcuts')
         self.shortcutsAct.setStatusTip(self.tr(
@@ -2513,7 +2513,7 @@
 
         self.exportShortcutsAct = E5Action(
             self.tr('Export Keyboard Shortcuts'),
-            UI.PixmapCache.getIcon("exportShortcuts.png"),
+            UI.PixmapCache.getIcon("exportShortcuts"),
             self.tr('&Export Keyboard Shortcuts...'),
             0, 0, self, 'export_keyboard_shortcuts')
         self.exportShortcutsAct.setStatusTip(self.tr(
@@ -2527,7 +2527,7 @@
 
         self.importShortcutsAct = E5Action(
             self.tr('Import Keyboard Shortcuts'),
-            UI.PixmapCache.getIcon("importShortcuts.png"),
+            UI.PixmapCache.getIcon("importShortcuts"),
             self.tr('&Import Keyboard Shortcuts...'),
             0, 0, self, 'import_keyboard_shortcuts')
         self.importShortcutsAct.setStatusTip(self.tr(
@@ -2542,7 +2542,7 @@
         if SSL_AVAILABLE:
             self.certificatesAct = E5Action(
                 self.tr('Manage SSL Certificates'),
-                UI.PixmapCache.getIcon("certificates.png"),
+                UI.PixmapCache.getIcon("certificates"),
                 self.tr('Manage SSL Certificates...'),
                 0, 0, self, 'manage_ssl_certificates')
             self.certificatesAct.setStatusTip(self.tr(
@@ -2558,7 +2558,7 @@
         
         self.editMessageFilterAct = E5Action(
             self.tr('Edit Message Filters'),
-            UI.PixmapCache.getIcon("warning.png"),
+            UI.PixmapCache.getIcon("warning"),
             self.tr('Edit Message Filters...'),
             0, 0, self, 'manage_message_filters')
         self.editMessageFilterAct.setStatusTip(self.tr(
@@ -2575,7 +2575,7 @@
 
         self.clearPrivateDataAct = E5Action(
             self.tr('Clear private data'),
-            UI.PixmapCache.getIcon("clearPrivateData.png"),
+            UI.PixmapCache.getIcon("clearPrivateData"),
             self.tr('Clear private data'),
             0, 0,
             self, 'clear_private_data')
@@ -2629,7 +2629,7 @@
         
         self.pluginInfoAct = E5Action(
             self.tr('Plugin Infos'),
-            UI.PixmapCache.getIcon("plugin.png"),
+            UI.PixmapCache.getIcon("plugin"),
             self.tr('&Plugin Infos...'), 0, 0, self, 'plugin_infos')
         self.pluginInfoAct.setStatusTip(self.tr('Show Plugin Infos'))
         self.pluginInfoAct.setWhatsThis(self.tr(
@@ -2642,7 +2642,7 @@
         
         self.pluginInstallAct = E5Action(
             self.tr('Install Plugins'),
-            UI.PixmapCache.getIcon("pluginInstall.png"),
+            UI.PixmapCache.getIcon("pluginInstall"),
             self.tr('&Install Plugins...'),
             0, 0, self, 'plugin_install')
         self.pluginInstallAct.setStatusTip(self.tr('Install Plugins'))
@@ -2655,7 +2655,7 @@
         
         self.pluginDeinstallAct = E5Action(
             self.tr('Uninstall Plugin'),
-            UI.PixmapCache.getIcon("pluginUninstall.png"),
+            UI.PixmapCache.getIcon("pluginUninstall"),
             self.tr('&Uninstall Plugin...'),
             0, 0, self, 'plugin_deinstall')
         self.pluginDeinstallAct.setStatusTip(self.tr('Uninstall Plugin'))
@@ -2668,7 +2668,7 @@
 
         self.pluginRepoAct = E5Action(
             self.tr('Plugin Repository'),
-            UI.PixmapCache.getIcon("pluginRepository.png"),
+            UI.PixmapCache.getIcon("pluginRepository"),
             self.tr('Plugin &Repository...'),
             0, 0, self, 'plugin_repository')
         self.pluginRepoAct.setStatusTip(self.tr(
@@ -2683,7 +2683,7 @@
         
         self.virtualenvManagerAct = E5Action(
             self.tr('Virtualenv Manager'),
-            UI.PixmapCache.getIcon("virtualenv.png"),
+            UI.PixmapCache.getIcon("virtualenv"),
             self.tr('&Virtualenv Manager...'),
             0, 0, self,
             'virtualenv_manager')
@@ -2700,7 +2700,7 @@
         
         self.virtualenvConfigAct = E5Action(
             self.tr('Virtualenv Configurator'),
-            UI.PixmapCache.getIcon("virtualenvConfig.png"),
+            UI.PixmapCache.getIcon("virtualenvConfig"),
             self.tr('Virtualenv &Configurator...'),
             0, 0, self,
             'virtualenv_configurator')
@@ -3033,7 +3033,7 @@
         ##############################################################
         
         pluginsMenu = QMenu(self.tr('P&lugins'), self)
-        pluginsMenu.setIcon(UI.PixmapCache.getIcon("plugin.png"))
+        pluginsMenu.setIcon(UI.PixmapCache.getIcon("plugin"))
         pluginsMenu.setTearOffEnabled(True)
         pluginsMenu.addAction(self.pluginInfoAct)
         pluginsMenu.addAction(self.pluginInstallAct)
@@ -3470,9 +3470,9 @@
         ))
         
         self.sbZoom = E5ZoomWidget(
-            UI.PixmapCache.getPixmap("zoomOut.png"),
-            UI.PixmapCache.getPixmap("zoomIn.png"),
-            UI.PixmapCache.getPixmap("zoomReset.png"),
+            UI.PixmapCache.getPixmap("zoomOut"),
+            UI.PixmapCache.getPixmap("zoomIn"),
+            UI.PixmapCache.getPixmap("zoomReset"),
             self.__statusBar)
         self.__statusBar.addPermanentWidget(self.sbZoom)
         self.sbZoom.setWhatsThis(self.tr(
@@ -7331,7 +7331,7 @@
             parent=self
         )
         self.__versionsDialog.setIconPixmap(
-            UI.PixmapCache.getPixmap("eric.png").scaled(64, 64))
+            UI.PixmapCache.getPixmap("eric").scaled(64, 64))
         self.__versionsDialog.show()
         
     def __sslErrors(self, reply, errors):
--- a/eric6/UI/data/codeDocumentationViewer.qrc	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/UI/data/codeDocumentationViewer.qrc	Sat May 02 13:51:07 2020 +0200
@@ -1,6 +1,7 @@
 <!DOCTYPE RCC>
 <RCC version="1.0">
 <qresource>
-  <file>documentViewerStyle.css</file>
+  <file>documentViewerStyle-dark.css</file>
+  <file>documentViewerStyle-light.css</file>
 </qresource>
 </RCC>
--- a/eric6/UI/data/codeDocumentationViewer_rc.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/UI/data/codeDocumentationViewer_rc.py	Sat May 02 13:51:07 2020 +0200
@@ -2,377 +2,235 @@
 
 # Resource object code
 #
-# Created by: The Resource Compiler for PyQt5 (Qt v5.13.0)
+# Created by: The Resource Compiler for PyQt5 (Qt v5.14.1)
 #
 # WARNING! All changes made in this file will be lost!
 
 from PyQt5 import QtCore
 
 qt_resource_data = b"\
-\x00\x00\x15\x60\
-\x2f\
-\x2a\x0a\x20\x2a\x20\x54\x68\x69\x73\x20\x73\x74\x79\x6c\x65\x20\
-\x64\x65\x66\x69\x6e\x69\x74\x69\x6f\x6e\x20\x69\x73\x20\x62\x61\
-\x73\x65\x64\x20\x6f\x6e\x20\x74\x68\x65\x20\x73\x74\x79\x6c\x65\
-\x20\x73\x68\x65\x65\x74\x20\x66\x69\x6c\x65\x20\x6f\x66\x20\x53\
-\x70\x79\x64\x65\x72\x2e\x0a\x20\x2a\x0a\x20\x2a\x20\x4d\x6f\x64\
-\x69\x66\x69\x65\x64\x20\x66\x6f\x72\x20\x75\x73\x69\x6e\x67\x20\
-\x63\x6f\x6c\x6f\x72\x20\x73\x63\x68\x65\x6d\x65\x73\x20\x61\x73\
-\x20\x6f\x66\x20\x57\x65\x62\x45\x6e\x67\x69\x6e\x65\x20\x37\x36\
-\x2e\x78\x2e\x0a\x20\x2a\x20\x73\x65\x65\x20\x63\x27\x74\x20\x31\
-\x39\x2f\x32\x30\x31\x39\x0a\x20\x2a\x2f\x0a\x0a\x40\x6d\x65\x64\
-\x69\x61\x20\x28\x70\x72\x65\x66\x65\x72\x73\x2d\x63\x6f\x6c\x6f\
-\x72\x2d\x73\x63\x68\x65\x6d\x65\x3a\x20\x6c\x69\x67\x68\x74\x29\
-\x20\x7b\x0a\x20\x20\x20\x20\x3a\x72\x6f\x6f\x74\x20\x7b\x0a\x20\
-\x20\x20\x20\x20\x20\x20\x20\x2d\x2d\x66\x6f\x6e\x74\x2d\x63\x6f\
-\x6c\x6f\x72\x3a\x20\x23\x30\x30\x30\x3b\x0a\x20\x20\x20\x20\x20\
-\x20\x20\x20\x2d\x2d\x62\x61\x63\x6b\x67\x72\x6f\x75\x6e\x64\x2d\
-\x63\x6f\x6c\x6f\x72\x3a\x20\x23\x66\x66\x66\x3b\x0a\x20\x20\x20\
-\x20\x20\x20\x20\x20\x2d\x2d\x62\x6f\x64\x79\x2d\x63\x6f\x6c\x6f\
-\x72\x3a\x20\x23\x64\x64\x64\x3b\x0a\x20\x20\x20\x20\x7d\x0a\x7d\
-\x0a\x40\x6d\x65\x64\x69\x61\x20\x28\x70\x72\x65\x66\x65\x72\x73\
-\x2d\x63\x6f\x6c\x6f\x72\x2d\x73\x63\x68\x65\x6d\x65\x3a\x20\x64\
-\x61\x72\x6b\x29\x20\x7b\x0a\x20\x20\x20\x20\x3a\x72\x6f\x6f\x74\
-\x20\x7b\x0a\x20\x20\x20\x20\x20\x20\x20\x20\x2d\x2d\x66\x6f\x6e\
-\x74\x2d\x63\x6f\x6c\x6f\x72\x3a\x20\x23\x66\x66\x66\x3b\x0a\x20\
-\x20\x20\x20\x20\x20\x20\x20\x2d\x2d\x62\x61\x63\x6b\x67\x72\x6f\
-\x75\x6e\x64\x2d\x63\x6f\x6c\x6f\x72\x3a\x20\x23\x30\x30\x30\x3b\
-\x0a\x20\x20\x20\x20\x20\x20\x20\x20\x2d\x2d\x62\x6f\x64\x79\x2d\
-\x63\x6f\x6c\x6f\x72\x3a\x20\x23\x33\x33\x33\x3b\x0a\x20\x20\x20\
-\x20\x7d\x0a\x7d\x0a\x0a\x68\x74\x6d\x6c\x20\x7b\x0a\x20\x20\x20\
-\x20\x62\x61\x63\x6b\x67\x72\x6f\x75\x6e\x64\x2d\x63\x6f\x6c\x6f\
-\x72\x3a\x20\x76\x61\x72\x28\x2d\x2d\x62\x61\x63\x6b\x67\x72\x6f\
-\x75\x6e\x64\x2d\x63\x6f\x6c\x6f\x72\x2c\x20\x23\x66\x66\x66\x29\
-\x3b\x0a\x7d\x0a\x0a\x62\x6f\x64\x79\x20\x7b\x0a\x20\x20\x20\x20\
-\x62\x61\x63\x6b\x67\x72\x6f\x75\x6e\x64\x2d\x63\x6f\x6c\x6f\x72\
-\x3a\x20\x76\x61\x72\x28\x2d\x2d\x62\x6f\x64\x79\x2d\x63\x6f\x6c\
-\x6f\x72\x2c\x20\x77\x68\x69\x74\x65\x29\x3b\x0a\x20\x20\x20\x20\
-\x63\x6f\x6c\x6f\x72\x3a\x20\x76\x61\x72\x28\x2d\x2d\x66\x6f\x6e\
-\x74\x2d\x63\x6f\x6c\x6f\x72\x2c\x20\x23\x30\x30\x30\x29\x3b\x0a\
-\x20\x20\x20\x20\x6d\x61\x72\x67\x69\x6e\x3a\x20\x30\x70\x78\x20\
-\x31\x30\x70\x78\x20\x31\x30\x70\x78\x20\x31\x30\x70\x78\x3b\x0a\
-\x7d\x0a\x0a\x0a\x2f\x2a\x20\x2d\x2d\x2d\x20\x54\x69\x74\x6c\x65\
-\x20\x73\x74\x79\x6c\x65\x20\x2d\x2d\x2d\x20\x2a\x2f\x0a\x64\x69\
-\x76\x2e\x74\x69\x74\x6c\x65\x20\x68\x31\x20\x7b\x0a\x20\x20\x20\
-\x20\x66\x6f\x6e\x74\x2d\x73\x69\x7a\x65\x3a\x20\x31\x33\x30\x25\
-\x3b\x0a\x20\x20\x20\x20\x66\x6f\x6e\x74\x2d\x66\x61\x6d\x69\x6c\
-\x79\x3a\x20\x27\x54\x72\x65\x62\x75\x63\x68\x65\x74\x20\x4d\x53\
-\x27\x2c\x20\x73\x61\x6e\x73\x2d\x73\x65\x72\x69\x66\x3b\x0a\x20\
-\x20\x20\x20\x62\x61\x63\x6b\x67\x72\x6f\x75\x6e\x64\x2d\x63\x6f\
-\x6c\x6f\x72\x3a\x20\x23\x38\x35\x37\x37\x34\x41\x3b\x0a\x20\x20\
-\x20\x20\x62\x61\x63\x6b\x67\x72\x6f\x75\x6e\x64\x2d\x69\x6d\x61\
-\x67\x65\x3a\x20\x2d\x77\x65\x62\x6b\x69\x74\x2d\x67\x72\x61\x64\
-\x69\x65\x6e\x74\x28\x0a\x20\x20\x20\x20\x20\x20\x20\x20\x6c\x69\
-\x6e\x65\x61\x72\x2c\x0a\x20\x20\x20\x20\x20\x20\x20\x20\x30\x20\
-\x30\x2c\x0a\x20\x20\x20\x20\x20\x20\x20\x20\x30\x20\x31\x30\x30\
-\x25\x2c\x0a\x20\x20\x20\x20\x20\x20\x20\x20\x66\x72\x6f\x6d\x28\
-\x23\x38\x35\x37\x37\x34\x41\x29\x2c\x0a\x20\x20\x20\x20\x20\x20\
-\x20\x20\x63\x6f\x6c\x6f\x72\x2d\x73\x74\x6f\x70\x28\x36\x30\x25\
-\x2c\x20\x23\x62\x39\x61\x35\x36\x37\x29\x2c\x0a\x20\x20\x20\x20\
-\x20\x20\x20\x20\x74\x6f\x28\x23\x65\x31\x63\x38\x37\x64\x29\x0a\
-\x20\x20\x20\x20\x29\x3b\x0a\x20\x20\x20\x20\x74\x65\x78\x74\x2d\
-\x73\x68\x61\x64\x6f\x77\x3a\x20\x30\x70\x78\x20\x31\x70\x78\x20\
-\x31\x70\x78\x20\x72\x67\x62\x61\x28\x30\x2c\x20\x30\x2c\x20\x30\
-\x2c\x20\x30\x2e\x32\x29\x3b\x0a\x20\x20\x20\x20\x66\x6f\x6e\x74\
-\x2d\x77\x65\x69\x67\x68\x74\x3a\x20\x6e\x6f\x72\x6d\x61\x6c\x3b\
-\x0a\x20\x20\x20\x20\x70\x61\x64\x64\x69\x6e\x67\x3a\x20\x36\x70\
-\x78\x20\x30\x70\x78\x20\x36\x70\x78\x20\x32\x30\x70\x78\x3b\x0a\
-\x20\x20\x20\x20\x6d\x61\x72\x67\x69\x6e\x3a\x20\x30\x70\x78\x20\
-\x2d\x32\x35\x70\x78\x3b\x0a\x20\x20\x20\x20\x63\x6f\x6c\x6f\x72\
-\x3a\x20\x23\x46\x46\x46\x46\x46\x46\x3b\x0a\x7d\x0a\x0a\x2f\x2a\
-\x0a\x20\x2a\x20\x54\x68\x65\x20\x6e\x65\x78\x74\x20\x74\x77\x6f\
-\x20\x73\x74\x79\x6c\x65\x73\x20\x61\x72\x65\x20\x6e\x65\x65\x64\
-\x65\x64\x20\x74\x6f\x0a\x20\x2a\x20\x6d\x6f\x64\x69\x66\x79\x20\
-\x74\x68\x65\x20\x61\x6e\x63\x68\x6f\x72\x73\x20\x70\x72\x65\x73\
-\x65\x6e\x74\x20\x6f\x6e\x20\x74\x68\x65\x0a\x20\x2a\x20\x74\x69\
-\x74\x6c\x65\x20\x6f\x66\x20\x70\x61\x67\x65\x73\x20\x6c\x69\x6b\
-\x65\x20\x73\x63\x69\x70\x79\x2e\x73\x74\x61\x74\x73\x20\x6f\x72\
-\x0a\x20\x2a\x20\x73\x63\x69\x70\x79\x2e\x69\x6f\x0a\x20\x2a\x2f\
-\x0a\x64\x69\x76\x2e\x74\x69\x74\x6c\x65\x20\x68\x31\x20\x61\x20\
-\x7b\x0a\x20\x20\x20\x20\x63\x6f\x6c\x6f\x72\x3a\x20\x74\x72\x61\
-\x6e\x73\x70\x61\x72\x65\x6e\x74\x3b\x0a\x20\x20\x20\x20\x63\x75\
-\x72\x73\x6f\x72\x3a\x20\x64\x65\x66\x61\x75\x6c\x74\x3b\x0a\x7d\
-\x0a\x0a\x64\x69\x76\x2e\x74\x69\x74\x6c\x65\x20\x68\x31\x20\x74\
-\x74\x20\x7b\x0a\x20\x20\x20\x20\x66\x6f\x6e\x74\x2d\x73\x69\x7a\
-\x65\x3a\x20\x39\x35\x25\x3b\x0a\x20\x20\x20\x20\x62\x61\x63\x6b\
-\x67\x72\x6f\x75\x6e\x64\x2d\x63\x6f\x6c\x6f\x72\x3a\x20\x74\x72\
-\x61\x6e\x73\x70\x61\x72\x65\x6e\x74\x3b\x0a\x20\x20\x20\x20\x63\
-\x6f\x6c\x6f\x72\x3a\x20\x23\x46\x46\x46\x46\x46\x46\x3b\x0a\x7d\
-\x0a\x0a\x0a\x2f\x2a\x20\x2d\x2d\x2d\x20\x4d\x65\x74\x61\x64\x61\
-\x74\x61\x20\x73\x74\x79\x6c\x65\x20\x2d\x2d\x2d\x20\x2a\x2f\x0a\
-\x64\x69\x76\x2e\x6d\x65\x74\x61\x64\x61\x74\x61\x20\x7b\x0a\x20\
-\x20\x20\x20\x6d\x61\x72\x67\x69\x6e\x2d\x74\x6f\x70\x3a\x20\x31\
-\x30\x70\x78\x3b\x0a\x20\x20\x20\x20\x6d\x61\x72\x67\x69\x6e\x2d\
-\x62\x6f\x74\x74\x6f\x6d\x3a\x20\x31\x35\x70\x78\x3b\x0a\x20\x20\
-\x20\x20\x6d\x61\x72\x67\x69\x6e\x2d\x72\x69\x67\x68\x74\x3a\x20\
-\x31\x70\x78\x3b\x0a\x20\x20\x20\x20\x70\x61\x64\x64\x69\x6e\x67\
-\x3a\x20\x31\x70\x78\x3b\x0a\x20\x20\x20\x20\x62\x61\x63\x6b\x67\
-\x72\x6f\x75\x6e\x64\x2d\x63\x6f\x6c\x6f\x72\x3a\x20\x23\x66\x66\
-\x66\x34\x64\x38\x3b\x0a\x20\x20\x20\x20\x62\x6f\x72\x64\x65\x72\
-\x3a\x20\x31\x70\x78\x20\x73\x6f\x6c\x69\x64\x20\x23\x43\x39\x43\
-\x39\x43\x39\x3b\x0a\x20\x20\x20\x20\x62\x6f\x72\x64\x65\x72\x2d\
-\x72\x61\x64\x69\x75\x73\x3a\x20\x36\x70\x78\x20\x36\x70\x78\x20\
-\x36\x70\x78\x20\x36\x70\x78\x3b\x0a\x20\x20\x20\x20\x62\x6f\x78\
-\x2d\x73\x68\x61\x64\x6f\x77\x3a\x20\x31\x70\x78\x20\x31\x70\x78\
-\x20\x37\x70\x78\x20\x23\x43\x41\x43\x41\x43\x41\x3b\x0a\x7d\x0a\
-\x0a\x64\x69\x76\x2e\x6d\x65\x74\x61\x64\x61\x74\x61\x20\x70\x20\
-\x7b\x0a\x20\x20\x20\x20\x6d\x61\x72\x67\x69\x6e\x3a\x20\x37\x70\
-\x78\x20\x30\x70\x78\x20\x37\x70\x78\x20\x31\x30\x70\x78\x3b\x0a\
-\x7d\x0a\x0a\x73\x70\x61\x6e\x2e\x64\x65\x66\x20\x7b\x0a\x20\x20\
-\x20\x20\x66\x6f\x6e\x74\x2d\x66\x61\x6d\x69\x6c\x79\x3a\x20\x6d\
-\x6f\x6e\x6f\x73\x70\x61\x63\x65\x3b\x0a\x20\x20\x20\x20\x66\x6f\
-\x6e\x74\x2d\x73\x69\x7a\x65\x3a\x20\x39\x30\x25\x3b\x0a\x7d\x0a\
-\x0a\x73\x70\x61\x6e\x2e\x61\x72\x67\x73\x70\x65\x63\x2d\x68\x69\
-\x67\x68\x6c\x69\x67\x68\x74\x20\x7b\x0a\x20\x20\x20\x20\x63\x6f\
-\x6c\x6f\x72\x3a\x20\x62\x6c\x75\x65\x3b\x0a\x20\x20\x20\x20\x66\
-\x6f\x6e\x74\x2d\x73\x69\x7a\x65\x3a\x20\x31\x31\x30\x25\x3b\x0a\
-\x20\x20\x20\x20\x66\x6f\x6e\x74\x2d\x77\x65\x69\x67\x68\x74\x3a\
-\x20\x39\x30\x30\x3b\x0a\x7d\x0a\x0a\x0a\x2f\x2a\x20\x2d\x2d\x2d\
-\x20\x44\x6f\x63\x73\x74\x72\x69\x6e\x67\x20\x64\x69\x76\x20\x73\
-\x74\x79\x6c\x65\x20\x2d\x2d\x2d\x20\x2a\x2f\x0a\x64\x69\x76\x2e\
-\x64\x6f\x63\x73\x74\x72\x69\x6e\x67\x20\x7b\x0a\x20\x20\x20\x20\
-\x6d\x61\x72\x67\x69\x6e\x2d\x74\x6f\x70\x3a\x20\x2d\x31\x70\x78\
-\x3b\x0a\x7d\x0a\x0a\x64\x69\x76\x2e\x64\x6f\x63\x73\x74\x72\x69\
-\x6e\x67\x20\x70\x20\x7b\x0a\x20\x20\x20\x20\x70\x61\x64\x64\x69\
-\x6e\x67\x3a\x20\x30\x70\x78\x20\x32\x70\x78\x20\x30\x70\x78\x3b\
-\x0a\x7d\x0a\x0a\x0a\x2f\x2a\x20\x2d\x2d\x2d\x20\x48\x65\x61\x64\
-\x65\x72\x73\x20\x73\x74\x79\x6c\x65\x20\x2d\x2d\x2d\x20\x2a\x2f\
-\x0a\x68\x32\x2c\x20\x68\x33\x2c\x20\x68\x34\x20\x7b\x0a\x20\x20\
-\x20\x20\x66\x6f\x6e\x74\x2d\x66\x61\x6d\x69\x6c\x79\x3a\x20\x27\
-\x48\x65\x6c\x76\x65\x74\x69\x63\x61\x27\x2c\x20\x73\x61\x6e\x73\
-\x2d\x73\x65\x72\x69\x66\x3b\x0a\x20\x20\x20\x20\x63\x6f\x6c\x6f\
-\x72\x3a\x20\x72\x67\x62\x28\x34\x39\x2c\x20\x31\x32\x36\x2c\x20\
-\x31\x37\x32\x29\x3b\x0a\x20\x20\x20\x20\x6d\x61\x72\x67\x69\x6e\
-\x2d\x74\x6f\x70\x3a\x20\x32\x30\x70\x78\x3b\x0a\x20\x20\x20\x20\
-\x6d\x61\x72\x67\x69\x6e\x2d\x62\x6f\x74\x74\x6f\x6d\x3a\x20\x31\
-\x30\x70\x78\x3b\x0a\x7d\x0a\x0a\x68\x32\x20\x7b\x0a\x20\x20\x20\
-\x20\x66\x6f\x6e\x74\x2d\x73\x69\x7a\x65\x3a\x20\x31\x32\x30\x25\
-\x3b\x0a\x20\x20\x20\x20\x66\x6f\x6e\x74\x2d\x77\x65\x69\x67\x68\
-\x74\x3a\x20\x6e\x6f\x72\x6d\x61\x6c\x3b\x0a\x20\x20\x20\x20\x62\
-\x6f\x72\x64\x65\x72\x2d\x62\x6f\x74\x74\x6f\x6d\x3a\x20\x31\x70\
-\x78\x20\x73\x6f\x6c\x69\x64\x20\x72\x67\x62\x28\x32\x32\x30\x2c\
-\x20\x32\x32\x30\x2c\x20\x32\x32\x30\x29\x3b\x0a\x20\x20\x20\x20\
-\x70\x61\x64\x64\x69\x6e\x67\x3a\x20\x34\x70\x78\x20\x30\x70\x78\
-\x20\x34\x70\x78\x20\x30\x70\x78\x3b\x0a\x7d\x0a\x0a\x68\x33\x20\
-\x7b\x0a\x20\x20\x20\x20\x66\x6f\x6e\x74\x2d\x73\x69\x7a\x65\x3a\
-\x20\x31\x31\x30\x25\x3b\x0a\x7d\x0a\x0a\x68\x34\x20\x7b\x0a\x20\
-\x20\x20\x20\x66\x6f\x6e\x74\x2d\x73\x69\x7a\x65\x3a\x20\x31\x30\
-\x30\x25\x3b\x0a\x20\x20\x20\x20\x6d\x61\x72\x67\x69\x6e\x2d\x74\
-\x6f\x70\x3a\x20\x31\x34\x70\x78\x3b\x0a\x20\x20\x20\x20\x66\x6f\
-\x6e\x74\x2d\x77\x65\x69\x67\x68\x74\x3a\x20\x6e\x6f\x72\x6d\x61\
-\x6c\x3b\x0a\x7d\x0a\x0a\x64\x6c\x2e\x64\x6f\x63\x75\x74\x69\x6c\
-\x73\x20\x7b\x0a\x20\x20\x20\x20\x70\x61\x64\x64\x69\x6e\x67\x3a\
-\x20\x30\x70\x78\x20\x31\x30\x70\x78\x20\x30\x70\x78\x3b\x0a\x7d\
-\x0a\x0a\x64\x69\x76\x2e\x73\x65\x63\x74\x69\x6f\x6e\x20\x70\x20\
-\x7b\x0a\x20\x20\x20\x20\x70\x61\x64\x64\x69\x6e\x67\x3a\x20\x30\
-\x70\x78\x20\x32\x70\x78\x20\x30\x70\x78\x3b\x0a\x7d\x0a\x0a\x23\
-\x77\x61\x72\x6e\x69\x6e\x67\x20\x7b\x0a\x20\x20\x20\x20\x6d\x61\
-\x72\x67\x69\x6e\x2d\x74\x6f\x70\x3a\x20\x35\x70\x78\x3b\x0a\x20\
-\x20\x20\x20\x62\x61\x63\x6b\x67\x72\x6f\x75\x6e\x64\x2d\x63\x6f\
-\x6c\x6f\x72\x3a\x20\x23\x46\x46\x45\x34\x45\x34\x3b\x0a\x20\x20\
-\x20\x20\x62\x6f\x72\x64\x65\x72\x3a\x20\x31\x70\x78\x20\x73\x6f\
-\x6c\x69\x64\x20\x23\x46\x36\x36\x3b\x0a\x20\x20\x20\x20\x70\x61\
-\x64\x64\x69\x6e\x67\x3a\x20\x34\x70\x78\x20\x38\x70\x78\x20\x34\
-\x70\x78\x20\x38\x70\x78\x3b\x0a\x20\x20\x20\x20\x74\x65\x78\x74\
-\x2d\x61\x6c\x69\x67\x6e\x3a\x20\x63\x65\x6e\x74\x65\x72\x3b\x0a\
-\x7d\x0a\x0a\x23\x64\x6f\x63\x2d\x77\x61\x72\x6e\x69\x6e\x67\x20\
-\x7b\x0a\x20\x20\x20\x20\x6d\x61\x72\x67\x69\x6e\x2d\x74\x6f\x70\
-\x3a\x20\x31\x36\x70\x78\x3b\x0a\x20\x20\x20\x20\x77\x69\x64\x74\
-\x68\x3a\x20\x34\x35\x25\x3b\x0a\x20\x20\x20\x20\x6d\x61\x72\x67\
-\x69\x6e\x2d\x6c\x65\x66\x74\x3a\x20\x61\x75\x74\x6f\x3b\x0a\x20\
-\x20\x20\x20\x6d\x61\x72\x67\x69\x6e\x2d\x72\x69\x67\x68\x74\x3a\
-\x20\x61\x75\x74\x6f\x3b\x0a\x20\x20\x20\x20\x63\x6f\x6c\x6f\x72\
-\x3a\x20\x72\x67\x62\x28\x31\x38\x35\x2c\x20\x37\x34\x2c\x20\x37\
-\x32\x29\x3b\x0a\x20\x20\x20\x20\x62\x61\x63\x6b\x67\x72\x6f\x75\
-\x6e\x64\x2d\x63\x6f\x6c\x6f\x72\x3a\x20\x72\x67\x62\x28\x32\x34\
-\x32\x2c\x20\x32\x32\x32\x2c\x20\x32\x32\x32\x29\x3b\x0a\x20\x20\
-\x20\x20\x62\x6f\x72\x64\x65\x72\x3a\x20\x31\x70\x78\x20\x73\x6f\
-\x6c\x69\x64\x20\x72\x67\x62\x28\x32\x33\x38\x2c\x20\x32\x31\x31\
-\x2c\x20\x32\x31\x35\x29\x3b\x0a\x20\x20\x20\x20\x62\x6f\x72\x64\
-\x65\x72\x2d\x72\x61\x64\x69\x75\x73\x3a\x20\x34\x70\x78\x20\x34\
-\x70\x78\x20\x34\x70\x78\x20\x34\x70\x78\x3b\x0a\x20\x20\x20\x20\
-\x70\x61\x64\x64\x69\x6e\x67\x3a\x20\x31\x35\x70\x78\x3b\x0a\x20\
-\x20\x20\x20\x74\x65\x78\x74\x2d\x61\x6c\x69\x67\x6e\x3a\x20\x63\
-\x65\x6e\x74\x65\x72\x3b\x0a\x20\x20\x20\x20\x66\x6f\x6e\x74\x2d\
-\x77\x65\x69\x67\x68\x74\x3a\x20\x62\x6f\x6c\x64\x3b\x0a\x20\x20\
-\x20\x20\x66\x6f\x6e\x74\x2d\x73\x69\x7a\x65\x3a\x20\x31\x30\x35\
-\x25\x3b\x0a\x7d\x0a\x0a\x0a\x2f\x2a\x20\x2d\x2d\x2d\x20\x4c\x69\
-\x6e\x6b\x73\x20\x2d\x2d\x2d\x20\x2a\x2f\x0a\x61\x20\x7b\x0a\x20\
-\x20\x20\x20\x74\x65\x78\x74\x2d\x64\x65\x63\x6f\x72\x61\x74\x69\
-\x6f\x6e\x3a\x20\x6e\x6f\x6e\x65\x3b\x0a\x20\x20\x20\x20\x63\x6f\
-\x6c\x6f\x72\x3a\x20\x72\x67\x62\x61\x28\x34\x30\x2c\x20\x31\x33\
-\x30\x2c\x20\x31\x38\x30\x2c\x20\x31\x29\x3b\x0a\x7d\x0a\x0a\x61\
-\x3a\x68\x6f\x76\x65\x72\x20\x7b\x0a\x20\x20\x20\x20\x74\x65\x78\
-\x74\x2d\x64\x65\x63\x6f\x72\x61\x74\x69\x6f\x6e\x3a\x20\x75\x6e\
-\x64\x65\x72\x6c\x69\x6e\x65\x3b\x0a\x7d\x0a\x0a\x0a\x2f\x2a\x20\
-\x2d\x2d\x2d\x20\x49\x6d\x61\x67\x65\x73\x20\x2d\x2d\x2d\x20\x2a\
-\x2f\x0a\x69\x6d\x67\x20\x7b\x0a\x20\x20\x20\x20\x62\x6f\x78\x2d\
-\x73\x68\x61\x64\x6f\x77\x3a\x20\x30\x70\x78\x20\x32\x70\x78\x20\
-\x36\x70\x78\x20\x23\x63\x61\x63\x61\x63\x61\x3b\x0a\x20\x20\x20\
-\x20\x62\x6f\x72\x64\x65\x72\x3a\x20\x31\x70\x78\x20\x73\x6f\x6c\
-\x69\x64\x20\x23\x63\x39\x63\x39\x63\x39\x3b\x0a\x7d\x0a\x0a\x69\
-\x6d\x67\x2e\x61\x6c\x69\x67\x6e\x2d\x63\x65\x6e\x74\x65\x72\x20\
-\x7b\x0a\x20\x20\x20\x20\x64\x69\x73\x70\x6c\x61\x79\x3a\x20\x62\
-\x6c\x6f\x63\x6b\x3b\x0a\x20\x20\x20\x20\x6d\x61\x72\x67\x69\x6e\
-\x2d\x6c\x65\x66\x74\x3a\x20\x61\x75\x74\x6f\x3b\x0a\x20\x20\x20\
-\x20\x6d\x61\x72\x67\x69\x6e\x2d\x72\x69\x67\x68\x74\x3a\x20\x61\
-\x75\x74\x6f\x3b\x0a\x7d\x0a\x0a\x0a\x2f\x2a\x20\x2d\x2d\x2d\x20\
-\x4c\x69\x73\x74\x73\x20\x73\x74\x79\x6c\x65\x20\x2d\x2d\x2d\x20\
-\x2a\x2f\x0a\x6f\x6c\x2e\x61\x72\x61\x62\x69\x63\x20\x7b\x0a\x20\
-\x20\x20\x20\x6d\x61\x72\x67\x69\x6e\x2d\x6c\x65\x66\x74\x3a\x20\
-\x2d\x31\x30\x70\x78\x3b\x0a\x7d\x0a\x0a\x75\x6c\x20\x7b\x0a\x20\
-\x20\x20\x20\x6d\x61\x72\x67\x69\x6e\x2d\x6c\x65\x66\x74\x3a\x20\
-\x2d\x35\x70\x78\x3b\x0a\x7d\x0a\x0a\x2f\x2a\x20\x2d\x2d\x2d\x20\
-\x4c\x69\x74\x65\x72\x61\x6c\x20\x62\x6c\x6f\x63\x6b\x73\x20\x73\
-\x74\x79\x6c\x65\x20\x2d\x2d\x2d\x20\x2a\x2f\x0a\x70\x72\x65\x2e\
-\x6c\x69\x74\x65\x72\x61\x6c\x2d\x62\x6c\x6f\x63\x6b\x20\x7b\x0a\
-\x20\x20\x20\x20\x70\x61\x64\x64\x69\x6e\x67\x2d\x6c\x65\x66\x74\
-\x3a\x20\x33\x35\x70\x78\x3b\x0a\x20\x20\x20\x20\x66\x6f\x6e\x74\
-\x2d\x73\x69\x7a\x65\x3a\x20\x39\x35\x25\x3b\x0a\x7d\x0a\x0a\x0a\
-\x2f\x2a\x20\x2d\x2d\x2d\x20\x44\x6f\x63\x75\x74\x69\x6c\x73\x20\
-\x74\x61\x62\x6c\x65\x20\x73\x74\x79\x6c\x65\x20\x2d\x2d\x2d\x20\
-\x2a\x2f\x0a\x74\x61\x62\x6c\x65\x2e\x64\x6f\x63\x75\x74\x69\x6c\
-\x73\x20\x7b\x0a\x20\x20\x20\x20\x62\x6f\x72\x64\x65\x72\x2d\x63\
-\x6f\x6c\x6c\x61\x70\x73\x65\x3a\x20\x63\x6f\x6c\x6c\x61\x70\x73\
-\x65\x3b\x0a\x20\x20\x20\x20\x62\x6f\x72\x64\x65\x72\x2d\x73\x70\
-\x61\x63\x69\x6e\x67\x3a\x20\x30\x3b\x0a\x20\x20\x20\x20\x62\x6f\
-\x72\x64\x65\x72\x3a\x20\x23\x44\x44\x44\x44\x44\x44\x3b\x0a\x20\
-\x20\x20\x20\x6d\x61\x72\x67\x69\x6e\x2d\x6c\x65\x66\x74\x3a\x20\
-\x61\x75\x74\x6f\x3b\x0a\x20\x20\x20\x20\x6d\x61\x72\x67\x69\x6e\
-\x2d\x72\x69\x67\x68\x74\x3a\x20\x61\x75\x74\x6f\x3b\x0a\x20\x20\
-\x20\x20\x6d\x61\x72\x67\x69\x6e\x2d\x74\x6f\x70\x3a\x20\x31\x37\
-\x70\x78\x3b\x0a\x20\x20\x20\x20\x6d\x61\x72\x67\x69\x6e\x2d\x62\
-\x6f\x74\x74\x6f\x6d\x3a\x20\x31\x37\x70\x78\x3b\x0a\x20\x20\x20\
-\x20\x77\x69\x64\x74\x68\x3a\x20\x39\x30\x25\x3b\x0a\x7d\x0a\x0a\
-\x74\x61\x62\x6c\x65\x2e\x64\x6f\x63\x75\x74\x69\x6c\x73\x20\x74\
-\x64\x20\x7b\x0a\x20\x20\x20\x20\x70\x61\x64\x64\x69\x6e\x67\x3a\
-\x20\x35\x70\x78\x3b\x0a\x7d\x0a\x0a\x74\x61\x62\x6c\x65\x2e\x64\
-\x6f\x63\x75\x74\x69\x6c\x73\x20\x74\x72\x2e\x72\x6f\x77\x2d\x6f\
-\x64\x64\x20\x7b\x0a\x20\x20\x20\x20\x62\x61\x63\x6b\x67\x72\x6f\
-\x75\x6e\x64\x2d\x63\x6f\x6c\x6f\x72\x3a\x20\x72\x67\x62\x28\x32\
-\x34\x39\x2c\x20\x32\x34\x39\x2c\x20\x32\x34\x39\x29\x3b\x0a\x7d\
-\x0a\x0a\x0a\x2f\x2a\x20\x2d\x2d\x2d\x20\x44\x6f\x63\x75\x74\x69\
-\x6c\x73\x20\x74\x61\x62\x6c\x65\x20\x68\x65\x61\x64\x65\x72\x73\
-\x20\x2d\x2d\x2d\x20\x2a\x2f\x0a\x74\x61\x62\x6c\x65\x2e\x64\x6f\
-\x63\x75\x74\x69\x6c\x73\x20\x74\x68\x20\x7b\x0a\x20\x20\x20\x20\
-\x62\x61\x63\x6b\x67\x72\x6f\x75\x6e\x64\x2d\x63\x6f\x6c\x6f\x72\
-\x3a\x20\x23\x45\x45\x45\x45\x45\x45\x3b\x0a\x20\x20\x20\x20\x62\
-\x6f\x72\x64\x65\x72\x2d\x62\x6f\x74\x74\x6f\x6d\x2d\x63\x6f\x6c\
-\x6f\x72\x3a\x20\x23\x44\x44\x44\x44\x44\x44\x3b\x0a\x20\x20\x20\
-\x20\x62\x6f\x72\x64\x65\x72\x2d\x62\x6f\x74\x74\x6f\x6d\x2d\x73\
-\x74\x79\x6c\x65\x3a\x20\x73\x6f\x6c\x69\x64\x3b\x0a\x20\x20\x20\
-\x20\x62\x6f\x72\x64\x65\x72\x2d\x62\x6f\x74\x74\x6f\x6d\x2d\x77\
-\x69\x64\x74\x68\x3a\x20\x31\x70\x78\x3b\x0a\x20\x20\x20\x20\x62\
-\x6f\x72\x64\x65\x72\x2d\x74\x6f\x70\x2d\x63\x6f\x6c\x6f\x72\x3a\
-\x20\x23\x44\x44\x44\x44\x44\x44\x3b\x0a\x20\x20\x20\x20\x62\x6f\
-\x72\x64\x65\x72\x2d\x74\x6f\x70\x2d\x73\x74\x79\x6c\x65\x3a\x20\
-\x73\x6f\x6c\x69\x64\x3b\x0a\x20\x20\x20\x20\x62\x6f\x72\x64\x65\
-\x72\x2d\x74\x6f\x70\x2d\x77\x69\x64\x74\x68\x3a\x20\x31\x70\x78\
-\x3b\x0a\x20\x20\x20\x20\x66\x6f\x6e\x74\x2d\x77\x65\x69\x67\x68\
-\x74\x3a\x20\x62\x6f\x6c\x64\x3b\x0a\x20\x20\x20\x20\x74\x65\x78\
-\x74\x2d\x61\x6c\x69\x67\x6e\x3a\x20\x63\x65\x6e\x74\x65\x72\x3b\
-\x0a\x20\x20\x20\x20\x70\x61\x64\x64\x69\x6e\x67\x3a\x20\x36\x70\
-\x78\x20\x30\x70\x78\x20\x36\x70\x78\x20\x38\x70\x78\x3b\x0a\x20\
-\x20\x20\x20\x63\x6f\x6c\x6f\x72\x3a\x20\x72\x67\x62\x28\x36\x35\
-\x2c\x20\x36\x35\x2c\x20\x36\x35\x29\x3b\x0a\x7d\x0a\x0a\x0a\x2f\
-\x2a\x20\x2d\x2d\x2d\x20\x46\x69\x65\x6c\x64\x2d\x6c\x69\x73\x74\
-\x20\x74\x61\x62\x6c\x65\x20\x73\x74\x79\x6c\x65\x20\x2d\x2d\x2d\
-\x20\x2a\x2f\x0a\x74\x61\x62\x6c\x65\x2e\x64\x6f\x63\x75\x74\x69\
-\x6c\x73\x2e\x66\x69\x65\x6c\x64\x2d\x6c\x69\x73\x74\x20\x7b\x0a\
-\x20\x20\x20\x20\x66\x6f\x6e\x74\x2d\x73\x69\x7a\x65\x3a\x20\x38\
-\x30\x25\x3b\x0a\x20\x20\x20\x20\x62\x6f\x72\x64\x65\x72\x2d\x63\
-\x6f\x6c\x6c\x61\x70\x73\x65\x3a\x20\x63\x6f\x6c\x6c\x61\x70\x73\
-\x65\x3b\x0a\x20\x20\x20\x20\x62\x6f\x72\x64\x65\x72\x2d\x6c\x65\
-\x66\x74\x3a\x20\x74\x72\x61\x6e\x73\x70\x61\x72\x65\x6e\x74\x3b\
-\x0a\x20\x20\x20\x20\x62\x6f\x72\x64\x65\x72\x2d\x72\x69\x67\x68\
-\x74\x3a\x20\x74\x72\x61\x6e\x73\x70\x61\x72\x65\x6e\x74\x3b\x0a\
-\x20\x20\x20\x20\x6d\x61\x72\x67\x69\x6e\x2d\x74\x6f\x70\x3a\x20\
-\x31\x35\x70\x78\x3b\x0a\x20\x20\x20\x20\x6d\x61\x72\x67\x69\x6e\
-\x2d\x6c\x65\x66\x74\x3a\x20\x34\x30\x70\x78\x3b\x0a\x20\x20\x20\
-\x20\x77\x69\x64\x74\x68\x3a\x20\x38\x33\x25\x3b\x0a\x7d\x0a\x0a\
-\x0a\x2f\x2a\x20\x2d\x2d\x2d\x20\x46\x69\x65\x6c\x64\x2d\x6c\x69\
-\x73\x74\x20\x74\x61\x62\x6c\x65\x20\x68\x65\x61\x64\x65\x72\x73\
-\x20\x2d\x2d\x2d\x20\x2a\x2f\x0a\x74\x61\x62\x6c\x65\x2e\x64\x6f\
-\x63\x75\x74\x69\x6c\x73\x2e\x66\x69\x65\x6c\x64\x2d\x6c\x69\x73\
-\x74\x20\x74\x68\x20\x7b\x0a\x20\x20\x20\x20\x62\x61\x63\x6b\x67\
-\x72\x6f\x75\x6e\x64\x2d\x63\x6f\x6c\x6f\x72\x3a\x20\x74\x72\x61\
-\x6e\x73\x70\x61\x72\x65\x6e\x74\x3b\x0a\x20\x20\x20\x20\x62\x6f\
-\x72\x64\x65\x72\x2d\x74\x6f\x70\x3a\x20\x74\x72\x61\x6e\x73\x70\
-\x61\x72\x65\x6e\x74\x3b\x0a\x20\x20\x20\x20\x62\x6f\x72\x64\x65\
-\x72\x2d\x62\x6f\x74\x74\x6f\x6d\x3a\x20\x74\x72\x61\x6e\x73\x70\
-\x61\x72\x65\x6e\x74\x3b\x0a\x20\x20\x20\x20\x63\x6f\x6c\x6f\x72\
-\x3a\x20\x62\x6c\x61\x63\x6b\x3b\x0a\x20\x20\x20\x20\x66\x6f\x6e\
-\x74\x2d\x77\x65\x69\x67\x68\x74\x3a\x20\x62\x6f\x6c\x64\x3b\x0a\
-\x20\x20\x20\x20\x74\x65\x78\x74\x2d\x61\x6c\x69\x67\x6e\x3a\x20\
-\x6c\x65\x66\x74\x3b\x0a\x20\x20\x20\x20\x70\x61\x64\x64\x69\x6e\
-\x67\x3a\x20\x34\x70\x78\x20\x30\x70\x78\x20\x34\x70\x78\x20\x38\
-\x70\x78\x3b\x0a\x7d\x0a\x0a\x0a\x2f\x2a\x20\x2d\x2d\x2d\x20\x53\
-\x70\x61\x63\x69\x6e\x67\x20\x61\x72\x6f\x75\x6e\x64\x20\x65\x78\
-\x61\x6d\x70\x6c\x65\x20\x63\x6f\x64\x65\x20\x2d\x2d\x2d\x20\x2a\
-\x2f\x0a\x64\x69\x76\x2e\x68\x69\x67\x68\x6c\x69\x67\x68\x74\x20\
-\x70\x72\x65\x20\x7b\x0a\x20\x20\x20\x20\x70\x61\x64\x64\x69\x6e\
-\x67\x3a\x20\x39\x70\x78\x20\x31\x34\x70\x78\x3b\x0a\x20\x20\x20\
-\x20\x62\x61\x63\x6b\x67\x72\x6f\x75\x6e\x64\x2d\x63\x6f\x6c\x6f\
-\x72\x3a\x20\x72\x67\x62\x28\x32\x34\x37\x2c\x20\x32\x34\x37\x2c\
-\x20\x32\x34\x39\x29\x3b\x0a\x20\x20\x20\x20\x62\x6f\x72\x64\x65\
-\x72\x2d\x72\x61\x64\x69\x75\x73\x3a\x20\x34\x70\x78\x20\x34\x70\
-\x78\x20\x34\x70\x78\x20\x34\x70\x78\x3b\x0a\x20\x20\x20\x20\x62\
-\x6f\x72\x64\x65\x72\x3a\x20\x31\x70\x78\x20\x73\x6f\x6c\x69\x64\
-\x20\x72\x67\x62\x28\x32\x32\x35\x2c\x20\x32\x32\x35\x2c\x20\x32\
-\x33\x32\x29\x3b\x0a\x7d\x0a\x0a\x64\x69\x76\x2e\x68\x69\x67\x68\
-\x6c\x69\x67\x68\x74\x20\x7b\x0a\x20\x20\x20\x20\x70\x61\x64\x64\
-\x69\x6e\x67\x3a\x20\x30\x70\x78\x20\x31\x30\x70\x78\x20\x30\x70\
-\x78\x3b\x0a\x7d\x0a\x0a\x64\x74\x20\x7b\x0a\x20\x20\x20\x20\x66\
-\x6f\x6e\x74\x2d\x77\x65\x69\x67\x68\x74\x3a\x20\x62\x6f\x6c\x64\
-\x3b\x0a\x20\x20\x20\x20\x2f\x2a\x66\x6f\x6e\x74\x2d\x73\x69\x7a\
-\x65\x3a\x20\x31\x36\x70\x78\x3b\x2a\x2f\x0a\x7d\x0a\x0a\x2e\x63\
-\x6c\x61\x73\x73\x69\x66\x69\x65\x72\x20\x7b\x0a\x20\x20\x20\x20\
-\x2f\x2a\x66\x6f\x6e\x74\x2d\x73\x69\x7a\x65\x3a\x20\x31\x30\x70\
-\x74\x3b\x2a\x2f\x0a\x20\x20\x20\x20\x66\x6f\x6e\x74\x2d\x77\x65\
-\x69\x67\x68\x74\x3a\x20\x6e\x6f\x72\x6d\x61\x6c\x3b\x0a\x7d\x0a\
-\x0a\x74\x74\x20\x7b\x0a\x20\x20\x20\x20\x62\x61\x63\x6b\x67\x72\
-\x6f\x75\x6e\x64\x2d\x63\x6f\x6c\x6f\x72\x3a\x20\x23\x45\x43\x46\
-\x30\x46\x33\x3b\x0a\x20\x20\x20\x20\x2f\x2a\x66\x6f\x6e\x74\x2d\
-\x73\x69\x7a\x65\x3a\x20\x39\x35\x25\x3b\x2a\x2f\x0a\x20\x20\x20\
-\x20\x70\x61\x64\x64\x69\x6e\x67\x3a\x20\x30\x70\x78\x20\x31\x70\
-\x78\x3b\x0a\x7d\x0a\x0a\x0a\x0a\x64\x69\x76\x2e\x61\x64\x6d\x6f\
-\x6e\x69\x74\x69\x6f\x6e\x2e\x6e\x6f\x74\x65\x20\x7b\x0a\x20\x20\
-\x20\x20\x66\x6f\x6e\x74\x2d\x73\x69\x7a\x65\x3a\x20\x30\x2e\x39\
-\x35\x65\x6d\x3b\x0a\x20\x20\x20\x20\x6d\x61\x72\x67\x69\x6e\x3a\
-\x20\x31\x2e\x33\x65\x6d\x3b\x0a\x20\x20\x20\x20\x62\x6f\x72\x64\
-\x65\x72\x3a\x20\x31\x70\x78\x20\x73\x6f\x6c\x69\x64\x20\x23\x42\
-\x43\x45\x38\x46\x31\x3b\x0a\x20\x20\x20\x20\x62\x61\x63\x6b\x67\
-\x72\x6f\x75\x6e\x64\x2d\x63\x6f\x6c\x6f\x72\x3a\x20\x23\x44\x39\
-\x45\x44\x46\x37\x3b\x0a\x20\x20\x20\x20\x70\x61\x64\x64\x69\x6e\
-\x67\x3a\x20\x30\x70\x78\x20\x35\x70\x78\x20\x30\x20\x35\x70\x78\
-\x3b\x0a\x20\x20\x20\x20\x63\x6f\x6c\x6f\x72\x3a\x20\x23\x33\x41\
-\x38\x37\x41\x44\x3b\x0a\x7d\x0a\x0a\x64\x69\x76\x2e\x61\x64\x6d\
-\x6f\x6e\x69\x74\x69\x6f\x6e\x20\x70\x2e\x61\x64\x6d\x6f\x6e\x69\
-\x74\x69\x6f\x6e\x2d\x74\x69\x74\x6c\x65\x20\x7b\x0a\x20\x20\x20\
-\x20\x66\x6f\x6e\x74\x2d\x73\x69\x7a\x65\x3a\x20\x31\x65\x6d\x3b\
-\x0a\x20\x20\x20\x20\x6d\x61\x72\x67\x69\x6e\x2d\x74\x6f\x70\x3a\
-\x20\x37\x70\x78\x3b\x0a\x20\x20\x20\x20\x66\x6f\x6e\x74\x2d\x77\
-\x65\x69\x67\x68\x74\x3a\x20\x62\x6f\x6c\x64\x3b\x0a\x7d\x0a\
+\x00\x00\x05\xeb\
+\x00\
+\x00\x13\xbb\x78\x9c\x9d\x58\xdd\x8e\x9b\x3a\x10\xbe\xcf\x53\x58\
+\x8a\x56\x4d\x56\x21\x0b\x04\x02\xc9\x5e\xad\xda\xae\x7a\xa4\xf6\
+\xaa\x7d\x01\x07\x9c\x60\x2d\x60\x84\x9d\x66\xf7\x54\x7d\xf7\x33\
+\x36\x36\xc1\xfc\x64\xdb\x03\x0b\x1b\x3c\xce\x30\xf3\xcd\x37\xe3\
+\x71\x1e\xee\x67\xe8\x1e\xfd\xc8\x28\x47\x5c\xbc\xe5\x04\xa5\xe4\
+\x48\x4b\x2a\x28\x2b\x11\x8c\x1d\x30\x27\x29\x82\xcf\x22\x23\x7a\
+\x02\xcf\x08\x11\xe8\x48\xe1\x23\x3b\xa2\xef\xd5\x5b\x4a\xea\x35\
+\x28\x79\x98\xcd\x32\x51\xe4\xe8\xd7\x0c\xc1\x71\xc0\xc9\xcb\xa9\
+\x66\xe7\x32\x75\x12\x96\xb3\x7a\x8f\xe6\xfe\x56\x9e\x8f\xb3\xdf\
+\xb3\xd9\x81\xa5\x6f\xef\x4f\x94\x62\x33\x76\x54\x47\x33\x56\xe0\
+\xfa\x44\xcb\x3d\x72\xab\x57\xe4\x59\x37\xa5\x7c\xf6\x70\x8f\x1c\
+\xc7\x41\x3f\xa8\xc8\x8d\xd1\xf2\x19\x2c\x4c\xe9\xcf\xb5\x50\xc3\
+\x99\xa7\xdf\x7f\x64\xa5\x70\x38\xfd\x97\xec\x91\xb7\x71\xef\x1e\
+\xaf\x83\x47\x5c\xd0\xfc\x6d\x8f\x3e\xfc\xa8\xc9\xe1\x9c\x64\xe0\
+\xf5\xb7\xef\x1f\x56\x88\xe3\x92\x3b\x9c\xd4\x54\x9b\x33\xe2\x41\
+\x1c\x46\x51\xf0\x34\x10\xd3\x02\x9f\xe0\x3d\xce\x85\x1c\x5e\xa8\
+\x70\x4e\x35\x4e\x29\x29\xc5\x42\xcd\x93\x47\x4e\x4b\x82\xeb\x55\
+\xfb\xec\x22\xb7\xfb\xe0\xb9\xee\xdd\xf5\xf9\x58\xb3\x62\xa1\x5f\
+\xb5\xbc\x0e\x2b\x1b\x1c\x2e\x58\xb5\xd8\xc2\x74\x34\x3f\xec\x70\
+\xb8\x8d\x3a\x33\x04\x5b\xcc\x89\x97\xc4\x51\xba\x54\x63\xcb\xc6\
+\x50\x41\x5e\x01\x89\x0c\xa7\xec\xa2\xb1\xd5\x57\x7d\x3a\xe0\x85\
+\xbb\x42\xfa\x6f\xed\x2f\x3b\x28\x5d\x08\x3d\x65\x62\x8f\x4a\x56\
+\x17\x38\x6f\x04\x15\x4e\x53\x5a\x9e\xf6\x68\x0b\xdf\x96\x9a\xe4\
+\x7f\x5f\xc5\xa7\x1f\x3f\xc7\x0f\xcd\xb0\x01\xef\x59\x1d\x2a\x94\
+\x0f\x9a\x9d\x04\x95\x60\x1c\x12\x17\xd6\xc4\x93\x23\x5c\xcb\x31\
+\x92\x02\x3b\x05\x93\x93\x0a\x96\xd2\xe3\x9b\xe2\x29\x2e\x93\x8c\
+\xd5\x1c\x55\x35\xe1\x00\xaf\xa6\xaf\x9c\xd4\xc4\x1e\x68\x5b\x41\
+\x20\x38\xc0\xfd\x02\x04\x49\x68\xf5\xb6\xe6\x02\x0b\x8e\x58\x2d\
+\x67\x35\x23\x94\xcd\x06\x94\xc1\x9a\x34\xda\x54\x51\x03\x15\x2a\
+\x30\xa5\x14\xda\x85\x73\xcd\xa5\x00\x92\x08\x9f\x73\xa1\x7c\xb0\
+\x14\x08\x31\xa4\xdd\x2e\xbc\x9b\x22\xd2\xf0\x05\x43\x8c\x0c\xdd\
+\xbf\x11\x81\x53\x2c\xf0\x90\xf1\x85\x91\xfc\xea\xc0\xef\x00\x41\
+\xf6\x3a\x69\x3a\xa3\x07\x26\x04\x2b\x40\x10\xf6\x04\x75\x13\x66\
+\xcf\x0c\xb7\x31\x6e\x47\x46\xf2\x00\x52\x36\x48\x63\x2d\x66\x35\
+\x54\x0a\x35\x1f\x71\x96\xd3\x14\xcd\x3f\xee\xe4\xd9\x15\x3b\x32\
+\x25\xce\xbc\x61\x4e\xe7\x32\x73\x5e\x5b\x82\x1a\x72\x46\x70\xcd\
+\x3f\x3e\xc9\xd3\x86\xc8\x55\x47\x1b\x82\x16\x84\xca\x82\x61\xaf\
+\x14\xb8\x5a\x51\x5b\x43\x00\xf4\x72\x0d\x51\xec\x46\xcb\xd4\x83\
+\x82\x95\x0c\xe4\x09\x79\x1c\x44\x52\xd6\x0f\xf3\x6d\x50\xcf\x2b\
+\x92\x38\x19\x00\x97\x4b\xf0\x6c\xee\x1c\xf2\xf3\x50\x81\xe7\x59\
+\x15\xc8\xe4\xd6\x4e\xfb\x61\x42\xfd\x89\x25\x5c\xd4\x80\x3e\x02\
+\xcf\x86\xf1\x4e\x5b\xf1\x30\xe0\x8e\xa7\x3d\xb4\x27\x1a\x50\xda\
+\xa8\x4a\x44\xfc\x06\x19\xeb\xd5\x5f\x08\x86\x30\x71\xfb\xa5\x99\
+\xbf\x42\xd9\x06\xae\x60\x0c\xaf\x0f\x5f\x48\xfe\x93\x08\x9a\xe0\
+\x91\xe2\xa9\xd1\x80\x12\xb3\x08\x76\x2b\xe4\xf9\x5b\xb8\x45\xa6\
+\xc2\x74\x2d\xef\xd7\x8f\x2b\x55\x8d\x8d\x99\x3f\x52\xd3\xfd\x51\
+\x44\xbb\xd5\x4a\x33\xaf\x55\xd7\xf2\x53\x1a\xe5\xfb\x50\xf2\xcc\
+\x6d\xd9\xa3\x7e\xa0\xa9\x13\x74\x80\xca\x36\x23\x46\x78\x9a\x18\
+\x36\x40\x5a\xe8\x1a\x0b\xad\xc4\x0c\x8c\xb7\xa3\x76\xcb\x00\xe6\
+\x32\x7e\x67\x41\x73\x3e\x16\x3c\xb5\x26\xba\x9d\x60\x73\x92\xa8\
+\x55\xfd\xdd\x50\xcf\x2f\xb8\x2e\xc7\xd9\x13\x0e\xb2\x5f\xba\x1e\
+\x6b\x08\x62\x23\x55\x2b\x09\x06\xd2\x43\x7a\x25\x50\xbb\x48\x3d\
+\x59\x02\x9e\x9f\x3f\x07\x9f\x83\xc9\x02\xf2\xbc\x6d\x1a\x86\x39\
+\xb8\xea\x4c\xdb\xe5\xb5\x25\xe2\x42\x53\x91\x81\x59\xa1\x8d\x69\
+\x4e\x8e\x80\x1e\x3e\x0b\x36\x56\xd4\xae\xe3\x43\x13\x24\x09\xbc\
+\x38\x5c\xa1\x28\x80\xcb\x10\xb3\x23\xf4\x03\x5f\x92\xa3\xb9\x2d\
+\xa7\x1c\x55\x33\x37\x31\x4c\xf2\x3c\x79\x0b\xad\x99\x6d\xd9\x0b\
+\x34\x94\xfa\xea\x97\xda\xf0\x3d\x84\x2d\xb2\x1c\x58\x9e\x0e\x4b\
+\x8c\x1b\xde\x59\x19\xfd\x95\x96\x2f\xdc\x64\xb2\x59\x23\x94\xfe\
+\x94\x24\xac\xc6\x92\x34\x92\x78\x25\xe9\xbb\x8e\x17\x01\xe4\x05\
+\x74\x4d\x70\x8b\xe5\x6d\xa9\x14\xe3\x7d\xc6\x7e\x92\x7a\x4a\x13\
+\x60\x4b\x6a\xd9\xe8\x58\x56\xfc\x53\xa8\x15\x59\x9b\x41\x0b\x13\
+\xe5\x6e\xc9\x37\x44\x95\x6b\xc2\x3c\xc1\xf2\x9c\xe4\x55\xb2\x93\
+\xa7\x7a\x05\x28\x5b\x2b\xa8\x9c\x06\x29\xad\x39\xa5\xbc\xca\xf1\
+\x9b\xac\xc4\x2c\x79\xf9\x6b\xb6\x58\x08\x72\xd1\xab\x88\x2c\x87\
+\xfa\x8f\x0f\x34\xb1\xc9\xda\x28\x76\xda\x8a\x75\xce\x47\xe5\xa1\
+\x16\xb7\xfa\xc1\x6a\x9c\x37\x86\xf6\x5e\x04\x3d\xce\x3a\x6f\xe4\
+\x8e\x92\xdb\xd9\xad\x35\x6e\x42\xab\x9a\x74\xfa\x0e\x7b\x55\x69\
+\xaa\x89\xc0\x87\x7e\xe3\xac\x86\xfa\xf5\x46\x73\x17\x08\x91\xe3\
+\x8a\x83\x46\xf3\xc9\xa2\xb6\x5c\x2a\x9b\x3a\x63\x07\x6b\xfe\x49\
+\x1d\xff\x2b\x4d\xad\xdc\x8f\xa6\xd6\x85\xa8\x57\x14\xcc\xf2\xdc\
+\x73\x46\xa4\xfd\x8a\x68\xf0\xef\x4f\xac\xd7\x35\xbb\x38\x2c\x4d\
+\x27\xf7\x2e\x32\xcd\x43\x58\xc2\x9a\x6b\x79\x0b\xdf\x4c\xaf\xa4\
+\xe3\x08\x8b\x6c\x7a\x7f\xb4\x89\xe5\x39\xb2\x78\xb5\x33\xba\xd0\
+\xda\x33\x54\x54\xf7\x4d\x96\x8c\xc9\x35\x54\xd7\xa6\xae\x91\x02\
+\xd2\xb7\x94\x4b\xf1\xa4\x66\x29\xec\xab\x9d\xa8\x53\x53\x65\x6d\
+\x74\x43\x11\xf7\x36\x0e\x12\x7b\x59\x61\x9b\xcb\xc6\xfe\x99\x92\
+\x3c\x75\x72\x48\xd4\xf7\xd9\xbd\x3e\x5e\x27\x0f\x56\xeb\xd8\x2c\
+\xd6\x7f\x46\xfe\x86\xd0\x83\x36\xde\x54\xfd\xc6\xff\x81\xd8\xa2\
+\x77\xbf\x11\x6f\x54\x06\x6e\x8f\xdc\xf1\xe6\xee\xb6\xc7\x37\xf9\
+\xd6\xf5\xf9\x06\xf5\xa6\x1c\x51\x96\x4e\x09\x4d\x3e\x4e\x6d\x66\
+\x2e\x19\xd4\xaf\x3f\xa6\x85\x74\xff\x46\x1b\x16\xf7\xfa\xd5\xef\
+\x4d\xf5\x81\xfd\xa2\xf4\x03\x91\x57\x5c\x54\x00\x46\xc2\x52\xab\
+\x65\xbe\x36\xe9\x50\x50\xfb\xe5\x60\x27\xdb\xa9\x60\x7a\x9b\xa3\
+\x9a\xd7\x68\x85\x62\x68\x60\x83\xe0\x2f\x16\xf6\xf1\x36\x21\x02\
+\xfe\x7a\xb2\x19\x8e\x36\xcb\xb6\x7b\xeb\xef\x22\x6e\xf4\x7a\x16\
+\x6b\x87\x60\x3e\xdc\x77\xbb\x01\xd9\x38\x01\x06\xf0\xbd\x75\x92\
+\x63\xce\x29\x10\xc1\xac\x90\xf6\x4c\xb7\x12\x72\xe6\x40\x73\xa7\
+\x25\x6d\x77\xb7\x63\x3f\xea\xa4\x3e\xf1\x8f\x23\x26\xc8\x65\x48\
+\xeb\xb5\x9d\x32\x91\x54\xfe\xe3\x14\xb6\x5d\xea\x67\xa9\x75\xc9\
+\x04\x19\x26\xa6\xbb\xde\x85\xa4\xb0\x7f\x60\xf0\xd6\x1b\x33\x34\
+\xd2\x22\x6c\xa3\xe8\x18\x4f\xb7\x9e\xbe\x07\x9d\xdd\xf6\x71\x68\
+\x58\x28\xc1\x46\x83\x9f\x2d\x36\x4f\x71\xf4\xf4\xa9\x0d\xd8\xd5\
+\x60\x54\x75\x1e\x9c\xe6\xa7\x80\xe1\x2e\xc0\xb6\xbd\xc9\xa8\xe8\
+\x46\xb9\xfc\x3d\xfb\x0f\xe2\x65\xd2\x66\
+\x00\x00\x05\xe4\
+\x00\
+\x00\x13\xaf\x78\x9c\x9d\x58\xdd\x72\xda\x3a\x10\xbe\xe7\x29\x34\
+\xc3\x64\x0a\x99\x98\xd8\x60\x63\x43\xae\x72\x92\x30\xed\xcc\xe9\
+\x55\xfb\x02\xc2\x16\x58\x13\xdb\xf2\x58\xa2\x84\xd3\xe9\xbb\x9f\
+\x95\x2c\x19\xcb\x3f\xb4\xe7\x98\xd8\x01\xed\xb2\xde\xfd\xf6\xdb\
+\xd5\x9a\xc7\xfb\x09\xba\x47\xdf\x53\xca\x11\x17\x97\x8c\xa0\x84\
+\x1c\x68\x41\x05\x65\x05\x82\xb5\x3d\xe6\x24\x41\xf0\x5e\xa4\x44\
+\x2b\xf0\x94\x10\x81\x0e\x14\xde\xb2\x03\xfa\x56\x5e\x12\x52\x2d\
+\xc0\xc8\xe3\x64\x92\x8a\x3c\x43\x3f\x27\x08\x8e\x3d\x8e\xdf\x8f\
+\x15\x3b\x15\x89\x13\xb3\x8c\x55\x5b\x34\x3d\xa8\xe3\x69\xf2\x6b\
+\x32\xd9\xb3\xe4\xf2\x7b\x45\x29\x36\x6b\xae\x3a\xea\xb5\x1c\x57\
+\x47\x5a\x6c\x91\x5b\x7e\x20\xcf\xba\x28\xe3\x93\xc7\x7b\xe4\x38\
+\x0e\xfa\x4e\x45\x66\x9c\x96\x9f\xc1\xc3\x84\xfe\x58\x08\xb5\x9c\
+\x7a\xfa\xfe\x07\x56\x08\x87\xd3\x7f\xc8\x16\x79\x2b\xf7\xee\xe9\
+\xba\x78\xc0\x39\xcd\x2e\x5b\xf4\xe9\x7b\x45\xf6\xa7\x38\x85\xa8\
+\xbf\x7e\xfb\xf4\x80\x38\x2e\xb8\xc3\x49\x45\xb5\x8b\x03\x11\x44\
+\x41\x18\xfa\xcf\x3d\x31\xcd\xf1\x11\xee\xe3\x9c\xc9\xfe\x9d\x0a\
+\xe7\x58\xe1\x84\x92\x42\xcc\x94\x9e\x3c\x32\x5a\x10\x5c\x3d\x34\
+\x9f\x5d\xe4\xb6\x3f\x78\xae\x7b\x77\xfd\x7c\xa8\x58\x3e\xd3\xb7\
+\x9a\x5f\x97\x95\x0f\x0e\x17\xac\x9c\xad\x41\x1d\x4d\xf7\x1b\x1c\
+\xac\xc3\x96\x86\x60\xb3\x29\xf1\xe2\x28\x4c\xe6\x6a\x6d\x5e\x3b\
+\x2a\xc8\x07\x20\x91\xe2\x84\x9d\x35\xb6\xfa\xac\x8e\x7b\x3c\x73\
+\x1f\x90\xfe\x5b\x2c\xe7\x2d\x94\xce\x84\x1e\x53\xb1\x45\x05\xab\
+\x72\x9c\xd5\x82\x12\x27\x09\x2d\x8e\x5b\xb4\x86\x6f\x4b\x4b\xf2\
+\xff\x52\xe5\xa7\x9b\x3f\x67\x19\x98\x65\x03\xde\x4e\x1d\x2a\x95\
+\x8f\x9a\x9d\x04\x15\xe0\x1c\x12\x67\x56\xe7\x93\x23\x5c\xc9\x35\
+\x92\x00\x3b\x05\x93\x4a\x39\x4b\xe8\xe1\xa2\x78\x8a\x8b\x38\x65\
+\x15\x47\x65\x45\x38\xc0\xab\xe9\x2b\x95\xea\xdc\x03\x6d\x4b\x48\
+\x04\x07\xb8\xdf\x81\x20\x31\x2d\x2f\x0b\x2e\xb0\xe0\x88\x55\x52\
+\xab\x5e\xa1\x6c\xd2\xa3\x0c\xd6\xa4\xd1\xae\x8a\x0a\xa8\x50\x82\
+\x2b\x85\xd0\x21\x9c\x2a\x2e\x05\x50\x44\xf8\x94\x09\x15\x83\x65\
+\x40\x88\x3e\xed\x36\xc1\xdd\x18\x91\xfa\x37\xe8\x63\x64\xe8\xfe\
+\x95\x08\x9c\x60\x81\xfb\x8c\xcf\x8d\xe4\x67\x0b\x7e\x07\x08\xb2\
+\xd5\x45\xd3\x5a\xdd\x33\x21\x58\x0e\x82\xa0\x23\xa8\xea\x34\x7b\
+\x66\xb9\xc9\x71\xb3\x32\x5c\xc9\x7e\x12\x69\x31\xab\xa0\x53\x28\
+\x7d\xc4\x59\x46\x13\x34\x7d\xd9\xc8\x57\x5b\xec\xc8\x92\x38\xf1\
+\x9a\x39\xad\xd3\xe8\x7c\x34\x04\x35\xe4\x0c\xe1\x9c\xbe\x3c\xcb\
+\x57\x03\x77\x13\x70\x69\x85\xbc\x55\xca\xae\xfe\x52\xd3\x2f\x00\
+\xe0\x62\x01\x19\x6b\x67\xc6\xd4\x7e\xce\x0a\x06\xf2\x98\x3c\xf5\
+\xb2\x26\x7b\x85\xf9\x36\x98\xe7\x25\x89\x9d\x14\x40\xca\x24\x50\
+\x36\x4f\xf6\xd9\xa9\x6f\xc0\xf3\xac\x6e\x63\xea\x68\x23\xbb\x5c\
+\x2b\xad\xaf\x2c\xe6\xa2\x02\xa4\x11\x44\xd6\xcf\x6d\xd2\x88\xfb\
+\xc9\x75\x3c\x1d\xa1\xad\x68\x40\x69\x32\x28\x11\x59\xd6\xc8\x58\
+\xb7\xfe\x4c\x30\xa4\x84\xdb\x37\x4d\x97\x0f\x28\x5d\xc1\xe9\x0f\
+\xe1\xf5\xe9\x33\xc9\x7e\x10\x41\x63\x3c\xd0\x28\x35\x1a\xd0\x4e\
+\x66\xfe\xe6\x01\x79\xcb\x35\x5c\x42\xd3\x4d\xda\x9e\x77\x7b\xc5\
+\x95\x96\xc6\xc7\x74\x39\xd0\xbf\x97\x83\x88\xb6\x3b\x93\x66\x59\
+\x63\xae\xe1\xa2\x74\x6a\xb9\x84\xf6\x66\x2e\xf3\x0e\xcd\x7d\x4d\
+\x1d\xbf\x05\x54\xba\x1a\x70\xc2\xd3\xc4\xb0\x01\xd2\x42\xd7\x78\
+\x68\x15\xa1\x6f\xa2\x1d\xf4\x5b\x26\x30\x93\xf9\x3b\x09\x9a\xf1\
+\xa1\xe4\xa9\xfd\xcf\x6d\x25\x9b\x93\x58\xed\xe0\xbf\x4d\xf5\xf4\
+\x8c\xab\x62\x98\x3d\xc1\x8d\xba\xde\xed\xde\xfc\x37\x7f\xb4\xae\
+\x77\xeb\xf5\x00\x7a\x91\x46\x2f\x32\x86\xd5\x86\x83\xa1\x5e\xa0\
+\x32\x63\x68\x71\xa4\xaa\x7d\x82\x50\x9d\x71\xbf\xbc\xa6\x1d\x9c\
+\x69\x22\x52\xb0\x1d\xd8\x98\x66\xe4\x00\xe8\xe1\x93\x60\x43\x0d\
+\xec\xba\xde\xa2\xa3\x17\x05\x0f\x28\xf4\xe1\x34\x6c\xec\x07\xad\
+\x18\xe2\x2f\x25\x39\xea\xcb\x7c\x2c\x7e\xa5\xb9\x8a\x40\xc9\xf3\
+\xe4\x25\xb0\x34\x9b\x16\xe7\x6b\x3c\xf4\xd9\x6d\xab\xc1\x2d\x98\
+\x7a\x64\xd9\xb3\x2c\xe9\xb7\x18\x37\xb8\xb3\x2a\xfa\x6f\x5a\xbc\
+\x73\x53\xc9\x66\x3f\x50\xf6\x13\x12\xb3\x0a\x4b\xd2\x48\xe2\x15\
+\xa4\x0b\x11\x9e\xf9\x50\x17\x30\x21\xc1\x25\x92\x97\xb9\x32\x8c\
+\xb7\x29\xfb\x41\xaa\x31\x4b\x00\x1f\xa9\xe4\x50\x63\x79\xf1\x25\
+\x57\xbb\xaf\x76\x83\xe6\x26\xcb\xed\xf6\x6e\x88\x2a\xfb\xff\x34\
+\xc6\xf2\x35\x4a\xb7\x78\x23\x5f\xea\x16\x60\x6c\xa1\xa0\x72\x6a\
+\xa4\xb4\xe5\x84\xf2\x32\xc3\x17\xd9\x89\x59\xfc\xfe\x9f\xd9\x62\
+\x21\xc8\x45\xa7\x23\xb2\x0c\xfa\x3f\xde\xd3\xd8\x26\x6b\x6d\xd8\
+\x69\x3a\xd6\x29\x1b\x94\x07\x5a\xdc\xd8\x07\xaf\x71\x56\x3b\xda\
+\xb9\x11\xcc\x33\x8b\xac\x96\x3b\x4a\x6e\x57\xb7\xb6\xb8\x0a\xac\
+\x6e\xd2\x9a\x31\xec\x5d\xa5\xee\x26\x02\xef\xbb\x43\xb2\x5a\xea\
+\xf6\x1b\xcd\x5d\x20\x44\x86\x4b\x0e\x16\xcd\x3b\x8b\xda\x72\xab\
+\xac\xfb\x8c\x9d\xac\xe9\xab\x3a\xfe\x57\x99\x5a\xb5\x1f\x8e\xed\
+\x0b\x61\xa7\x29\x98\xed\xb9\x13\x8c\x48\xba\x1d\xd1\xe0\xdf\x55\
+\xac\x16\x15\x3b\x3b\x2c\x49\x46\x9f\x53\xea\x86\x00\x1b\x99\xb9\
+\xcc\x6f\x41\x9c\xea\xcd\x74\x18\x64\x91\x8e\x3f\x0e\xbd\xa9\x63\
+\x60\xff\x6a\x34\xda\xe8\xda\x1a\x2a\xb1\xdb\xba\x50\x86\xe4\x1a\
+\xad\xeb\x0c\x57\x4b\x01\xec\x5b\xc6\xa5\x78\xd4\xb2\x14\x76\xcd\
+\x8e\xb4\xaa\xb1\xce\x36\xf8\xfc\x10\x75\x9e\x13\x24\xfc\x6b\x68\
+\xdb\xf5\x69\x63\xbf\xa3\x24\x4b\x9c\x0c\x6a\xf5\xf7\x04\x5f\x1c\
+\xae\xca\xbd\x0d\x3b\x32\xfb\xf5\x9f\xf1\xbf\xe6\x74\x6f\x6a\x37\
+\x8d\xbf\x8e\xbf\x27\xb6\x18\xde\x9d\xbb\x6b\x93\xbe\xdb\xe1\x77\
+\xb4\xba\xbb\x1d\xf1\x4d\xbe\xb5\x63\xbe\x41\xbd\xb1\x40\x94\xa7\
+\x63\x42\x53\x92\x63\xcf\x2e\xfb\x0c\x9b\x16\xfc\x07\xb4\x90\xe1\
+\xdf\x98\xc4\xa2\xce\xc8\xfa\xad\x6e\x40\xf0\x78\x28\xe3\x40\xe4\
+\x03\xe7\x25\x80\x11\xb3\xc4\x9a\x9a\xaf\x73\x3a\xf4\xd4\x6e\x47\
+\xd8\xc8\x89\xca\x1f\x9f\x7e\xea\xba\x0f\x65\xc9\x87\xa6\xee\xff\
+\x74\x7b\x1f\x19\x16\x96\x81\x9c\x28\xe4\x65\xb5\x9c\x37\x53\x5c\
+\xf7\x69\xe2\xc6\xcc\x67\x51\xb7\x8f\xe8\xe3\x7d\x7b\x2a\x90\x03\
+\x14\x00\x01\xdf\x5b\xc4\x19\xe6\x9c\x02\x1b\xcc\x4e\x69\x6b\xba\
+\xa5\x90\x9a\x3d\xcb\xad\xd1\xb4\x79\xa2\x1d\xea\x5c\x2f\x3b\x77\
+\xb7\x1a\x70\x41\x6e\x47\xda\xae\x1d\x94\x49\xa7\x8a\x1f\x27\xf0\
+\xf8\xa5\x7e\x8a\x5a\x14\x4c\x90\x7e\x75\xba\x8b\x4d\x40\x72\xfb\
+\x47\x05\x6f\xb1\x32\x4b\x03\xa3\xc2\x5f\x2f\x6f\xd1\xce\x1b\x9d\
+\x6b\x5f\x37\x6f\xaf\xbb\xf0\xa9\xef\x58\x20\xc1\x46\xbd\x9f\x2a\
+\x56\xcf\x51\xf8\xfc\xda\x24\xec\xea\x30\x2a\x5b\x1f\x9c\xfa\xf1\
+\xbf\xff\x34\x60\xfb\x5e\x97\x55\x78\xa3\x67\xfe\x9a\xfc\x0b\x44\
+\x7b\xd0\xbc\
 "
 
 qt_resource_name = b"\
-\x00\x17\
-\x0b\xd4\x1a\x23\
+\x00\x1c\
+\x01\xf8\xc7\xe3\
 \x00\x64\
 \x00\x6f\x00\x63\x00\x75\x00\x6d\x00\x65\x00\x6e\x00\x74\x00\x56\x00\x69\x00\x65\x00\x77\x00\x65\x00\x72\x00\x53\x00\x74\x00\x79\
-\x00\x6c\x00\x65\x00\x2e\x00\x63\x00\x73\x00\x73\
+\x00\x6c\x00\x65\x00\x2d\x00\x64\x00\x61\x00\x72\x00\x6b\x00\x2e\x00\x63\x00\x73\x00\x73\
+\x00\x1d\
+\x0a\x5e\x6e\x63\
+\x00\x64\
+\x00\x6f\x00\x63\x00\x75\x00\x6d\x00\x65\x00\x6e\x00\x74\x00\x56\x00\x69\x00\x65\x00\x77\x00\x65\x00\x72\x00\x53\x00\x74\x00\x79\
+\x00\x6c\x00\x65\x00\x2d\x00\x6c\x00\x69\x00\x67\x00\x68\x00\x74\x00\x2e\x00\x63\x00\x73\x00\x73\
 "
 
 qt_resource_struct_v1 = b"\
-\x00\x00\x00\x00\x00\x02\x00\x00\x00\x01\x00\x00\x00\x01\
-\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\x00\x00\x00\x00\
+\x00\x00\x00\x00\x00\x02\x00\x00\x00\x02\x00\x00\x00\x01\
+\x00\x00\x00\x00\x00\x01\x00\x00\x00\x01\x00\x00\x00\x00\
+\x00\x00\x00\x3e\x00\x01\x00\x00\x00\x01\x00\x00\x05\xef\
 "
 
 qt_resource_struct_v2 = b"\
-\x00\x00\x00\x00\x00\x02\x00\x00\x00\x01\x00\x00\x00\x01\
+\x00\x00\x00\x00\x00\x02\x00\x00\x00\x02\x00\x00\x00\x01\
 \x00\x00\x00\x00\x00\x00\x00\x00\
-\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\x00\x00\x00\x00\
-\x00\x00\x01\x6d\x35\x85\x81\xa1\
+\x00\x00\x00\x00\x00\x01\x00\x00\x00\x01\x00\x00\x00\x00\
+\x00\x00\x01\x71\x72\xc4\xcc\x71\
+\x00\x00\x00\x3e\x00\x01\x00\x00\x00\x01\x00\x00\x05\xef\
+\x00\x00\x01\x71\x72\xc4\xcc\x41\
 "
 
 qt_version = [int(v) for v in QtCore.qVersion().split('.')]
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/eric6/UI/data/documentViewerStyle-dark.css	Sat May 02 13:51:07 2020 +0200
@@ -0,0 +1,294 @@
+/*
+ * This style definition is based on the style sheet file of Spyder.
+ */
+
+html {
+    background-color: #262626;
+}
+
+body {
+    background-color: #262626;
+    color: #ffffff;
+    margin: 0px 10px 10px 10px;
+}
+
+
+/* --- Title style --- */
+div.title h1 {
+    font-size: 130%;
+    font-family: 'Trebuchet MS', sans-serif;
+    background-color: #85774A;
+    background-image: -webkit-gradient(
+        linear,
+        0 0,
+        0 100%,
+        from(#85774A),
+        color-stop(60%, #b9a567),
+        to(#e1c87d)
+    );
+    text-shadow: 0px 1px 1px rgba(0, 0, 0, 0.2);
+    font-weight: normal;
+    padding: 6px 0px 6px 20px;
+    margin: 0px -25px;
+    color: #FFFFFF;
+}
+
+/*
+ * The next two styles are needed to
+ * modify the anchors present on the
+ * title of pages like scipy.stats or
+ * scipy.io
+ */
+div.title h1 a {
+    color: transparent;
+    cursor: default;
+}
+
+div.title h1 tt {
+    font-size: 95%;
+    background-color: transparent;
+    color: #FFFFFF;
+}
+
+
+/* --- Metadata style --- */
+div.metadata {
+    margin-top: 10px;
+    margin-bottom: 15px;
+    margin-right: 1px;
+    padding: 1px;
+    background-color: #fff4d8;
+    border: 1px solid #C9C9C9;
+    border-radius: 6px 6px 6px 6px;
+    box-shadow: 1px 1px 7px #CACACA;
+    color: #000000;
+}
+
+div.metadata p {
+    margin: 7px 0px 7px 10px;
+}
+
+span.def {
+    font-family: monospace;
+    font-size: 90%;
+}
+
+span.argspec-highlight {
+    color: blue;
+    font-size: 110%;
+    font-weight: 900;
+}
+
+
+/* --- Docstring div style --- */
+div.docstring {
+    margin-top: -1px;
+}
+
+div.docstring p {
+    padding: 0px 2px 0px;
+}
+
+
+/* --- Headers style --- */
+h2, h3, h4 {
+    font-family: 'Helvetica', sans-serif;
+    color: rgb(49, 126, 172);
+    margin-top: 20px;
+    margin-bottom: 10px;
+}
+
+h2 {
+    font-size: 120%;
+    font-weight: normal;
+    border-bottom: 1px solid rgb(220, 220, 220);
+    padding: 4px 0px 4px 0px;
+}
+
+h3 {
+    font-size: 110%;
+}
+
+h4 {
+    font-size: 100%;
+    margin-top: 14px;
+    font-weight: normal;
+}
+
+dl.docutils {
+    padding: 0px 10px 0px;
+}
+
+div.section p {
+    padding: 0px 2px 0px;
+}
+
+#warning {
+    margin-top: 5px;
+    padding: 4px 8px 4px 8px;
+    text-align: center;
+    border: 1px solid #FFE4E4;
+    background-color: #F66;
+}
+
+#doc-warning {
+    margin-top: 16px;
+    width: 45%;
+    margin-left: auto;
+    margin-right: auto;
+    background-color: rgb(185, 74, 72);
+    color: rgb(242, 222, 222);
+    border: 1px solid rgb(238, 211, 215);
+    border-radius: 4px 4px 4px 4px;
+    padding: 15px;
+    text-align: center;
+    font-weight: bold;
+    font-size: 105%;
+}
+
+
+/* --- Links --- */
+a {
+    text-decoration: none;
+    color: rgba(40, 130, 180, 1);
+}
+
+a:hover {
+    text-decoration: underline;
+}
+
+
+/* --- Images --- */
+img {
+    box-shadow: 0px 2px 6px #cacaca;
+    border: 1px solid #c9c9c9;
+}
+
+img.align-center {
+    display: block;
+    margin-left: auto;
+    margin-right: auto;
+}
+
+
+/* --- Lists style --- */
+ol.arabic {
+    margin-left: -10px;
+}
+
+ul {
+    margin-left: -5px;
+}
+
+/* --- Literal blocks style --- */
+pre.literal-block {
+    padding-left: 35px;
+    font-size: 95%;
+}
+
+
+/* --- Docutils table style --- */
+table.docutils {
+    border-collapse: collapse;
+    border-spacing: 0;
+    border: #DDDDDD;
+    margin-left: auto;
+    margin-right: auto;
+    margin-top: 17px;
+    margin-bottom: 17px;
+    width: 90%;
+}
+
+table.docutils td {
+    padding: 5px;
+}
+
+table.docutils tr.row-odd {
+    background-color: rgb(56, 56, 56);
+}
+
+
+/* --- Docutils table headers --- */
+table.docutils th {
+    background-color: #383838;
+    border-bottom-color: #DDDDDD;
+    border-bottom-style: solid;
+    border-bottom-width: 1px;
+    border-top-color: #DDDDDD;
+    border-top-style: solid;
+    border-top-width: 1px;
+    font-weight: bold;
+    text-align: center;
+    padding: 6px 0px 6px 8px;
+    color: rgb(38, 38, 38);
+}
+
+
+/* --- Field-list table style --- */
+table.docutils.field-list {
+    font-size: 80%;
+    border-collapse: collapse;
+    border-left: transparent;
+    border-right: transparent;
+    margin-top: 15px;
+    margin-left: 40px;
+    width: 83%;
+}
+
+
+/* --- Field-list table headers --- */
+table.docutils.field-list th {
+    background-color: transparent;
+    border-top: transparent;
+    border-bottom: transparent;
+    color: white;
+    font-weight: bold;
+    text-align: left;
+    padding: 4px 0px 4px 8px;
+}
+
+
+/* --- Spacing around example code --- */
+div.highlight pre {
+    padding: 9px 14px;
+    background-color: rgb(47, 89, 44);
+    border-radius: 4px 4px 4px 4px;
+    border: 1px solid rgb(78, 149, 73);
+}
+
+div.highlight {
+    padding: 0px 10px 0px;
+}
+
+dt {
+    font-weight: bold;
+    /*font-size: 16px;*/
+}
+
+.classifier {
+    /*font-size: 10pt;*/
+    font-weight: normal;
+}
+
+tt {
+    background-color: #2d2e2f;
+    /*font-size: 95%;*/
+    padding: 0px 1px;
+}
+
+
+
+div.admonition.note {
+    font-size: 0.95em;
+    margin: 1.3em;
+    border: 1px solid #677f84;
+    background-color: #212426;
+    padding: 0px 5px 0 5px;
+    color: #3A87AD;
+}
+
+div.admonition p.admonition-title {
+    font-size: 1em;
+    margin-top: 7px;
+    font-weight: bold;
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/eric6/UI/data/documentViewerStyle-light.css	Sat May 02 13:51:07 2020 +0200
@@ -0,0 +1,293 @@
+/*
+ * This style definition is based on the style sheet file of Spyder.
+ */
+
+html {
+    background-color: #ffffff;
+}
+
+body {
+    background-color: #ffffff;
+    color: #000000;
+    margin: 0px 10px 10px 10px;
+}
+
+
+/* --- Title style --- */
+div.title h1 {
+    font-size: 130%;
+    font-family: 'Trebuchet MS', sans-serif;
+    background-color: #85774A;
+    background-image: -webkit-gradient(
+        linear,
+        0 0,
+        0 100%,
+        from(#85774A),
+        color-stop(60%, #b9a567),
+        to(#e1c87d)
+    );
+    text-shadow: 0px 1px 1px rgba(0, 0, 0, 0.2);
+    font-weight: normal;
+    padding: 6px 0px 6px 20px;
+    margin: 0px -25px;
+    color: #FFFFFF;
+}
+
+/*
+ * The next two styles are needed to
+ * modify the anchors present on the
+ * title of pages like scipy.stats or
+ * scipy.io
+ */
+div.title h1 a {
+    color: transparent;
+    cursor: default;
+}
+
+div.title h1 tt {
+    font-size: 95%;
+    background-color: transparent;
+    color: #FFFFFF;
+}
+
+
+/* --- Metadata style --- */
+div.metadata {
+    margin-top: 10px;
+    margin-bottom: 15px;
+    margin-right: 1px;
+    padding: 1px;
+    background-color: #fff4d8;
+    border: 1px solid #C9C9C9;
+    border-radius: 6px 6px 6px 6px;
+    box-shadow: 1px 1px 7px #CACACA;
+}
+
+div.metadata p {
+    margin: 7px 0px 7px 10px;
+}
+
+span.def {
+    font-family: monospace;
+    font-size: 90%;
+}
+
+span.argspec-highlight {
+    color: blue;
+    font-size: 110%;
+    font-weight: 900;
+}
+
+
+/* --- Docstring div style --- */
+div.docstring {
+    margin-top: -1px;
+}
+
+div.docstring p {
+    padding: 0px 2px 0px;
+}
+
+
+/* --- Headers style --- */
+h2, h3, h4 {
+    font-family: 'Helvetica', sans-serif;
+    color: rgb(49, 126, 172);
+    margin-top: 20px;
+    margin-bottom: 10px;
+}
+
+h2 {
+    font-size: 120%;
+    font-weight: normal;
+    border-bottom: 1px solid rgb(220, 220, 220);
+    padding: 4px 0px 4px 0px;
+}
+
+h3 {
+    font-size: 110%;
+}
+
+h4 {
+    font-size: 100%;
+    margin-top: 14px;
+    font-weight: normal;
+}
+
+dl.docutils {
+    padding: 0px 10px 0px;
+}
+
+div.section p {
+    padding: 0px 2px 0px;
+}
+
+#warning {
+    margin-top: 5px;
+    background-color: #FFE4E4;
+    border: 1px solid #F66;
+    padding: 4px 8px 4px 8px;
+    text-align: center;
+}
+
+#doc-warning {
+    margin-top: 16px;
+    width: 45%;
+    margin-left: auto;
+    margin-right: auto;
+    color: rgb(185, 74, 72);
+    background-color: rgb(242, 222, 222);
+    border: 1px solid rgb(238, 211, 215);
+    border-radius: 4px 4px 4px 4px;
+    padding: 15px;
+    text-align: center;
+    font-weight: bold;
+    font-size: 105%;
+}
+
+
+/* --- Links --- */
+a {
+    text-decoration: none;
+    color: rgba(40, 130, 180, 1);
+}
+
+a:hover {
+    text-decoration: underline;
+}
+
+
+/* --- Images --- */
+img {
+    box-shadow: 0px 2px 6px #cacaca;
+    border: 1px solid #c9c9c9;
+}
+
+img.align-center {
+    display: block;
+    margin-left: auto;
+    margin-right: auto;
+}
+
+
+/* --- Lists style --- */
+ol.arabic {
+    margin-left: -10px;
+}
+
+ul {
+    margin-left: -5px;
+}
+
+/* --- Literal blocks style --- */
+pre.literal-block {
+    padding-left: 35px;
+    font-size: 95%;
+}
+
+
+/* --- Docutils table style --- */
+table.docutils {
+    border-collapse: collapse;
+    border-spacing: 0;
+    border: #DDDDDD;
+    margin-left: auto;
+    margin-right: auto;
+    margin-top: 17px;
+    margin-bottom: 17px;
+    width: 90%;
+}
+
+table.docutils td {
+    padding: 5px;
+}
+
+table.docutils tr.row-odd {
+    background-color: rgb(249, 249, 249);
+}
+
+
+/* --- Docutils table headers --- */
+table.docutils th {
+    background-color: #EEEEEE;
+    border-bottom-color: #DDDDDD;
+    border-bottom-style: solid;
+    border-bottom-width: 1px;
+    border-top-color: #DDDDDD;
+    border-top-style: solid;
+    border-top-width: 1px;
+    font-weight: bold;
+    text-align: center;
+    padding: 6px 0px 6px 8px;
+    color: rgb(65, 65, 65);
+}
+
+
+/* --- Field-list table style --- */
+table.docutils.field-list {
+    font-size: 80%;
+    border-collapse: collapse;
+    border-left: transparent;
+    border-right: transparent;
+    margin-top: 15px;
+    margin-left: 40px;
+    width: 83%;
+}
+
+
+/* --- Field-list table headers --- */
+table.docutils.field-list th {
+    background-color: transparent;
+    border-top: transparent;
+    border-bottom: transparent;
+    color: black;
+    font-weight: bold;
+    text-align: left;
+    padding: 4px 0px 4px 8px;
+}
+
+
+/* --- Spacing around example code --- */
+div.highlight pre {
+    padding: 9px 14px;
+    background-color: rgb(247, 247, 249);
+    border-radius: 4px 4px 4px 4px;
+    border: 1px solid rgb(225, 225, 232);
+}
+
+div.highlight {
+    padding: 0px 10px 0px;
+}
+
+dt {
+    font-weight: bold;
+    /*font-size: 16px;*/
+}
+
+.classifier {
+    /*font-size: 10pt;*/
+    font-weight: normal;
+}
+
+tt {
+    background-color: #ECF0F3;
+    /*font-size: 95%;*/
+    padding: 0px 1px;
+}
+
+
+
+div.admonition.note {
+    font-size: 0.95em;
+    margin: 1.3em;
+    border: 1px solid #BCE8F1;
+    background-color: #D9EDF7;
+    padding: 0px 5px 0 5px;
+    color: #3A87AD;
+}
+
+div.admonition p.admonition-title {
+    font-size: 1em;
+    margin-top: 7px;
+    font-weight: bold;
+}
--- a/eric6/UI/data/documentViewerStyle.css	Sun Apr 05 18:17:08 2020 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,311 +0,0 @@
-/*
- * This style definition is based on the style sheet file of Spyder.
- *
- * Modified for using color schemes as of WebEngine 76.x.
- * see c't 19/2019
- */
-
-@media (prefers-color-scheme: light) {
-    :root {
-        --font-color: #000;
-        --background-color: #fff;
-        --body-color: #ddd;
-    }
-}
-@media (prefers-color-scheme: dark) {
-    :root {
-        --font-color: #fff;
-        --background-color: #000;
-        --body-color: #333;
-    }
-}
-
-html {
-    background-color: var(--background-color, #fff);
-}
-
-body {
-    background-color: var(--body-color, white);
-    color: var(--font-color, #000);
-    margin: 0px 10px 10px 10px;
-}
-
-
-/* --- Title style --- */
-div.title h1 {
-    font-size: 130%;
-    font-family: 'Trebuchet MS', sans-serif;
-    background-color: #85774A;
-    background-image: -webkit-gradient(
-        linear,
-        0 0,
-        0 100%,
-        from(#85774A),
-        color-stop(60%, #b9a567),
-        to(#e1c87d)
-    );
-    text-shadow: 0px 1px 1px rgba(0, 0, 0, 0.2);
-    font-weight: normal;
-    padding: 6px 0px 6px 20px;
-    margin: 0px -25px;
-    color: #FFFFFF;
-}
-
-/*
- * The next two styles are needed to
- * modify the anchors present on the
- * title of pages like scipy.stats or
- * scipy.io
- */
-div.title h1 a {
-    color: transparent;
-    cursor: default;
-}
-
-div.title h1 tt {
-    font-size: 95%;
-    background-color: transparent;
-    color: #FFFFFF;
-}
-
-
-/* --- Metadata style --- */
-div.metadata {
-    margin-top: 10px;
-    margin-bottom: 15px;
-    margin-right: 1px;
-    padding: 1px;
-    background-color: #fff4d8;
-    border: 1px solid #C9C9C9;
-    border-radius: 6px 6px 6px 6px;
-    box-shadow: 1px 1px 7px #CACACA;
-}
-
-div.metadata p {
-    margin: 7px 0px 7px 10px;
-}
-
-span.def {
-    font-family: monospace;
-    font-size: 90%;
-}
-
-span.argspec-highlight {
-    color: blue;
-    font-size: 110%;
-    font-weight: 900;
-}
-
-
-/* --- Docstring div style --- */
-div.docstring {
-    margin-top: -1px;
-}
-
-div.docstring p {
-    padding: 0px 2px 0px;
-}
-
-
-/* --- Headers style --- */
-h2, h3, h4 {
-    font-family: 'Helvetica', sans-serif;
-    color: rgb(49, 126, 172);
-    margin-top: 20px;
-    margin-bottom: 10px;
-}
-
-h2 {
-    font-size: 120%;
-    font-weight: normal;
-    border-bottom: 1px solid rgb(220, 220, 220);
-    padding: 4px 0px 4px 0px;
-}
-
-h3 {
-    font-size: 110%;
-}
-
-h4 {
-    font-size: 100%;
-    margin-top: 14px;
-    font-weight: normal;
-}
-
-dl.docutils {
-    padding: 0px 10px 0px;
-}
-
-div.section p {
-    padding: 0px 2px 0px;
-}
-
-#warning {
-    margin-top: 5px;
-    background-color: #FFE4E4;
-    border: 1px solid #F66;
-    padding: 4px 8px 4px 8px;
-    text-align: center;
-}
-
-#doc-warning {
-    margin-top: 16px;
-    width: 45%;
-    margin-left: auto;
-    margin-right: auto;
-    color: rgb(185, 74, 72);
-    background-color: rgb(242, 222, 222);
-    border: 1px solid rgb(238, 211, 215);
-    border-radius: 4px 4px 4px 4px;
-    padding: 15px;
-    text-align: center;
-    font-weight: bold;
-    font-size: 105%;
-}
-
-
-/* --- Links --- */
-a {
-    text-decoration: none;
-    color: rgba(40, 130, 180, 1);
-}
-
-a:hover {
-    text-decoration: underline;
-}
-
-
-/* --- Images --- */
-img {
-    box-shadow: 0px 2px 6px #cacaca;
-    border: 1px solid #c9c9c9;
-}
-
-img.align-center {
-    display: block;
-    margin-left: auto;
-    margin-right: auto;
-}
-
-
-/* --- Lists style --- */
-ol.arabic {
-    margin-left: -10px;
-}
-
-ul {
-    margin-left: -5px;
-}
-
-/* --- Literal blocks style --- */
-pre.literal-block {
-    padding-left: 35px;
-    font-size: 95%;
-}
-
-
-/* --- Docutils table style --- */
-table.docutils {
-    border-collapse: collapse;
-    border-spacing: 0;
-    border: #DDDDDD;
-    margin-left: auto;
-    margin-right: auto;
-    margin-top: 17px;
-    margin-bottom: 17px;
-    width: 90%;
-}
-
-table.docutils td {
-    padding: 5px;
-}
-
-table.docutils tr.row-odd {
-    background-color: rgb(249, 249, 249);
-}
-
-
-/* --- Docutils table headers --- */
-table.docutils th {
-    background-color: #EEEEEE;
-    border-bottom-color: #DDDDDD;
-    border-bottom-style: solid;
-    border-bottom-width: 1px;
-    border-top-color: #DDDDDD;
-    border-top-style: solid;
-    border-top-width: 1px;
-    font-weight: bold;
-    text-align: center;
-    padding: 6px 0px 6px 8px;
-    color: rgb(65, 65, 65);
-}
-
-
-/* --- Field-list table style --- */
-table.docutils.field-list {
-    font-size: 80%;
-    border-collapse: collapse;
-    border-left: transparent;
-    border-right: transparent;
-    margin-top: 15px;
-    margin-left: 40px;
-    width: 83%;
-}
-
-
-/* --- Field-list table headers --- */
-table.docutils.field-list th {
-    background-color: transparent;
-    border-top: transparent;
-    border-bottom: transparent;
-    color: black;
-    font-weight: bold;
-    text-align: left;
-    padding: 4px 0px 4px 8px;
-}
-
-
-/* --- Spacing around example code --- */
-div.highlight pre {
-    padding: 9px 14px;
-    background-color: rgb(247, 247, 249);
-    border-radius: 4px 4px 4px 4px;
-    border: 1px solid rgb(225, 225, 232);
-}
-
-div.highlight {
-    padding: 0px 10px 0px;
-}
-
-dt {
-    font-weight: bold;
-    /*font-size: 16px;*/
-}
-
-.classifier {
-    /*font-size: 10pt;*/
-    font-weight: normal;
-}
-
-tt {
-    background-color: #ECF0F3;
-    /*font-size: 95%;*/
-    padding: 0px 1px;
-}
-
-
-
-div.admonition.note {
-    font-size: 0.95em;
-    margin: 1.3em;
-    border: 1px solid #BCE8F1;
-    background-color: #D9EDF7;
-    padding: 0px 5px 0 5px;
-    color: #3A87AD;
-}
-
-div.admonition p.admonition-title {
-    font-size: 1em;
-    margin-top: 7px;
-    font-weight: bold;
-}
--- a/eric6/Utilities/BackgroundClient.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/Utilities/BackgroundClient.py	Sat May 02 13:51:07 2020 +0200
@@ -80,6 +80,12 @@
         @param fn filename for identification (str)
         @param data return value(s) (any basic datatype)
         """
+        if not isinstance(data, (
+            dict, list, tuple, str, int, float, bool, type(None),
+        )):
+            # handle sending of objects of unsupported types
+            data = str(data)
+        
         packedData = json.dumps([fx, fn, data])
         if sys.version_info[0] >= 3:
             packedData = bytes(packedData, 'utf-8')
--- a/eric6/VCS/ProjectHelper.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/VCS/ProjectHelper.py	Sat May 02 13:51:07 2020 +0200
@@ -67,7 +67,7 @@
         self.vcsNewAct = E5Action(
             QCoreApplication.translate(
                 "VcsProjectHelper", 'New from repository'),
-            UI.PixmapCache.getIcon("vcsCheckout.png"),
+            UI.PixmapCache.getIcon("vcsCheckout"),
             QCoreApplication.translate(
                 "VcsProjectHelper", '&New from repository...'),
             0, 0, self, 'vcs_new')
@@ -87,7 +87,7 @@
         self.vcsExportAct = E5Action(
             QCoreApplication.translate(
                 "VcsProjectHelper", 'Export from repository'),
-            UI.PixmapCache.getIcon("vcsExport.png"),
+            UI.PixmapCache.getIcon("vcsExport"),
             QCoreApplication.translate(
                 "VcsProjectHelper", '&Export from repository...'),
             0, 0, self, 'vcs_export')
@@ -106,7 +106,7 @@
         self.vcsAddAct = E5Action(
             QCoreApplication.translate(
                 "VcsProjectHelper", 'Add to repository'),
-            UI.PixmapCache.getIcon("vcsCommit.png"),
+            UI.PixmapCache.getIcon("vcsCommit"),
             QCoreApplication.translate(
                 "VcsProjectHelper", '&Add to repository...'),
             0, 0, self, 'vcs_add')
--- a/eric6/ViewManager/ViewManager.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/ViewManager/ViewManager.py	Sat May 02 13:51:07 2020 +0200
@@ -628,7 +628,7 @@
         """
         self.newAct = E5Action(
             QCoreApplication.translate('ViewManager', 'New'),
-            UI.PixmapCache.getIcon("new.png"),
+            UI.PixmapCache.getIcon("new"),
             QCoreApplication.translate('ViewManager', '&New'),
             QKeySequence(
                 QCoreApplication.translate('ViewManager', "Ctrl+N",
@@ -647,7 +647,7 @@
         
         self.openAct = E5Action(
             QCoreApplication.translate('ViewManager', 'Open'),
-            UI.PixmapCache.getIcon("open.png"),
+            UI.PixmapCache.getIcon("open"),
             QCoreApplication.translate('ViewManager', '&Open...'),
             QKeySequence(
                 QCoreApplication.translate('ViewManager', "Ctrl+O",
@@ -668,7 +668,7 @@
         
         self.closeAct = E5Action(
             QCoreApplication.translate('ViewManager', 'Close'),
-            UI.PixmapCache.getIcon("closeEditor.png"),
+            UI.PixmapCache.getIcon("closeEditor"),
             QCoreApplication.translate('ViewManager', '&Close'),
             QKeySequence(
                 QCoreApplication.translate('ViewManager', "Ctrl+W",
@@ -706,7 +706,7 @@
         
         self.saveAct = E5Action(
             QCoreApplication.translate('ViewManager', 'Save'),
-            UI.PixmapCache.getIcon("fileSave.png"),
+            UI.PixmapCache.getIcon("fileSave"),
             QCoreApplication.translate('ViewManager', '&Save'),
             QKeySequence(QCoreApplication.translate(
                 'ViewManager', "Ctrl+S", "File|Save")),
@@ -723,7 +723,7 @@
         
         self.saveAsAct = E5Action(
             QCoreApplication.translate('ViewManager', 'Save as'),
-            UI.PixmapCache.getIcon("fileSaveAs.png"),
+            UI.PixmapCache.getIcon("fileSaveAs"),
             QCoreApplication.translate('ViewManager', 'Save &as...'),
             QKeySequence(QCoreApplication.translate(
                 'ViewManager', "Shift+Ctrl+S", "File|Save As")),
@@ -741,7 +741,7 @@
         
         self.saveCopyAct = E5Action(
             QCoreApplication.translate('ViewManager', 'Save Copy'),
-            UI.PixmapCache.getIcon("fileSaveCopy.png"),
+            UI.PixmapCache.getIcon("fileSaveCopy"),
             QCoreApplication.translate('ViewManager', 'Save &Copy...'),
             0, 0, self.saveActGrp, 'vm_file_save_copy')
         self.saveCopyAct.setStatusTip(QCoreApplication.translate(
@@ -757,7 +757,7 @@
         
         self.saveAllAct = E5Action(
             QCoreApplication.translate('ViewManager', 'Save all'),
-            UI.PixmapCache.getIcon("fileSaveAll.png"),
+            UI.PixmapCache.getIcon("fileSaveAll"),
             QCoreApplication.translate('ViewManager', 'Save a&ll'),
             0, 0, self.saveActGrp, 'vm_file_save_all')
         self.saveAllAct.setStatusTip(QCoreApplication.translate(
@@ -774,7 +774,7 @@
 
         self.printAct = E5Action(
             QCoreApplication.translate('ViewManager', 'Print'),
-            UI.PixmapCache.getIcon("print.png"),
+            UI.PixmapCache.getIcon("print"),
             QCoreApplication.translate('ViewManager', '&Print'),
             QKeySequence(QCoreApplication.translate(
                 'ViewManager', "Ctrl+P", "File|Print")),
@@ -792,7 +792,7 @@
         
         self.printPreviewAct = E5Action(
             QCoreApplication.translate('ViewManager', 'Print Preview'),
-            UI.PixmapCache.getIcon("printPreview.png"),
+            UI.PixmapCache.getIcon("printPreview"),
             QCoreApplication.translate('ViewManager', 'Print Preview'),
             0, 0, self, 'vm_file_print_preview')
         self.printPreviewAct.setStatusTip(QCoreApplication.translate(
@@ -931,7 +931,7 @@
         
         self.undoAct = E5Action(
             QCoreApplication.translate('ViewManager', 'Undo'),
-            UI.PixmapCache.getIcon("editUndo.png"),
+            UI.PixmapCache.getIcon("editUndo"),
             QCoreApplication.translate('ViewManager', '&Undo'),
             QKeySequence(QCoreApplication.translate(
                 'ViewManager', "Ctrl+Z", "Edit|Undo")),
@@ -950,7 +950,7 @@
         
         self.redoAct = E5Action(
             QCoreApplication.translate('ViewManager', 'Redo'),
-            UI.PixmapCache.getIcon("editRedo.png"),
+            UI.PixmapCache.getIcon("editRedo"),
             QCoreApplication.translate('ViewManager', '&Redo'),
             QKeySequence(QCoreApplication.translate(
                 'ViewManager', "Ctrl+Shift+Z", "Edit|Redo")),
@@ -990,7 +990,7 @@
         
         self.cutAct = E5Action(
             QCoreApplication.translate('ViewManager', 'Cut'),
-            UI.PixmapCache.getIcon("editCut.png"),
+            UI.PixmapCache.getIcon("editCut"),
             QCoreApplication.translate('ViewManager', 'Cu&t'),
             QKeySequence(QCoreApplication.translate(
                 'ViewManager', "Ctrl+X", "Edit|Cut")),
@@ -1010,7 +1010,7 @@
         
         self.copyAct = E5Action(
             QCoreApplication.translate('ViewManager', 'Copy'),
-            UI.PixmapCache.getIcon("editCopy.png"),
+            UI.PixmapCache.getIcon("editCopy"),
             QCoreApplication.translate('ViewManager', '&Copy'),
             QKeySequence(QCoreApplication.translate(
                 'ViewManager', "Ctrl+C", "Edit|Copy")),
@@ -1030,7 +1030,7 @@
         
         self.pasteAct = E5Action(
             QCoreApplication.translate('ViewManager', 'Paste'),
-            UI.PixmapCache.getIcon("editPaste.png"),
+            UI.PixmapCache.getIcon("editPaste"),
             QCoreApplication.translate('ViewManager', '&Paste'),
             QKeySequence(QCoreApplication.translate(
                 'ViewManager', "Ctrl+V", "Edit|Paste")),
@@ -1050,7 +1050,7 @@
         
         self.deleteAct = E5Action(
             QCoreApplication.translate('ViewManager', 'Clear'),
-            UI.PixmapCache.getIcon("editDelete.png"),
+            UI.PixmapCache.getIcon("editDelete"),
             QCoreApplication.translate('ViewManager', 'Clear'),
             QKeySequence(QCoreApplication.translate(
                 'ViewManager', "Alt+Shift+C", "Edit|Clear")),
@@ -1085,7 +1085,7 @@
         
         self.indentAct = E5Action(
             QCoreApplication.translate('ViewManager', 'Indent'),
-            UI.PixmapCache.getIcon("editIndent.png"),
+            UI.PixmapCache.getIcon("editIndent"),
             QCoreApplication.translate('ViewManager', '&Indent'),
             QKeySequence(QCoreApplication.translate(
                 'ViewManager', "Ctrl+I", "Edit|Indent")),
@@ -1104,7 +1104,7 @@
         
         self.unindentAct = E5Action(
             QCoreApplication.translate('ViewManager', 'Unindent'),
-            UI.PixmapCache.getIcon("editUnindent.png"),
+            UI.PixmapCache.getIcon("editUnindent"),
             QCoreApplication.translate('ViewManager', 'U&nindent'),
             QKeySequence(QCoreApplication.translate(
                 'ViewManager', "Ctrl+Shift+I", "Edit|Unindent")),
@@ -1123,7 +1123,7 @@
         
         self.smartIndentAct = E5Action(
             QCoreApplication.translate('ViewManager', 'Smart indent'),
-            UI.PixmapCache.getIcon("editSmartIndent.png"),
+            UI.PixmapCache.getIcon("editSmartIndent"),
             QCoreApplication.translate('ViewManager', 'Smart indent'),
             0, 0,
             self.editActGrp, 'vm_edit_smart_indent')
@@ -1140,7 +1140,7 @@
         
         self.commentAct = E5Action(
             QCoreApplication.translate('ViewManager', 'Comment'),
-            UI.PixmapCache.getIcon("editComment.png"),
+            UI.PixmapCache.getIcon("editComment"),
             QCoreApplication.translate('ViewManager', 'C&omment'),
             QKeySequence(QCoreApplication.translate(
                 'ViewManager', "Ctrl+M", "Edit|Comment")),
@@ -1159,7 +1159,7 @@
         
         self.uncommentAct = E5Action(
             QCoreApplication.translate('ViewManager', 'Uncomment'),
-            UI.PixmapCache.getIcon("editUncomment.png"),
+            UI.PixmapCache.getIcon("editUncomment"),
             QCoreApplication.translate('ViewManager', 'Unco&mment'),
             QKeySequence(QCoreApplication.translate(
                 'ViewManager', "Alt+Ctrl+M", "Edit|Uncomment")),
@@ -1178,7 +1178,7 @@
         
         self.toggleCommentAct = E5Action(
             QCoreApplication.translate('ViewManager', 'Toggle Comment'),
-            UI.PixmapCache.getIcon("editToggleComment.png"),
+            UI.PixmapCache.getIcon("editToggleComment"),
             QCoreApplication.translate('ViewManager', 'Toggle Comment'),
             QKeySequence(QCoreApplication.translate(
                 'ViewManager', "Ctrl+Shift+M", "Edit|Toggle Comment")),
@@ -1251,7 +1251,7 @@
         
         self.selectAllAct = E5Action(
             QCoreApplication.translate('ViewManager', 'Select all'),
-            UI.PixmapCache.getIcon("editSelectAll.png"),
+            UI.PixmapCache.getIcon("editSelectAll"),
             QCoreApplication.translate('ViewManager', '&Select all'),
             QKeySequence(QCoreApplication.translate(
                 'ViewManager', "Ctrl+A", "Edit|Select all")),
@@ -1425,7 +1425,7 @@
         
         self.codeInfoAct = E5Action(
             QCoreApplication.translate('ViewManager', 'Code Info'),
-            UI.PixmapCache.getIcon("codeDocuViewer.png"),
+            UI.PixmapCache.getIcon("codeDocuViewer"),
             QCoreApplication.translate('ViewManager', 'Code Info'),
             QKeySequence(QCoreApplication.translate(
                 'ViewManager', "Ctrl+Alt+I", "Edit|Code Info")),
@@ -2870,7 +2870,7 @@
         
         self.searchAct = E5Action(
             QCoreApplication.translate('ViewManager', 'Search'),
-            UI.PixmapCache.getIcon("find.png"),
+            UI.PixmapCache.getIcon("find"),
             QCoreApplication.translate('ViewManager', '&Search...'),
             QKeySequence(QCoreApplication.translate(
                 'ViewManager', "Ctrl+F", "Search|Search")),
@@ -2891,7 +2891,7 @@
         self.searchNextAct = E5Action(
             QCoreApplication.translate(
                 'ViewManager', 'Search next'),
-            UI.PixmapCache.getIcon("findNext.png"),
+            UI.PixmapCache.getIcon("findNext"),
             QCoreApplication.translate('ViewManager', 'Search &next'),
             QKeySequence(QCoreApplication.translate(
                 'ViewManager', "F3", "Search|Search next")),
@@ -2911,7 +2911,7 @@
         
         self.searchPrevAct = E5Action(
             QCoreApplication.translate('ViewManager', 'Search previous'),
-            UI.PixmapCache.getIcon("findPrev.png"),
+            UI.PixmapCache.getIcon("findPrev"),
             QCoreApplication.translate('ViewManager', 'Search &previous'),
             QKeySequence(QCoreApplication.translate(
                 'ViewManager', "Shift+F3", "Search|Search previous")),
@@ -2931,7 +2931,7 @@
         
         self.searchClearMarkersAct = E5Action(
             QCoreApplication.translate('ViewManager', 'Clear search markers'),
-            UI.PixmapCache.getIcon("findClear.png"),
+            UI.PixmapCache.getIcon("findClear"),
             QCoreApplication.translate('ViewManager', 'Clear search markers'),
             QKeySequence(QCoreApplication.translate(
                 'ViewManager', "Ctrl+3", "Search|Clear search markers")),
@@ -2951,7 +2951,7 @@
         self.searchNextWordAct = E5Action(
             QCoreApplication.translate(
                 'ViewManager', 'Search current word forward'),
-            UI.PixmapCache.getIcon("findWordNext.png"),
+            UI.PixmapCache.getIcon("findWordNext"),
             QCoreApplication.translate(
                 'ViewManager', 'Search current word forward'),
             QKeySequence(QCoreApplication.translate(
@@ -2974,7 +2974,7 @@
         self.searchPrevWordAct = E5Action(
             QCoreApplication.translate(
                 'ViewManager', 'Search current word backward'),
-            UI.PixmapCache.getIcon("findWordPrev.png"),
+            UI.PixmapCache.getIcon("findWordPrev"),
             QCoreApplication.translate(
                 'ViewManager', 'Search current word backward'),
             QKeySequence(QCoreApplication.translate(
@@ -3016,7 +3016,7 @@
         self.replaceAndSearchAct = E5Action(
             QCoreApplication.translate(
                 'ViewManager', 'Replace and Search'),
-            UI.PixmapCache.getIcon("editReplaceSearch.png"),
+            UI.PixmapCache.getIcon("editReplaceSearch"),
             QCoreApplication.translate(
                 'ViewManager', 'Replace and Search'),
             QKeySequence(QCoreApplication.translate(
@@ -3040,7 +3040,7 @@
         self.replaceSelectionAct = E5Action(
             QCoreApplication.translate(
                 'ViewManager', 'Replace Occurrence'),
-            UI.PixmapCache.getIcon("editReplace.png"),
+            UI.PixmapCache.getIcon("editReplace"),
             QCoreApplication.translate(
                 'ViewManager', 'Replace Occurrence'),
             QKeySequence(QCoreApplication.translate(
@@ -3062,7 +3062,7 @@
         self.replaceAllAct = E5Action(
             QCoreApplication.translate(
                 'ViewManager', 'Replace All'),
-            UI.PixmapCache.getIcon("editReplaceAll.png"),
+            UI.PixmapCache.getIcon("editReplaceAll"),
             QCoreApplication.translate(
                 'ViewManager', 'Replace All'),
             QKeySequence(QCoreApplication.translate(
@@ -3083,7 +3083,7 @@
         
         self.quickSearchAct = E5Action(
             QCoreApplication.translate('ViewManager', 'Quicksearch'),
-            UI.PixmapCache.getIcon("quickFindNext.png"),
+            UI.PixmapCache.getIcon("quickFindNext"),
             QCoreApplication.translate('ViewManager', '&Quicksearch'),
             QKeySequence(QCoreApplication.translate(
                 'ViewManager', "Ctrl+Shift+K", "Search|Quicksearch")),
@@ -3105,7 +3105,7 @@
         self.quickSearchBackAct = E5Action(
             QCoreApplication.translate(
                 'ViewManager', 'Quicksearch backwards'),
-            UI.PixmapCache.getIcon("quickFindPrev.png"),
+            UI.PixmapCache.getIcon("quickFindPrev"),
             QCoreApplication.translate(
                 'ViewManager', 'Quicksearch &backwards'),
             QKeySequence(QCoreApplication.translate(
@@ -3126,7 +3126,7 @@
         
         self.quickSearchExtendAct = E5Action(
             QCoreApplication.translate('ViewManager', 'Quicksearch extend'),
-            UI.PixmapCache.getIcon("quickFindExtend.png"),
+            UI.PixmapCache.getIcon("quickFindExtend"),
             QCoreApplication.translate('ViewManager', 'Quicksearch e&xtend'),
             QKeySequence(QCoreApplication.translate(
                 'ViewManager', "Ctrl+Shift+H", "Search|Quicksearch extend")),
@@ -3147,7 +3147,7 @@
         
         self.gotoAct = E5Action(
             QCoreApplication.translate('ViewManager', 'Goto Line'),
-            UI.PixmapCache.getIcon("goto.png"),
+            UI.PixmapCache.getIcon("goto"),
             QCoreApplication.translate('ViewManager', '&Goto Line...'),
             QKeySequence(QCoreApplication.translate(
                 'ViewManager', "Ctrl+G", "Search|Goto Line")),
@@ -3166,7 +3166,7 @@
         
         self.gotoBraceAct = E5Action(
             QCoreApplication.translate('ViewManager', 'Goto Brace'),
-            UI.PixmapCache.getIcon("gotoBrace.png"),
+            UI.PixmapCache.getIcon("gotoBrace"),
             QCoreApplication.translate('ViewManager', 'Goto &Brace'),
             QKeySequence(QCoreApplication.translate(
                 'ViewManager', "Ctrl+L", "Search|Goto Brace")),
@@ -3185,7 +3185,7 @@
         self.gotoLastEditAct = E5Action(
             QCoreApplication.translate(
                 'ViewManager', 'Goto Last Edit Location'),
-            UI.PixmapCache.getIcon("gotoLastEditPosition.png"),
+            UI.PixmapCache.getIcon("gotoLastEditPosition"),
             QCoreApplication.translate(
                 'ViewManager', 'Goto Last &Edit Location'),
             QKeySequence(QCoreApplication.translate(
@@ -3254,7 +3254,7 @@
         
         self.searchFilesAct = E5Action(
             QCoreApplication.translate('ViewManager', 'Search in Files'),
-            UI.PixmapCache.getIcon("projectFind.png"),
+            UI.PixmapCache.getIcon("projectFind"),
             QCoreApplication.translate('ViewManager', 'Search in &Files...'),
             QKeySequence(QCoreApplication.translate(
                 'ViewManager', "Shift+Ctrl+F", "Search|Search Files")),
@@ -3295,7 +3295,7 @@
         self.searchOpenFilesAct = E5Action(
             QCoreApplication.translate(
                 'ViewManager', 'Search in Open Files'),
-            UI.PixmapCache.getIcon("documentFind.png"),
+            UI.PixmapCache.getIcon("documentFind"),
             QCoreApplication.translate(
                 'ViewManager', 'Search in Open Files...'),
             QKeySequence(QCoreApplication.translate(
@@ -3482,7 +3482,7 @@
         
         self.zoomInAct = E5Action(
             QCoreApplication.translate('ViewManager', 'Zoom in'),
-            UI.PixmapCache.getIcon("zoomIn.png"),
+            UI.PixmapCache.getIcon("zoomIn"),
             QCoreApplication.translate('ViewManager', 'Zoom &in'),
             QKeySequence(QCoreApplication.translate(
                 'ViewManager', "Ctrl++", "View|Zoom in")),
@@ -3501,7 +3501,7 @@
         
         self.zoomOutAct = E5Action(
             QCoreApplication.translate('ViewManager', 'Zoom out'),
-            UI.PixmapCache.getIcon("zoomOut.png"),
+            UI.PixmapCache.getIcon("zoomOut"),
             QCoreApplication.translate('ViewManager', 'Zoom &out'),
             QKeySequence(QCoreApplication.translate(
                 'ViewManager', "Ctrl+-", "View|Zoom out")),
@@ -3520,7 +3520,7 @@
         
         self.zoomResetAct = E5Action(
             QCoreApplication.translate('ViewManager', 'Zoom reset'),
-            UI.PixmapCache.getIcon("zoomReset.png"),
+            UI.PixmapCache.getIcon("zoomReset"),
             QCoreApplication.translate('ViewManager', 'Zoom &reset'),
             QKeySequence(QCoreApplication.translate(
                 'ViewManager', "Ctrl+0", "View|Zoom reset")),
@@ -3539,7 +3539,7 @@
         
         self.zoomToAct = E5Action(
             QCoreApplication.translate('ViewManager', 'Zoom'),
-            UI.PixmapCache.getIcon("zoomTo.png"),
+            UI.PixmapCache.getIcon("zoomTo"),
             QCoreApplication.translate('ViewManager', '&Zoom'),
             QKeySequence(QCoreApplication.translate(
                 'ViewManager', "Ctrl+#", "View|Zoom")),
@@ -3620,7 +3620,7 @@
         
         self.unhighlightAct = E5Action(
             QCoreApplication.translate('ViewManager', 'Remove all highlights'),
-            UI.PixmapCache.getIcon("unhighlight.png"),
+            UI.PixmapCache.getIcon("unhighlight"),
             QCoreApplication.translate('ViewManager', 'Remove all highlights'),
             0, 0,
             self, 'vm_view_unhighlight')
@@ -3636,7 +3636,7 @@
         
         self.newDocumentViewAct = E5Action(
             QCoreApplication.translate('ViewManager', 'New Document View'),
-            UI.PixmapCache.getIcon("documentNewView.png"),
+            UI.PixmapCache.getIcon("documentNewView"),
             QCoreApplication.translate('ViewManager', 'New &Document View'),
             0, 0, self, 'vm_view_new_document_view')
         self.newDocumentViewAct.setStatusTip(QCoreApplication.translate(
@@ -3654,7 +3654,7 @@
         self.newDocumentSplitViewAct = E5Action(
             QCoreApplication.translate(
                 'ViewManager', 'New Document View (with new split)'),
-            UI.PixmapCache.getIcon("splitVertical.png"),
+            UI.PixmapCache.getIcon("splitVertical"),
             QCoreApplication.translate(
                 'ViewManager', 'New Document View (with new split)'),
             0, 0, self, 'vm_view_new_document_split_view')
@@ -3674,7 +3674,7 @@
         
         self.splitViewAct = E5Action(
             QCoreApplication.translate('ViewManager', 'Split view'),
-            UI.PixmapCache.getIcon("splitVertical.png"),
+            UI.PixmapCache.getIcon("splitVertical"),
             QCoreApplication.translate('ViewManager', '&Split view'),
             0, 0, self, 'vm_view_split_view')
         self.splitViewAct.setStatusTip(QCoreApplication.translate(
@@ -3704,7 +3704,7 @@
         
         self.splitRemoveAct = E5Action(
             QCoreApplication.translate('ViewManager', 'Remove split'),
-            UI.PixmapCache.getIcon("remsplitVertical.png"),
+            UI.PixmapCache.getIcon("remsplitVertical"),
             QCoreApplication.translate('ViewManager', '&Remove split'),
             0, 0, self, 'vm_view_remove_split')
         self.splitRemoveAct.setStatusTip(QCoreApplication.translate(
@@ -3752,7 +3752,7 @@
         
         self.previewAct = E5Action(
             QCoreApplication.translate('ViewManager', 'Preview'),
-            UI.PixmapCache.getIcon("previewer.png"),
+            UI.PixmapCache.getIcon("previewer"),
             QCoreApplication.translate('ViewManager', 'Preview'),
             0, 0, self, 'vm_preview', True)
         self.previewAct.setStatusTip(QCoreApplication.translate(
@@ -3985,7 +3985,7 @@
 
         self.bookmarkToggleAct = E5Action(
             QCoreApplication.translate('ViewManager', 'Toggle Bookmark'),
-            UI.PixmapCache.getIcon("bookmarkToggle.png"),
+            UI.PixmapCache.getIcon("bookmarkToggle"),
             QCoreApplication.translate('ViewManager', '&Toggle Bookmark'),
             QKeySequence(QCoreApplication.translate(
                 'ViewManager', "Alt+Ctrl+T", "Bookmark|Toggle")),
@@ -4004,7 +4004,7 @@
         
         self.bookmarkNextAct = E5Action(
             QCoreApplication.translate('ViewManager', 'Next Bookmark'),
-            UI.PixmapCache.getIcon("bookmarkNext.png"),
+            UI.PixmapCache.getIcon("bookmarkNext"),
             QCoreApplication.translate('ViewManager', '&Next Bookmark'),
             QKeySequence(QCoreApplication.translate(
                 'ViewManager', "Ctrl+PgDown", "Bookmark|Next")),
@@ -4022,7 +4022,7 @@
         
         self.bookmarkPreviousAct = E5Action(
             QCoreApplication.translate('ViewManager', 'Previous Bookmark'),
-            UI.PixmapCache.getIcon("bookmarkPrevious.png"),
+            UI.PixmapCache.getIcon("bookmarkPrevious"),
             QCoreApplication.translate('ViewManager', '&Previous Bookmark'),
             QKeySequence(QCoreApplication.translate(
                 'ViewManager', "Ctrl+PgUp", "Bookmark|Previous")),
@@ -4057,7 +4057,7 @@
         
         self.syntaxErrorGotoAct = E5Action(
             QCoreApplication.translate('ViewManager', 'Goto Syntax Error'),
-            UI.PixmapCache.getIcon("syntaxErrorGoto.png"),
+            UI.PixmapCache.getIcon("syntaxErrorGoto"),
             QCoreApplication.translate('ViewManager', '&Goto Syntax Error'),
             0, 0,
             self.bookmarkActGrp, 'vm_syntaxerror_goto')
@@ -4089,7 +4089,7 @@
         
         self.warningsNextAct = E5Action(
             QCoreApplication.translate('ViewManager', 'Next warning message'),
-            UI.PixmapCache.getIcon("warningNext.png"),
+            UI.PixmapCache.getIcon("warningNext"),
             QCoreApplication.translate('ViewManager', '&Next warning message'),
             0, 0,
             self.bookmarkActGrp, 'vm_warning_next')
@@ -4107,7 +4107,7 @@
         self.warningsPreviousAct = E5Action(
             QCoreApplication.translate(
                 'ViewManager', 'Previous warning message'),
-            UI.PixmapCache.getIcon("warningPrev.png"),
+            UI.PixmapCache.getIcon("warningPrev"),
             QCoreApplication.translate(
                 'ViewManager', '&Previous warning message'),
             0, 0,
@@ -4142,7 +4142,7 @@
         
         self.notcoveredNextAct = E5Action(
             QCoreApplication.translate('ViewManager', 'Next uncovered line'),
-            UI.PixmapCache.getIcon("notcoveredNext.png"),
+            UI.PixmapCache.getIcon("notcoveredNext"),
             QCoreApplication.translate('ViewManager', '&Next uncovered line'),
             0, 0,
             self.bookmarkActGrp, 'vm_uncovered_next')
@@ -4160,7 +4160,7 @@
         self.notcoveredPreviousAct = E5Action(
             QCoreApplication.translate(
                 'ViewManager', 'Previous uncovered line'),
-            UI.PixmapCache.getIcon("notcoveredPrev.png"),
+            UI.PixmapCache.getIcon("notcoveredPrev"),
             QCoreApplication.translate(
                 'ViewManager', '&Previous uncovered line'),
             0, 0,
@@ -4179,7 +4179,7 @@
         
         self.taskNextAct = E5Action(
             QCoreApplication.translate('ViewManager', 'Next Task'),
-            UI.PixmapCache.getIcon("taskNext.png"),
+            UI.PixmapCache.getIcon("taskNext"),
             QCoreApplication.translate('ViewManager', '&Next Task'),
             0, 0,
             self.bookmarkActGrp, 'vm_task_next')
@@ -4195,7 +4195,7 @@
         
         self.taskPreviousAct = E5Action(
             QCoreApplication.translate('ViewManager', 'Previous Task'),
-            UI.PixmapCache.getIcon("taskPrev.png"),
+            UI.PixmapCache.getIcon("taskPrev"),
             QCoreApplication.translate(
                 'ViewManager', '&Previous Task'),
             0, 0,
@@ -4213,7 +4213,7 @@
         
         self.changeNextAct = E5Action(
             QCoreApplication.translate('ViewManager', 'Next Change'),
-            UI.PixmapCache.getIcon("changeNext.png"),
+            UI.PixmapCache.getIcon("changeNext"),
             QCoreApplication.translate('ViewManager', '&Next Change'),
             0, 0,
             self.bookmarkActGrp, 'vm_change_next')
@@ -4230,7 +4230,7 @@
         
         self.changePreviousAct = E5Action(
             QCoreApplication.translate('ViewManager', 'Previous Change'),
-            UI.PixmapCache.getIcon("changePrev.png"),
+            UI.PixmapCache.getIcon("changePrev"),
             QCoreApplication.translate(
                 'ViewManager', '&Previous Change'),
             0, 0,
@@ -4337,7 +4337,7 @@
         
         self.spellCheckAct = E5Action(
             QCoreApplication.translate('ViewManager', 'Check spelling'),
-            UI.PixmapCache.getIcon("spellchecking.png"),
+            UI.PixmapCache.getIcon("spellchecking"),
             QCoreApplication.translate(
                 'ViewManager', 'Check &spelling...'),
             QKeySequence(QCoreApplication.translate(
@@ -4357,7 +4357,7 @@
         self.autoSpellCheckAct = E5Action(
             QCoreApplication.translate(
                 'ViewManager', 'Automatic spell checking'),
-            UI.PixmapCache.getIcon("autospellchecking.png"),
+            UI.PixmapCache.getIcon("autospellchecking"),
             QCoreApplication.translate(
                 'ViewManager', '&Automatic spell checking'),
             0, 0,
@@ -4914,7 +4914,7 @@
         if language is None:
             pixmap = QPixmap()
         elif language == "":
-            pixmap = UI.PixmapCache.getPixmap("fileText.png")
+            pixmap = UI.PixmapCache.getPixmap("fileText")
         else:
             import QScintilla.Lexers
             pixmap = QScintilla.Lexers.getLanguageIcon(language, True)
@@ -4953,11 +4953,11 @@
         @return pixmap for the eol indicator (QPixmap)
         """
         if eolIndicator == "LF":
-            pixmap = UI.PixmapCache.getPixmap("eolLinux.png")
+            pixmap = UI.PixmapCache.getPixmap("eolLinux")
         elif eolIndicator == "CR":
-            pixmap = UI.PixmapCache.getPixmap("eolMac.png")
+            pixmap = UI.PixmapCache.getPixmap("eolMac")
         elif eolIndicator == "CRLF":
-            pixmap = UI.PixmapCache.getPixmap("eolWindows.png")
+            pixmap = UI.PixmapCache.getPixmap("eolWindows")
         else:
             pixmap = QPixmap()
         return pixmap
@@ -6179,19 +6179,19 @@
         if checked:
             self.setSplitOrientation(Qt.Horizontal)
             self.splitViewAct.setIcon(
-                UI.PixmapCache.getIcon("splitHorizontal.png"))
+                UI.PixmapCache.getIcon("splitHorizontal"))
             self.splitRemoveAct.setIcon(
-                UI.PixmapCache.getIcon("remsplitHorizontal.png"))
+                UI.PixmapCache.getIcon("remsplitHorizontal"))
             self.newDocumentSplitViewAct.setIcon(
-                UI.PixmapCache.getIcon("splitHorizontal.png"))
+                UI.PixmapCache.getIcon("splitHorizontal"))
         else:
             self.setSplitOrientation(Qt.Vertical)
             self.splitViewAct.setIcon(
-                UI.PixmapCache.getIcon("splitVertical.png"))
+                UI.PixmapCache.getIcon("splitVertical"))
             self.splitRemoveAct.setIcon(
-                UI.PixmapCache.getIcon("remsplitVertical.png"))
+                UI.PixmapCache.getIcon("remsplitVertical"))
             self.newDocumentSplitViewAct.setIcon(
-                UI.PixmapCache.getIcon("splitVertical.png"))
+                UI.PixmapCache.getIcon("splitVertical"))
         Preferences.setUI("SplitOrientationVertical", checked)
     
     def __previewEditor(self, checked):
@@ -6601,7 +6601,7 @@
                 
                 if self.ui.notificationsEnabled():
                     self.ui.showNotification(
-                        UI.PixmapCache.getPixmap("spellchecking48.png"),
+                        UI.PixmapCache.getPixmap("spellchecking48"),
                         QCoreApplication.translate(
                             'ViewManager', "Edit Spelling Dictionary"),
                         QCoreApplication.translate(
--- a/eric6/WebBrowser/AdBlock/AdBlockDialog.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/WebBrowser/AdBlock/AdBlockDialog.py	Sat May 02 13:51:07 2020 +0200
@@ -38,7 +38,7 @@
         
         self.__manager = manager
         
-        self.iconLabel.setPixmap(UI.PixmapCache.getPixmap("adBlockPlus48.png"))
+        self.iconLabel.setPixmap(UI.PixmapCache.getPixmap("adBlockPlus48"))
         
         self.updateSpinBox.setValue(
             Preferences.getWebBrowser("AdBlockUpdatePeriod"))
@@ -59,7 +59,7 @@
         menu = QMenu(self)
         menu.aboutToShow.connect(self.__aboutToShowActionMenu)
         self.actionButton.setMenu(menu)
-        self.actionButton.setIcon(UI.PixmapCache.getIcon("adBlockAction.png"))
+        self.actionButton.setIcon(UI.PixmapCache.getIcon("adBlockAction"))
         self.actionButton.setPopupMode(QToolButton.InstantPopup)
         
         self.__load()
@@ -85,9 +85,9 @@
         for subscription in self.__manager.subscriptions():
             tree = AdBlockTreeWidget(subscription, self.subscriptionsTabWidget)
             if subscription.isEnabled():
-                icon = UI.PixmapCache.getIcon("adBlockPlus.png")
+                icon = UI.PixmapCache.getIcon("adBlockPlus")
             else:
-                icon = UI.PixmapCache.getIcon("adBlockPlusDisabled.png")
+                icon = UI.PixmapCache.getIcon("adBlockPlusDisabled")
             self.subscriptionsTabWidget.addTab(
                 tree, icon, subscription.title())
         
@@ -278,13 +278,13 @@
             # enable required one as well
             sub = self.__manager.subscription(subscription.requiresLocation())
             requiresSubscriptions = [] if sub is None else [sub]
-            icon = UI.PixmapCache.getIcon("adBlockPlus.png")
+            icon = UI.PixmapCache.getIcon("adBlockPlus")
         else:
             # disable dependent ones as well
             requiresSubscriptions = (
                 self.__manager.getRequiresSubscriptions(subscription)
             )
-            icon = UI.PixmapCache.getIcon("adBlockPlusDisabled.png")
+            icon = UI.PixmapCache.getIcon("adBlockPlusDisabled")
         requiresSubscriptions.append(subscription)
         for sub in requiresSubscriptions:
             sub.setEnabled(enable)
--- a/eric6/WebBrowser/AdBlock/AdBlockExceptionsDialog.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/WebBrowser/AdBlock/AdBlockExceptionsDialog.py	Sat May 02 13:51:07 2020 +0200
@@ -32,7 +32,7 @@
         self.setWindowFlags(Qt.Window)
         
         self.iconLabel.setPixmap(
-            UI.PixmapCache.getPixmap("adBlockPlusGreen48.png"))
+            UI.PixmapCache.getPixmap("adBlockPlusGreen48"))
         
         self.hostEdit.setInactiveText(self.tr("Enter host to be added..."))
         
--- a/eric6/WebBrowser/AdBlock/AdBlockIcon.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/WebBrowser/AdBlock/AdBlockIcon.py	Sat May 02 13:51:07 2020 +0200
@@ -52,7 +52,7 @@
             self.currentChanged()
         else:
             self.setPixmap(
-                UI.PixmapCache.getPixmap("adBlockPlusDisabled16.png"))
+                UI.PixmapCache.getPixmap("adBlockPlusDisabled16"))
     
     def __createMenu(self, menu):
         """
@@ -67,13 +67,13 @@
         
         if manager.isEnabled():
             act = menu.addAction(
-                UI.PixmapCache.getIcon("adBlockPlusDisabled.png"),
+                UI.PixmapCache.getIcon("adBlockPlusDisabled"),
                 self.tr("Disable AdBlock"))
             act.setData(False)
             act.triggered.connect(lambda: self.__enableAdBlock(act))
         else:
             act = menu.addAction(
-                UI.PixmapCache.getIcon("adBlockPlus.png"),
+                UI.PixmapCache.getIcon("adBlockPlus"),
                 self.tr("Enable AdBlock"))
             act.setData(True)
             act.triggered.connect(lambda: self.__enableAdBlock(act))
@@ -81,22 +81,22 @@
         if manager.isEnabled() and self.__mw.currentBrowser().url().host():
             if self.__isCurrentHostExcepted():
                 act = menu.addAction(
-                    UI.PixmapCache.getIcon("adBlockPlus.png"),
+                    UI.PixmapCache.getIcon("adBlockPlus"),
                     self.tr("Remove AdBlock Exception"))
                 act.setData(False)
                 act.triggered.connect(lambda: self.__setException(act))
             else:
                 act = menu.addAction(
-                    UI.PixmapCache.getIcon("adBlockPlusGreen.png"),
+                    UI.PixmapCache.getIcon("adBlockPlusGreen"),
                     self.tr("Add AdBlock Exception"))
                 act.setData(True)
                 act.triggered.connect(lambda: self.__setException(act))
         menu.addAction(
-            UI.PixmapCache.getIcon("adBlockPlusGreen.png"),
+            UI.PixmapCache.getIcon("adBlockPlusGreen"),
             self.tr("AdBlock Exceptions..."), manager.showExceptionsDialog)
         menu.addSeparator()
         menu.addAction(
-            UI.PixmapCache.getIcon("adBlockPlus.png"),
+            UI.PixmapCache.getIcon("adBlockPlus"),
             self.tr("AdBlock Configuration..."), manager.showDialog)
     
     def menuAction(self):
@@ -114,10 +114,10 @@
         
         if self.__enabled:
             self.__menuAction.setIcon(
-                UI.PixmapCache.getIcon("adBlockPlus.png"))
+                UI.PixmapCache.getIcon("adBlockPlus"))
         else:
             self.__menuAction.setIcon(
-                UI.PixmapCache.getIcon("adBlockPlusDisabled.png"))
+                UI.PixmapCache.getIcon("adBlockPlusDisabled"))
         
         return self.__menuAction
     
@@ -167,9 +167,9 @@
         if self.__enabled:
             if self.__isCurrentHostExcepted():
                 self.setPixmap(
-                    UI.PixmapCache.getPixmap("adBlockPlusGreen16.png"))
+                    UI.PixmapCache.getPixmap("adBlockPlusGreen16"))
             else:
-                self.setPixmap(UI.PixmapCache.getPixmap("adBlockPlus16.png"))
+                self.setPixmap(UI.PixmapCache.getPixmap("adBlockPlus16"))
     
     def __setException(self, act):
         """
--- a/eric6/WebBrowser/AutoScroll/AutoScroller.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/WebBrowser/AutoScroll/AutoScroller.py	Sat May 02 13:51:07 2020 +0200
@@ -213,13 +213,13 @@
         
         if vertical and horizontal:
             self.__indicator.setPixmap(
-                UI.PixmapCache.getPixmap("scrollAll.png"))
+                UI.PixmapCache.getPixmap("scrollAll"))
         elif vertical:
             self.__indicator.setPixmap(
-                UI.PixmapCache.getPixmap("scrollVertical.png"))
+                UI.PixmapCache.getPixmap("scrollVertical"))
         else:
             self.__indicator.setPixmap(
-                UI.PixmapCache.getPixmap("scrollHorizontal.png"))
+                UI.PixmapCache.getPixmap("scrollHorizontal"))
         
         self.__view = view
         p = QPoint(
--- a/eric6/WebBrowser/Bookmarks/BookmarksImporters/ChromeImporter.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/WebBrowser/Bookmarks/BookmarksImporters/ChromeImporter.py	Sat May 02 13:51:07 2020 +0200
@@ -41,7 +41,7 @@
         else:
             standardDir = os.path.expanduser("~/.config/google-chrome/Default")
         return (
-            UI.PixmapCache.getPixmap("chrome.png"),
+            UI.PixmapCache.getPixmap("chrome"),
             "Google Chrome",
             "Bookmarks",
             QCoreApplication.translate(
@@ -62,7 +62,7 @@
         else:
             standardDir = os.path.expanduser("~/.config/chromium/Default")
         return (
-            UI.PixmapCache.getPixmap("chromium.png"),
+            UI.PixmapCache.getPixmap("chromium"),
             "Chromium",
             "Bookmarks",
             QCoreApplication.translate(
--- a/eric6/WebBrowser/Bookmarks/BookmarksImporters/FirefoxImporter.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/WebBrowser/Bookmarks/BookmarksImporters/FirefoxImporter.py	Sat May 02 13:51:07 2020 +0200
@@ -40,7 +40,7 @@
         else:
             standardDir = os.path.expanduser("~/.mozilla/firefox")
         return (
-            UI.PixmapCache.getPixmap("chrome.png"),
+            UI.PixmapCache.getPixmap("chrome"),
             "Mozilla Firefox",
             "places.sqlite",
             QCoreApplication.translate(
--- a/eric6/WebBrowser/Bookmarks/BookmarksImporters/HtmlImporter.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/WebBrowser/Bookmarks/BookmarksImporters/HtmlImporter.py	Sat May 02 13:51:07 2020 +0200
@@ -30,7 +30,7 @@
     """
     if sourceId == "html":
         return (
-            UI.PixmapCache.getPixmap("html.png"),
+            UI.PixmapCache.getPixmap("html"),
             "HTML Netscape Bookmarks",
             QCoreApplication.translate(
                 "HtmlImporter",
--- a/eric6/WebBrowser/Bookmarks/BookmarksImporters/IExplorerImporter.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/WebBrowser/Bookmarks/BookmarksImporters/IExplorerImporter.py	Sat May 02 13:51:07 2020 +0200
@@ -36,7 +36,7 @@
         else:
             standardDir = ""
         return (
-            UI.PixmapCache.getPixmap("internet_explorer.png"),
+            UI.PixmapCache.getPixmap("internet_explorer"),
             "Internet Explorer",
             "",
             QCoreApplication.translate(
--- a/eric6/WebBrowser/Bookmarks/BookmarksImporters/OperaImporter.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/WebBrowser/Bookmarks/BookmarksImporters/OperaImporter.py	Sat May 02 13:51:07 2020 +0200
@@ -38,7 +38,7 @@
         else:
             standardDir = os.path.expanduser("~/.opera")
         return (
-            UI.PixmapCache.getPixmap("opera.png"),
+            UI.PixmapCache.getPixmap("opera"),
             "Opera",
             "bookmarks.adr",
             QCoreApplication.translate(
--- a/eric6/WebBrowser/Bookmarks/BookmarksImporters/SafariImporter.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/WebBrowser/Bookmarks/BookmarksImporters/SafariImporter.py	Sat May 02 13:51:07 2020 +0200
@@ -40,7 +40,7 @@
         else:
             standardDir = ""
         return (
-            UI.PixmapCache.getPixmap("safari.png"),
+            UI.PixmapCache.getPixmap("safari"),
             "Apple Safari",
             "Bookmarks.plist",
             QCoreApplication.translate(
--- a/eric6/WebBrowser/Bookmarks/BookmarksImporters/XbelImporter.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/WebBrowser/Bookmarks/BookmarksImporters/XbelImporter.py	Sat May 02 13:51:07 2020 +0200
@@ -32,7 +32,7 @@
         from ..BookmarksManager import BookmarksManager
         bookmarksFile = BookmarksManager.getFileName()
         return (
-            UI.PixmapCache.getPixmap("ericWeb48.png"),
+            UI.PixmapCache.getPixmap("ericWeb48"),
             "eric6 Web Browser",
             os.path.basename(bookmarksFile),
             QCoreApplication.translate(
@@ -53,7 +53,7 @@
         else:
             standardDir = ""
         return (
-            UI.PixmapCache.getPixmap("konqueror.png"),
+            UI.PixmapCache.getPixmap("konqueror"),
             "Konqueror",
             "bookmarks.xml",
             QCoreApplication.translate(
@@ -68,7 +68,7 @@
         )
     elif sourceId == "xbel":
         return (
-            UI.PixmapCache.getPixmap("xbel.png"),
+            UI.PixmapCache.getPixmap("xbel"),
             "XBEL Bookmarks",
             QCoreApplication.translate(
                 "XbelImporter", "XBEL Bookmarks") + " (*.xbel *.xml)",
--- a/eric6/WebBrowser/Bookmarks/BookmarksImporters/__init__.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/WebBrowser/Bookmarks/BookmarksImporters/__init__.py	Sat May 02 13:51:07 2020 +0200
@@ -23,32 +23,32 @@
     """
     importers = []
     importers.append(
-        (UI.PixmapCache.getIcon("ericWeb48.png"), "eric6 Web Browser",
+        (UI.PixmapCache.getIcon("ericWeb48"), "eric6 Web Browser",
          "e5browser"))
     importers.append(
-        (UI.PixmapCache.getIcon("firefox.png"), "Mozilla Firefox", "firefox"))
+        (UI.PixmapCache.getIcon("firefox"), "Mozilla Firefox", "firefox"))
     importers.append(
-        (UI.PixmapCache.getIcon("chrome.png"), "Google Chrome", "chrome"))
+        (UI.PixmapCache.getIcon("chrome"), "Google Chrome", "chrome"))
     if Globals.isLinuxPlatform():
         importers.append(
-            (UI.PixmapCache.getIcon("chromium.png"), "Chromium", "chromium"))
+            (UI.PixmapCache.getIcon("chromium"), "Chromium", "chromium"))
         importers.append(
-            (UI.PixmapCache.getIcon("konqueror.png"), "Konqueror",
+            (UI.PixmapCache.getIcon("konqueror"), "Konqueror",
              "konqueror"))
     importers.append(
-        (UI.PixmapCache.getIcon("opera.png"), "Opera", "opera"))
+        (UI.PixmapCache.getIcon("opera"), "Opera", "opera"))
     importers.append(
-        (UI.PixmapCache.getIcon("safari.png"), "Apple Safari", "safari"))
+        (UI.PixmapCache.getIcon("safari"), "Apple Safari", "safari"))
     if Globals.isWindowsPlatform():
         importers.append(
-            (UI.PixmapCache.getIcon("internet_explorer.png"),
+            (UI.PixmapCache.getIcon("internet_explorer"),
              "Internet Explorer", "ie"))
     importers.append(
-        (UI.PixmapCache.getIcon("xbel.png"),
+        (UI.PixmapCache.getIcon("xbel"),
          QCoreApplication.translate("BookmarksImporters", "XBEL File"),
          "xbel"))
     importers.append(
-        (UI.PixmapCache.getIcon("html.png"),
+        (UI.PixmapCache.getIcon("html"),
          QCoreApplication.translate("BookmarksImporters", "HTML File"),
          "html"))
     return importers
--- a/eric6/WebBrowser/Bookmarks/BookmarksModel.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/WebBrowser/Bookmarks/BookmarksModel.py	Sat May 02 13:51:07 2020 +0200
@@ -201,7 +201,7 @@
         elif role == Qt.DecorationRole:
             if index.column() == 0:
                 if bookmarkNode.type() == BookmarkNode.Folder:
-                    return UI.PixmapCache.getIcon("dirOpen.png")
+                    return UI.PixmapCache.getIcon("dirOpen")
                 import WebBrowser.WebBrowserWindow
                 return WebBrowser.WebBrowserWindow.WebBrowserWindow.icon(
                     QUrl(bookmarkNode.url))
--- a/eric6/WebBrowser/Download/DownloadItem.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/WebBrowser/Download/DownloadItem.py	Sat May 02 13:51:07 2020 +0200
@@ -65,9 +65,9 @@
         
         self.progressBar.setMaximum(0)
         
-        self.pauseButton.setIcon(UI.PixmapCache.getIcon("pause.png"))
-        self.stopButton.setIcon(UI.PixmapCache.getIcon("stopLoading.png"))
-        self.openButton.setIcon(UI.PixmapCache.getIcon("open.png"))
+        self.pauseButton.setIcon(UI.PixmapCache.getIcon("pause"))
+        self.stopButton.setIcon(UI.PixmapCache.getIcon("stopLoading"))
+        self.openButton.setIcon(UI.PixmapCache.getIcon("open"))
         self.openButton.setEnabled(False)
         self.openButton.setVisible(False)
         if not hasattr(QWebEngineDownloadItem, "pause"):
--- a/eric6/WebBrowser/Download/DownloadManager.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/WebBrowser/Download/DownloadManager.py	Sat May 02 13:51:07 2020 +0200
@@ -106,11 +106,11 @@
             itm = self.__downloads[row]
             if itm.downloadedSuccessfully():
                 menu.addAction(
-                    UI.PixmapCache.getIcon("open.png"),
+                    UI.PixmapCache.getIcon("open"),
                     self.tr("Open"), self.__contextMenuOpen)
             elif itm.downloading():
                 menu.addAction(
-                    UI.PixmapCache.getIcon("stopLoading.png"),
+                    UI.PixmapCache.getIcon("stopLoading"),
                     self.tr("Cancel"), self.__contextMenuCancel)
                 menu.addSeparator()
             menu.addAction(
@@ -499,7 +499,7 @@
             if success and e5App().activeWindow() is not self:
                 if WebBrowserWindow.notificationsEnabled():
                     WebBrowserWindow.showNotification(
-                        UI.PixmapCache.getPixmap("downloads48.png"),
+                        UI.PixmapCache.getPixmap("downloads48"),
                         self.tr("Downloads finished"),
                         self.tr("All files have been downloaded.")
                     )
--- a/eric6/WebBrowser/Download/DownloadManagerButton.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/WebBrowser/Download/DownloadManagerButton.py	Sat May 02 13:51:07 2020 +0200
@@ -33,7 +33,7 @@
         self.__manager = WebBrowserWindow.downloadManager()
         
         self.setObjectName("navigation_download_manager_button")
-        self.setIcon(UI.PixmapCache.getIcon("downloads.png"))
+        self.setIcon(UI.PixmapCache.getIcon("downloads"))
         self.setToolTip(self.tr("Open Download Manager"))
         self.setToolButtonStyle(Qt.ToolButtonIconOnly)
         self.setFocusPolicy(Qt.NoFocus)
--- a/eric6/WebBrowser/FeaturePermissions/FeaturePermissionBar.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/WebBrowser/FeaturePermissions/FeaturePermissionBar.py	Sat May 02 13:51:07 2020 +0200
@@ -75,25 +75,25 @@
             pass
         
         self.__permissionFeatureIconNames = {
-            QWebEnginePage.Geolocation: "geolocation.png",
-            QWebEnginePage.MediaAudioCapture: "audiocapture.png",
-            QWebEnginePage.MediaVideoCapture: "camera.png",
-            QWebEnginePage.MediaAudioVideoCapture: "audio-video.png",
-            QWebEnginePage.MouseLock: "mouse.png",
+            QWebEnginePage.Geolocation: "geolocation",
+            QWebEnginePage.MediaAudioCapture: "audiocapture",
+            QWebEnginePage.MediaVideoCapture: "camera",
+            QWebEnginePage.MediaAudioVideoCapture: "audio-video",
+            QWebEnginePage.MouseLock: "mouse",
         }
         try:
             # these are defined as of Qt 5.10.0/PyQt 5.10.0
             self.__permissionFeatureIconNames.update({
-                QWebEnginePage.DesktopVideoCapture: "desktopVideoCapture.png",
+                QWebEnginePage.DesktopVideoCapture: "desktopVideoCapture",
                 QWebEnginePage.DesktopAudioVideoCapture:
-                    "desktopAudioVideoCapture.png",
+                    "desktopAudioVideoCapture",
             })
         except AttributeError:
             pass
         try:
             # this was re-added in Qt 5.13.0
             self.__permissionFeatureIconNames[
-                QWebEnginePage.Notifications] = "notification.png"
+                QWebEnginePage.Notifications] = "notification"
         except AttributeError:
             pass
         
@@ -110,7 +110,7 @@
         self.__rememberButton.setCheckable(True)
         self.__allowButton = QPushButton(self.tr("Allow"), self)
         self.__denyButton = QPushButton(self.tr("Deny"), self)
-        self.__discardButton = QPushButton(UI.PixmapCache.getIcon("close.png"),
+        self.__discardButton = QPushButton(UI.PixmapCache.getIcon("close"),
                                            "", self)
         self.__allowButton.clicked.connect(self.__permissionGranted)
         self.__denyButton.clicked.connect(self.__permissionDenied)
--- a/eric6/WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py	Sat May 02 13:51:07 2020 +0200
@@ -53,7 +53,7 @@
             self.notifList.headerItem().setText(1, self.tr("Permission"))
             self.tabWidget.addTab(
                 self.notifList,
-                UI.PixmapCache.getIcon("notification.png"),
+                UI.PixmapCache.getIcon("notification"),
                 self.tr("Notifications"))
         
         self.geoList = QTreeWidget()
@@ -68,7 +68,7 @@
         self.geoList.headerItem().setText(1, self.tr("Permission"))
         self.tabWidget.addTab(
             self.geoList,
-            UI.PixmapCache.getIcon("geolocation.png"),
+            UI.PixmapCache.getIcon("geolocation"),
             self.tr("Geolocation"))
         
         self.micList = QTreeWidget()
@@ -83,7 +83,7 @@
         self.micList.headerItem().setText(1, self.tr("Permission"))
         self.tabWidget.addTab(
             self.micList,
-            UI.PixmapCache.getIcon("audiocapture.png"),
+            UI.PixmapCache.getIcon("audiocapture"),
             self.tr("Microphone"))
         
         self.camList = QTreeWidget()
@@ -98,7 +98,7 @@
         self.camList.headerItem().setText(1, self.tr("Permission"))
         self.tabWidget.addTab(
             self.camList,
-            UI.PixmapCache.getIcon("camera.png"),
+            UI.PixmapCache.getIcon("camera"),
             self.tr("Camera"))
         
         self.micCamList = QTreeWidget()
@@ -113,7 +113,7 @@
         self.micCamList.headerItem().setText(1, self.tr("Permission"))
         self.tabWidget.addTab(
             self.micCamList,
-            UI.PixmapCache.getIcon("audio-video.png"),
+            UI.PixmapCache.getIcon("audio-video"),
             self.tr("Microphone && Camera"))
         
         self.mouseLockList = QTreeWidget()
@@ -129,7 +129,7 @@
         self.mouseLockList.headerItem().setText(1, self.tr("Permission"))
         self.tabWidget.addTab(
             self.mouseLockList,
-            UI.PixmapCache.getIcon("mouse.png"),
+            UI.PixmapCache.getIcon("mouse"),
             self.tr("Mouse Lock"))
         
         if hasattr(QWebEnginePage, "DesktopVideoCapture"):
@@ -147,7 +147,7 @@
             self.deskVidList.headerItem().setText(1, self.tr("Permission"))
             self.tabWidget.addTab(
                 self.deskVidList,
-                UI.PixmapCache.getIcon("desktopVideoCapture.png"),
+                UI.PixmapCache.getIcon("desktopVideoCapture"),
                 self.tr("Desktop Video"))
             
             self.deskAudVidList = QTreeWidget()
@@ -163,7 +163,7 @@
             self.deskAudVidList.headerItem().setText(1, self.tr("Permission"))
             self.tabWidget.addTab(
                 self.deskAudVidList,
-                UI.PixmapCache.getIcon("desktopAudioVideoCapture.png"),
+                UI.PixmapCache.getIcon("desktopAudioVideoCapture"),
                 self.tr("Desktop Audio && Video"))
         
         if hasattr(QWebEnginePage, "Notifications"):
--- a/eric6/WebBrowser/Feeds/FeedsDialog.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/WebBrowser/Feeds/FeedsDialog.py	Sat May 02 13:51:07 2020 +0200
@@ -34,7 +34,7 @@
         super(FeedsDialog, self).__init__(parent)
         self.setupUi(self)
         
-        self.iconLabel.setPixmap(UI.PixmapCache.getPixmap("rss48.png"))
+        self.iconLabel.setPixmap(UI.PixmapCache.getPixmap("rss48"))
         
         self.__browser = browser
         
@@ -79,7 +79,7 @@
         if feedsManager.addFeed(urlString, title, self.__browser.icon()):
             if WebBrowserWindow.notificationsEnabled():
                 WebBrowserWindow.showNotification(
-                    UI.PixmapCache.getPixmap("rss48.png"),
+                    UI.PixmapCache.getPixmap("rss48"),
                     self.tr("Add RSS Feed"),
                     self.tr("""The feed was added successfully."""))
             else:
--- a/eric6/WebBrowser/Feeds/FeedsManager.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/WebBrowser/Feeds/FeedsManager.py	Sat May 02 13:51:07 2020 +0200
@@ -97,7 +97,7 @@
         
         # step 2: add the feed
         if icon.isNull():
-            icon = UI.PixmapCache.getIcon("rss16.png")
+            icon = UI.PixmapCache.getIcon("rss16")
         feed = (urlString, title, icon)
         self.__feeds.append(feed)
         self.__addFeedItem(feed)
@@ -302,7 +302,7 @@
                         itm = QTreeWidgetItem(topItem)
                         itm.setText(0, titleString)
                         itm.setData(0, FeedsManager.UrlStringRole, linkString)
-                        itm.setIcon(0, UI.PixmapCache.getIcon("rss16.png"))
+                        itm.setIcon(0, UI.PixmapCache.getIcon("rss16"))
                         
                         linkString = ""
                         titleString = ""
--- a/eric6/WebBrowser/FlashCookieManager/FlashCookieManagerDialog.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/WebBrowser/FlashCookieManager/FlashCookieManagerDialog.py	Sat May 02 13:51:07 2020 +0200
@@ -353,7 +353,7 @@
             else:
                 newParent = QTreeWidgetItem(self.cookiesList)
                 newParent.setText(0, cookieOrigin)
-                newParent.setIcon(0, UI.PixmapCache.getIcon("dirOpen.png"))
+                newParent.setIcon(0, UI.PixmapCache.getIcon("dirOpen"))
                 self.cookiesList.addTopLevelItem(newParent)
                 originDict[cookieOrigin] = newParent
                 
--- a/eric6/WebBrowser/FlashCookieManager/FlashCookieNotification.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/WebBrowser/FlashCookieManager/FlashCookieNotification.py	Sat May 02 13:51:07 2020 +0200
@@ -47,14 +47,14 @@
         self.setLayout(self.__layout)
         self.__layout.setContentsMargins(9, 0, 0, 0)
         self.__iconLabel = QLabel(self)
-        self.__iconLabel.setPixmap(UI.PixmapCache.getPixmap("flashCookie.png"))
+        self.__iconLabel.setPixmap(UI.PixmapCache.getPixmap("flashCookie"))
         self.__layout.addWidget(self.__iconLabel)
         self.__messageLabel = QLabel(msg, self)
         self.__layout.addWidget(self.__messageLabel)
         self.__viewButton = QPushButton(self.tr("View"), self)
         self.__layout.addWidget(self.__viewButton)
         self.__layout.addStretch()
-        self.__discardButton = QPushButton(UI.PixmapCache.getIcon("close.png"),
+        self.__discardButton = QPushButton(UI.PixmapCache.getIcon("close"),
                                            "", self)
         self.__layout.addWidget(self.__discardButton)
         
--- a/eric6/WebBrowser/GreaseMonkey/GreaseMonkeyAddScriptDialog.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/WebBrowser/GreaseMonkey/GreaseMonkeyAddScriptDialog.py	Sat May 02 13:51:07 2020 +0200
@@ -38,7 +38,7 @@
         self.setupUi(self)
         
         self.iconLabel.setPixmap(
-            UI.PixmapCache.getPixmap("greaseMonkey48.png"))
+            UI.PixmapCache.getPixmap("greaseMonkey48"))
         
         self.__manager = manager
         self.__script = script
@@ -95,7 +95,7 @@
         from WebBrowser.WebBrowserWindow import WebBrowserWindow
         if success and WebBrowserWindow.notificationsEnabled():
             WebBrowserWindow.showNotification(
-                UI.PixmapCache.getPixmap("greaseMonkey48.png"),
+                UI.PixmapCache.getPixmap("greaseMonkey48"),
                 self.tr("GreaseMonkey Script Installation"),
                 msg)
         else:
--- a/eric6/WebBrowser/GreaseMonkey/GreaseMonkeyConfiguration/GreaseMonkeyConfigurationDialog.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/WebBrowser/GreaseMonkey/GreaseMonkeyConfiguration/GreaseMonkeyConfigurationDialog.py	Sat May 02 13:51:07 2020 +0200
@@ -42,7 +42,7 @@
         self.setWindowFlags(Qt.Window)
         
         self.iconLabel.setPixmap(
-            UI.PixmapCache.getPixmap("greaseMonkey48.png"))
+            UI.PixmapCache.getPixmap("greaseMonkey48"))
         
         self.__manager = manager
         
@@ -97,7 +97,7 @@
             itm.setText(script.name())
             icon = script.icon()
             if icon.isNull:
-                icon = UI.PixmapCache.getIcon("greaseMonkeyScript.png")
+                icon = UI.PixmapCache.getIcon("greaseMonkeyScript")
             itm.setIcon(icon)
             itm.setData(
                 GreaseMonkeyConfigurationDialog.ScriptVersionRole,
--- a/eric6/WebBrowser/GreaseMonkey/GreaseMonkeyConfiguration/GreaseMonkeyConfigurationListDelegate.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/WebBrowser/GreaseMonkey/GreaseMonkeyConfiguration/GreaseMonkeyConfigurationListDelegate.py	Sat May 02 13:51:07 2020 +0200
@@ -38,7 +38,7 @@
         super(GreaseMonkeyConfigurationListDelegate, self).__init__(parent)
         
         self.__removePixmap = UI.PixmapCache.getIcon(
-            "greaseMonkeyTrash.png").pixmap(
+            "greaseMonkeyTrash").pixmap(
                 GreaseMonkeyConfigurationListDelegate.RemoveIconSize)
         self.__rowHeight = 0
         self.__padding = 0
--- a/eric6/WebBrowser/GreaseMonkey/GreaseMonkeyConfiguration/GreaseMonkeyConfigurationScriptInfoDialog.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/WebBrowser/GreaseMonkey/GreaseMonkeyConfiguration/GreaseMonkeyConfigurationScriptInfoDialog.py	Sat May 02 13:51:07 2020 +0200
@@ -36,7 +36,7 @@
         self.setupUi(self)
         
         self.iconLabel.setPixmap(
-            UI.PixmapCache.getPixmap("greaseMonkey48.png"))
+            UI.PixmapCache.getPixmap("greaseMonkey48"))
         
         self.__scriptFileName = script.fileName()
         
--- a/eric6/WebBrowser/History/HistoryMenu.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/WebBrowser/History/HistoryMenu.py	Sat May 02 13:51:07 2020 +0200
@@ -375,14 +375,14 @@
                 self.newPrivateWindow)
         self.addMenu(self.__mostVisitedMenu)
         act = self.addMenu(self.__closedTabsMenu)
-        act.setIcon(UI.PixmapCache.getIcon("trash.png"))
+        act.setIcon(UI.PixmapCache.getIcon("trash"))
         act.setEnabled(self.__tabWidget.canRestoreClosedTab())
         self.addSeparator()
         
-        act = self.addAction(UI.PixmapCache.getIcon("history.png"),
+        act = self.addAction(UI.PixmapCache.getIcon("history"),
                              self.tr("Show All History..."))
         act.triggered.connect(self.showHistoryDialog)
-        act = self.addAction(UI.PixmapCache.getIcon("historyClear.png"),
+        act = self.addAction(UI.PixmapCache.getIcon("historyClear"),
                              self.tr("Clear History..."))
         act.triggered.connect(self.__clearHistoryDialog)
     
--- a/eric6/WebBrowser/History/HistoryTreeModel.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/WebBrowser/History/HistoryTreeModel.py	Sat May 02 13:51:07 2020 +0200
@@ -71,7 +71,7 @@
         
         elif role == Qt.DecorationRole:
             if index.column() == 0 and not index.parent().isValid():
-                return UI.PixmapCache.getIcon("history.png")
+                return UI.PixmapCache.getIcon("history")
         
         elif role == HistoryModel.DateRole:
             if index.column() == 0 and index.internalId() == 0:
--- a/eric6/WebBrowser/Navigation/NavigationBar.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/WebBrowser/Navigation/NavigationBar.py	Sat May 02 13:51:07 2020 +0200
@@ -58,7 +58,7 @@
         self.__backButton.setFocusPolicy(Qt.NoFocus)
         self.__backButton.setAutoRaise(True)
         self.__backButton.setIcon(
-            UI.PixmapCache.getIcon("back.png"))
+            UI.PixmapCache.getIcon("back"))
         self.__backButton.setEnabled(False)
         
         self.__forwardButton = E5ToolButton(self)
@@ -68,7 +68,7 @@
         self.__forwardButton.setFocusPolicy(Qt.NoFocus)
         self.__forwardButton.setAutoRaise(True)
         self.__forwardButton.setIcon(
-            UI.PixmapCache.getIcon("forward.png"))
+            UI.PixmapCache.getIcon("forward"))
         self.__forwardButton.setEnabled(False)
         
         self.__backNextLayout = QHBoxLayout()
@@ -86,13 +86,13 @@
         self.__homeButton.setFocusPolicy(Qt.NoFocus)
         self.__homeButton.setAutoRaise(True)
         self.__homeButton.setIcon(
-            UI.PixmapCache.getIcon("home.png"))
+            UI.PixmapCache.getIcon("home"))
         
         self.__exitFullScreenButton = E5ToolButton(self)
         self.__exitFullScreenButton.setObjectName(
             "navigation_exitfullscreen_button")
         self.__exitFullScreenButton.setIcon(
-            UI.PixmapCache.getIcon("windowRestore.png"))
+            UI.PixmapCache.getIcon("windowRestore"))
         self.__exitFullScreenButton.setToolTip(self.tr("Exit Fullscreen"))
         self.__exitFullScreenButton.setToolButtonStyle(Qt.ToolButtonIconOnly)
         self.__exitFullScreenButton.setFocusPolicy(Qt.NoFocus)
@@ -105,7 +105,7 @@
         self.__superMenuButton = E5ToolButton(self)
         self.__superMenuButton.setObjectName(
             "navigation_supermenu_button")
-        self.__superMenuButton.setIcon(UI.PixmapCache.getIcon("superMenu.png"))
+        self.__superMenuButton.setIcon(UI.PixmapCache.getIcon("superMenu"))
         self.__superMenuButton.setToolTip(self.tr("Main Menu"))
         self.__superMenuButton.setPopupMode(QToolButton.InstantPopup)
         self.__superMenuButton.setToolButtonStyle(Qt.ToolButtonIconOnly)
--- a/eric6/WebBrowser/Navigation/ReloadStopButton.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/WebBrowser/Navigation/ReloadStopButton.py	Sat May 02 13:51:07 2020 +0200
@@ -61,10 +61,10 @@
         Private slot to update the button.
         """
         if self.__loading:
-            self.setIcon(UI.PixmapCache.getIcon("stopLoading.png"))
+            self.setIcon(UI.PixmapCache.getIcon("stopLoading"))
             self.setToolTip(self.tr("Stop loading"))
         else:
-            self.setIcon(UI.PixmapCache.getIcon("reload.png"))
+            self.setIcon(UI.PixmapCache.getIcon("reload"))
             self.setToolTip(self.tr("Reload the current screen"))
     
     def setLoading(self, loading):
--- a/eric6/WebBrowser/PersonalInformationManager/PersonalDataDialog.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/WebBrowser/PersonalInformationManager/PersonalDataDialog.py	Sat May 02 13:51:07 2020 +0200
@@ -29,7 +29,7 @@
         super(PersonalDataDialog, self).__init__(parent)
         self.setupUi(self)
         
-        self.iconLabel.setPixmap(UI.PixmapCache.getPixmap("pim48.png"))
+        self.iconLabel.setPixmap(UI.PixmapCache.getPixmap("pim48"))
         
         self.firstnameEdit.setText(Preferences.getWebBrowser("PimFirstName"))
         self.lastnameEdit.setText(Preferences.getWebBrowser("PimLastName"))
--- a/eric6/WebBrowser/PersonalInformationManager/PersonalInformationManager.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/WebBrowser/PersonalInformationManager/PersonalInformationManager.py	Sat May 02 13:51:07 2020 +0200
@@ -148,7 +148,7 @@
             self.__loadSettings()
         
         submenu = QMenu(self.tr("Insert Personal Information"), menu)
-        submenu.setIcon(UI.PixmapCache.getIcon("pim.png"))
+        submenu.setIcon(UI.PixmapCache.getIcon("pim"))
         
         for key, info in sorted(self.__allInfo.items()):
             if info:
--- a/eric6/WebBrowser/SafeBrowsing/SafeBrowsingDialog.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/WebBrowser/SafeBrowsing/SafeBrowsingDialog.py	Sat May 02 13:51:07 2020 +0200
@@ -43,7 +43,7 @@
         self.__manager.progress.connect(self.__setProgress)
         
         self.iconLabel.setPixmap(
-            UI.PixmapCache.getPixmap("safeBrowsing48.png"))
+            UI.PixmapCache.getPixmap("safeBrowsing48"))
         
         self.__gsbHelpDialog = None
         
--- a/eric6/WebBrowser/SafeBrowsing/SafeBrowsingInfoWidget.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/WebBrowser/SafeBrowsing/SafeBrowsingInfoWidget.py	Sat May 02 13:51:07 2020 +0200
@@ -34,7 +34,7 @@
         layout = QHBoxLayout(self)
         
         iconLabel = QLabel(self)
-        iconLabel.setPixmap(UI.PixmapCache.getPixmap("safeBrowsing48.png"))
+        iconLabel.setPixmap(UI.PixmapCache.getPixmap("safeBrowsing48"))
         layout.addWidget(iconLabel, 0, Qt.AlignTop)
         
         infoLabel = QLabel(self)
--- a/eric6/WebBrowser/SafeBrowsing/SafeBrowsingManager.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/WebBrowser/SafeBrowsing/SafeBrowsingManager.py	Sat May 02 13:51:07 2020 +0200
@@ -164,7 +164,7 @@
         
         if WebBrowserWindow.notificationsEnabled():
             WebBrowserWindow.showNotification(
-                UI.PixmapCache.getPixmap("safeBrowsing48.png"),
+                UI.PixmapCache.getPixmap("safeBrowsing48"),
                 self.tr("Google Safe Browsing"),
                 message,
                 timeout=timeout,
--- a/eric6/WebBrowser/SearchWidget.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/WebBrowser/SearchWidget.py	Sat May 02 13:51:07 2020 +0200
@@ -33,9 +33,9 @@
         
         self.__mainWindow = mainWindow
         
-        self.closeButton.setIcon(UI.PixmapCache.getIcon("close.png"))
-        self.findPrevButton.setIcon(UI.PixmapCache.getIcon("1leftarrow.png"))
-        self.findNextButton.setIcon(UI.PixmapCache.getIcon("1rightarrow.png"))
+        self.closeButton.setIcon(UI.PixmapCache.getIcon("close"))
+        self.findPrevButton.setIcon(UI.PixmapCache.getIcon("1leftarrow"))
+        self.findNextButton.setIcon(UI.PixmapCache.getIcon("1rightarrow"))
         
         self.__defaultBaseColor = (
             self.findtextCombo.lineEdit().palette().color(QPalette.Base)
--- a/eric6/WebBrowser/SiteInfo/SiteInfoDialog.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/WebBrowser/SiteInfo/SiteInfoDialog.py	Sat May 02 13:51:07 2020 +0200
@@ -46,9 +46,9 @@
         
         # put icons
         self.tabWidget.setTabIcon(
-            0, UI.PixmapCache.getIcon("siteinfo-general.png"))
+            0, UI.PixmapCache.getIcon("siteinfo-general"))
         self.tabWidget.setTabIcon(
-            1, UI.PixmapCache.getIcon("siteinfo-media.png"))
+            1, UI.PixmapCache.getIcon("siteinfo-media"))
         
         self.__imageReply = None
         
--- a/eric6/WebBrowser/SiteInfo/SiteInfoWidget.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/WebBrowser/SiteInfo/SiteInfoWidget.py	Sat May 02 13:51:07 2020 +0200
@@ -62,12 +62,12 @@
             secureLabel.setText(
                 self.tr("Your connection to this site is <b>secure</b>."))
             secureIcon.setPixmap(
-                UI.PixmapCache.getPixmap("securityHigh.png"))
+                UI.PixmapCache.getPixmap("securityHigh"))
         else:
             secureLabel.setText(
                 self.tr("Your connection to this site is <b>not secure</b>."))
             secureIcon.setPixmap(
-                UI.PixmapCache.getPixmap("securityLow.png"))
+                UI.PixmapCache.getPixmap("securityLow"))
         rows += 1
         
         visits = WebBrowserWindow.historyManager().siteVisitsCount(
@@ -83,16 +83,16 @@
                 self.tr("This is your <b>{0}.</b> visit of this site.")
                 .format(visits))
             historyIcon.setPixmap(
-                UI.PixmapCache.getPixmap("flagGreen.png"))
+                UI.PixmapCache.getPixmap("flagGreen"))
         elif visits == 0:
             historyLabel.setText(
                 self.tr("You have <b>never</b> visited this site before.")
                 .format(visits))
             historyIcon.setPixmap(
-                UI.PixmapCache.getPixmap("flagBlack.png"))
+                UI.PixmapCache.getPixmap("flagBlack"))
         else:
             historyIcon.setPixmap(
-                UI.PixmapCache.getPixmap("flagYellow.png"))
+                UI.PixmapCache.getPixmap("flagYellow"))
             if visits == 1:
                 visitStr = self.tr("first")
             elif visits == 2:
--- a/eric6/WebBrowser/Sync/SyncAssistantDialog.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/WebBrowser/Sync/SyncAssistantDialog.py	Sat May 02 13:51:07 2020 +0200
@@ -44,12 +44,14 @@
         self.setPage(SyncGlobals.PageCheck, SyncCheckPage(self))
         
         self.setPixmap(QWizard.LogoPixmap,
-                       UI.PixmapCache.getPixmap("ericWeb48.png"))
+                       UI.PixmapCache.getPixmap("ericWeb48"))
         self.setPixmap(QWizard.WatermarkPixmap,
-                       UI.PixmapCache.getPixmap("eric256.png"))
+                       UI.PixmapCache.getPixmap("eric256"))
         self.setPixmap(QWizard.BackgroundPixmap,
-                       UI.PixmapCache.getPixmap("eric256.png"))
+                       UI.PixmapCache.getPixmap("eric256"))
         
         self.setMinimumSize(650, 450)
         if Globals.isWindowsPlatform():
             self.setWizardStyle(QWizard.ModernStyle)
+        
+        self.setOption(QWizard.NoCancelButtonOnLastPage, True)
--- a/eric6/WebBrowser/Sync/SyncCheckPage.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/WebBrowser/Sync/SyncCheckPage.py	Sat May 02 13:51:07 2020 +0200
@@ -7,11 +7,7 @@
 Module implementing the synchronization status wizard page.
 """
 
-
-import os
-
-from PyQt5.QtCore import QByteArray, QTimer
-from PyQt5.QtGui import QMovie
+from PyQt5.QtCore import QTimer
 from PyQt5.QtWidgets import QWizardPage
 
 from . import SyncGlobals
@@ -21,8 +17,6 @@
 import Preferences
 import UI.PixmapCache
 
-from eric6config import getConfig
-
 
 class SyncCheckPage(QWizardPage, Ui_SyncCheckPage):
     """
@@ -76,51 +70,49 @@
         
         if not syncMgr.syncEnabled():
             self.bookmarkLabel.setPixmap(
-                UI.PixmapCache.getPixmap("syncNo.png"))
-            self.historyLabel.setPixmap(UI.PixmapCache.getPixmap("syncNo.png"))
+                UI.PixmapCache.getPixmap("syncNo"))
+            self.historyLabel.setPixmap(UI.PixmapCache.getPixmap("syncNo"))
             self.passwordsLabel.setPixmap(
-                UI.PixmapCache.getPixmap("syncNo.png"))
+                UI.PixmapCache.getPixmap("syncNo"))
             self.userAgentsLabel.setPixmap(
-                UI.PixmapCache.getPixmap("syncNo.png"))
+                UI.PixmapCache.getPixmap("syncNo"))
             self.speedDialLabel.setPixmap(
-                UI.PixmapCache.getPixmap("syncNo.png"))
+                UI.PixmapCache.getPixmap("syncNo"))
             return
         
-        animationFile = os.path.join(getConfig("ericPixDir"), "loading.gif")
-        
         # bookmarks
         if Preferences.getWebBrowser("SyncBookmarks"):
-            self.__makeAnimatedLabel(animationFile, self.bookmarkLabel)
+            self.__makeAnimatedLabel("loadingAnimation", self.bookmarkLabel)
         else:
             self.bookmarkLabel.setPixmap(
-                UI.PixmapCache.getPixmap("syncNo.png"))
+                UI.PixmapCache.getPixmap("syncNo"))
         
         # history
         if Preferences.getWebBrowser("SyncHistory"):
-            self.__makeAnimatedLabel(animationFile, self.historyLabel)
+            self.__makeAnimatedLabel("loadingAnimation", self.historyLabel)
         else:
-            self.historyLabel.setPixmap(UI.PixmapCache.getPixmap("syncNo.png"))
+            self.historyLabel.setPixmap(UI.PixmapCache.getPixmap("syncNo"))
         
         # Passwords
         if Preferences.getWebBrowser("SyncPasswords"):
-            self.__makeAnimatedLabel(animationFile, self.passwordsLabel)
+            self.__makeAnimatedLabel("loadingAnimation", self.passwordsLabel)
         else:
             self.passwordsLabel.setPixmap(
-                UI.PixmapCache.getPixmap("syncNo.png"))
+                UI.PixmapCache.getPixmap("syncNo"))
         
         # user agent settings
         if Preferences.getWebBrowser("SyncUserAgents"):
-            self.__makeAnimatedLabel(animationFile, self.userAgentsLabel)
+            self.__makeAnimatedLabel("loadingAnimation", self.userAgentsLabel)
         else:
             self.userAgentsLabel.setPixmap(
-                UI.PixmapCache.getPixmap("syncNo.png"))
+                UI.PixmapCache.getPixmap("syncNo"))
         
         # speed dial settings
         if Preferences.getWebBrowser("SyncSpeedDial"):
-            self.__makeAnimatedLabel(animationFile, self.speedDialLabel)
+            self.__makeAnimatedLabel("loadingAnimation", self.speedDialLabel)
         else:
             self.speedDialLabel.setPixmap(
-                UI.PixmapCache.getPixmap("syncNo.png"))
+                UI.PixmapCache.getPixmap("syncNo"))
         
         QTimer.singleShot(
             0, lambda: syncMgr.loadSettings(forceUpload=forceUpload))
@@ -129,13 +121,14 @@
         """
         Private slot to create an animated label.
         
-        @param fileName name of the file containing the animation (string)
-        @param label reference to the label to be animated (QLabel)
+        @param fileName name of the file containing the animation
+        @type str
+        @param label reference to the label to be animated
+        @type E5AnimatedLabel
         """
-        movie = QMovie(fileName, QByteArray(), label)
-        movie.setSpeed(100)
-        label.setMovie(movie)
-        movie.start()
+        label.setInterval(40)
+        label.setAnimationFile(fileName)
+        label.start()
     
     def __updateMessages(self, type_, msg):
         """
@@ -168,38 +161,38 @@
         if type_ == "bookmarks":
             if status:
                 self.bookmarkLabel.setPixmap(
-                    UI.PixmapCache.getPixmap("syncCompleted.png"))
+                    UI.PixmapCache.getPixmap("syncCompleted"))
             else:
                 self.bookmarkLabel.setPixmap(
-                    UI.PixmapCache.getPixmap("syncFailed.png"))
+                    UI.PixmapCache.getPixmap("syncFailed"))
         elif type_ == "history":
             if status:
                 self.historyLabel.setPixmap(
-                    UI.PixmapCache.getPixmap("syncCompleted.png"))
+                    UI.PixmapCache.getPixmap("syncCompleted"))
             else:
                 self.historyLabel.setPixmap(
-                    UI.PixmapCache.getPixmap("syncFailed.png"))
+                    UI.PixmapCache.getPixmap("syncFailed"))
         elif type_ == "passwords":
             if status:
                 self.passwordsLabel.setPixmap(
-                    UI.PixmapCache.getPixmap("syncCompleted.png"))
+                    UI.PixmapCache.getPixmap("syncCompleted"))
             else:
                 self.passwordsLabel.setPixmap(
-                    UI.PixmapCache.getPixmap("syncFailed.png"))
+                    UI.PixmapCache.getPixmap("syncFailed"))
         elif type_ == "useragents":
             if status:
                 self.userAgentsLabel.setPixmap(
-                    UI.PixmapCache.getPixmap("syncCompleted.png"))
+                    UI.PixmapCache.getPixmap("syncCompleted"))
             else:
                 self.userAgentsLabel.setPixmap(
-                    UI.PixmapCache.getPixmap("syncFailed.png"))
+                    UI.PixmapCache.getPixmap("syncFailed"))
         elif type_ == "speeddial":
             if status:
                 self.speedDialLabel.setPixmap(
-                    UI.PixmapCache.getPixmap("syncCompleted.png"))
+                    UI.PixmapCache.getPixmap("syncCompleted"))
             else:
                 self.speedDialLabel.setPixmap(
-                    UI.PixmapCache.getPixmap("syncFailed.png"))
+                    UI.PixmapCache.getPixmap("syncFailed"))
     
     def __syncError(self, message):
         """
--- a/eric6/WebBrowser/Sync/SyncCheckPage.ui	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/WebBrowser/Sync/SyncCheckPage.ui	Sat May 02 13:51:07 2020 +0200
@@ -80,7 +80,7 @@
        </widget>
       </item>
       <item row="0" column="1">
-       <widget class="QLabel" name="bookmarkLabel"/>
+       <widget class="E5AnimatedLabel" name="bookmarkLabel"/>
       </item>
       <item row="0" column="2" colspan="2">
        <widget class="QLabel" name="bookmarkMsgLabel">
@@ -103,7 +103,7 @@
        </widget>
       </item>
       <item row="1" column="1">
-       <widget class="QLabel" name="historyLabel"/>
+       <widget class="E5AnimatedLabel" name="historyLabel"/>
       </item>
       <item row="1" column="2" colspan="2">
        <widget class="QLabel" name="historyMsgLabel">
@@ -126,7 +126,7 @@
        </widget>
       </item>
       <item row="2" column="1">
-       <widget class="QLabel" name="passwordsLabel"/>
+       <widget class="E5AnimatedLabel" name="passwordsLabel"/>
       </item>
       <item row="2" column="2" colspan="2">
        <widget class="QLabel" name="passwordsMsgLabel">
@@ -149,7 +149,7 @@
        </widget>
       </item>
       <item row="3" column="1">
-       <widget class="QLabel" name="userAgentsLabel"/>
+       <widget class="E5AnimatedLabel" name="userAgentsLabel"/>
       </item>
       <item row="3" column="2" colspan="2">
        <widget class="QLabel" name="userAgentsMsgLabel">
@@ -172,7 +172,7 @@
        </widget>
       </item>
       <item row="4" column="1" colspan="2">
-       <widget class="QLabel" name="speedDialLabel"/>
+       <widget class="E5AnimatedLabel" name="speedDialLabel"/>
       </item>
       <item row="4" column="3">
        <widget class="QLabel" name="speedDialMsgLabel">
@@ -212,6 +212,13 @@
    </item>
   </layout>
  </widget>
+ <customwidgets>
+  <customwidget>
+   <class>E5AnimatedLabel</class>
+   <extends>QLabel</extends>
+   <header>E5Gui/E5AnimatedLabel.h</header>
+  </customwidget>
+ </customwidgets>
  <resources/>
  <connections/>
 </ui>
--- a/eric6/WebBrowser/TabManager/TabManagerWidget.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/WebBrowser/TabManager/TabManagerWidget.py	Sat May 02 13:51:07 2020 +0200
@@ -289,7 +289,7 @@
                 if not browser.isLoading():
                     tabItem.setIcon(0, browser.icon())
                 else:
-                    tabItem.setIcon(0, UI.PixmapCache.getIcon("loading.png"))
+                    tabItem.setIcon(0, UI.PixmapCache.getIcon("loading"))
                 tabItem.setText(0, browser.title())
                 tabItem.setToolTip(0, browser.title())
                 
@@ -333,7 +333,7 @@
                 if not browser.isLoading():
                     tabItem.setIcon(0, browser.icon())
                 else:
-                    tabItem.setIcon(0, UI.PixmapCache.getIcon("loading.png"))
+                    tabItem.setIcon(0, UI.PixmapCache.getIcon("loading"))
                 tabItem.setText(0, browser.title())
                 tabItem.setToolTip(0, browser.title())
                 
@@ -527,12 +527,12 @@
         
         if self.__isBrowserSelected():
             act = menu.addAction(
-                UI.PixmapCache.getIcon("bookmark22.png"),
+                UI.PixmapCache.getIcon("bookmark22"),
                 self.tr("&Bookmark checked tabs"))
             act.setObjectName("bookmarkSelection")
             act.triggered.connect(lambda: self.__processActions(act))
             act = menu.addAction(
-                UI.PixmapCache.getIcon("tabClose.png"),
+                UI.PixmapCache.getIcon("tabClose"),
                 self.tr("&Close checked tabs"))
             act.setObjectName("closeSelection")
             act.triggered.connect(lambda: self.__processActions(act))
@@ -564,7 +564,7 @@
         """
         icon = E5ClickableLabel()
         icon.setPixmap(
-            UI.PixmapCache.getPixmap("tabManager.png").scaled(16, 16))
+            UI.PixmapCache.getPixmap("tabManager").scaled(16, 16))
         icon.setToolTip(self.tr("Show Tab Manager"))
         icon.clicked.connect(lambda: self.raiseTabManager(icon))
         
--- a/eric6/WebBrowser/Tools/WebIconProvider.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/WebBrowser/Tools/WebIconProvider.py	Sat May 02 13:51:07 2020 +0200
@@ -174,15 +174,15 @@
         """
         scheme = url.scheme()
         if scheme in ["eric", "about"]:
-            return UI.PixmapCache.getIcon("ericWeb.png")
+            return UI.PixmapCache.getIcon("ericWeb")
         elif scheme == "qthelp":
-            return UI.PixmapCache.getIcon("qthelp.png")
+            return UI.PixmapCache.getIcon("qthelp")
         elif scheme == "file":
-            return UI.PixmapCache.getIcon("fileMisc.png")
+            return UI.PixmapCache.getIcon("fileMisc")
         elif scheme == "abp":
-            return UI.PixmapCache.getIcon("adBlockPlus.png")
+            return UI.PixmapCache.getIcon("adBlockPlus")
         elif scheme == "ftp":
-            return UI.PixmapCache.getIcon("network-server.png")
+            return UI.PixmapCache.getIcon("network-server")
         
         self.load()
         
@@ -201,9 +201,9 @@
                 return self.__iconsDB[iconUrlStr]
         
         if scheme == "https":
-            return UI.PixmapCache.getIcon("securityHigh32.png")
+            return UI.PixmapCache.getIcon("securityHigh32")
         else:
-            return UI.PixmapCache.getIcon("defaultIcon.png")
+            return UI.PixmapCache.getIcon("defaultIcon")
     
     def clear(self):
         """
--- a/eric6/WebBrowser/UrlBar/BookmarkActionSelectionDialog.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/WebBrowser/UrlBar/BookmarkActionSelectionDialog.py	Sat May 02 13:51:07 2020 +0200
@@ -40,7 +40,7 @@
         
         self.__action = self.Undefined
         
-        self.icon.setPixmap(UI.PixmapCache.getPixmap("bookmark32.png"))
+        self.icon.setPixmap(UI.PixmapCache.getPixmap("bookmark32"))
         
         from WebBrowser.WebBrowserWindow import WebBrowserWindow
         
--- a/eric6/WebBrowser/UrlBar/BookmarkInfoDialog.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/WebBrowser/UrlBar/BookmarkInfoDialog.py	Sat May 02 13:51:07 2020 +0200
@@ -33,7 +33,7 @@
         
         self.__bookmark = bookmark
         
-        self.icon.setPixmap(UI.PixmapCache.getPixmap("bookmark32.png"))
+        self.icon.setPixmap(UI.PixmapCache.getPixmap("bookmark32"))
         
         font = QFont()
         font.setPointSize(font.pointSize() + 2)
--- a/eric6/WebBrowser/UrlBar/UrlBar.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/WebBrowser/UrlBar/UrlBar.py	Sat May 02 13:51:07 2020 +0200
@@ -45,7 +45,7 @@
         self.__browser = None
         self.__privateMode = WebBrowserWindow.isPrivate()
         
-        self.__bmActiveIcon = UI.PixmapCache.getIcon("bookmark16.png")
+        self.__bmActiveIcon = UI.PixmapCache.getIcon("bookmark16")
         self.__bmInactiveIcon = QIcon(
             self.__bmActiveIcon.pixmap(16, 16, QIcon.Disabled))
         
@@ -57,7 +57,7 @@
         self.addWidget(self.__favicon, E5LineEdit.LeftSide)
         
         self.__rssButton = E5LineEditButton(self)
-        self.__rssButton.setIcon(UI.PixmapCache.getIcon("rss16.png"))
+        self.__rssButton.setIcon(UI.PixmapCache.getIcon("rss16"))
         self.addWidget(self.__rssButton, E5LineEdit.RightSide)
         self.__rssButton.setVisible(False)
         
@@ -66,7 +66,7 @@
         self.__bookmarkButton.setVisible(False)
         
         self.__clearButton = E5LineEditButton(self)
-        self.__clearButton.setIcon(UI.PixmapCache.getIcon("clearLeft.png"))
+        self.__clearButton.setIcon(UI.PixmapCache.getIcon("clearLeft"))
         self.addWidget(self.__clearButton, E5LineEdit.RightSide)
         self.__clearButton.setVisible(False)
         
--- a/eric6/WebBrowser/VirusTotal/VirusTotalDomainReportDialog.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/WebBrowser/VirusTotal/VirusTotalDomainReportDialog.py	Sat May 02 13:51:07 2020 +0200
@@ -51,7 +51,7 @@
         self.headerLabel.setText(
             self.tr("<b>Report for domain {0}</b>").format(domain))
         self.headerPixmap.setPixmap(
-            UI.PixmapCache.getPixmap("virustotal.png"))
+            UI.PixmapCache.getPixmap("virustotal"))
         
         for resolution in resolutions:
             QTreeWidgetItem(
--- a/eric6/WebBrowser/VirusTotal/VirusTotalIpReportDialog.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/WebBrowser/VirusTotal/VirusTotalIpReportDialog.py	Sat May 02 13:51:07 2020 +0200
@@ -42,7 +42,7 @@
         self.headerLabel.setText(
             self.tr("<b>Report for IP {0}</b>").format(ip))
         self.headerPixmap.setPixmap(
-            UI.PixmapCache.getPixmap("virustotal.png"))
+            UI.PixmapCache.getPixmap("virustotal"))
         self.ownerLabel.setText(owner)
         
         for resolution in resolutions:
--- a/eric6/WebBrowser/VirusTotal/VirusTotalWhoisDialog.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/WebBrowser/VirusTotal/VirusTotalWhoisDialog.py	Sat May 02 13:51:07 2020 +0200
@@ -36,5 +36,5 @@
         self.headerLabel.setText(
             self.tr("<b>Whois information for domain {0}</b>").format(domain))
         self.headerPixmap.setPixmap(
-            UI.PixmapCache.getPixmap("virustotal.png"))
+            UI.PixmapCache.getPixmap("virustotal"))
         self.whoisEdit.setPlainText(whois)
--- a/eric6/WebBrowser/WebBrowserPage.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/WebBrowser/WebBrowserPage.py	Sat May 02 13:51:07 2020 +0200
@@ -130,12 +130,13 @@
                 return False
         
         # GreaseMonkey
-        if PYQT_WEBENGINE_VERSION >= 0x50e00:       # PyQtWebEngine >= 5.14.0
+        try:
+            # PyQtWebEngine >= 5.14.0
             navigationType = type_ in [
                 QWebEnginePage.NavigationTypeLinkClicked,
                 QWebEnginePage.NavigationTypeRedirect
             ]
-        else:
+        except AttributeError:
             navigationType = type_ == QWebEnginePage.NavigationTypeLinkClicked
         if navigationType and url.toString().endswith(".user.js"):
             WebBrowserWindow.greaseMonkeyManager().downloadScript(url)
--- a/eric6/WebBrowser/WebBrowserTabWidget.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/WebBrowser/WebBrowserTabWidget.py	Sat May 02 13:51:07 2020 +0200
@@ -32,8 +32,6 @@
 import Preferences
 import Globals
 
-from eric6config import getConfig
-
 
 def isCupsAvailable():
     """
@@ -120,7 +118,7 @@
         
         self.__navigationButton = QToolButton(self)
         self.__navigationButton.setIcon(
-            UI.PixmapCache.getIcon("1downarrow.png"))
+            UI.PixmapCache.getIcon("1downarrow"))
         self.__navigationButton.setToolTip(
             self.tr("Show a navigation menu"))
         self.__navigationButton.setPopupMode(QToolButton.InstantPopup)
@@ -133,7 +131,7 @@
             self.__aboutToShowClosedTabsMenu)
         
         self.__closedTabsButton = QToolButton(self)
-        self.__closedTabsButton.setIcon(UI.PixmapCache.getIcon("trash.png"))
+        self.__closedTabsButton.setIcon(UI.PixmapCache.getIcon("trash"))
         self.__closedTabsButton.setToolTip(
             self.tr("Show a navigation menu for closed tabs"))
         self.__closedTabsButton.setPopupMode(QToolButton.InstantPopup)
@@ -147,7 +145,7 @@
         self.setCornerWidget(self.__rightCornerWidget, Qt.TopRightCorner)
         
         self.__newTabButton = QToolButton(self)
-        self.__newTabButton.setIcon(UI.PixmapCache.getIcon("plus.png"))
+        self.__newTabButton.setIcon(UI.PixmapCache.getIcon("plus"))
         self.__newTabButton.setToolTip(
             self.tr("Open a new web browser tab"))
         self.setCornerWidget(self.__newTabButton, Qt.TopLeftCorner)
@@ -163,36 +161,36 @@
         """
         self.__tabContextMenu = QMenu(self)
         self.tabContextNewAct = self.__tabContextMenu.addAction(
-            UI.PixmapCache.getIcon("tabNew.png"),
+            UI.PixmapCache.getIcon("tabNew"),
             self.tr('New Tab'), self.newBrowser)
         self.__tabContextMenu.addSeparator()
         self.leftMenuAct = self.__tabContextMenu.addAction(
-            UI.PixmapCache.getIcon("1leftarrow.png"),
+            UI.PixmapCache.getIcon("1leftarrow"),
             self.tr('Move Left'), self.__tabContextMenuMoveLeft)
         self.rightMenuAct = self.__tabContextMenu.addAction(
-            UI.PixmapCache.getIcon("1rightarrow.png"),
+            UI.PixmapCache.getIcon("1rightarrow"),
             self.tr('Move Right'), self.__tabContextMenuMoveRight)
         self.__tabContextMenu.addSeparator()
         self.tabContextCloneAct = self.__tabContextMenu.addAction(
             self.tr("Duplicate Page"), self.__tabContextMenuClone)
         self.__tabContextMenu.addSeparator()
         self.tabContextCloseAct = self.__tabContextMenu.addAction(
-            UI.PixmapCache.getIcon("tabClose.png"),
+            UI.PixmapCache.getIcon("tabClose"),
             self.tr('Close'), self.__tabContextMenuClose)
         self.tabContextCloseOthersAct = self.__tabContextMenu.addAction(
-            UI.PixmapCache.getIcon("tabCloseOther.png"),
+            UI.PixmapCache.getIcon("tabCloseOther"),
             self.tr("Close Others"), self.__tabContextMenuCloseOthers)
         self.__tabContextMenu.addAction(
             self.tr('Close All'), self.closeAllBrowsers)
         self.__tabContextMenu.addSeparator()
         self.__tabContextMenu.addAction(
-            UI.PixmapCache.getIcon("printPreview.png"),
+            UI.PixmapCache.getIcon("printPreview"),
             self.tr('Print Preview'), self.__tabContextMenuPrintPreview)
         self.__tabContextMenu.addAction(
-            UI.PixmapCache.getIcon("print.png"),
+            UI.PixmapCache.getIcon("print"),
             self.tr('Print'), self.__tabContextMenuPrint)
         self.__tabContextMenu.addAction(
-            UI.PixmapCache.getIcon("printPdf.png"),
+            UI.PixmapCache.getIcon("printPdf"),
             self.tr('Print as PDF'), self.__tabContextMenuPrintPdf)
         self.__tabContextMenu.addSeparator()
         if hasattr(WebBrowserPage, "isAudioMuted"):
@@ -202,25 +200,25 @@
         else:
             self.__audioAct = None
         self.__tabContextMenu.addAction(
-            UI.PixmapCache.getIcon("reload.png"),
+            UI.PixmapCache.getIcon("reload"),
             self.tr('Reload All'), self.reloadAllBrowsers)
         self.__tabContextMenu.addSeparator()
         self.__tabContextMenu.addAction(
-            UI.PixmapCache.getIcon("addBookmark.png"),
+            UI.PixmapCache.getIcon("addBookmark"),
             self.tr('Bookmark All Tabs'), self.__mainWindow.bookmarkAll)
         
         self.__tabBackContextMenu = QMenu(self)
         self.__tabBackContextMenu.addAction(
             self.tr('Close All'), self.closeAllBrowsers)
         self.__tabBackContextMenu.addAction(
-            UI.PixmapCache.getIcon("reload.png"),
+            UI.PixmapCache.getIcon("reload"),
             self.tr('Reload All'), self.reloadAllBrowsers)
         self.__tabBackContextMenu.addAction(
-            UI.PixmapCache.getIcon("addBookmark.png"),
+            UI.PixmapCache.getIcon("addBookmark"),
             self.tr('Bookmark All Tabs'), self.__mainWindow.bookmarkAll)
         self.__tabBackContextMenu.addSeparator()
         self.__restoreClosedTabAct = self.__tabBackContextMenu.addAction(
-            UI.PixmapCache.getIcon("trash.png"),
+            UI.PixmapCache.getIcon("trash"),
             self.tr('Restore Closed Tab'))
         self.__restoreClosedTabAct.setEnabled(False)
         self.__restoreClosedTabAct.setData(0)
@@ -251,11 +249,11 @@
                 ):
                     self.__audioAct.setText(self.tr("Unmute Tab"))
                     self.__audioAct.setIcon(
-                        UI.PixmapCache.getIcon("audioVolumeHigh.png"))
+                        UI.PixmapCache.getIcon("audioVolumeHigh"))
                 else:
                     self.__audioAct.setText(self.tr("Mute Tab"))
                     self.__audioAct.setIcon(
-                        UI.PixmapCache.getIcon("audioVolumeMuted.png"))
+                        UI.PixmapCache.getIcon("audioVolumeMuted"))
             
             self.__tabContextMenu.popup(coord)
     
@@ -356,9 +354,9 @@
             painter = QPainter(pix)
             icon.paint(painter, 0, 0, 22, 22)
             if page.isAudioMuted():
-                audioIcon = UI.PixmapCache.getIcon("audioMuted.png")
+                audioIcon = UI.PixmapCache.getIcon("audioMuted")
             else:
-                audioIcon = UI.PixmapCache.getIcon("audioPlaying.png")
+                audioIcon = UI.PixmapCache.getIcon("audioPlaying")
             audioIcon.paint(painter, 13, 13, 18, 18)
             painter.end()
             self.setTabIcon(index, QIcon(pix))
@@ -884,13 +882,9 @@
         @type WebBrowserView
         """
         index = self.indexOf(browser)
-        anim = self.animationLabel(
-            index, os.path.join(getConfig("ericPixDir"), "loading.gif"),
-            100)
+        anim = self.animationLabel(index, "loadingAnimation", 40)
         if not anim:
-            loading = QIcon(os.path.join(getConfig("ericPixDir"),
-                            "loading.gif"))
-            self.setTabIcon(index, loading)
+            self.setTabIcon(index, UI.PixmapCache.getIcon("loading"))
         else:
             self.setTabIcon(index, QIcon())
         self.setTabText(index, self.tr("Loading..."))
@@ -967,10 +961,10 @@
                 parent=self)
             quitButton = mb.addButton(
                 self.tr("&Quit"), E5MessageBox.AcceptRole)
-            quitButton.setIcon(UI.PixmapCache.getIcon("exit.png"))
+            quitButton.setIcon(UI.PixmapCache.getIcon("exit"))
             closeTabButton = mb.addButton(
                 self.tr("C&lose Current Tab"), E5MessageBox.AcceptRole)
-            closeTabButton.setIcon(UI.PixmapCache.getIcon("tabClose.png"))
+            closeTabButton.setIcon(UI.PixmapCache.getIcon("tabClose"))
             mb.addButton(E5MessageBox.Cancel)
             mb.exec_()
             if mb.clickedButton() == quitButton:
--- a/eric6/WebBrowser/WebBrowserView.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/WebBrowser/WebBrowserView.py	Sat May 02 13:51:07 2020 +0200
@@ -585,7 +585,7 @@
         ):
             self.__menu.addSeparator()
             self.__menu.addAction(
-                UI.PixmapCache.getIcon("webInspector.png"),
+                UI.PixmapCache.getIcon("webInspector"),
                 self.tr("Inspect Element..."), self.__webInspector)
         
         if not self.__menu.isEmpty():
@@ -671,42 +671,42 @@
             menu.addSeparator()
         
         act = menu.addAction(
-            UI.PixmapCache.getIcon("openNewTab.png"),
+            UI.PixmapCache.getIcon("openNewTab"),
             self.tr("Open Link in New Tab\tCtrl+LMB"))
         act.setData(hitTest.linkUrl())
         act.triggered.connect(
             lambda: self.__openLinkInNewTab(act))
         act = menu.addAction(
-            UI.PixmapCache.getIcon("newWindow.png"),
+            UI.PixmapCache.getIcon("newWindow"),
             self.tr("Open Link in New Window"))
         act.setData(hitTest.linkUrl())
         act.triggered.connect(
             lambda: self.__openLinkInNewWindow(act))
         act = menu.addAction(
-            UI.PixmapCache.getIcon("privateMode.png"),
+            UI.PixmapCache.getIcon("privateMode"),
             self.tr("Open Link in New Private Window"))
         act.setData(hitTest.linkUrl())
         act.triggered.connect(
             lambda: self.__openLinkInNewPrivateWindow(act))
         menu.addSeparator()
         menu.addAction(
-            UI.PixmapCache.getIcon("download.png"),
+            UI.PixmapCache.getIcon("download"),
             self.tr("Save Lin&k"), self.__downloadLink)
         act = menu.addAction(
-            UI.PixmapCache.getIcon("bookmark22.png"),
+            UI.PixmapCache.getIcon("bookmark22"),
             self.tr("Bookmark this Link"))
         act.setData(hitTest.linkUrl())
         act.triggered.connect(
             lambda: self.__bookmarkLink(act))
         menu.addSeparator()
         act = menu.addAction(
-            UI.PixmapCache.getIcon("editCopy.png"),
+            UI.PixmapCache.getIcon("editCopy"),
             self.tr("Copy Link to Clipboard"))
         act.setData(hitTest.linkUrl())
         act.triggered.connect(
             lambda: self.__copyLink(act))
         act = menu.addAction(
-            UI.PixmapCache.getIcon("mailSend.png"),
+            UI.PixmapCache.getIcon("mailSend"),
             self.tr("Send Link"))
         act.setData(hitTest.linkUrl())
         act.triggered.connect(
@@ -716,7 +716,7 @@
             Preferences.getWebBrowser("VirusTotalServiceKey") != ""
         ):
             act = menu.addAction(
-                UI.PixmapCache.getIcon("virustotal.png"),
+                UI.PixmapCache.getIcon("virustotal"),
                 self.tr("Scan Link with VirusTotal"))
             act.setData(hitTest.linkUrl())
             act.triggered.connect(
@@ -735,25 +735,25 @@
             menu.addSeparator()
         
         act = menu.addAction(
-            UI.PixmapCache.getIcon("openNewTab.png"),
+            UI.PixmapCache.getIcon("openNewTab"),
             self.tr("Open Image in New Tab"))
         act.setData(hitTest.imageUrl())
         act.triggered.connect(
             lambda: self.__openLinkInNewTab(act))
         menu.addSeparator()
         menu.addAction(
-            UI.PixmapCache.getIcon("download.png"),
+            UI.PixmapCache.getIcon("download"),
             self.tr("Save Image"), self.__downloadImage)
         menu.addAction(
             self.tr("Copy Image to Clipboard"), self.__copyImage)
         act = menu.addAction(
-            UI.PixmapCache.getIcon("editCopy.png"),
+            UI.PixmapCache.getIcon("editCopy"),
             self.tr("Copy Image Location to Clipboard"))
         act.setData(hitTest.imageUrl())
         act.triggered.connect(
             lambda: self.__copyLink(act))
         act = menu.addAction(
-            UI.PixmapCache.getIcon("mailSend.png"),
+            UI.PixmapCache.getIcon("mailSend"),
             self.tr("Send Image Link"))
         act.setData(hitTest.imageUrl())
         act.triggered.connect(
@@ -764,7 +764,7 @@
             engine = WebBrowserWindow.imageSearchEngine()
             searchEngineName = engine.searchEngine()
             act = menu.addAction(
-                UI.PixmapCache.getIcon("{0}.png".format(
+                UI.PixmapCache.getIcon("{0}".format(
                     searchEngineName.lower())),
                 self.tr("Search image in {0}").format(searchEngineName))
             act.setData(engine.getSearchQuery(hitTest.imageUrl()))
@@ -774,7 +774,7 @@
                 self.tr("Search image with..."))
             for searchEngineName in engine.searchEngineNames():
                 act = self.__imageSearchMenu.addAction(
-                    UI.PixmapCache.getIcon("{0}.png".format(
+                    UI.PixmapCache.getIcon("{0}".format(
                         searchEngineName.lower())),
                     self.tr("Search image in {0}").format(searchEngineName))
                 act.setData(engine.getSearchQuery(
@@ -784,7 +784,7 @@
         
         menu.addSeparator()
         act = menu.addAction(
-            UI.PixmapCache.getIcon("adBlockPlus.png"),
+            UI.PixmapCache.getIcon("adBlockPlus"),
             self.tr("Block Image"))
         act.setData(hitTest.imageUrl().toString())
         act.triggered.connect(
@@ -794,7 +794,7 @@
             Preferences.getWebBrowser("VirusTotalServiceKey") != ""
         ):
             act = menu.addAction(
-                UI.PixmapCache.getIcon("virustotal.png"),
+                UI.PixmapCache.getIcon("virustotal"),
                 self.tr("Scan Image with VirusTotal"))
             act.setData(hitTest.imageUrl())
             act.triggered.connect(
@@ -814,35 +814,35 @@
         
         if hitTest.mediaPaused():
             menu.addAction(
-                UI.PixmapCache.getIcon("mediaPlaybackStart.png"),
+                UI.PixmapCache.getIcon("mediaPlaybackStart"),
                 self.tr("Play"), self.__pauseMedia)
         else:
             menu.addAction(
-                UI.PixmapCache.getIcon("mediaPlaybackPause.png"),
+                UI.PixmapCache.getIcon("mediaPlaybackPause"),
                 self.tr("Pause"), self.__pauseMedia)
         if hitTest.mediaMuted():
             menu.addAction(
-                UI.PixmapCache.getIcon("audioVolumeHigh.png"),
+                UI.PixmapCache.getIcon("audioVolumeHigh"),
                 self.tr("Unmute"), self.__muteMedia)
         else:
             menu.addAction(
-                UI.PixmapCache.getIcon("audioVolumeMuted.png"),
+                UI.PixmapCache.getIcon("audioVolumeMuted"),
                 self.tr("Mute"), self.__muteMedia)
         menu.addSeparator()
         act = menu.addAction(
-            UI.PixmapCache.getIcon("editCopy.png"),
+            UI.PixmapCache.getIcon("editCopy"),
             self.tr("Copy Media Address to Clipboard"))
         act.setData(hitTest.mediaUrl())
         act.triggered.connect(
             lambda: self.__copyLink(act))
         act = menu.addAction(
-            UI.PixmapCache.getIcon("mailSend.png"),
+            UI.PixmapCache.getIcon("mailSend"),
             self.tr("Send Media Address"))
         act.setData(hitTest.mediaUrl())
         act.triggered.connect(
             lambda: self.__sendLink(act))
         menu.addAction(
-            UI.PixmapCache.getIcon("download.png"),
+            UI.PixmapCache.getIcon("download"),
             self.tr("Save Media"), self.__downloadMedia)
     
     def __createSelectedTextContextMenu(self, menu, hitTest):
@@ -860,7 +860,7 @@
         menu.addAction(self.__mw.copyAct)
         menu.addSeparator()
         act = menu.addAction(
-            UI.PixmapCache.getIcon("mailSend.png"),
+            UI.PixmapCache.getIcon("mailSend"),
             self.tr("Send Text"))
         act.setData(self.selectedText())
         act.triggered.connect(
@@ -898,7 +898,7 @@
                 "http://translate.google.com/#auto/{0}/{1}".format(
                     langCode, self.selectedText()))
             act = menu.addAction(
-                UI.PixmapCache.getIcon("translate.png"),
+                UI.PixmapCache.getIcon("translate"),
                 self.tr("Google Translate"))
             act.setData(googleTranslatorUrl)
             act.triggered.connect(
@@ -907,7 +907,7 @@
                 "http://{0}.wiktionary.org/wiki/Special:Search?search={1}"
                 .format(langCode, self.selectedText()))
             act = menu.addAction(
-                UI.PixmapCache.getIcon("wikipedia.png"),
+                UI.PixmapCache.getIcon("wikipedia"),
                 self.tr("Dictionary"))
             act.setData(wiktionaryUrl)
             act.triggered.connect(
@@ -942,14 +942,14 @@
             menu.addAction(self.__mw.forwardAct)
             menu.addSeparator()
             menu.addAction(
-                UI.PixmapCache.getIcon("plus.png"),
+                UI.PixmapCache.getIcon("plus"),
                 self.tr("Add New Page"), self.__addSpeedDial)
             menu.addAction(
-                UI.PixmapCache.getIcon("preferences-general.png"),
+                UI.PixmapCache.getIcon("preferences-general"),
                 self.tr("Configure Speed Dial"), self.__configureSpeedDial)
             menu.addSeparator()
             menu.addAction(
-                UI.PixmapCache.getIcon("reload.png"),
+                UI.PixmapCache.getIcon("reload"),
                 self.tr("Reload All Dials"), self.__reloadAllSpeedDials)
             menu.addSeparator()
             menu.addAction(
@@ -957,16 +957,16 @@
             return
         
         menu.addAction(
-            UI.PixmapCache.getIcon("bookmark22.png"),
+            UI.PixmapCache.getIcon("bookmark22"),
             self.tr("Bookmark this Page"), self.addBookmark)
         act = menu.addAction(
-            UI.PixmapCache.getIcon("editCopy.png"),
+            UI.PixmapCache.getIcon("editCopy"),
             self.tr("Copy Page Link"))
         act.setData(self.url())
         act.triggered.connect(
             lambda: self.__copyLink(act))
         act = menu.addAction(
-            UI.PixmapCache.getIcon("mailSend.png"),
+            UI.PixmapCache.getIcon("mailSend"),
             self.tr("Send Page Link"))
         act.setData(self.url())
         act.triggered.connect(
@@ -1002,7 +1002,7 @@
                 b"http://validator.w3.org/check?uri=" +
                 QUrl.toPercentEncoding(bytes(self.url().toEncoded()).decode()))
             act = menu.addAction(
-                UI.PixmapCache.getIcon("w3.png"),
+                UI.PixmapCache.getIcon("w3"),
                 self.tr("Validate Page"))
             act.setData(w3url)
             act.triggered.connect(
@@ -1023,7 +1023,7 @@
                     QUrl.toPercentEncoding(
                         bytes(self.url().toEncoded()).decode()))
                 act = menu.addAction(
-                    UI.PixmapCache.getIcon("translate.png"),
+                    UI.PixmapCache.getIcon("translate"),
                     self.tr("Google Translate"))
                 act.setData(googleTranslatorUrl)
             act.triggered.connect(
--- a/eric6/WebBrowser/WebBrowserWebSearchWidget.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/WebBrowser/WebBrowserWebSearchWidget.py	Sat May 02 13:51:07 2020 +0200
@@ -63,7 +63,7 @@
         self.addWidget(self.__engineButton, E5LineEdit.LeftSide)
         
         self.__searchButton = E5LineEditButton(self)
-        self.__searchButton.setIcon(UI.PixmapCache.getIcon("webSearch.png"))
+        self.__searchButton.setIcon(UI.PixmapCache.getIcon("webSearch"))
         self.addWidget(self.__searchButton, E5LineEdit.LeftSide)
         
         self.__model = QStandardItemModel(self)
--- a/eric6/WebBrowser/WebBrowserWindow.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/WebBrowser/WebBrowserWindow.py	Sat May 02 13:51:07 2020 +0200
@@ -155,7 +155,7 @@
             self.setWindowTitle(self.tr("eric6 Web Browser"))
         
         self.__settingsDir = settingsDir
-        self.setWindowIcon(UI.PixmapCache.getIcon("ericWeb.png"))
+        self.setWindowIcon(UI.PixmapCache.getIcon("ericWeb"))
 
         self.__mHistory = []
         self.__lastConfigurationPageName = ""
@@ -215,9 +215,9 @@
         self.__helpInstaller = None
         
         self.__zoomWidget = E5ZoomWidget(
-            UI.PixmapCache.getPixmap("zoomOut.png"),
-            UI.PixmapCache.getPixmap("zoomIn.png"),
-            UI.PixmapCache.getPixmap("zoomReset.png"), self)
+            UI.PixmapCache.getPixmap("zoomOut"),
+            UI.PixmapCache.getPixmap("zoomIn"),
+            UI.PixmapCache.getPixmap("zoomReset"), self)
         self.statusBar().addPermanentWidget(self.__zoomWidget)
         self.__zoomWidget.setMapping(
             WebBrowserView.ZoomLevels, WebBrowserView.ZoomLevelDefault)
@@ -708,7 +708,7 @@
         
         self.newTabAct = E5Action(
             self.tr('New Tab'),
-            UI.PixmapCache.getIcon("tabNew.png"),
+            UI.PixmapCache.getIcon("tabNew"),
             self.tr('&New Tab'),
             QKeySequence(self.tr("Ctrl+T", "File|New Tab")),
             0, self, 'webbrowser_file_new_tab')
@@ -722,7 +722,7 @@
         
         self.newAct = E5Action(
             self.tr('New Window'),
-            UI.PixmapCache.getIcon("newWindow.png"),
+            UI.PixmapCache.getIcon("newWindow"),
             self.tr('New &Window'),
             QKeySequence(self.tr("Ctrl+N", "File|New Window")),
             0, self, 'webbrowser_file_new_window')
@@ -737,7 +737,7 @@
         
         self.newPrivateAct = E5Action(
             self.tr('New Private Window'),
-            UI.PixmapCache.getIcon("privateMode.png"),
+            UI.PixmapCache.getIcon("privateMode"),
             self.tr('New &Private Window'),
             QKeySequence(self.tr("Ctrl+Shift+P", "File|New Private Window")),
             0, self, 'webbrowser_file_new_private_window')
@@ -753,7 +753,7 @@
         
         self.openAct = E5Action(
             self.tr('Open File'),
-            UI.PixmapCache.getIcon("open.png"),
+            UI.PixmapCache.getIcon("open"),
             self.tr('&Open File'),
             QKeySequence(self.tr("Ctrl+O", "File|Open")),
             0, self, 'webbrowser_file_open')
@@ -768,7 +768,7 @@
         
         self.openTabAct = E5Action(
             self.tr('Open File in New Tab'),
-            UI.PixmapCache.getIcon("openNewTab.png"),
+            UI.PixmapCache.getIcon("openNewTab"),
             self.tr('Open File in New &Tab'),
             QKeySequence(self.tr("Shift+Ctrl+O", "File|Open in new tab")),
             0, self, 'webbrowser_file_open_tab')
@@ -785,7 +785,7 @@
         if hasattr(QWebEnginePage, "SavePage"):
             self.saveAsAct = E5Action(
                 self.tr('Save As'),
-                UI.PixmapCache.getIcon("fileSaveAs.png"),
+                UI.PixmapCache.getIcon("fileSaveAs"),
                 self.tr('&Save As...'),
                 QKeySequence(self.tr("Shift+Ctrl+S", "File|Save As")),
                 0, self, 'webbrowser_file_save_as')
@@ -802,7 +802,7 @@
         
         self.saveVisiblePageScreenAct = E5Action(
             self.tr('Save Page Screen'),
-            UI.PixmapCache.getIcon("fileSavePixmap.png"),
+            UI.PixmapCache.getIcon("fileSavePixmap"),
             self.tr('Save Page Screen...'),
             0, 0, self, 'webbrowser_file_save_visible_page_screen')
         self.saveVisiblePageScreenAct.setStatusTip(
@@ -848,7 +848,7 @@
         
         self.printAct = E5Action(
             self.tr('Print'),
-            UI.PixmapCache.getIcon("print.png"),
+            UI.PixmapCache.getIcon("print"),
             self.tr('&Print'),
             QKeySequence(self.tr("Ctrl+P", "File|Print")),
             0, self, 'webbrowser_file_print')
@@ -862,7 +862,7 @@
         
         self.printPdfAct = E5Action(
             self.tr('Print as PDF'),
-            UI.PixmapCache.getIcon("printPdf.png"),
+            UI.PixmapCache.getIcon("printPdf"),
             self.tr('Print as PDF'),
             0, 0, self, 'webbrowser_file_print_pdf')
         self.printPdfAct.setStatusTip(self.tr(
@@ -877,7 +877,7 @@
         
         self.printPreviewAct = E5Action(
             self.tr('Print Preview'),
-            UI.PixmapCache.getIcon("printPreview.png"),
+            UI.PixmapCache.getIcon("printPreview"),
             self.tr('Print Preview'),
             0, 0, self, 'webbrowser_file_print_preview')
         self.printPreviewAct.setStatusTip(self.tr(
@@ -892,7 +892,7 @@
         
         self.sendPageLinkAct = E5Action(
             self.tr('Send Page Link'),
-            UI.PixmapCache.getIcon("mailSend.png"),
+            UI.PixmapCache.getIcon("mailSend"),
             self.tr('Send Page Link'),
             0, 0, self, 'webbrowser_send_page_link')
         self.sendPageLinkAct.setStatusTip(self.tr(
@@ -906,7 +906,7 @@
         
         self.closeAct = E5Action(
             self.tr('Close'),
-            UI.PixmapCache.getIcon("close.png"),
+            UI.PixmapCache.getIcon("close"),
             self.tr('&Close'),
             QKeySequence(self.tr("Ctrl+W", "File|Close")),
             0, self, 'webbrowser_file_close')
@@ -934,7 +934,7 @@
         
         self.exitAct = E5Action(
             self.tr('Quit'),
-            UI.PixmapCache.getIcon("exit.png"),
+            UI.PixmapCache.getIcon("exit"),
             self.tr('&Quit'),
             QKeySequence(self.tr("Ctrl+Q", "File|Quit")),
             0, self, 'webbrowser_file_quit')
@@ -948,7 +948,7 @@
         
         self.backAct = E5Action(
             self.tr('Backward'),
-            UI.PixmapCache.getIcon("back.png"),
+            UI.PixmapCache.getIcon("back"),
             self.tr('&Backward'),
             QKeySequence(self.tr("Alt+Left", "Go|Backward")),
             0, self, 'webbrowser_go_backward')
@@ -963,7 +963,7 @@
         
         self.forwardAct = E5Action(
             self.tr('Forward'),
-            UI.PixmapCache.getIcon("forward.png"),
+            UI.PixmapCache.getIcon("forward"),
             self.tr('&Forward'),
             QKeySequence(self.tr("Alt+Right", "Go|Forward")),
             0, self, 'webbrowser_go_foreward')
@@ -979,7 +979,7 @@
         
         self.homeAct = E5Action(
             self.tr('Home'),
-            UI.PixmapCache.getIcon("home.png"),
+            UI.PixmapCache.getIcon("home"),
             self.tr('&Home'),
             QKeySequence(self.tr("Ctrl+Home", "Go|Home")),
             0, self, 'webbrowser_go_home')
@@ -994,7 +994,7 @@
         
         self.reloadAct = E5Action(
             self.tr('Reload'),
-            UI.PixmapCache.getIcon("reload.png"),
+            UI.PixmapCache.getIcon("reload"),
             self.tr('&Reload'),
             QKeySequence(self.tr("Ctrl+R", "Go|Reload")),
             QKeySequence(self.tr("F5", "Go|Reload")),
@@ -1010,7 +1010,7 @@
         
         self.stopAct = E5Action(
             self.tr('Stop'),
-            UI.PixmapCache.getIcon("stopLoading.png"),
+            UI.PixmapCache.getIcon("stopLoading"),
             self.tr('&Stop'),
             QKeySequence(self.tr("Ctrl+.", "Go|Stop")),
             QKeySequence(self.tr("Esc", "Go|Stop")),
@@ -1025,7 +1025,7 @@
         
         self.copyAct = E5Action(
             self.tr('Copy'),
-            UI.PixmapCache.getIcon("editCopy.png"),
+            UI.PixmapCache.getIcon("editCopy"),
             self.tr('&Copy'),
             QKeySequence(self.tr("Ctrl+C", "Edit|Copy")),
             0, self, 'webbrowser_edit_copy')
@@ -1039,7 +1039,7 @@
         
         self.cutAct = E5Action(
             self.tr('Cut'),
-            UI.PixmapCache.getIcon("editCut.png"),
+            UI.PixmapCache.getIcon("editCut"),
             self.tr('Cu&t'),
             QKeySequence(self.tr("Ctrl+X", "Edit|Cut")),
             0, self, 'webbrowser_edit_cut')
@@ -1053,7 +1053,7 @@
         
         self.pasteAct = E5Action(
             self.tr('Paste'),
-            UI.PixmapCache.getIcon("editPaste.png"),
+            UI.PixmapCache.getIcon("editPaste"),
             self.tr('&Paste'),
             QKeySequence(self.tr("Ctrl+V", "Edit|Paste")),
             0, self, 'webbrowser_edit_paste')
@@ -1067,7 +1067,7 @@
         
         self.undoAct = E5Action(
             self.tr('Undo'),
-            UI.PixmapCache.getIcon("editUndo.png"),
+            UI.PixmapCache.getIcon("editUndo"),
             self.tr('&Undo'),
             QKeySequence(self.tr("Ctrl+Z", "Edit|Undo")),
             0, self, 'webbrowser_edit_undo')
@@ -1081,7 +1081,7 @@
         
         self.redoAct = E5Action(
             self.tr('Redo'),
-            UI.PixmapCache.getIcon("editRedo.png"),
+            UI.PixmapCache.getIcon("editRedo"),
             self.tr('&Redo'),
             QKeySequence(self.tr("Ctrl+Shift+Z", "Edit|Redo")),
             0, self, 'webbrowser_edit_redo')
@@ -1095,7 +1095,7 @@
         
         self.selectAllAct = E5Action(
             self.tr('Select All'),
-            UI.PixmapCache.getIcon("editSelectAll.png"),
+            UI.PixmapCache.getIcon("editSelectAll"),
             self.tr('&Select All'),
             QKeySequence(self.tr("Ctrl+A", "Edit|Select All")),
             0, self, 'webbrowser_edit_select_all')
@@ -1122,7 +1122,7 @@
         
         self.findAct = E5Action(
             self.tr('Find...'),
-            UI.PixmapCache.getIcon("find.png"),
+            UI.PixmapCache.getIcon("find"),
             self.tr('&Find...'),
             QKeySequence(self.tr("Ctrl+F", "Edit|Find")),
             0, self, 'webbrowser_edit_find')
@@ -1136,7 +1136,7 @@
         
         self.findNextAct = E5Action(
             self.tr('Find next'),
-            UI.PixmapCache.getIcon("findNext.png"),
+            UI.PixmapCache.getIcon("findNext"),
             self.tr('Find &next'),
             QKeySequence(self.tr("F3", "Edit|Find next")),
             0, self, 'webbrowser_edit_find_next')
@@ -1151,7 +1151,7 @@
         
         self.findPrevAct = E5Action(
             self.tr('Find previous'),
-            UI.PixmapCache.getIcon("findPrev.png"),
+            UI.PixmapCache.getIcon("findPrev"),
             self.tr('Find &previous'),
             QKeySequence(self.tr("Shift+F3", "Edit|Find previous")),
             0, self, 'webbrowser_edit_find_previous')
@@ -1183,7 +1183,7 @@
         
         self.bookmarksAddAct = E5Action(
             self.tr('Add Bookmark'),
-            UI.PixmapCache.getIcon("addBookmark.png"),
+            UI.PixmapCache.getIcon("addBookmark"),
             self.tr('Add &Bookmark...'),
             QKeySequence(self.tr("Ctrl+D", "Help|Add bookmark")),
             0, self, 'webbrowser_bookmark_add')
@@ -1227,7 +1227,7 @@
         
         self.whatsThisAct = E5Action(
             self.tr('What\'s This?'),
-            UI.PixmapCache.getIcon("whatsThis.png"),
+            UI.PixmapCache.getIcon("whatsThis"),
             self.tr('&What\'s This?'),
             QKeySequence(self.tr("Shift+F1", "Help|What's This?'")),
             0, self, 'webbrowser_help_whats_this')
@@ -1271,7 +1271,7 @@
         
         self.zoomInAct = E5Action(
             self.tr('Zoom in'),
-            UI.PixmapCache.getIcon("zoomIn.png"),
+            UI.PixmapCache.getIcon("zoomIn"),
             self.tr('Zoom &in'),
             QKeySequence(self.tr("Ctrl++", "View|Zoom in")),
             QKeySequence(self.tr("Zoom In", "View|Zoom in")),
@@ -1287,7 +1287,7 @@
         
         self.zoomOutAct = E5Action(
             self.tr('Zoom out'),
-            UI.PixmapCache.getIcon("zoomOut.png"),
+            UI.PixmapCache.getIcon("zoomOut"),
             self.tr('Zoom &out'),
             QKeySequence(self.tr("Ctrl+-", "View|Zoom out")),
             QKeySequence(self.tr("Zoom Out", "View|Zoom out")),
@@ -1303,7 +1303,7 @@
         
         self.zoomResetAct = E5Action(
             self.tr('Zoom reset'),
-            UI.PixmapCache.getIcon("zoomReset.png"),
+            UI.PixmapCache.getIcon("zoomReset"),
             self.tr('Zoom &reset'),
             QKeySequence(self.tr("Ctrl+0", "View|Zoom reset")),
             0, self, 'webbrowser_view_zoom_reset')
@@ -1334,7 +1334,7 @@
         
         self.fullScreenAct = E5Action(
             self.tr('Full Screen'),
-            UI.PixmapCache.getIcon("windowFullscreen.png"),
+            UI.PixmapCache.getIcon("windowFullscreen"),
             self.tr('&Full Screen'),
             0, 0,
             self, 'webbrowser_view_full_screen')
@@ -1376,7 +1376,7 @@
         
         self.prefAct = E5Action(
             self.tr('Preferences'),
-            UI.PixmapCache.getIcon("configure.png"),
+            UI.PixmapCache.getIcon("configure"),
             self.tr('&Preferences...'), 0, 0, self, 'webbrowser_preferences')
         self.prefAct.setStatusTip(self.tr(
             'Set the prefered configuration'))
@@ -1390,7 +1390,7 @@
         
         self.acceptedLanguagesAct = E5Action(
             self.tr('Languages'),
-            UI.PixmapCache.getIcon("flag.png"),
+            UI.PixmapCache.getIcon("flag"),
             self.tr('&Languages...'), 0, 0,
             self, 'webbrowser_accepted_languages')
         self.acceptedLanguagesAct.setStatusTip(self.tr(
@@ -1405,7 +1405,7 @@
         
         self.cookiesAct = E5Action(
             self.tr('Cookies'),
-            UI.PixmapCache.getIcon("cookie.png"),
+            UI.PixmapCache.getIcon("cookie"),
             self.tr('C&ookies...'), 0, 0, self, 'webbrowser_cookies')
         self.cookiesAct.setStatusTip(self.tr(
             'Configure cookies handling'))
@@ -1419,7 +1419,7 @@
         
         self.flashCookiesAct = E5Action(
             self.tr('Flash Cookies'),
-            UI.PixmapCache.getIcon("flashCookie.png"),
+            UI.PixmapCache.getIcon("flashCookie"),
             self.tr('&Flash Cookies...'), 0, 0, self,
             'webbrowser_flash_cookies')
         self.flashCookiesAct.setStatusTip(self.tr(
@@ -1434,7 +1434,7 @@
         
         self.personalDataAct = E5Action(
             self.tr('Personal Information'),
-            UI.PixmapCache.getIcon("pim.png"),
+            UI.PixmapCache.getIcon("pim"),
             self.tr('Personal Information...'),
             0, 0,
             self, 'webbrowser_personal_information')
@@ -1451,7 +1451,7 @@
         
         self.greaseMonkeyAct = E5Action(
             self.tr('GreaseMonkey Scripts'),
-            UI.PixmapCache.getIcon("greaseMonkey.png"),
+            UI.PixmapCache.getIcon("greaseMonkey"),
             self.tr('GreaseMonkey Scripts...'),
             0, 0,
             self, 'webbrowser_greasemonkey')
@@ -1468,7 +1468,7 @@
         
         self.editMessageFilterAct = E5Action(
             self.tr('Edit Message Filters'),
-            UI.PixmapCache.getIcon("warning.png"),
+            UI.PixmapCache.getIcon("warning"),
             self.tr('Edit Message Filters...'), 0, 0, self,
             'webbrowser_manage_message_filters')
         self.editMessageFilterAct.setStatusTip(self.tr(
@@ -1485,7 +1485,7 @@
         
         self.featurePermissionAct = E5Action(
             self.tr('Edit HTML5 Feature Permissions'),
-            UI.PixmapCache.getIcon("featurePermission.png"),
+            UI.PixmapCache.getIcon("featurePermission"),
             self.tr('Edit HTML5 Feature Permissions...'), 0, 0, self,
             'webbrowser_edit_feature_permissions')
         self.featurePermissionAct.setStatusTip(self.tr(
@@ -1502,7 +1502,7 @@
         if WebBrowserWindow._useQtHelp:
             self.syncTocAct = E5Action(
                 self.tr('Sync with Table of Contents'),
-                UI.PixmapCache.getIcon("syncToc.png"),
+                UI.PixmapCache.getIcon("syncToc"),
                 self.tr('Sync with Table of Contents'),
                 0, 0, self, 'webbrowser_sync_toc')
             self.syncTocAct.setStatusTip(self.tr(
@@ -1586,7 +1586,7 @@
         
         self.clearPrivateDataAct = E5Action(
             self.tr('Clear private data'),
-            UI.PixmapCache.getIcon("clearPrivateData.png"),
+            UI.PixmapCache.getIcon("clearPrivateData"),
             self.tr('Clear private data'),
             0, 0,
             self, 'webbrowser_clear_private_data')
@@ -1618,7 +1618,7 @@
         
         self.manageIconsAct = E5Action(
             self.tr('Manage saved Favicons'),
-            UI.PixmapCache.getIcon("icons.png"),
+            UI.PixmapCache.getIcon("icons"),
             self.tr('Manage saved Favicons'),
             0, 0,
             self, 'webbrowser_manage_icons_db')
@@ -1650,7 +1650,7 @@
         
         self.passwordsAct = E5Action(
             self.tr('Manage Saved Passwords'),
-            UI.PixmapCache.getIcon("passwords.png"),
+            UI.PixmapCache.getIcon("passwords"),
             self.tr('Manage Saved Passwords...'),
             0, 0,
             self, 'webbrowser_manage_passwords')
@@ -1665,7 +1665,7 @@
         
         self.adblockAct = E5Action(
             self.tr('Ad Block'),
-            UI.PixmapCache.getIcon("adBlockPlus.png"),
+            UI.PixmapCache.getIcon("adBlockPlus"),
             self.tr('&Ad Block...'),
             0, 0,
             self, 'webbrowser_adblock')
@@ -1681,7 +1681,7 @@
         
         self.certificateErrorsAct = E5Action(
             self.tr('Manage SSL Certificate Errors'),
-            UI.PixmapCache.getIcon("certificates.png"),
+            UI.PixmapCache.getIcon("certificates"),
             self.tr('Manage SSL Certificate Errors...'),
             0, 0,
             self, 'webbrowser_manage_certificate_errors')
@@ -1698,7 +1698,7 @@
         
         self.safeBrowsingAct = E5Action(
             self.tr('Manage Safe Browsing'),
-            UI.PixmapCache.getIcon("safeBrowsing.png"),
+            UI.PixmapCache.getIcon("safeBrowsing"),
             self.tr('Manage Safe Browsing...'), 0, 0, self,
             'webbrowser_manage_safe_browsing')
         self.safeBrowsingAct.setStatusTip(self.tr(
@@ -1728,7 +1728,7 @@
         
         self.feedsManagerAct = E5Action(
             self.tr('RSS Feeds Dialog'),
-            UI.PixmapCache.getIcon("rss22.png"),
+            UI.PixmapCache.getIcon("rss22"),
             self.tr('&RSS Feeds Dialog...'),
             QKeySequence(self.tr("Ctrl+Shift+F", "Help|RSS Feeds Dialog")),
             0, self, 'webbrowser_rss_feeds')
@@ -1745,7 +1745,7 @@
         
         self.siteInfoAct = E5Action(
             self.tr('Siteinfo Dialog'),
-            UI.PixmapCache.getIcon("helpAbout.png"),
+            UI.PixmapCache.getIcon("helpAbout"),
             self.tr('&Siteinfo Dialog...'),
             QKeySequence(self.tr("Ctrl+Shift+I", "Help|Siteinfo Dialog")),
             0, self, 'webbrowser_siteinfo')
@@ -1775,7 +1775,7 @@
         
         self.synchronizationAct = E5Action(
             self.tr('Synchronize data'),
-            UI.PixmapCache.getIcon("sync.png"),
+            UI.PixmapCache.getIcon("sync"),
             self.tr('&Synchronize Data...'),
             0, 0, self, 'webbrowser_synchronize_data')
         self.synchronizationAct.setStatusTip(self.tr(
@@ -1791,7 +1791,7 @@
         
         self.zoomValuesAct = E5Action(
             self.tr('Manage Saved Zoom Values'),
-            UI.PixmapCache.getIcon("zoomReset.png"),
+            UI.PixmapCache.getIcon("zoomReset"),
             self.tr('Manage Saved Zoom Values...'),
             0, 0,
             self, 'webbrowser_manage_zoom_values')
@@ -1848,7 +1848,7 @@
         
         self.virustotalScanCurrentAct = E5Action(
             self.tr("Scan current site"),
-            UI.PixmapCache.getIcon("virustotal.png"),
+            UI.PixmapCache.getIcon("virustotal"),
             self.tr("Scan current site"),
             0, 0,
             self, 'webbrowser_virustotal_scan_site')
@@ -1858,7 +1858,7 @@
         
         self.virustotalIpReportAct = E5Action(
             self.tr("IP Address Report"),
-            UI.PixmapCache.getIcon("virustotal.png"),
+            UI.PixmapCache.getIcon("virustotal"),
             self.tr("IP Address Report"),
             0, 0,
             self, 'webbrowser_virustotal_ip_report')
@@ -1868,7 +1868,7 @@
         
         self.virustotalDomainReportAct = E5Action(
             self.tr("Domain Report"),
-            UI.PixmapCache.getIcon("virustotal.png"),
+            UI.PixmapCache.getIcon("virustotal"),
             self.tr("Domain Report"),
             0, 0,
             self, 'webbrowser_virustotal_domain_report')
@@ -1886,7 +1886,7 @@
 
         self.shortcutsAct = E5Action(
             self.tr('Keyboard Shortcuts'),
-            UI.PixmapCache.getIcon("configureShortcuts.png"),
+            UI.PixmapCache.getIcon("configureShortcuts"),
             self.tr('Keyboard &Shortcuts...'),
             0, 0,
             self, 'webbrowser_keyboard_shortcuts')
@@ -1902,7 +1902,7 @@
 
         self.exportShortcutsAct = E5Action(
             self.tr('Export Keyboard Shortcuts'),
-            UI.PixmapCache.getIcon("exportShortcuts.png"),
+            UI.PixmapCache.getIcon("exportShortcuts"),
             self.tr('&Export Keyboard Shortcuts...'),
             0, 0, self, 'export_keyboard_shortcuts')
         self.exportShortcutsAct.setStatusTip(self.tr(
@@ -1916,7 +1916,7 @@
 
         self.importShortcutsAct = E5Action(
             self.tr('Import Keyboard Shortcuts'),
-            UI.PixmapCache.getIcon("importShortcuts.png"),
+            UI.PixmapCache.getIcon("importShortcuts"),
             self.tr('&Import Keyboard Shortcuts...'),
             0, 0, self, 'import_keyboard_shortcuts')
         self.importShortcutsAct.setStatusTip(self.tr(
@@ -2126,7 +2126,7 @@
         menu.addSeparator()
         menu.addAction(self.synchronizationAct)
         menu.addSeparator()
-        vtMenu = menu.addMenu(UI.PixmapCache.getIcon("virustotal.png"),
+        vtMenu = menu.addMenu(UI.PixmapCache.getIcon("virustotal"),
                               self.tr("&VirusTotal"))
         vtMenu.addAction(self.virustotalScanCurrentAct)
         vtMenu.addAction(self.virustotalIpReportAct)
@@ -2197,7 +2197,7 @@
         self.__superMenu.addAction(self.selectAllAct)
         self.__superMenu.addAction(self.findAct)
         self.__superMenu.addSeparator()
-        act = self.__superMenu.addAction(UI.PixmapCache.getIcon("history.png"),
+        act = self.__superMenu.addAction(UI.PixmapCache.getIcon("history"),
                                          self.tr("Show All History..."))
         act.triggered.connect(self.historyMenu.showHistoryDialog)
         self.__superMenu.addAction(self.bookmarksManageAct)
@@ -2281,7 +2281,7 @@
         menu.addSeparator()
         menu.addAction(self.synchronizationAct)
         menu.addSeparator()
-        vtMenu = menu.addMenu(UI.PixmapCache.getIcon("virustotal.png"),
+        vtMenu = menu.addMenu(UI.PixmapCache.getIcon("virustotal"),
                               self.tr("&VirusTotal"))
         vtMenu.addAction(self.virustotalScanCurrentAct)
         vtMenu.addAction(self.virustotalIpReportAct)
@@ -2920,7 +2920,7 @@
                     parent=self)
                 quitButton = mb.addButton(
                     self.tr("&Quit"), E5MessageBox.AcceptRole)
-                quitButton.setIcon(UI.PixmapCache.getIcon("exit.png"))
+                quitButton.setIcon(UI.PixmapCache.getIcon("exit"))
                 mb.addButton(E5MessageBox.Cancel)
                 mb.exec_()
                 return mb.clickedButton() == quitButton
--- a/eric6/i18n/eric6_cs.ts	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/i18n/eric6_cs.ts	Sat May 02 13:51:07 2020 +0200
@@ -1210,12 +1210,12 @@
         <translation type="unfinished">&lt;&lt;Ostatní&gt;&gt;</translation>
     </message>
     <message>
-        <location filename="../Graphics/ApplicationDiagramBuilder.py" line="292"/>
+        <location filename="../Graphics/ApplicationDiagramBuilder.py" line="294"/>
         <source>Load Diagram</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Graphics/ApplicationDiagramBuilder.py" line="292"/>
+        <location filename="../Graphics/ApplicationDiagramBuilder.py" line="294"/>
         <source>&lt;p&gt;The diagram belongs to the project &lt;b&gt;{0}&lt;/b&gt;. Shall this project be opened?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2385,32 +2385,32 @@
 <context>
     <name>BrowserModel</name>
     <message>
-        <location filename="../UI/BrowserModel.py" line="62"/>
+        <location filename="../UI/BrowserModel.py" line="63"/>
         <source>Name</source>
         <translation>Jméno</translation>
     </message>
     <message>
-        <location filename="../UI/BrowserModel.py" line="730"/>
+        <location filename="../UI/BrowserModel.py" line="731"/>
         <source>Attributes</source>
         <translation>Atributy</translation>
     </message>
     <message>
-        <location filename="../UI/BrowserModel.py" line="660"/>
+        <location filename="../UI/BrowserModel.py" line="661"/>
         <source>Globals</source>
         <translation>Globální</translation>
     </message>
     <message>
-        <location filename="../UI/BrowserModel.py" line="654"/>
+        <location filename="../UI/BrowserModel.py" line="655"/>
         <source>Coding: {0}</source>
         <translation>Kódování: {0}</translation>
     </message>
     <message>
-        <location filename="../UI/BrowserModel.py" line="740"/>
+        <location filename="../UI/BrowserModel.py" line="741"/>
         <source>Class Attributes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/BrowserModel.py" line="666"/>
+        <location filename="../UI/BrowserModel.py" line="667"/>
         <source>Imports</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3093,54 +3093,54 @@
 <context>
     <name>CodeDocumentationViewer</name>
     <message>
-        <location filename="../UI/CodeDocumentationViewer.py" line="175"/>
+        <location filename="../UI/CodeDocumentationViewer.py" line="211"/>
         <source>Code Info Provider:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/CodeDocumentationViewer.py" line="188"/>
+        <location filename="../UI/CodeDocumentationViewer.py" line="224"/>
         <source>Select the code info provider</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/CodeDocumentationViewer.py" line="190"/>
+        <location filename="../UI/CodeDocumentationViewer.py" line="226"/>
         <source>&lt;disabled&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/CodeDocumentationViewer.py" line="371"/>
+        <location filename="../UI/CodeDocumentationViewer.py" line="407"/>
         <source>No documentation available</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/CodeDocumentationViewer.py" line="392"/>
+        <location filename="../UI/CodeDocumentationViewer.py" line="428"/>
         <source>No source code documentation provider has been registered. This function has been disabled.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/CodeDocumentationViewer.py" line="397"/>
+        <location filename="../UI/CodeDocumentationViewer.py" line="433"/>
         <source>This function has been disabled.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/CodeDocumentationViewerTemplate.py" line="137"/>
+        <location filename="../UI/CodeDocumentationViewerTemplate.py" line="139"/>
         <source>No further documentation available</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/CodeDocumentationViewerTemplate.py" line="58"/>
+        <location filename="../UI/CodeDocumentationViewerTemplate.py" line="60"/>
         <source>&lt;p&gt;&lt;b&gt;Definition:&lt;/b&gt; &lt;span class=&quot;def&quot;&gt;@NAME@@ARGSPEC@&lt;/span&gt;&lt;/p&gt;</source>
         <comment>Just translate &apos;Definition:&apos; and leave the rest intact.</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/CodeDocumentationViewerTemplate.py" line="68"/>
+        <location filename="../UI/CodeDocumentationViewerTemplate.py" line="70"/>
         <source>&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; @NOTE@&lt;/p&gt;</source>
         <comment>Just translate &apos;Note:&apos; and leave the rest intact.</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/CodeDocumentationViewerTemplate.py" line="63"/>
+        <location filename="../UI/CodeDocumentationViewerTemplate.py" line="65"/>
         <source>&lt;p&gt;&lt;b&gt;Type:&lt;/b&gt; @TYPE@&lt;/p&gt;</source>
         <comment>Just translate &apos;Type:&apos; and leave the rest intact.</comment>
         <translation type="unfinished"></translation>
@@ -4232,7 +4232,7 @@
     <message>
         <location filename="../Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.ui" line="143"/>
         <source>Colour</source>
-        <translation>Barva</translation>
+        <translation type="obsolete">Barva</translation>
     </message>
     <message>
         <location filename="../Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.ui" line="42"/>
@@ -4247,7 +4247,7 @@
     <message>
         <location filename="../Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.ui" line="155"/>
         <source>Enter a variable name or a colour</source>
-        <translation>Zadejte hodnotu barvy nebo název</translation>
+        <translation type="obsolete">Zadejte hodnotu barvy nebo název</translation>
     </message>
     <message>
         <location filename="../Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.ui" line="167"/>
@@ -4417,7 +4417,7 @@
     <message>
         <location filename="../Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.py" line="72"/>
         <source>&lt;p&gt;The colour &lt;b&gt;{0}&lt;/b&gt; is not valid.&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Barva &lt;b&gt;{0}&lt;/b&gt; není platná.&lt;/p&gt;</translation>
+        <translation type="obsolete">&lt;p&gt;Barva &lt;b&gt;{0}&lt;/b&gt; není platná.&lt;/p&gt;</translation>
     </message>
     <message>
         <location filename="../Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.ui" line="55"/>
@@ -4430,11 +4430,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.ui" line="292"/>
-        <source>Colour Variable</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.ui" line="87"/>
         <source>Parent</source>
         <translation type="unfinished"></translation>
@@ -4474,6 +4469,26 @@
         <source>Enter the parent expression</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.ui" line="143"/>
+        <source>Color</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.ui" line="155"/>
+        <source>Enter a variable name or a color</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.ui" line="292"/>
+        <source>Color Variable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.py" line="72"/>
+        <source>&lt;p&gt;The color &lt;b&gt;{0}&lt;/b&gt; is not valid.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>CompareDialog</name>
@@ -6385,7 +6400,7 @@
         <translation>&amp;Filtr pro:</translation>
     </message>
     <message>
-        <location filename="../Project/CreateDialogCodeDialog.py" line="577"/>
+        <location filename="../Project/CreateDialogCodeDialog.py" line="580"/>
         <source>Code Generation</source>
         <translation>Generování kódu</translation>
     </message>
@@ -6410,17 +6425,17 @@
         <translation>&lt;p&gt;Byla nalezena chyba načtená z &lt;b&gt;{0}&lt;/b&gt;.&lt;/p&gt;&lt;p&gt;{1}&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/CreateDialogCodeDialog.py" line="437"/>
+        <location filename="../Project/CreateDialogCodeDialog.py" line="440"/>
         <source>&lt;p&gt;Could not open the code template file &quot;{0}&quot;.&lt;/p&gt;&lt;p&gt;Reason: {1}&lt;/p&gt;</source>
         <translation>&lt;p&gt;Template soubor &lt;b&gt;{0}&lt;/b&gt; nelze otevřít.&lt;/p&gt;&lt;p&gt;Důvod: {1}&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/CreateDialogCodeDialog.py" line="475"/>
+        <location filename="../Project/CreateDialogCodeDialog.py" line="478"/>
         <source>&lt;p&gt;Could not open the source file &quot;{0}&quot;.&lt;/p&gt;&lt;p&gt;Reason: {1}&lt;/p&gt;</source>
         <translation>&lt;p&gt;Nelze ovevřít source soubor &quot;{0}&quot;.&lt;/p&gt;&lt;p&gt;Důvod: {1}&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/CreateDialogCodeDialog.py" line="577"/>
+        <location filename="../Project/CreateDialogCodeDialog.py" line="580"/>
         <source>&lt;p&gt;Could not write the source file &quot;{0}&quot;.&lt;/p&gt;&lt;p&gt;Reason: {1}&lt;/p&gt;</source>
         <translation>&lt;p&gt;Nelze zapsat do source souboru &quot;{0}&quot;.&lt;/p&gt;&lt;p&gt;Důvod: {1}&lt;/p&gt;</translation>
     </message>
@@ -7633,21 +7648,6 @@
         <translation type="unfinished">Vyberte, má-li debuger běžet vzdáleně</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="630"/>
-        <source>Background Colours</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="659"/>
-        <source>Select the background colour for changed items.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="695"/>
-        <source>Select the background colour for elements which are loaded for the first time.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="669"/>
         <source>Changed elements:</source>
         <translation type="unfinished"></translation>
@@ -7657,6 +7657,21 @@
         <source>First time opened elements:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="630"/>
+        <source>Background Colors</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="659"/>
+        <source>Select the background color for changed items.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="695"/>
+        <source>Select the background color for elements which are loaded for the first time.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DebuggerInterfacePython</name>
@@ -8139,110 +8154,110 @@
 <context>
     <name>DiffColoursPage</name>
     <message>
-        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="17"/>
-        <source>&lt;b&gt;Configure Diff colours&lt;/b&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="39"/>
-        <source>Select the background colour for header lines</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="42"/>
-        <source>Header Colour</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="52"/>
         <source>Header Line</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="65"/>
-        <source>Select the background colour for bad whitespace</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="68"/>
-        <source>Whitespace Colour</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="88"/>
-        <source>Select the text foreground colour</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="91"/>
-        <source>Text Colour</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="101"/>
         <source>Normal Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="114"/>
-        <source>Select the background colour for additions</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="117"/>
-        <source>Added Colour</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="127"/>
         <source>Added Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="140"/>
-        <source>Select the background colour for removed text</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="143"/>
-        <source>Removed Colour</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="153"/>
         <source>Removed Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="166"/>
-        <source>Select the background colour for replaced text</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="169"/>
-        <source>Replaced Colour</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="179"/>
         <source>Replaced Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="192"/>
-        <source>Select the background colour for context lines</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="195"/>
-        <source>Context Colour</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="205"/>
         <source>Context Line</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="17"/>
+        <source>&lt;b&gt;Configure Diff colors&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="39"/>
+        <source>Select the background color for header lines</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="42"/>
+        <source>Header Color</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="65"/>
+        <source>Select the background color for bad whitespace</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="68"/>
+        <source>Whitespace Color</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="88"/>
+        <source>Select the text foreground color</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="91"/>
+        <source>Text Color</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="114"/>
+        <source>Select the background color for additions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="117"/>
+        <source>Added Color</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="140"/>
+        <source>Select the background color for removed text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="143"/>
+        <source>Removed Color</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="166"/>
+        <source>Select the background color for replaced text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="169"/>
+        <source>Replaced Color</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="192"/>
+        <source>Select the background color for context lines</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="195"/>
+        <source>Context Color</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DiffDialog</name>
@@ -9428,7 +9443,7 @@
 <context>
     <name>E5GraphicsView</name>
     <message>
-        <location filename="../E5Graphics/E5GraphicsView.py" line="56"/>
+        <location filename="../E5Graphics/E5GraphicsView.py" line="58"/>
         <source>&lt;b&gt;Graphics View&lt;/b&gt;
 &lt;p&gt;This graphics view is used to show a diagram. 
 There are various actions available to manipulate the 
@@ -9458,7 +9473,7 @@
 &lt;/ul&gt;</translation>
     </message>
     <message>
-        <location filename="../E5Graphics/E5GraphicsView.py" line="377"/>
+        <location filename="../E5Graphics/E5GraphicsView.py" line="416"/>
         <source>{0}, Page {1}</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10968,7 +10983,7 @@
 <context>
     <name>Editor</name>
     <message>
-        <location filename="../QScintilla/Editor.py" line="3106"/>
+        <location filename="../QScintilla/Editor.py" line="3107"/>
         <source>Open File</source>
         <translation>Otevřít soubor</translation>
     </message>
@@ -11218,7 +11233,7 @@
         <translation>Editovat breakpoint...</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5607"/>
+        <location filename="../QScintilla/Editor.py" line="5615"/>
         <source>Enable breakpoint</source>
         <translation>Aktivovat breakpoint</translation>
     </message>
@@ -11258,237 +11273,237 @@
         <translation>Předchozí úloha</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="1955"/>
+        <location filename="../QScintilla/Editor.py" line="1956"/>
         <source>Modification of Read Only file</source>
         <translation>Modifikace souboru otevřeného jen pro čtení</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="1955"/>
+        <location filename="../QScintilla/Editor.py" line="1956"/>
         <source>You are attempting to change a read only file. Please save to a different file first.</source>
         <translation>Pokoušíte se změnit soubor, který je otevřen jen pro čtení. Prosím, uložte jej nejdříve do jiného souboru.</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="2663"/>
+        <location filename="../QScintilla/Editor.py" line="2664"/>
         <source>Printing...</source>
         <translation>Tisk...</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="2680"/>
+        <location filename="../QScintilla/Editor.py" line="2681"/>
         <source>Printing completed</source>
         <translation>Tisk je hotov</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="2682"/>
+        <location filename="../QScintilla/Editor.py" line="2683"/>
         <source>Error while printing</source>
         <translation>Chyba během tisku</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="2685"/>
+        <location filename="../QScintilla/Editor.py" line="2686"/>
         <source>Printing aborted</source>
         <translation>Tisk byl zrušen</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="3295"/>
+        <location filename="../QScintilla/Editor.py" line="3296"/>
         <source>Save File</source>
         <translation>Uložit soubor</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="3046"/>
+        <location filename="../QScintilla/Editor.py" line="3047"/>
         <source>File Modified</source>
         <translation>Soubor je modifikován</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="4772"/>
+        <location filename="../QScintilla/Editor.py" line="4777"/>
         <source>Autocompletion</source>
         <translation>Autodoplňování</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="4772"/>
+        <location filename="../QScintilla/Editor.py" line="4777"/>
         <source>Autocompletion is not available because there is no autocompletion source set.</source>
         <translation>Autodoplňování není dostupné protože zdrojová část autodoplňování nebyla nalezena.</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5610"/>
+        <location filename="../QScintilla/Editor.py" line="5618"/>
         <source>Disable breakpoint</source>
         <translation>Deaktivovat breakpoint</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5985"/>
+        <location filename="../QScintilla/Editor.py" line="5993"/>
         <source>Code Coverage</source>
         <translation>Pokrytí kódu</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5985"/>
+        <location filename="../QScintilla/Editor.py" line="5993"/>
         <source>Please select a coverage file</source>
         <translation>Prosím, vyberte soubor s pokrytím kódu</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6048"/>
+        <location filename="../QScintilla/Editor.py" line="6056"/>
         <source>Show Code Coverage Annotations</source>
         <translation>Zobrazit poznámky pokrytí kódu</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6041"/>
+        <location filename="../QScintilla/Editor.py" line="6049"/>
         <source>All lines have been covered.</source>
         <translation>Všechny řádky byly pokryty.</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6048"/>
+        <location filename="../QScintilla/Editor.py" line="6056"/>
         <source>There is no coverage file available.</source>
         <translation>Soubor s pokrytím není dostupný.</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6165"/>
+        <location filename="../QScintilla/Editor.py" line="6173"/>
         <source>Profile Data</source>
         <translation>Profilovat data</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6165"/>
+        <location filename="../QScintilla/Editor.py" line="6173"/>
         <source>Please select a profile file</source>
         <translation>Prosím, vyberte soubor s profilem</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6327"/>
+        <location filename="../QScintilla/Editor.py" line="6335"/>
         <source>Syntax Error</source>
         <translation>Chyba syntaxe</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6327"/>
+        <location filename="../QScintilla/Editor.py" line="6335"/>
         <source>No syntax error message available.</source>
         <translation>Hlášení syntaktické chyby není dostupné.</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6718"/>
+        <location filename="../QScintilla/Editor.py" line="6726"/>
         <source>Macro Name</source>
         <translation>Název makra</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6718"/>
+        <location filename="../QScintilla/Editor.py" line="6726"/>
         <source>Select a macro name:</source>
         <translation>Vyberte název makra:</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6746"/>
+        <location filename="../QScintilla/Editor.py" line="6754"/>
         <source>Load macro file</source>
         <translation>Načíst soubor makra</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6789"/>
+        <location filename="../QScintilla/Editor.py" line="6797"/>
         <source>Macro files (*.macro)</source>
         <translation>Macro soubory (*.macro)</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6769"/>
+        <location filename="../QScintilla/Editor.py" line="6777"/>
         <source>Error loading macro</source>
         <translation>Chyba při načítání makra</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6789"/>
+        <location filename="../QScintilla/Editor.py" line="6797"/>
         <source>Save macro file</source>
         <translation>Uložit soubor s makrem</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6806"/>
+        <location filename="../QScintilla/Editor.py" line="6814"/>
         <source>Save macro</source>
         <translation>Uložit makro</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6822"/>
+        <location filename="../QScintilla/Editor.py" line="6830"/>
         <source>Error saving macro</source>
         <translation>Chyba při ukládání makra</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6835"/>
+        <location filename="../QScintilla/Editor.py" line="6843"/>
         <source>Start Macro Recording</source>
         <translation>Spustit záznam makra</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6835"/>
+        <location filename="../QScintilla/Editor.py" line="6843"/>
         <source>Macro recording is already active. Start new?</source>
         <translation>Nahrávání makra již probíhá. Spustit nové?</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6861"/>
+        <location filename="../QScintilla/Editor.py" line="6869"/>
         <source>Macro Recording</source>
         <translation>Záznam makra</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6861"/>
+        <location filename="../QScintilla/Editor.py" line="6869"/>
         <source>Enter name of the macro:</source>
         <translation>Vložte název makra:</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7001"/>
+        <location filename="../QScintilla/Editor.py" line="7009"/>
         <source>File changed</source>
         <translation>Soubor změněn</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7307"/>
+        <location filename="../QScintilla/Editor.py" line="7320"/>
         <source>Drop Error</source>
         <translation>Zahodit chybu</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7328"/>
-        <source>Resources</source>
-        <translation>Zdroje</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="7330"/>
-        <source>Add file...</source>
-        <translation>Přidat soubor...</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="7332"/>
-        <source>Add files...</source>
-        <translation>Přidat soubory...</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="7334"/>
-        <source>Add aliased file...</source>
-        <translation>Přidat zástupce souboru...</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="7337"/>
-        <source>Add localized resource...</source>
-        <translation>Přidat lokalizované resource...</translation>
-    </message>
-    <message>
         <location filename="../QScintilla/Editor.py" line="7341"/>
+        <source>Resources</source>
+        <translation>Zdroje</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="7343"/>
+        <source>Add file...</source>
+        <translation>Přidat soubor...</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="7345"/>
+        <source>Add files...</source>
+        <translation>Přidat soubory...</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="7347"/>
+        <source>Add aliased file...</source>
+        <translation>Přidat zástupce souboru...</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="7350"/>
+        <source>Add localized resource...</source>
+        <translation>Přidat lokalizované resource...</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="7354"/>
         <source>Add resource frame</source>
         <translation>Přidat resource frame</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7360"/>
+        <location filename="../QScintilla/Editor.py" line="7373"/>
         <source>Add file resource</source>
         <translation>Přidat soubor resource</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7376"/>
+        <location filename="../QScintilla/Editor.py" line="7389"/>
         <source>Add file resources</source>
         <translation>Přidat soubory resource</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7403"/>
+        <location filename="../QScintilla/Editor.py" line="7416"/>
         <source>Add aliased file resource</source>
         <translation>Přidat zástupce souboru resource</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7469"/>
+        <location filename="../QScintilla/Editor.py" line="7482"/>
         <source>Package Diagram</source>
         <translation>Diagram balíčku</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7469"/>
+        <location filename="../QScintilla/Editor.py" line="7482"/>
         <source>Include class attributes?</source>
         <translation>Včetně atributů třídy?</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7505"/>
+        <location filename="../QScintilla/Editor.py" line="7518"/>
         <source>Application Diagram</source>
         <translation>Diagram aplikace</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7505"/>
+        <location filename="../QScintilla/Editor.py" line="7518"/>
         <source>Include module names?</source>
         <translation>Včetně jmen modulů?</translation>
     </message>
@@ -11508,12 +11523,12 @@
         <translation>Nebyl zadán forám exportu. Zrušeno....</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7491"/>
+        <location filename="../QScintilla/Editor.py" line="7504"/>
         <source>Imports Diagram</source>
         <translation>Importovat diagram</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7491"/>
+        <location filename="../QScintilla/Editor.py" line="7504"/>
         <source>Include imports from external modules?</source>
         <translation>Zahrnout importy z externích modulů?</translation>
     </message>
@@ -11583,7 +11598,7 @@
         <translation>Použít Pygments lexer.</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7834"/>
+        <location filename="../QScintilla/Editor.py" line="7847"/>
         <source>Check spelling...</source>
         <translation>Zatrhnout kontrolu...</translation>
     </message>
@@ -11593,12 +11608,12 @@
         <translation>Zatrhnout výběr kontroly...</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7837"/>
+        <location filename="../QScintilla/Editor.py" line="7850"/>
         <source>Add to dictionary</source>
         <translation>Přidat do slovníku</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7839"/>
+        <location filename="../QScintilla/Editor.py" line="7852"/>
         <source>Ignore All</source>
         <translation>Ignorovat vše</translation>
     </message>
@@ -11623,47 +11638,47 @@
         <translation>Alternativy ({0})</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="3046"/>
+        <location filename="../QScintilla/Editor.py" line="3047"/>
         <source>&lt;p&gt;The file &lt;b&gt;{0}&lt;/b&gt; has unsaved changes.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Soubor &lt;b&gt;{0}&lt;/b&gt; obsahuje neuložené změny.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="3106"/>
+        <location filename="../QScintilla/Editor.py" line="3107"/>
         <source>&lt;p&gt;The file &lt;b&gt;{0}&lt;/b&gt; could not be opened.&lt;/p&gt;&lt;p&gt;Reason: {1}&lt;/p&gt;</source>
         <translation>&lt;p&gt;Soubor &lt;b&gt;{0}&lt;/b&gt; nemůže být přejmenován.&lt;br /&gt;Důvod: {1}&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="3232"/>
+        <location filename="../QScintilla/Editor.py" line="3233"/>
         <source>&lt;p&gt;The file &lt;b&gt;{0}&lt;/b&gt; could not be saved.&lt;br/&gt;Reason: {1}&lt;/p&gt;</source>
         <translation>&lt;p&gt;Soubor &lt;b&gt;{0}&lt;/b&gt; nemůže být přejmenován.&lt;br /&gt;Důvod: {1}&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6760"/>
+        <location filename="../QScintilla/Editor.py" line="6768"/>
         <source>&lt;p&gt;The macro file &lt;b&gt;{0}&lt;/b&gt; could not be read.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Soubor s makrem &lt;b&gt;{0}&lt;/b&gt; nelze načíst.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6769"/>
+        <location filename="../QScintilla/Editor.py" line="6777"/>
         <source>&lt;p&gt;The macro file &lt;b&gt;{0}&lt;/b&gt; is corrupt.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Soubor s makrem &lt;b&gt;{0}&lt;/b&gt; je poškozen.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6822"/>
+        <location filename="../QScintilla/Editor.py" line="6830"/>
         <source>&lt;p&gt;The macro file &lt;b&gt;{0}&lt;/b&gt; could not be written.&lt;/p&gt;</source>
         <translation>&lt;p&gt;So souboru s makrem &lt;b&gt;{0}&lt;/b&gt; nelze zapisovat.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7166"/>
+        <location filename="../QScintilla/Editor.py" line="7179"/>
         <source>{0} (ro)</source>
         <translation>{0} (ro)</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7307"/>
+        <location filename="../QScintilla/Editor.py" line="7320"/>
         <source>&lt;p&gt;&lt;b&gt;{0}&lt;/b&gt; is not a file.&lt;/p&gt;</source>
         <translation>&lt;p&gt;&lt;b&gt;{0}&lt;/b&gt; není soubor.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7403"/>
+        <location filename="../QScintilla/Editor.py" line="7416"/>
         <source>Alias for file &lt;b&gt;{0}&lt;/b&gt;:</source>
         <translation>Zástupce pro soubor &lt;b&gt;{0}&lt;/b&gt;:</translation>
     </message>
@@ -11688,27 +11703,27 @@
         <translation>Vyčistit varování</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="3295"/>
+        <location filename="../QScintilla/Editor.py" line="3296"/>
         <source>&lt;p&gt;The file &lt;b&gt;{0}&lt;/b&gt; already exists. Overwrite it?&lt;/p&gt;</source>
         <translation type="unfinished">&lt;p&gt;Soubor &lt;b&gt;{0}&lt;/b&gt; již existuje.&lt;/p&gt;&lt;p&gt;Má se přepsat?&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6806"/>
+        <location filename="../QScintilla/Editor.py" line="6814"/>
         <source>&lt;p&gt;The macro file &lt;b&gt;{0}&lt;/b&gt; already exists. Overwrite it?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6606"/>
+        <location filename="../QScintilla/Editor.py" line="6614"/>
         <source>Warning: {0}</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6613"/>
+        <location filename="../QScintilla/Editor.py" line="6621"/>
         <source>Error: {0}</source>
         <translation type="unfinished">Chyby: {0}</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6997"/>
+        <location filename="../QScintilla/Editor.py" line="7005"/>
         <source>&lt;br&gt;&lt;b&gt;Warning:&lt;/b&gt; You will lose your changes upon reopening it.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11733,27 +11748,27 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="8255"/>
+        <location filename="../QScintilla/Editor.py" line="8268"/>
         <source>Sort Lines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="8255"/>
+        <location filename="../QScintilla/Editor.py" line="8268"/>
         <source>The selection contains illegal data for a numerical sort.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6541"/>
+        <location filename="../QScintilla/Editor.py" line="6549"/>
         <source>Warning</source>
         <translation type="unfinished">Varování</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6541"/>
+        <location filename="../QScintilla/Editor.py" line="6549"/>
         <source>No warning messages available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6603"/>
+        <location filename="../QScintilla/Editor.py" line="6611"/>
         <source>Style: {0}</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11778,7 +11793,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6991"/>
+        <location filename="../QScintilla/Editor.py" line="6999"/>
         <source>&lt;p&gt;The file &lt;b&gt;{0}&lt;/b&gt; has been changed while it was opened in eric6. Reread it?&lt;/p&gt;</source>
         <translation type="unfinished">&lt;p&gt;Soubor &lt;b&gt;{0}&lt;/b&gt; byl změněn po té co již byl načten do eric5. Znovu načíst?&lt;/p&gt; {0}?} {6.?}</translation>
     </message>
@@ -11793,32 +11808,32 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="4902"/>
+        <location filename="../QScintilla/Editor.py" line="4907"/>
         <source>Auto-Completion Provider</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="4902"/>
+        <location filename="../QScintilla/Editor.py" line="4907"/>
         <source>The completion list provider &apos;{0}&apos; was already registered. Ignoring duplicate request.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5177"/>
+        <location filename="../QScintilla/Editor.py" line="5185"/>
         <source>Call-Tips Provider</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5177"/>
+        <location filename="../QScintilla/Editor.py" line="5185"/>
         <source>The call-tips provider &apos;{0}&apos; was already registered. Ignoring duplicate request.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="8344"/>
+        <location filename="../QScintilla/Editor.py" line="8357"/>
         <source>Register Mouse Click Handler</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="8344"/>
+        <location filename="../QScintilla/Editor.py" line="8357"/>
         <source>A mouse click handler for &quot;{0}&quot; was already registered by &quot;{1}&quot;. Aborting request by &quot;{2}&quot;...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11848,12 +11863,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="8465"/>
+        <location filename="../QScintilla/Editor.py" line="8478"/>
         <source>EditorConfig Properties</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="8465"/>
+        <location filename="../QScintilla/Editor.py" line="8478"/>
         <source>&lt;p&gt;The EditorConfig properties for file &lt;b&gt;{0}&lt;/b&gt; could not be loaded.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12380,17 +12395,17 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="122"/>
         <source>Colours</source>
-        <translation>Barvy</translation>
+        <translation type="obsolete">Barvy</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="128"/>
         <source>Background colour:</source>
-        <translation>Barva pozadí:</translation>
+        <translation type="obsolete">Barva pozadí:</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="141"/>
         <source>Select the background colour for calltips.</source>
-        <translation>Vybrat barvu pozadí pro Rychlé tipy.</translation>
+        <translation type="obsolete">Vybrat barvu pozadí pro Rychlé tipy.</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="74"/>
@@ -12403,22 +12418,22 @@
         <translation>Zobrazuje číslo maximálního počtu Rychlých tipů, které budou zobrazovány</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="167"/>
+        <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="213"/>
         <source>Plug-In Behavior</source>
         <translation>Plug-In chování</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="173"/>
+        <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="219"/>
         <source>Select to show QScintilla provided calltips, if the selected plug-ins fail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="176"/>
+        <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="222"/>
         <source>Qscintilla provided calltips are shown, if this option is enabled and calltips shall be provided by plug-ins (see calltips sub-page of the plug-in) and the plugin-ins don&apos;t deliver any calltips.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="179"/>
+        <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="225"/>
         <source>Show QScintilla calltips, if plug-ins fail</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12447,6 +12462,41 @@
         <source>Above Text</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="122"/>
+        <source>Colors</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="128"/>
+        <source>Background color:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="141"/>
+        <source>Select the background color for calltips.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="164"/>
+        <source>Foreground color:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="177"/>
+        <source>Select the foreground color for calltips.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="187"/>
+        <source>Highlight color:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="200"/>
+        <source>Select the highlight color for calltips.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>EditorCalltipsQScintillaPage</name>
@@ -13404,12 +13454,12 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="273"/>
         <source>Select the background colour for all styles</source>
-        <translation>Výběr barvy pozadí pro všechny styly</translation>
+        <translation type="obsolete">Výběr barvy pozadí pro všechny styly</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="276"/>
         <source>All Background Colours</source>
-        <translation>Všechny barvy pozadí</translation>
+        <translation type="obsolete">Všechny barvy pozadí</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="325"/>
@@ -13419,12 +13469,12 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="184"/>
         <source>Select the background colour.</source>
-        <translation>Výběr barvy pozadí.</translation>
+        <translation type="obsolete">Výběr barvy pozadí.</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="187"/>
         <source>Background Colour</source>
-        <translation>Barva pozadí</translation>
+        <translation type="obsolete">Barva pozadí</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="194"/>
@@ -13439,12 +13489,12 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="174"/>
         <source>Select the foreground colour.</source>
-        <translation>Vybrat barvu popředí.</translation>
+        <translation type="obsolete">Vybrat barvu popředí.</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="177"/>
         <source>Foreground Colour</source>
-        <translation>Barva popředí</translation>
+        <translation type="obsolete">Barva popředí</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="293"/>
@@ -13646,6 +13696,36 @@
         <source>Press to set all sub-styles to default values</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="174"/>
+        <source>Select the foreground color.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="177"/>
+        <source>Foreground Color</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="184"/>
+        <source>Select the background color.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="187"/>
+        <source>Background Color</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="273"/>
+        <source>Select the background color for all styles</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="276"/>
+        <source>All Background Colors</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>EditorKeywordsPage</name>
@@ -14437,12 +14517,12 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorSearchPage.ui" line="127"/>
         <source>Marker Colour:</source>
-        <translation>Barva značky:</translation>
+        <translation type="obsolete">Barva značky:</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorSearchPage.ui" line="140"/>
         <source>Select the colour for the search markers.</source>
-        <translation>Vybrat barvu pro značky hledání.</translation>
+        <translation type="obsolete">Vybrat barvu pro značky hledání.</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorSearchPage.ui" line="53"/>
@@ -14514,6 +14594,16 @@
         <source>QScintilla Extended  Mode (C++11)</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorSearchPage.ui" line="127"/>
+        <source>Marker Color:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorSearchPage.ui" line="140"/>
+        <source>Select the color for the search markers.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>EditorSpellCheckingPage</name>
@@ -14555,12 +14645,12 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorSpellCheckingPage.ui" line="221"/>
         <source>Marker Colour:</source>
-        <translation>Barva značky:</translation>
+        <translation type="obsolete">Barva značky:</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorSpellCheckingPage.ui" line="234"/>
         <source>Select the colour for the spelling markers.</source>
-        <translation>Vybraz barvu značek kontroly.</translation>
+        <translation type="obsolete">Vybraz barvu značek kontroly.</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorSpellCheckingPage.ui" line="17"/>
@@ -14590,7 +14680,7 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorSpellCheckingPage.ui" line="215"/>
         <source>Colours</source>
-        <translation>Barvy</translation>
+        <translation type="obsolete">Barvy</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorSpellCheckingPage.ui" line="260"/>
@@ -14678,6 +14768,21 @@
 &lt;p&gt;Enter the file extension of pure text files. The complete contents of files with these extensions will be checked.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorSpellCheckingPage.ui" line="215"/>
+        <source>Colors</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorSpellCheckingPage.ui" line="221"/>
+        <source>Marker Color:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorSpellCheckingPage.ui" line="234"/>
+        <source>Select the color for the spelling markers.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>EditorStylesPage</name>
@@ -14829,27 +14934,27 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="515"/>
         <source>Select to use custom selection colours</source>
-        <translation>Vybrat použití obvyklého výběru barev</translation>
+        <translation type="obsolete">Vybrat použití obvyklého výběru barev</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="518"/>
         <source>&lt;b&gt;Use custom selection colours&lt;/b&gt;&lt;p&gt;Select this entry in order to use custom selection colours in the editor and shell windows. The colours for the selection foreground and background are defined on the colours page.&lt;/p&gt;</source>
-        <translation>&lt;b&gt;Použít obvyklý výběr barev&lt;/b&gt;&lt;p&gt;Vyberte tento přepínač pokud v okně editoru a shellu chcete použít obvyklý typ barev. Barvy popředí a pozadí budou definovány barvami strany.&lt;/p&gt;</translation>
+        <translation type="obsolete">&lt;b&gt;Použít obvyklý výběr barev&lt;/b&gt;&lt;p&gt;Vyberte tento přepínač pokud v okně editoru a shellu chcete použít obvyklý typ barev. Barvy popředí a pozadí budou definovány barvami strany.&lt;/p&gt;</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="521"/>
         <source>Use custom selection colours</source>
-        <translation>Použít obvyklé barvy</translation>
+        <translation type="obsolete">Použít obvyklé barvy</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="528"/>
         <source>Select, if selected text should be colourized by the lexer.</source>
-        <translation>Vybrat, jestliže má být vybraný text obarven lexerem.</translation>
+        <translation type="obsolete">Vybrat, jestliže má být vybraný text obarven lexerem.</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="531"/>
         <source>Colourize selected text</source>
-        <translation>Obarvit vybraný text</translation>
+        <translation type="obsolete">Obarvit vybraný text</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="538"/>
@@ -14869,7 +14974,7 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="565"/>
         <source>Select the foreground colour for the selection.</source>
-        <translation>Vybrat barvu popředí pro výběr.</translation>
+        <translation type="obsolete">Vybrat barvu popředí pro výběr.</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="575"/>
@@ -14879,7 +14984,7 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="588"/>
         <source>Select the background colour for the selection.</source>
-        <translation>Vybrat barvu pozadí pro výběr.</translation>
+        <translation type="obsolete">Vybrat barvu pozadí pro výběr.</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="609"/>
@@ -14904,7 +15009,7 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="648"/>
         <source>Select the colour for the caret.</source>
-        <translation>Výběr barvy karetu.</translation>
+        <translation type="obsolete">Výběr barvy karetu.</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="672"/>
@@ -14914,7 +15019,7 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="761"/>
         <source>Select the background colour for the line containing the caret.</source>
-        <translation>Vybrat barvu pozadí pro řádku obsahující karet.</translation>
+        <translation type="obsolete">Vybrat barvu pozadí pro řádku obsahující karet.</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="808"/>
@@ -14924,7 +15029,7 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="821"/>
         <source>Select the colour for the current line marker.</source>
-        <translation type="unfinished">Vybrat barvu pro značku aktuální řádky.</translation>
+        <translation type="obsolete">Vybrat barvu pro značku aktuální řádky.</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="831"/>
@@ -14934,7 +15039,7 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="844"/>
         <source>Select the colour for the error line marker.</source>
-        <translation type="unfinished">Vybrat barvu pro značku chybné řádky.</translation>
+        <translation type="obsolete">Vybrat barvu pro značku chybné řádky.</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="857"/>
@@ -14959,7 +15064,7 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="886"/>
         <source>Select the colour for highlighting matching braces.</source>
-        <translation>Výběr barvy pro zvýraznění párových závorek.</translation>
+        <translation type="obsolete">Výběr barvy pro zvýraznění párových závorek.</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="896"/>
@@ -14969,7 +15074,7 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="909"/>
         <source>Select the background colour for highlighting matching braces.</source>
-        <translation>Výběr barvy pozadí pro zvýraznění párových závorek.</translation>
+        <translation type="obsolete">Výběr barvy pozadí pro zvýraznění párových závorek.</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="925"/>
@@ -14979,7 +15084,7 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="932"/>
         <source>Select the colour for  highlighting nonmatching braces.</source>
-        <translation>Výběr barvy pro zvýraznění nepárových závorek.</translation>
+        <translation type="obsolete">Výběr barvy pro zvýraznění nepárových závorek.</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="948"/>
@@ -14989,7 +15094,7 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="955"/>
         <source>Select the background colour for  highlighting nonmatching braces.</source>
-        <translation>Vybrat barvu pozadí pro zvýraznění nepárových závorek.</translation>
+        <translation type="obsolete">Vybrat barvu pozadí pro zvýraznění nepárových závorek.</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="968"/>
@@ -15019,12 +15124,12 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1124"/>
         <source>Select the colour for the edge marker.</source>
-        <translation>Vybrat barvu pro značku okraje.</translation>
+        <translation type="obsolete">Vybrat barvu pro značku okraje.</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1134"/>
         <source>Background colour:</source>
-        <translation>Barva pozadí:</translation>
+        <translation type="obsolete">Barva pozadí:</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1147"/>
@@ -15059,7 +15164,7 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1222"/>
         <source>Change Background Colour</source>
-        <translation>Změnit barvu pozadí</translation>
+        <translation type="obsolete">Změnit barvu pozadí</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="2077"/>
@@ -15094,7 +15199,7 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="351"/>
         <source>Select the foreground colour for the margins</source>
-        <translation>Vybrat barvu textu okrajů</translation>
+        <translation type="obsolete">Vybrat barvu textu okrajů</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="361"/>
@@ -15104,7 +15209,7 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="374"/>
         <source>Select the background colour for the margins</source>
-        <translation>Vybrat barvu pozadí okrajů</translation>
+        <translation type="obsolete">Vybrat barvu pozadí okrajů</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="384"/>
@@ -15114,7 +15219,7 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="397"/>
         <source>Select the background colour for the foldmargin</source>
-        <translation>Vybrat barvu pozadí pro okraj se značkami skládání</translation>
+        <translation type="obsolete">Vybrat barvu pozadí pro okraj se značkami skládání</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="792"/>
@@ -15157,21 +15262,11 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="420"/>
-        <source>Select the foreground colour of the foldmarkers</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="430"/>
         <source>Foldmarkers background:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="443"/>
-        <source>Select the background colour of the foldmarkers</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="37"/>
         <source>&lt;b&gt;Note:&lt;/b&gt; Fonts and colors of the syntax highlighters have to be configured on the syntax highlighter styles page.</source>
         <translation type="unfinished"></translation>
@@ -15197,21 +15292,11 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1402"/>
-        <source>Press to select the foreground colour</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1405"/>
         <source>Foreground</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1412"/>
-        <source>Press to select the background colour</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1415"/>
         <source>Background</source>
         <translation type="unfinished"></translation>
@@ -15242,54 +15327,24 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1636"/>
-        <source>Select the foreground colour for visible whitespace</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1646"/>
         <source>Whitespace background:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1659"/>
-        <source>Select the background colour for visible whitespace</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="53"/>
-        <source>Select to set the colour of the edit area different to the default style</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="56"/>
-        <source>Override edit area colours</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="68"/>
         <source>Edit area foreground:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="81"/>
-        <source>Select the foreground colour for the edit area.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="91"/>
         <source>Edit area background:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="104"/>
-        <source>Select the background colour for the edit area.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="47"/>
         <source>Colours</source>
-        <translation type="unfinished">Barvy</translation>
+        <translation type="obsolete">Barvy</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1444"/>
@@ -15322,26 +15377,6 @@
         <translation type="unfinished"> ms</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1514"/>
-        <source>Unsaved changes colour:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1527"/>
-        <source>Select the colour for the change marker for unsaved changes.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1537"/>
-        <source>Saved changes colour:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1550"/>
-        <source>Select the colour for the change marker for saved changes.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1003"/>
         <source>Select the wrap mode for long lines</source>
         <translation type="unfinished"></translation>
@@ -15417,91 +15452,46 @@
         <translation type="unfinished">Chyby:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1782"/>
-        <source>Select the colour for error markers</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1792"/>
         <source>Warnings:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1805"/>
-        <source>Select the colour for warning markers</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1815"/>
         <source>Bookmarks:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1828"/>
-        <source>Select the colour for bookmark markers</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1838"/>
         <source>Breakpoints:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1851"/>
-        <source>Select the colour for breakpoint markers</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1861"/>
         <source>Tasks:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1874"/>
-        <source>Select the colour for task markers</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1884"/>
         <source>Changes:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1897"/>
-        <source>Select the colour for change markers</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1907"/>
         <source>Coverage:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1920"/>
-        <source>Select the colour for coverage markers</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1930"/>
         <source>Current Line:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1943"/>
-        <source>Select the colour for the current line marker</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1999"/>
         <source>Background:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="2012"/>
-        <source>Select the background colour for the marker map</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1674"/>
         <source>Indentation Guides</source>
         <translation type="unfinished"></translation>
@@ -15522,31 +15512,16 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1705"/>
-        <source>Select the foreground colour for indentation guides</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1715"/>
         <source>Indentation Guides background:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1728"/>
-        <source>Select the background colour for indentation guides</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1953"/>
         <source>Search Markers:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1966"/>
-        <source>Select the colour for the search marker</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="2093"/>
         <source>Select to hide the Format Buttons bar when formatting is not supported</source>
         <translation type="unfinished"></translation>
@@ -15557,26 +15532,11 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="798"/>
-        <source>Select to indicate the debug markers using coloured line backgrounds, arrow indicators otherwise</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="801"/>
-        <source>Use background colours</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1976"/>
         <source>Conflict Marker Line:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1989"/>
-        <source>Select the colour for the conflict marker line marker</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1749"/>
         <source>Select to show the marker map right of the editor</source>
         <translation type="unfinished"></translation>
@@ -15723,8 +15683,263 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="47"/>
+        <source>Colors</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="53"/>
+        <source>Select to set the color of the edit area different to the default style</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="56"/>
+        <source>Override edit area colors</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="81"/>
+        <source>Select the foreground color for the edit area.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="104"/>
+        <source>Select the background color for the edit area.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="648"/>
+        <source>Select the color for the caret.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="351"/>
+        <source>Select the foreground color for the margins</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="374"/>
+        <source>Select the background color for the margins</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="397"/>
+        <source>Select the background color for the foldmargin</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="420"/>
+        <source>Select the foreground color of the foldmarkers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="443"/>
+        <source>Select the background color of the foldmarkers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="515"/>
+        <source>Select to use custom selection colors</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="518"/>
+        <source>&lt;b&gt;Use custom selection colors&lt;/b&gt;&lt;p&gt;Select this entry in order to use custom selection colors in the editor and shell windows. The colors for the selection foreground and background are defined on the colors page.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="521"/>
+        <source>Use custom selection colors</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="528"/>
+        <source>Select, if selected text should be colorized by the lexer.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="531"/>
+        <source>Colorize selected text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="565"/>
+        <source>Select the foreground color for the selection.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="588"/>
+        <source>Select the background color for the selection.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="761"/>
+        <source>Select the background color for the line containing the caret.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="798"/>
+        <source>Select to indicate the debug markers using colored line backgrounds, arrow indicators otherwise</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="801"/>
+        <source>Use background colors</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="821"/>
+        <source>Select the color for the current line marker.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="844"/>
+        <source>Select the color for the error line marker.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="886"/>
+        <source>Select the color for highlighting matching braces.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="909"/>
+        <source>Select the background color for highlighting matching braces.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="932"/>
+        <source>Select the color for  highlighting nonmatching braces.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="955"/>
+        <source>Select the background color for  highlighting nonmatching braces.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1124"/>
+        <source>Select the color for the edge marker.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1134"/>
+        <source>Background color:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1222"/>
+        <source>Change Background Color</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1402"/>
+        <source>Press to select the foreground color</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1412"/>
+        <source>Press to select the background color</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1514"/>
+        <source>Unsaved changes color:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1527"/>
+        <source>Select the color for the change marker for unsaved changes.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1537"/>
+        <source>Saved changes color:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1550"/>
+        <source>Select the color for the change marker for saved changes.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1636"/>
+        <source>Select the foreground color for visible whitespace</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1659"/>
+        <source>Select the background color for visible whitespace</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1705"/>
+        <source>Select the foreground color for indentation guides</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1728"/>
+        <source>Select the background color for indentation guides</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1763"/>
-        <source>Marker Colours</source>
+        <source>Marker Colors</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1782"/>
+        <source>Select the color for error markers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1805"/>
+        <source>Select the color for warning markers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1828"/>
+        <source>Select the color for bookmark markers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1851"/>
+        <source>Select the color for breakpoint markers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1874"/>
+        <source>Select the color for task markers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1897"/>
+        <source>Select the color for change markers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1920"/>
+        <source>Select the color for coverage markers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1943"/>
+        <source>Select the color for the current line marker</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1966"/>
+        <source>Select the color for the search marker</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1989"/>
+        <source>Select the color for the conflict marker line marker</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="2012"/>
+        <source>Select the background color for the marker map</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -16861,17 +17076,17 @@
     <message>
         <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="252"/>
         <source>Enter the filename of a CSS style sheet. Leave empty to use the colours defined below.</source>
-        <translation>Zadejte jméno souboru s CSS styly. Ponechte prázdné pro použití barev definovaných níže.</translation>
+        <translation type="obsolete">Zadejte jméno souboru s CSS styly. Ponechte prázdné pro použití barev definovaných níže.</translation>
     </message>
     <message>
         <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="262"/>
         <source>Colours</source>
-        <translation>Barvy</translation>
+        <translation type="obsolete">Barvy</translation>
     </message>
     <message>
         <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="268"/>
         <source>Press to select the class and function header background colour.</source>
-        <translation>Stisknout pro výběr barvy pozadí pro třídu a hlavičku funkce.</translation>
+        <translation type="obsolete">Stisknout pro výběr barvy pozadí pro třídu a hlavičku funkce.</translation>
     </message>
     <message>
         <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="271"/>
@@ -16881,7 +17096,7 @@
     <message>
         <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="278"/>
         <source>Press to select the class and function header foreground colour.</source>
-        <translation>Stisknout pro výběr barvy textu pro třídu a hlavičku funkce.</translation>
+        <translation type="obsolete">Stisknout pro výběr barvy textu pro třídu a hlavičku funkce.</translation>
     </message>
     <message>
         <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="281"/>
@@ -16891,7 +17106,7 @@
     <message>
         <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="288"/>
         <source>Press to select the level 2 header background colour.</source>
-        <translation>Stisknout pro výběr barvy pozadí hlavičky druhé úrovně.</translation>
+        <translation type="obsolete">Stisknout pro výběr barvy pozadí hlavičky druhé úrovně.</translation>
     </message>
     <message>
         <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="291"/>
@@ -16901,7 +17116,7 @@
     <message>
         <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="298"/>
         <source>Press to select the level 2 header foreground colour.</source>
-        <translation>Stisknout pro výběr barvy textu hlavičky druhé úrovně.</translation>
+        <translation type="obsolete">Stisknout pro výběr barvy textu hlavičky druhé úrovně.</translation>
     </message>
     <message>
         <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="301"/>
@@ -16911,7 +17126,7 @@
     <message>
         <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="308"/>
         <source>Press to select the level 1 header background colour.</source>
-        <translation>Stisknout pro výběr barvy pozadí hlavičky první úrovně.</translation>
+        <translation type="obsolete">Stisknout pro výběr barvy pozadí hlavičky první úrovně.</translation>
     </message>
     <message>
         <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="311"/>
@@ -16921,7 +17136,7 @@
     <message>
         <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="318"/>
         <source>Press to select the level 1 header foreground colour.</source>
-        <translation>Stisknout pro výběr barvy textu hlavičky první úrovně.</translation>
+        <translation type="obsolete">Stisknout pro výběr barvy textu hlavičky první úrovně.</translation>
     </message>
     <message>
         <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="321"/>
@@ -16931,7 +17146,7 @@
     <message>
         <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="328"/>
         <source>Press to select the body background colour.</source>
-        <translation>Stisknout pro výběr barvy pozadí těla.</translation>
+        <translation type="obsolete">Stisknout pro výběr barvy pozadí těla.</translation>
     </message>
     <message>
         <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="331"/>
@@ -16941,7 +17156,7 @@
     <message>
         <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="338"/>
         <source>Press to select the body foreground colour.</source>
-        <translation>Stisknout pro výběr barvy textu těla.</translation>
+        <translation type="obsolete">Stisknout pro výběr barvy textu těla.</translation>
     </message>
     <message>
         <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="341"/>
@@ -16951,7 +17166,7 @@
     <message>
         <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="348"/>
         <source>Press to select the foreground colour of links.</source>
-        <translation>Stisknout pro výběr barvy linek.</translation>
+        <translation type="obsolete">Stisknout pro výběr barvy linek.</translation>
     </message>
     <message>
         <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="351"/>
@@ -16961,7 +17176,7 @@
     <message>
         <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="358"/>
         <source>This shows an example of the selected colours.</source>
-        <translation>Zde se zobrazuje příklad vybraných barev.</translation>
+        <translation type="obsolete">Zde se zobrazuje příklad vybraných barev.</translation>
     </message>
     <message>
         <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py" line="53"/>
@@ -17058,6 +17273,66 @@
         <source>&lt;?xml version=&quot;1.0&quot; encoding=&quot;utf-8&quot;?&gt;&lt;!DOCTYPE html PUBLIC &quot;-//W3C//DTD XHTML 1.0 Strict//EN&quot;&quot;http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd&quot;&gt;&lt;html&gt;&lt;head&gt;&lt;title&gt;&lt;/title&gt;&lt;/head&gt;&lt;body style=&quot;background-color:{BodyBgColor};color:{BodyColor}&quot;&gt;&lt;h1 style=&quot;background-color:{Level1HeaderBgColor};color:{Level1HeaderColor}&quot;&gt;Level 1 Header&lt;/h1&gt;&lt;h3 style=&quot;background-color:{Level2HeaderBgColor};color:{Level2HeaderColor}&quot;&gt;Level 2 Header&lt;/h3&gt;&lt;h2 style=&quot;background-color:{CFBgColor};color:{CFColor}&quot;&gt;Class and Function Header&lt;/h2&gt;Standard body text with &lt;a style=&quot;color:{LinkColor}&quot;&gt;some links&lt;/a&gt; embedded.&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="252"/>
+        <source>Enter the filename of a CSS style sheet. Leave empty to use the colors defined below.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="262"/>
+        <source>Colors</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="268"/>
+        <source>Press to select the class and function header background color.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="278"/>
+        <source>Press to select the class and function header foreground color.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="288"/>
+        <source>Press to select the level 2 header background color.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="298"/>
+        <source>Press to select the level 2 header foreground color.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="308"/>
+        <source>Press to select the level 1 header background color.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="318"/>
+        <source>Press to select the level 1 header foreground color.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="328"/>
+        <source>Press to select the body background color.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="338"/>
+        <source>Press to select the body foreground color.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="348"/>
+        <source>Press to select the foreground color of links.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="358"/>
+        <source>This shows an example of the selected colors.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>EricdocExecDialog</name>
@@ -17537,7 +17812,7 @@
 <context>
     <name>ExporterHTML</name>
     <message>
-        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="516"/>
+        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="537"/>
         <source>Export source</source>
         <translation>Zdroj exportu</translation>
     </message>
@@ -17547,25 +17822,45 @@
         <translation>HTML soubory (*.html)</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="448"/>
+        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="466"/>
         <source>&lt;p&gt;The source could not be exported to &lt;b&gt;{0}&lt;/b&gt;.&lt;/p&gt;&lt;p&gt;Reason: {1}&lt;/p&gt;</source>
         <translation>&lt;p&gt;Zdroj nemohl být do &lt;b&gt;{0}&lt;/b&gt; exportován.&lt;/p&gt;&lt;p&gt;Důvod: {1}&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="457"/>
+        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="475"/>
         <source>&lt;p&gt;The source could not be exported to &lt;b&gt;{0}&lt;/b&gt;.&lt;/p&gt;&lt;p&gt;Reason: No HTML code generated.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="516"/>
+        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="537"/>
         <source>&lt;p&gt;Markdown export requires the &lt;b&gt;python-markdown&lt;/b&gt; package.&lt;br/&gt;Install it with your package manager, &apos;pip install docutils&apos; or see &lt;a href=&quot;http://pythonhosted.org/Markdown/install.html&quot;&gt; installation instructions.&lt;/a&gt;&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="484"/>
+        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="502"/>
         <source>&lt;p&gt;ReStructuredText export requires the &lt;b&gt;python-docutils&lt;/b&gt; package.&lt;br/&gt;Install it with your package manager, &apos;pip install docutils&apos; or see &lt;a href=&quot;http://pypi.python.org/pypi/docutils&quot;&gt;this page.&lt;/a&gt;&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="412"/>
+        <source>Light Background Color</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="413"/>
+        <source>Dark Background Color</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="416"/>
+        <source>Markdown Export</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="416"/>
+        <source>Select color scheme:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ExporterODT</name>
@@ -21251,12 +21546,12 @@
         <translation type="unfinished">Graf</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="101"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="106"/>
         <source>Commit ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="102"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="107"/>
         <source>Author</source>
         <translation type="unfinished">Autor</translation>
     </message>
@@ -21266,7 +21561,7 @@
         <translation type="unfinished">Datum</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="103"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="108"/>
         <source>Committer</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21276,7 +21571,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="104"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="109"/>
         <source>Subject</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21351,7 +21646,7 @@
         <translation type="unfinished">Kopírovat z</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2098"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2100"/>
         <source>Differences</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21411,328 +21706,328 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="88"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="93"/>
         <source>&amp;Refresh</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="90"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="95"/>
         <source>Press to refresh the list of commits</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="98"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="103"/>
         <source>Find</source>
         <translation type="unfinished">Hledat</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="99"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="104"/>
         <source>Filter</source>
         <translation type="unfinished">Filtr</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="105"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="110"/>
         <source>File</source>
         <translation type="unfinished">Soubor</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="122"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="128"/>
         <source>&lt;table&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Commit ID&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Date&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{1}&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Author&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{2} &amp;lt;{3}&amp;gt;&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Commit Date&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{4}&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Committer&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{5} &amp;lt;{6}&amp;gt;&lt;/td&gt;&lt;/tr&gt;{7}&lt;tr&gt;&lt;td&gt;&lt;b&gt;Subject&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{8}&lt;/td&gt;&lt;/tr&gt;{9}&lt;/table&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="134"/>
-        <source>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Parents&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</source>
-        <translation type="unfinished">&lt;tr&gt;&lt;td&gt;&lt;b&gt;Rodiče&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</translation>
-    </message>
-    <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="137"/>
-        <source>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Children&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="140"/>
-        <source>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Branches&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</source>
-        <translation type="unfinished">&lt;tr&gt;&lt;td&gt;&lt;b&gt;Větve&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</translation>
+        <source>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Parents&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</source>
+        <translation type="unfinished">&lt;tr&gt;&lt;td&gt;&lt;b&gt;Rodiče&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</translation>
     </message>
     <message>
         <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="143"/>
-        <source>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Tags&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</source>
-        <translation type="unfinished">&lt;tr&gt;&lt;td&gt;&lt;b&gt;Tagy&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</translation>
+        <source>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Children&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="146"/>
+        <source>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Branches&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</source>
+        <translation type="unfinished">&lt;tr&gt;&lt;td&gt;&lt;b&gt;Větve&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</translation>
+    </message>
+    <message>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="149"/>
+        <source>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Tags&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</source>
+        <translation type="unfinished">&lt;tr&gt;&lt;td&gt;&lt;b&gt;Tagy&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</translation>
+    </message>
+    <message>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="152"/>
         <source>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Message&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="197"/>
-        <source>Added</source>
-        <translation type="unfinished">Přidáno</translation>
-    </message>
-    <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="198"/>
-        <source>Deleted</source>
-        <translation type="unfinished">Smazáno</translation>
-    </message>
-    <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="199"/>
-        <source>Modified</source>
-        <translation type="unfinished">Změněno</translation>
-    </message>
-    <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="200"/>
-        <source>Copied</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="201"/>
-        <source>Renamed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="202"/>
-        <source>Type changed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="203"/>
-        <source>Unmerged</source>
-        <translation type="unfinished"></translation>
+        <source>Added</source>
+        <translation type="unfinished">Přidáno</translation>
     </message>
     <message>
         <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="204"/>
+        <source>Deleted</source>
+        <translation type="unfinished">Smazáno</translation>
+    </message>
+    <message>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="205"/>
+        <source>Modified</source>
+        <translation type="unfinished">Změněno</translation>
+    </message>
+    <message>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="206"/>
+        <source>Copied</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="207"/>
+        <source>Renamed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="208"/>
+        <source>Type changed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="209"/>
+        <source>Unmerged</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="210"/>
         <source>Unknown</source>
         <translation type="unfinished">Neznámý</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="240"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="246"/>
         <source>Show Commit ID Column</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="242"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="248"/>
         <source>Press to show the commit ID column</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="250"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="256"/>
         <source>Show Author Columns</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="252"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="258"/>
         <source>Press to show the author columns</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="260"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="266"/>
         <source>Show Committer Columns</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="262"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="268"/>
         <source>Press to show the committer columns</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="270"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="276"/>
         <source>Show Branches Column</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="272"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="278"/>
         <source>Press to show the branches column</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="280"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="286"/>
         <source>Show Tags Column</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="282"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="288"/>
         <source>Press to show the Tags column</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="309"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="315"/>
         <source>Copy Commits</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="311"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="317"/>
         <source>Cherry-pick the selected commits to the current branch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="316"/>
-        <source>Tag</source>
-        <translation type="unfinished">Tag</translation>
-    </message>
-    <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="318"/>
-        <source>Tag the selected commit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1792"/>
-        <source>Branch</source>
-        <translation type="unfinished">Větev</translation>
-    </message>
-    <message>
         <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="322"/>
-        <source>Create a new branch at the selected commit.</source>
-        <translation type="unfinished"></translation>
+        <source>Tag</source>
+        <translation type="unfinished">Tag</translation>
     </message>
     <message>
         <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="324"/>
+        <source>Tag the selected commit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1794"/>
+        <source>Branch</source>
+        <translation type="unfinished">Větev</translation>
+    </message>
+    <message>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="328"/>
+        <source>Create a new branch at the selected commit.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="330"/>
         <source>Branch &amp;&amp; Switch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="326"/>
-        <source>Create a new branch at the selected commit and switch the work tree to it.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1844"/>
-        <source>Switch</source>
-        <translation type="unfinished">Přepnout</translation>
-    </message>
-    <message>
         <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="332"/>
-        <source>Switch the working directory to the selected commit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1870"/>
-        <source>Show Short Log</source>
-        <translation type="unfinished"></translation>
+        <source>Create a new branch at the selected commit and switch the work tree to it.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1846"/>
+        <source>Switch</source>
+        <translation type="unfinished">Přepnout</translation>
     </message>
     <message>
         <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="338"/>
+        <source>Switch the working directory to the selected commit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1872"/>
+        <source>Show Short Log</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="344"/>
         <source>Show a dialog with a log output for release notes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="341"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="347"/>
         <source>Describe</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="343"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="349"/>
         <source>Show the most recent tag reachable from a commit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="632"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="634"/>
         <source>The git process did not finish within 30s.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="635"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="637"/>
         <source>Could not start the git executable.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="638"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="640"/>
         <source>Git Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="754"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="756"/>
         <source>{0} ({1}%)</source>
         <comment>action, confidence</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="820"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="822"/>
         <source>Process Generation Error</source>
         <translation type="unfinished">Chyba v procesu generování</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="820"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="822"/>
         <source>The process {0} could not be started. Ensure, that it is in the search path.</source>
         <translation type="unfinished">Proces {0} nelze spustit. Ověřte, že je umístěn v požadované cestě.</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1265"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1267"/>
         <source>Side-by-Side Diff to Parent {0}</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1277"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1279"/>
         <source>&lt;a href=&quot;sbsdiff:{0}_{1}&quot;&gt;Side-by-Side Compare&lt;/a&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1706"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1708"/>
         <source>Copy Changesets</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1844"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1846"/>
         <source>The project should be reread. Do this now?</source>
         <translation type="unfinished">Projekt bude znovu načten. Má se provést?</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1870"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1872"/>
         <source>Select a branch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1823"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1825"/>
         <source>Select a default branch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1823"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1825"/>
         <source>Branch &amp; Switch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2052"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2054"/>
         <source>Find Commit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2052"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2054"/>
         <source>&apos;{0}&apos; was not found.</source>
         <translation type="unfinished">&apos;{0}&apos; nebyl nalezen.</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2112"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2114"/>
         <source>Differences to Parent {0}</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2127"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2129"/>
         <source>Diff to Parent {0}</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2153"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2155"/>
         <source>There is no difference.</source>
         <translation type="unfinished">Žádné rozdíly nebyly nalezeny.</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2316"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2318"/>
         <source>Save Diff</source>
         <translation type="unfinished">Uložit Diff</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2282"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2284"/>
         <source>Patch Files (*.diff)</source>
         <translation type="unfinished">Patch soubory (*.diff)</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2299"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2301"/>
         <source>&lt;p&gt;The patch file &lt;b&gt;{0}&lt;/b&gt; already exists. Overwrite it?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2316"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2318"/>
         <source>&lt;p&gt;The patch file &lt;b&gt;{0}&lt;/b&gt; could not be saved.&lt;br&gt;Reason: {1}&lt;/p&gt;</source>
         <translation type="unfinished">&lt;p&gt;Patch soubor &lt;b&gt;{0}&lt;/b&gt; nelze uložit.&lt;br /&gt;Důvod: {1}&lt;/p&gt;</translation>
     </message>
@@ -26173,20 +26468,60 @@
 <context>
     <name>GraphicsPage</name>
     <message>
-        <location filename="../Preferences/ConfigurationPages/GraphicsPage.ui" line="16"/>
+        <location filename="../Preferences/ConfigurationPages/GraphicsPage.ui" line="17"/>
         <source>&lt;b&gt;Configure graphics settings&lt;/b&gt;</source>
         <translation>&lt;b&gt;Konfigurace grafických nastavení&lt;/b&gt;</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/GraphicsPage.ui" line="38"/>
+        <location filename="../Preferences/ConfigurationPages/GraphicsPage.ui" line="43"/>
         <source>Press to select the font for the graphic items</source>
         <translation>Stisknout pro výběr fontu pro grafické prvky</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/GraphicsPage.ui" line="51"/>
+        <location filename="../Preferences/ConfigurationPages/GraphicsPage.ui" line="56"/>
         <source>Graphics Font</source>
         <translation>Font pro grafiku</translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/GraphicsPage.ui" line="37"/>
+        <source>Font</source>
+        <translation type="unfinished">Font</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/GraphicsPage.ui" line="72"/>
+        <source>Drawing Mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/GraphicsPage.ui" line="78"/>
+        <source>Select to determine the drawing mode automatically</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/GraphicsPage.ui" line="81"/>
+        <source>Automatic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/GraphicsPage.ui" line="91"/>
+        <source>Select to draw black shapes on a white background</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/GraphicsPage.ui" line="94"/>
+        <source>Black On White</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/GraphicsPage.ui" line="101"/>
+        <source>Select to draw white shapes on a black background</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/GraphicsPage.ui" line="104"/>
+        <source>White On Black</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>GreaseMonkeyAddScriptDialog</name>
@@ -29879,21 +30214,11 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/HexEditorPage.ui" line="142"/>
-        <source>Select the foreground colour of the address area</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/HexEditorPage.ui" line="291"/>
         <source>Background:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/HexEditorPage.ui" line="165"/>
-        <source>Select the background colour of the address area</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/HexEditorPage.ui" line="178"/>
         <source>ASCII Area</source>
         <translation type="unfinished"></translation>
@@ -29924,31 +30249,11 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/HexEditorPage.ui" line="226"/>
-        <source>Select the foreground colour for highlighted data</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/HexEditorPage.ui" line="249"/>
-        <source>Select the background colour for highlighted data</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/HexEditorPage.ui" line="262"/>
         <source>Selection</source>
         <translation type="unfinished">Výběr</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/HexEditorPage.ui" line="281"/>
-        <source>Select the foreground colour of the selection</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/HexEditorPage.ui" line="304"/>
-        <source>Select the background colour of the selection</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/HexEditorPage.ui" line="317"/>
         <source>Font</source>
         <translation type="unfinished">Font</translation>
@@ -29978,6 +30283,36 @@
         <source>Enter the number of recent files to remember</source>
         <translation type="unfinished">Zadejte počet nedávných souborů k zapamatování</translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/HexEditorPage.ui" line="142"/>
+        <source>Select the foreground color of the address area</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/HexEditorPage.ui" line="165"/>
+        <source>Select the background color of the address area</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/HexEditorPage.ui" line="226"/>
+        <source>Select the foreground color for highlighted data</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/HexEditorPage.ui" line="249"/>
+        <source>Select the background color for highlighted data</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/HexEditorPage.ui" line="281"/>
+        <source>Select the foreground color of the selection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/HexEditorPage.ui" line="304"/>
+        <source>Select the background color of the selection</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Hg</name>
@@ -32694,7 +33029,7 @@
 <context>
     <name>HgLogBrowserDialog</name>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="92"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="98"/>
         <source>Mercurial Log</source>
         <translation></translation>
     </message>
@@ -32724,17 +33059,17 @@
         <translation>Vybrat pole pro filtrování</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="122"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="128"/>
         <source>Revision</source>
         <translation>Revize</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="123"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="129"/>
         <source>Author</source>
         <translation>Autor</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="124"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="130"/>
         <source>Message</source>
         <translation>Zpráva</translation>
     </message>
@@ -32834,17 +33169,17 @@
         <translation type="obsolete">Mód vstu&amp;pu hesla</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="200"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="206"/>
         <source>Added</source>
         <translation>Přidáno</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="201"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="207"/>
         <source>Deleted</source>
         <translation>Smazáno</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="202"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="208"/>
         <source>Modified</source>
         <translation>Změněno</translation>
     </message>
@@ -32869,7 +33204,7 @@
         <translation type="obsolete">Nelze spustit hg program.</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="840"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="845"/>
         <source>Mercurial Error</source>
         <translation>Mercurial chyba</translation>
     </message>
@@ -32889,63 +33224,63 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="182"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="188"/>
         <source>All</source>
         <translation type="unfinished">Vše</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="94"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="100"/>
         <source>Mercurial Log (Incoming)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="96"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="102"/>
         <source>Mercurial Log (Outgoing)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="217"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="223"/>
         <source>Bookmarks</source>
         <translation type="unfinished">Záložky</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="111"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="117"/>
         <source>Press to refresh the list of changesets</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="109"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="115"/>
         <source>&amp;Refresh</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="126"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="132"/>
         <source>Phase</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="268"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="275"/>
         <source>Change the phase of the selected revisions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="270"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="277"/>
         <source>&lt;b&gt;Change Phase&lt;/b&gt;
 &lt;p&gt;This changes the phase of the selected revisions. The selected revisions have to have the same current phase.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="266"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="273"/>
         <source>Change Phase</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2000"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2005"/>
         <source>Copy Changesets</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2343"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2348"/>
         <source>The project should be reread. Do this now?</source>
         <translation type="unfinished">Projekt bude znovu načten. Má se provést?</translation>
     </message>
@@ -32955,42 +33290,42 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="257"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="264"/>
         <source>Copy the selected changesets to the current branch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="275"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="282"/>
         <source>Tag</source>
         <translation type="unfinished">Tag</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="278"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="285"/>
         <source>Tag the selected revision</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2072"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2077"/>
         <source>Switch</source>
         <translation type="unfinished">Přepnout</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="288"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="295"/>
         <source>Switch the working directory to the selected revision</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="311"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="318"/>
         <source>Pull Large Files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="313"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="320"/>
         <source>Pull large files for selected revisions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1130"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1135"/>
         <source>{0} (large file)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -33015,147 +33350,147 @@
         <translation type="unfinished">Stisknout pro vyhledání následujícího výskytu</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="119"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="125"/>
         <source>Find</source>
         <translation type="unfinished">Hledat</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="120"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="126"/>
         <source>Filter</source>
         <translation type="unfinished">Filtr</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="164"/>
-        <source>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Tags&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</source>
-        <translation type="unfinished">&lt;tr&gt;&lt;td&gt;&lt;b&gt;Tagy&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</translation>
-    </message>
-    <message>
         <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="170"/>
+        <source>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Tags&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</source>
+        <translation type="unfinished">&lt;tr&gt;&lt;td&gt;&lt;b&gt;Tagy&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</translation>
+    </message>
+    <message>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="176"/>
         <source>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Bookmarks&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2485"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2490"/>
         <source>Find Commit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2485"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2490"/>
         <source>&apos;{0}&apos; was not found.</source>
         <translation type="unfinished">&apos;{0}&apos; nebyl nalezen.</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="125"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="131"/>
         <source>File</source>
         <translation type="unfinished">Soubor</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="206"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="212"/>
         <source>Draft</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="207"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="213"/>
         <source>Public</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="208"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="214"/>
         <source>Secret</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2205"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2210"/>
         <source>Pull Changes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="309"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="316"/>
         <source>Pull changes from a remote repository</source>
         <translation type="unfinished">Stáhnout změny (pull) ze vzdáleného repozitáře</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="322"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="329"/>
         <source>Push Selected Changes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="325"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="332"/>
         <source>Push changes of the selected changeset and its ancestors to a remote repository</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="328"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="335"/>
         <source>Push All Changes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="331"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="338"/>
         <source>Push all changes to a remote repository</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2170"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2175"/>
         <source>Fetch Changes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2251"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2256"/>
         <source>Strip Changesets</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="317"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="324"/>
         <source>Fetch changes from a remote repository</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="374"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="381"/>
         <source>Strip changesets from a repository</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="293"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="300"/>
         <source>Define Bookmark...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="296"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="303"/>
         <source>Bookmark the selected revision</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="298"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="305"/>
         <source>Move Bookmark...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="301"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="308"/>
         <source>Move bookmark to the selected revision</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2095"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2100"/>
         <source>Define Bookmark</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2095"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2100"/>
         <source>Enter bookmark name for changeset &quot;{0}&quot;:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2119"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2124"/>
         <source>Move Bookmark</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2119"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2124"/>
         <source>Select the bookmark to be moved  to changeset &quot;{0}&quot;:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2058"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2063"/>
         <source>Select bookmark to switch to (leave empty to use revision):</source>
         <translation type="unfinished"></translation>
     </message>
@@ -33170,148 +33505,148 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="167"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="173"/>
         <source>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Latest Tag&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="148"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="154"/>
         <source>&lt;table&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Revision&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Date&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{1}&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Author&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{2}&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Branch&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{3}&lt;/td&gt;&lt;/tr&gt;{4}&lt;tr&gt;&lt;td&gt;&lt;b&gt;Message&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{5}&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="158"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="164"/>
         <source>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Parents&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</source>
         <translation type="unfinished">&lt;tr&gt;&lt;td&gt;&lt;b&gt;Rodiče&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="161"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="167"/>
         <source>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Children&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="260"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="267"/>
         <source>Merge with Changeset</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="263"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="270"/>
         <source>Merge the working directory with the selected changeset</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="336"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="343"/>
         <source>Create Changegroup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="339"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="346"/>
         <source>Create a changegroup file containing the selected changesets</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="341"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="348"/>
         <source>&lt;b&gt;Create Changegroup&lt;/b&gt;
 &lt;p&gt;This creates a changegroup file containing the selected revisions. If no revisions are selected, all changesets will be bundled. If one revision is selected, it will be interpreted as the base revision. Otherwise the lowest revision will be used as the base revision and all other revision will be bundled. If the dialog is showing outgoing changesets, all selected changesets will be bundled.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2343"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2348"/>
         <source>Apply Changegroup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="353"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="360"/>
         <source>Apply the currently viewed changegroup file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="358"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="365"/>
         <source>Sign Revisions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="361"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="368"/>
         <source>Add a signature for the selected revisions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="363"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="370"/>
         <source>Verify Signatures</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="366"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="373"/>
         <source>Verify all signatures there may be for the selected revision</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="379"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="386"/>
         <source>Select All Entries</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="381"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="388"/>
         <source>Deselect All Entries</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1369"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1374"/>
         <source>Side-by-Side Diff to Parent {0}</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1380"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1385"/>
         <source>&lt;a href=&quot;sbsdiff:{0}_{1}&quot;&gt;Side-by-Side Compare&lt;/a&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1521"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1526"/>
         <source>Pull Selected Changes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1522"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1527"/>
         <source>Fetch Selected Changes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2529"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2534"/>
         <source>Differences</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2539"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2544"/>
         <source>Differences to Parent {0}</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2555"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2560"/>
         <source>Diff to Parent {0}{1}</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2580"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2585"/>
         <source>There is no difference.</source>
         <translation type="unfinished">Žádné rozdíly nebyly nalezeny.</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2723"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2728"/>
         <source>Save Diff</source>
         <translation type="unfinished">Uložit Diff</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2690"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2695"/>
         <source>Patch Files (*.diff)</source>
         <translation type="unfinished">Patch soubory (*.diff)</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2707"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2712"/>
         <source>&lt;p&gt;The patch file &lt;b&gt;{0}&lt;/b&gt; already exists. Overwrite it?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2723"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2728"/>
         <source>&lt;p&gt;The patch file &lt;b&gt;{0}&lt;/b&gt; could not be saved.&lt;br&gt;Reason: {1}&lt;/p&gt;</source>
         <translation type="unfinished">&lt;p&gt;Patch soubor &lt;b&gt;{0}&lt;/b&gt; nelze uložit.&lt;br /&gt;Důvod: {1}&lt;/p&gt;</translation>
     </message>
@@ -33321,22 +33656,22 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2528"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2533"/>
         <source>Generating differences ...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="98"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="104"/>
         <source>Mercurial Full Log</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="280"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="287"/>
         <source>Close Heads</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="283"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="290"/>
         <source>Close the selected heads</source>
         <translation type="unfinished"></translation>
     </message>
@@ -33750,12 +34085,12 @@
         <translation>Vybrat všechny adresáře ve správě verzí</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="833"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="835"/>
         <source>Remove from repository only</source>
         <translation>Odebrat jen z repozitáře</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="833"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="835"/>
         <source>Do you really want to remove these files from the repository?</source>
         <translation>Opravdu chcete odebrat tyto soubory z repozitáře?</translation>
     </message>
@@ -36351,52 +36686,52 @@
 <context>
     <name>HgServeDialog</name>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py" line="47"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py" line="50"/>
         <source>Mercurial Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py" line="49"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py" line="57"/>
         <source>Start Server</source>
         <translation type="unfinished">Spustit server</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py" line="55"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py" line="63"/>
         <source>Stop Server</source>
         <translation type="unfinished">Zastavit server</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py" line="61"/>
-        <source>Start Browser</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py" line="69"/>
+        <source>Start Browser</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py" line="77"/>
         <source>Enter the server port</source>
         <translation type="unfinished">Zadejte port serveru</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py" line="75"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py" line="83"/>
         <source>Select the style to use</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py" line="79"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py" line="87"/>
         <source>Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py" line="86"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py" line="94"/>
         <source>Browser</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py" line="140"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py" line="148"/>
         <source>Process Generation Error</source>
         <translation type="unfinished">Chyba v procesu generování</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py" line="140"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py" line="148"/>
         <source>The process {0} could not be started. Ensure, that it is in the search path.</source>
         <translation type="unfinished">Proces {0} nelze spustit. Ověřte, že je umístěn v požadované cestě.</translation>
     </message>
@@ -39827,53 +40162,138 @@
         <translation>&lt;font color=&quot;#FF0000&quot;&gt;&lt;b&gt;Poznámka:&lt;/b&gt; Tato nastavení budou aktivována až po novém spuštění aplikace.&lt;/font&gt;</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="118"/>
+        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="220"/>
         <source>Delete</source>
         <translation>Odebrat</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="128"/>
+        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="230"/>
         <source>Press to add the entered directory to the list</source>
         <translation>Stisknout pro přidání adresáře do seznamu</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="131"/>
+        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="233"/>
         <source>Add</source>
         <translation>Přidat</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="156"/>
+        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="258"/>
         <source>Show</source>
         <translation>Zobrazit</translation>
     </message>
     <message>
+        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="177"/>
+        <source>Up</source>
+        <translation>Nahoru</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="187"/>
+        <source>Down</source>
+        <translation>Dolů</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="146"/>
+        <source>List of icon directories</source>
+        <translation>Seznam adresářů s ikonami</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="217"/>
+        <source>Press to delete the selected directory from the list</source>
+        <translation>Stisknout pro odebrání vybraného adresáře ze seznamu</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="44"/>
+        <source>Default Icons</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="52"/>
+        <source>Select to select between Breeze (dark) and Breeze (light) based on the window lightness</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="55"/>
+        <source>Automatic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="65"/>
+        <source>Select to use the Breeze vector icons for light window background</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="68"/>
+        <source>Breeze (light)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="75"/>
-        <source>Up</source>
-        <translation>Nahoru</translation>
+        <source>Select to use the Breeze vector icons for dark window background</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="78"/>
+        <source>Breeze (dark)</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="85"/>
-        <source>Down</source>
-        <translation>Dolů</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="44"/>
-        <source>List of icon directories</source>
-        <translation>Seznam adresářů s ikonami</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="115"/>
-        <source>Press to delete the selected directory from the list</source>
-        <translation>Stisknout pro odebrání vybraného adresáře ze seznamu</translation>
+        <source>Select to use the Oxygen pixmap icons</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="88"/>
+        <source>Oxygen</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="112"/>
+        <source>Press to show a dialog with a preview of the selected default icon set</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="140"/>
+        <source>Custom Icon Directories</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IconsPreviewDialog</name>
     <message>
-        <location filename="../Preferences/ConfigurationPages/IconsPreviewDialog.ui" line="13"/>
+        <location filename="../Preferences/ConfigurationPages/IconsPreviewDialog.ui" line="14"/>
         <source>Icons Preview</source>
         <translation>Náhled ikon</translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IconsPreviewDialog.ui" line="25"/>
+        <source>Directory:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IconsPreviewDialog.ui" line="38"/>
+        <source>Select the icons directory to be shown</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IconsPreviewDialog.ui" line="74"/>
+        <source>Invert Background</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IconsPreviewDialog.ui" line="87"/>
+        <source>Refresh</source>
+        <translation type="unfinished">Obnovit</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IconsPreviewDialog.ui" line="84"/>
+        <source>Select to refresh the icons display</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IconsPreviewDialog.ui" line="71"/>
+        <source>Select to invert the background color</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>IdlCompilerDefineNameDialog</name>
@@ -42107,7 +42527,7 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="102"/>
         <source>Colours</source>
-        <translation type="unfinished">Barvy</translation>
+        <translation type="obsolete">Barvy</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="108"/>
@@ -42115,116 +42535,56 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="121"/>
-        <source>Select the colour for network messages</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="131"/>
         <source>Nick Names:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="144"/>
-        <source>Select the colour for nick names</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="154"/>
         <source>Server Messages:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="167"/>
-        <source>Select the colour for server messages</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="177"/>
         <source>Own Nick Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="190"/>
-        <source>Select the colour for own nick name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="200"/>
         <source>Channel Messages:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="213"/>
-        <source>Select the colour for channel messages</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="223"/>
         <source>Join Channel:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="236"/>
-        <source>Select the colour for join channel messages</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="246"/>
         <source>Error Messages:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="259"/>
-        <source>Select the colour for error messages</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="269"/>
         <source>Leave Channel:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="282"/>
-        <source>Select the colour for leave channel messages</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="292"/>
         <source>Timestamp:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="305"/>
-        <source>Select the colour for timestamps</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="315"/>
         <source>Channel Info:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="328"/>
-        <source>Select the colour for channel info messages</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="338"/>
         <source>Hyperlink:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="351"/>
-        <source>Select the colour for hyperlinks</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="364"/>
-        <source>Enable to allow coloured text in IRC messages</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="367"/>
         <source>Allow Colored Text in IRC Messages</source>
         <translation type="unfinished"></translation>
@@ -42330,21 +42690,11 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="824"/>
-        <source>Select the foreground colour for the marker</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="834"/>
         <source>Marker Background:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="847"/>
-        <source>Select the background colour for the marker</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="862"/>
         <source>Shutdown</source>
         <translation type="unfinished"></translation>
@@ -42359,6 +42709,81 @@
         <source>Confirm Shutdown When Connected</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="102"/>
+        <source>Colors</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="121"/>
+        <source>Select the color for network messages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="144"/>
+        <source>Select the color for nick names</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="167"/>
+        <source>Select the color for server messages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="190"/>
+        <source>Select the color for own nick name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="213"/>
+        <source>Select the color for channel messages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="236"/>
+        <source>Select the color for join channel messages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="259"/>
+        <source>Select the color for error messages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="282"/>
+        <source>Select the color for leave channel messages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="305"/>
+        <source>Select the color for timestamps</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="328"/>
+        <source>Select the color for channel info messages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="351"/>
+        <source>Select the color for hyperlinks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="364"/>
+        <source>Enable to allow colored text in IRC messages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="824"/>
+        <source>Select the foreground color for the marker</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="847"/>
+        <source>Select the background color for the marker</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>IrcServerEditDialog</name>
@@ -43753,257 +44178,257 @@
 <context>
     <name>LexerPygments</name>
     <message>
-        <location filename="../QScintilla/Lexers/LexerPygments.py" line="180"/>
+        <location filename="../QScintilla/Lexers/LexerPygments.py" line="196"/>
         <source>Default</source>
         <translation>Výchozí</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/LexerPygments.py" line="181"/>
-        <source>Comment</source>
-        <translation>Poznámka</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/LexerPygments.py" line="182"/>
-        <source>Preprocessor</source>
-        <translation>Preprocessor</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/LexerPygments.py" line="183"/>
-        <source>Keyword</source>
-        <translation>Klíčové slovo</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/LexerPygments.py" line="184"/>
-        <source>Pseudo Keyword</source>
-        <translation>Pseudo klíčové slovo</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/LexerPygments.py" line="185"/>
-        <source>Type Keyword</source>
-        <translation>Zadejte klíčové slovo</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/LexerPygments.py" line="186"/>
-        <source>Operator</source>
-        <translation>Operátor</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/LexerPygments.py" line="187"/>
-        <source>Word</source>
-        <translation>Slovo</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/LexerPygments.py" line="188"/>
-        <source>Builtin</source>
-        <translation>Builtin</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/LexerPygments.py" line="189"/>
-        <source>Function or method name</source>
-        <translation>Funkce nebo název metody</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/LexerPygments.py" line="190"/>
-        <source>Class name</source>
-        <translation>Název třídy</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/LexerPygments.py" line="191"/>
-        <source>Namespace</source>
-        <translation>Jmenný prostor</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/LexerPygments.py" line="192"/>
-        <source>Exception</source>
-        <translation>Výjimka</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/LexerPygments.py" line="193"/>
-        <source>Identifier</source>
-        <translation>Identifikátor</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/LexerPygments.py" line="194"/>
-        <source>Constant</source>
-        <translation>Konstanta</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/LexerPygments.py" line="195"/>
-        <source>Label</source>
-        <translation>Označení</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/LexerPygments.py" line="196"/>
-        <source>Entity</source>
-        <translation>Entita</translation>
-    </message>
-    <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="197"/>
-        <source>Attribute</source>
-        <translation>Atribut</translation>
+        <source>Comment</source>
+        <translation>Poznámka</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="198"/>
-        <source>Tag</source>
-        <translation>Tag</translation>
+        <source>Preprocessor</source>
+        <translation>Preprocessor</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="199"/>
-        <source>Decorator</source>
-        <translation>Dekorátor</translation>
+        <source>Keyword</source>
+        <translation>Klíčové slovo</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="200"/>
-        <source>String</source>
-        <translation>String</translation>
+        <source>Pseudo Keyword</source>
+        <translation>Pseudo klíčové slovo</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="201"/>
-        <source>Documentation string</source>
-        <translation>Dokumentační string</translation>
+        <source>Type Keyword</source>
+        <translation>Zadejte klíčové slovo</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="202"/>
-        <source>Scalar</source>
-        <translation>Skalár</translation>
+        <source>Operator</source>
+        <translation>Operátor</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="203"/>
-        <source>Escape</source>
-        <translation>Escape</translation>
+        <source>Word</source>
+        <translation>Slovo</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="204"/>
-        <source>Regular expression</source>
-        <translation>Regulární výraz</translation>
+        <source>Builtin</source>
+        <translation>Builtin</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="205"/>
-        <source>Symbol</source>
-        <translation>Symbol</translation>
+        <source>Function or method name</source>
+        <translation>Funkce nebo název metody</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="206"/>
-        <source>Other string</source>
-        <translation>Jiný string</translation>
+        <source>Class name</source>
+        <translation>Název třídy</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="207"/>
-        <source>Number</source>
-        <translation>Číslo</translation>
+        <source>Namespace</source>
+        <translation>Jmenný prostor</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="208"/>
-        <source>Heading</source>
-        <translation>Nadpis</translation>
+        <source>Exception</source>
+        <translation>Výjimka</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="209"/>
-        <source>Subheading</source>
-        <translation>Podnadpis</translation>
+        <source>Identifier</source>
+        <translation>Identifikátor</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="210"/>
-        <source>Deleted</source>
-        <translation>Smazáno</translation>
+        <source>Constant</source>
+        <translation>Konstanta</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="211"/>
-        <source>Inserted</source>
-        <translation>Vloženo</translation>
+        <source>Label</source>
+        <translation>Označení</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="212"/>
-        <source>Generic error</source>
-        <translation>Generická chyba</translation>
+        <source>Entity</source>
+        <translation>Entita</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="213"/>
-        <source>Emphasized text</source>
-        <translation>Zvýrazněný text</translation>
+        <source>Attribute</source>
+        <translation>Atribut</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="214"/>
-        <source>Strong text</source>
-        <translation>Tučný text</translation>
+        <source>Tag</source>
+        <translation>Tag</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="215"/>
-        <source>Prompt</source>
-        <translation>Prompt</translation>
+        <source>Decorator</source>
+        <translation>Dekorátor</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="216"/>
-        <source>Output</source>
-        <translation>Výstup</translation>
+        <source>String</source>
+        <translation>String</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="217"/>
-        <source>Traceback</source>
-        <translation>Traceback</translation>
+        <source>Documentation string</source>
+        <translation>Dokumentační string</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="218"/>
-        <source>Error</source>
-        <translation>Chyba</translation>
+        <source>Scalar</source>
+        <translation>Skalár</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="219"/>
-        <source>Comment block</source>
-        <translation type="unfinished"></translation>
+        <source>Escape</source>
+        <translation>Escape</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="220"/>
-        <source>Property</source>
-        <translation type="unfinished"></translation>
+        <source>Regular expression</source>
+        <translation>Regulární výraz</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="221"/>
-        <source>Character</source>
-        <translation type="unfinished"></translation>
+        <source>Symbol</source>
+        <translation>Symbol</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="222"/>
-        <source>Here document</source>
-        <translation type="unfinished"></translation>
+        <source>Other string</source>
+        <translation>Jiný string</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="223"/>
-        <source>Punctuation</source>
-        <translation type="unfinished"></translation>
+        <source>Number</source>
+        <translation>Číslo</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="224"/>
-        <source>Hashbang</source>
-        <translation type="unfinished"></translation>
+        <source>Heading</source>
+        <translation>Nadpis</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="225"/>
-        <source>Reserved Keyword</source>
-        <translation type="unfinished"></translation>
+        <source>Subheading</source>
+        <translation>Podnadpis</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="226"/>
-        <source>Literal</source>
-        <translation type="unfinished"></translation>
+        <source>Deleted</source>
+        <translation>Smazáno</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="227"/>
-        <source>Double quoted string</source>
-        <translation type="unfinished"></translation>
+        <source>Inserted</source>
+        <translation>Vloženo</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="228"/>
-        <source>Single quoted string</source>
-        <translation type="unfinished"></translation>
+        <source>Generic error</source>
+        <translation>Generická chyba</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="229"/>
-        <source>Backtick string</source>
-        <translation type="unfinished"></translation>
+        <source>Emphasized text</source>
+        <translation>Zvýrazněný text</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="230"/>
+        <source>Strong text</source>
+        <translation>Tučný text</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/LexerPygments.py" line="231"/>
+        <source>Prompt</source>
+        <translation>Prompt</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/LexerPygments.py" line="232"/>
+        <source>Output</source>
+        <translation>Výstup</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/LexerPygments.py" line="233"/>
+        <source>Traceback</source>
+        <translation>Traceback</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/LexerPygments.py" line="234"/>
+        <source>Error</source>
+        <translation>Chyba</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/LexerPygments.py" line="235"/>
+        <source>Comment block</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/LexerPygments.py" line="236"/>
+        <source>Property</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/LexerPygments.py" line="237"/>
+        <source>Character</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/LexerPygments.py" line="238"/>
+        <source>Here document</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/LexerPygments.py" line="239"/>
+        <source>Punctuation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/LexerPygments.py" line="240"/>
+        <source>Hashbang</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/LexerPygments.py" line="241"/>
+        <source>Reserved Keyword</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/LexerPygments.py" line="242"/>
+        <source>Literal</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/LexerPygments.py" line="243"/>
+        <source>Double quoted string</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/LexerPygments.py" line="244"/>
+        <source>Single quoted string</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/LexerPygments.py" line="245"/>
+        <source>Backtick string</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/LexerPygments.py" line="246"/>
         <source>Whitespace</source>
         <translation type="unfinished"></translation>
     </message>
@@ -45068,14 +45493,9 @@
         <translation type="unfinished">Zobrazit na nový výstup</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/LogViewerPage.ui" line="49"/>
-        <source>Error Colour:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/LogViewerPage.ui" line="62"/>
         <source>Select the colour for text sent to stderr</source>
-        <translation type="unfinished">Vybrat barvu pro text poslaný na stderr</translation>
+        <translation type="obsolete">Vybrat barvu pro text poslaný na stderr</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/LogViewerPage.ui" line="87"/>
@@ -45112,6 +45532,16 @@
         <source>&lt;b&gt;Message Filters for both&lt;/b&gt;&lt;p&gt;This list shows the configured message filters used to suppress messages received via stdout or stderr.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/LogViewerPage.ui" line="49"/>
+        <source>Error Color:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/LogViewerPage.ui" line="62"/>
+        <source>Select the color for text sent to stderr</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MakePropertiesDialog</name>
@@ -45897,27 +46327,27 @@
 <context>
     <name>MicroPythonDevice</name>
     <message>
-        <location filename="../MicroPython/MicroPythonDevices.py" line="207"/>
+        <location filename="../MicroPython/MicroPythonDevices.py" line="214"/>
         <source>Unsupported Device</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonDevices.py" line="217"/>
+        <location filename="../MicroPython/MicroPythonDevices.py" line="224"/>
         <source>REPL is not supported by this device.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonDevices.py" line="236"/>
+        <location filename="../MicroPython/MicroPythonDevices.py" line="243"/>
         <source>Plotter is not supported by this device.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonDevices.py" line="255"/>
+        <location filename="../MicroPython/MicroPythonDevices.py" line="262"/>
         <source>Running scripts is not supported by this device.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonDevices.py" line="275"/>
+        <location filename="../MicroPython/MicroPythonDevices.py" line="282"/>
         <source>File Manager is not supported by this device.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -46181,27 +46611,27 @@
 <context>
     <name>MicroPythonGraphWidget</name>
     <message>
-        <location filename="../MicroPython/MicroPythonGraphWidget.py" line="63"/>
+        <location filename="../MicroPython/MicroPythonGraphWidget.py" line="64"/>
         <source>Press to save the raw data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonGraphWidget.py" line="72"/>
+        <location filename="../MicroPython/MicroPythonGraphWidget.py" line="73"/>
         <source>max. X:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonGraphWidget.py" line="81"/>
+        <location filename="../MicroPython/MicroPythonGraphWidget.py" line="82"/>
         <source>Enter the maximum number of data points to be plotted.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonGraphWidget.py" line="311"/>
+        <location filename="../MicroPython/MicroPythonGraphWidget.py" line="329"/>
         <source>Save Chart Data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonGraphWidget.py" line="311"/>
+        <location filename="../MicroPython/MicroPythonGraphWidget.py" line="329"/>
         <source>&lt;p&gt;The chart data could not be saved into file &lt;b&gt;{0}&lt;/b&gt;.&lt;/p&gt;&lt;p&gt;Reason: {1}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -46269,93 +46699,168 @@
         <translation type="unfinished">Zalamovat dlouhé řádky</translation>
     </message>
     <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="169"/>
+        <source>MPY Cross Compiler</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="175"/>
+        <source>Program:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="191"/>
+        <source>Enter the path of the cross compiler executable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.py" line="67"/>
+        <source>All Files (*)</source>
+        <translation type="unfinished">Všechny soubory (*)</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="298"/>
+        <source>Documentation</source>
+        <translation type="unfinished">Dokumentace</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="304"/>
+        <source>MicroPython:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="311"/>
+        <source>Enter the URL for the MicroPython documentation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="318"/>
+        <source>CircuitPython:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="325"/>
+        <source>Enter the URL for the CircuitPython documentation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="332"/>
+        <source>BBC micro:bit:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="339"/>
+        <source>Enter the URL for the BBC micro:bit MicroPython documentation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="201"/>
+        <source>PyBoard</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="207"/>
+        <source>dfu-util Path:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="223"/>
+        <source>Enter the path of the dfu-util flashing executable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="233"/>
+        <source>Firmware</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="246"/>
+        <source>Enter the URL for the MicroPython firmware for PyBoard, ESP8266 and ESP32</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="260"/>
+        <source>Enter the URL for the CircuitPython firmware</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="274"/>
+        <source>Enter the URL for the BBC micro:bit Firmware</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="140"/>
-        <source>MPY Cross Compiler</source>
+        <source>Chart Pane</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="146"/>
-        <source>Program:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="162"/>
-        <source>Enter the path of the cross compiler executable</source>
+        <source>Color Theme:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="159"/>
+        <source>Select the color scheme of the chart</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/MicroPythonPage.py" line="42"/>
-        <source>All Files (*)</source>
-        <translation type="unfinished">Všechny soubory (*)</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="255"/>
-        <source>Documentation</source>
-        <translation type="unfinished">Dokumentace</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="261"/>
-        <source>MicroPython:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="268"/>
-        <source>Enter the URL for the MicroPython documentation</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="275"/>
-        <source>CircuitPython:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="282"/>
-        <source>Enter the URL for the CircuitPython documentation</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="289"/>
-        <source>BBC micro:bit:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="296"/>
-        <source>Enter the URL for the BBC micro:bit MicroPython documentation</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="172"/>
-        <source>PyBoard</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="178"/>
-        <source>dfu-util Path:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="194"/>
-        <source>Enter the path of the dfu-util flashing executable</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="204"/>
-        <source>Firmware</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="217"/>
-        <source>Enter the URL for the MicroPython firmware for PyBoard, ESP8266 and ESP32</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="231"/>
-        <source>Enter the URL for the CircuitPython firmware</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="245"/>
-        <source>Enter the URL for the BBC micro:bit Firmware</source>
+        <source>Automatic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.py" line="44"/>
+        <source>Light</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.py" line="46"/>
+        <source>Dark</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.py" line="48"/>
+        <source>Blue Cerulean</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.py" line="50"/>
+        <source>Brown Sand</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.py" line="52"/>
+        <source>Blue NCS</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.py" line="54"/>
+        <source>High Contrast</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.py" line="56"/>
+        <source>Blue Icy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.py" line="58"/>
+        <source>Qt</source>
+        <translation type="unfinished">Qt</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="346"/>
+        <source>Calliope mini:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="288"/>
+        <source>Enter the URL for the Callope mini Firmware</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="353"/>
+        <source>Enter the URL for the Calliope mini MicroPython documentation</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -46400,17 +46905,17 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="420"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="460"/>
         <source>Press to connect the selected device</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="226"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="263"/>
         <source>&lt;h3&gt;The QtSerialPort package is not available.&lt;br/&gt;MicroPython support is deactivated.&lt;/h3&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message numerus="yes">
-        <location filename="../MicroPython/MicroPythonWidget.py" line="263"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="300"/>
         <source>%n supported device(s) detected.</source>
         <translation type="unfinished">
             <numerusform></numerusform>
@@ -46419,42 +46924,42 @@
         </translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="269"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="306"/>
         <source>{0} at {1}</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="277"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="314"/>
         <source>No supported devices detected.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="390"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="430"/>
         <source>Clear</source>
         <translation type="unfinished">Vyčistit</translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="392"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="432"/>
         <source>Copy</source>
         <translation type="unfinished">Kopírovat</translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="393"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="433"/>
         <source>Paste</source>
         <translation type="unfinished">Vložit</translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="415"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="455"/>
         <source>Press to disconnect the current device</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="436"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="476"/>
         <source>No device attached</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="436"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="476"/>
         <source>Please ensure the device is plugged into your computer and selected.
 
 It must have a version of MicroPython (or CircuitPython) flashed onto it before anything will work.
@@ -46463,217 +46968,217 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="463"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="503"/>
         <source>Start REPL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="463"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="503"/>
         <source>&lt;p&gt;The REPL cannot be started.&lt;/p&gt;&lt;p&gt;Reason: {0}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="853"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="893"/>
         <source>Serial Device Connect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="853"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="893"/>
         <source>&lt;p&gt;Cannot connect to device at serial port &lt;b&gt;{0}&lt;/b&gt;.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="898"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="938"/>
         <source>Run Script</source>
         <translation type="unfinished">Spustit skript</translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="881"/>
-        <source>There is no editor open. Abort...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="889"/>
-        <source>The current editor does not contain a script. Abort...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="898"/>
-        <source>&lt;p&gt;Cannot run script.&lt;/p&gt;&lt;p&gt;Reason: {0}&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="921"/>
-        <source>Open Python File</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../MicroPython/MicroPythonWidget.py" line="921"/>
+        <source>There is no editor open. Abort...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="929"/>
+        <source>The current editor does not contain a script. Abort...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="938"/>
+        <source>&lt;p&gt;Cannot run script.&lt;/p&gt;&lt;p&gt;Reason: {0}&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="961"/>
+        <source>Open Python File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="961"/>
         <source>Python3 Files (*.py);;All Files (*)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="965"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1005"/>
         <source>Start Chart</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="965"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1005"/>
         <source>&lt;p&gt;The Chart cannot be started.&lt;/p&gt;&lt;p&gt;Reason: {0}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="994"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1034"/>
         <source>Unsaved Chart Data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="994"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1034"/>
         <source>The chart contains unsaved data.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1045"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1085"/>
         <source>Start File Manager</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1045"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1085"/>
         <source>&lt;p&gt;The File Manager cannot be started.&lt;/p&gt;&lt;p&gt;Reason: {0}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1096"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1136"/>
         <source>Show Version</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1099"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1139"/>
         <source>Show Implementation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1210"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1250"/>
         <source>Synchronize Time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1107"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1147"/>
         <source>Show Device Time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1110"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1150"/>
         <source>Show Local Time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1421"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1461"/>
         <source>Compile Python File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1481"/>
+        <source>Compile Current Editor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1188"/>
+        <source>&lt;h3&gt;Device Version Information&lt;/h3&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1197"/>
+        <source>No version information available.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1199"/>
+        <source>Device Version Information</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1222"/>
+        <source>unknown</source>
+        <translation type="unfinished">neznámý</translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1226"/>
+        <source>Device Implementation Information</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1226"/>
+        <source>&lt;h3&gt;Device Implementation Information&lt;/h3&gt;&lt;p&gt;This device contains &lt;b&gt;{0} {1}&lt;/b&gt;.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1250"/>
+        <source>&lt;p&gt;The time of the connected device was synchronized with the local time.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1272"/>
+        <source>&lt;h3&gt;Device Date and Time&lt;/h3&gt;&lt;table&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Date&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Time&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{1}&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1280"/>
+        <source>&lt;h3&gt;Device Date and Time&lt;/h3&gt;&lt;p&gt;{0}&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1294"/>
+        <source>Device Date and Time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1307"/>
+        <source>Local Date and Time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1307"/>
+        <source>&lt;h3&gt;Local Date and Time&lt;/h3&gt;&lt;table&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Date&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Time&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{1}&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1374"/>
+        <source>Error handling device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1374"/>
+        <source>&lt;p&gt;There was an error communicating with the connected device.&lt;/p&gt;&lt;p&gt;Method: {0}&lt;/p&gt;&lt;p&gt;Message: {1}&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1413"/>
+        <source>The MicroPython cross compiler &lt;b&gt;mpy-cross&lt;/b&gt; cannot be found. Ensure it is in the search path or configure it on the MicroPython configuration page.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1431"/>
+        <source>Python Files (*.py);;All Files (*)</source>
+        <translation type="unfinished">Python soubory (*.py);;Všechny soubory (*)</translation>
+    </message>
+    <message>
         <location filename="../MicroPython/MicroPythonWidget.py" line="1441"/>
-        <source>Compile Current Editor</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1148"/>
-        <source>&lt;h3&gt;Device Version Information&lt;/h3&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1157"/>
-        <source>No version information available.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1159"/>
-        <source>Device Version Information</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1182"/>
-        <source>unknown</source>
-        <translation type="unfinished">neznámý</translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1186"/>
-        <source>Device Implementation Information</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1186"/>
-        <source>&lt;h3&gt;Device Implementation Information&lt;/h3&gt;&lt;p&gt;This device contains &lt;b&gt;{0} {1}&lt;/b&gt;.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1210"/>
-        <source>&lt;p&gt;The time of the connected device was synchronized with the local time.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1232"/>
-        <source>&lt;h3&gt;Device Date and Time&lt;/h3&gt;&lt;table&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Date&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Time&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{1}&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1240"/>
-        <source>&lt;h3&gt;Device Date and Time&lt;/h3&gt;&lt;p&gt;{0}&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1254"/>
-        <source>Device Date and Time</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1267"/>
-        <source>Local Date and Time</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1267"/>
-        <source>&lt;h3&gt;Local Date and Time&lt;/h3&gt;&lt;table&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Date&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Time&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{1}&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1334"/>
-        <source>Error handling device</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1334"/>
-        <source>&lt;p&gt;There was an error communicating with the connected device.&lt;/p&gt;&lt;p&gt;Method: {0}&lt;/p&gt;&lt;p&gt;Message: {1}&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1373"/>
-        <source>The MicroPython cross compiler &lt;b&gt;mpy-cross&lt;/b&gt; cannot be found. Ensure it is in the search path or configure it on the MicroPython configuration page.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1391"/>
-        <source>Python Files (*.py);;All Files (*)</source>
-        <translation type="unfinished">Python soubory (*.py);;Všechny soubory (*)</translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1401"/>
         <source>The Python file &lt;b&gt;{0}&lt;/b&gt; does not exist. Aborting...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1411"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1451"/>
         <source>&apos;mpy-cross&apos; Output</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1434"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1474"/>
         <source>The current editor does not contain a Python file. Aborting...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="175"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="211"/>
         <source>MicroPython Menu</source>
         <translation type="unfinished"></translation>
     </message>
@@ -46683,47 +47188,47 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="978"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1018"/>
         <source>&#xc2;&#xb5;Py Chart</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1058"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1098"/>
         <source>&#xc2;&#xb5;Py Files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1134"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1174"/>
         <source>Show Documentation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1138"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1178"/>
         <source>Configure</source>
         <translation type="unfinished">Konfigurovat</translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1113"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1153"/>
         <source>Show Time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1130"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1170"/>
         <source>Download Firmware</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1310"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1350"/>
         <source>Date and Time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1293"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1333"/>
         <source>&lt;table&gt;&lt;tr&gt;&lt;th&gt;&lt;/th&gt;&lt;th&gt;Local Date and Time&lt;/th&gt;&lt;th&gt;Device Date and Time&lt;/th&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Date&lt;/b&gt;&lt;/td&gt;&lt;td align=&apos;center&apos;&gt;{0}&lt;/td&gt;&lt;td align=&apos;center&apos;&gt;{2}&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Time&lt;/b&gt;&lt;/td&gt;&lt;td align=&apos;center&apos;&gt;{1}&lt;/td&gt;&lt;td align=&apos;center&apos;&gt;{3}&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1310"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1350"/>
         <source>&lt;table&gt;&lt;tr&gt;&lt;th&gt;Local Date and Time&lt;/th&gt;&lt;th&gt;Device Date and Time&lt;/th&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td align=&apos;center&apos;&gt;{0} {1}&lt;/td&gt;&lt;td align=&apos;center&apos;&gt;{2}&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -46731,85 +47236,90 @@
 <context>
     <name>MicrobitDevice</name>
     <message>
-        <location filename="../MicroPython/MicrobitDevices.py" line="67"/>
+        <location filename="../MicroPython/MicrobitDevices.py" line="74"/>
         <source>BBC micro:bit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicrobitDevices.py" line="134"/>
+        <location filename="../MicroPython/MicrobitDevices.py" line="149"/>
         <source>Workspace Directory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicrobitDevices.py" line="134"/>
-        <source>Could not find an attached BBC micro:bit.
+        <location filename="../MicroPython/MicrobitDevices.py" line="186"/>
+        <source>Save Script as &apos;main.py&apos;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicrobitDevices.py" line="188"/>
+        <source>Save the current script as &apos;main.py&apos; on the connected device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicrobitDevices.py" line="241"/>
+        <source>MicroPython Firmware Files (*.hex);;All Files (*)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicrobitDevices.py" line="286"/>
+        <source>The script is empty. Aborting.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicrobitDevices.py" line="276"/>
+        <source>The current editor does not contain a Python script. Write it anyway?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicrobitDevices.py" line="314"/>
+        <source>&lt;p&gt;The script could not be saved to the device.&lt;/p&gt;&lt;p&gt;Reason: {0}&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicrobitDevices.py" line="241"/>
+        <source>Flash MicroPython Firmware</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicrobitDevices.py" line="273"/>
+        <source>Save Script</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicrobitDevices.py" line="303"/>
+        <source>Save Script as &apos;{0}&apos;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicrobitDevices.py" line="294"/>
+        <source>Enter a file name on the device:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicrobitDevices.py" line="183"/>
+        <source>Save the current script to the selected device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicrobitDevices.py" line="77"/>
+        <source>Calliope mini</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicrobitDevices.py" line="232"/>
+        <source>Could not find an attached {0}.
 
 Please make sure the device is plugged into this computer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicrobitDevices.py" line="171"/>
-        <source>Save Script as &apos;main.py&apos;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicrobitDevices.py" line="173"/>
-        <source>Save the current script as &apos;main.py&apos; on the connected device</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicrobitDevices.py" line="177"/>
-        <source>Reset micro:bit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicrobitDevices.py" line="201"/>
-        <source>MicroPython Firmware Files (*.hex);;All Files (*)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicrobitDevices.py" line="246"/>
-        <source>The script is empty. Aborting.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicrobitDevices.py" line="236"/>
-        <source>The current editor does not contain a Python script. Write it anyway?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicrobitDevices.py" line="274"/>
-        <source>&lt;p&gt;The script could not be saved to the device.&lt;/p&gt;&lt;p&gt;Reason: {0}&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicrobitDevices.py" line="201"/>
-        <source>Flash MicroPython Firmware</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicrobitDevices.py" line="233"/>
-        <source>Save Script</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicrobitDevices.py" line="190"/>
-        <source>The BBC micro:bit is not ready for flashing. See the &lt;a href=&quot;https://microbit.org/guide/firmware/&quot;&gt;micro:bit web site&lt;/a&gt; for details.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicrobitDevices.py" line="263"/>
-        <source>Save Script as &apos;{0}&apos;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicrobitDevices.py" line="254"/>
-        <source>Enter a file name on the device:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicrobitDevices.py" line="168"/>
-        <source>Save the current script to the selected device</source>
+        <location filename="../MicroPython/MicrobitDevices.py" line="192"/>
+        <source>Reset {0}</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicrobitDevices.py" line="213"/>
+        <source>&lt;p&gt;The BBC micro:bit is not ready for flashing. Follow these instructions.&lt;/p&gt;&lt;ul&gt;&lt;li&gt;unplug USB cable and any batteries&lt;/li&gt;&lt;li&gt;keep RESET button pressed an plug USB cable back in&lt;/li&gt;&lt;li&gt;a drive called MAINTENANCE should be available&lt;/li&gt;&lt;/ul&gt;&lt;p&gt;See the &lt;a href=&quot;https://microbit.org/guide/firmware/&quot;&gt;micro:bit web site&lt;/a&gt; for details.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -50683,7 +51193,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message numerus="yes">
-        <location filename="../PipInterface/PipPackagesWidget.py" line="635"/>
+        <location filename="../PipInterface/PipPackagesWidget.py" line="645"/>
         <source>%n package(s) found.</source>
         <translation type="unfinished">
             <numerusform></numerusform>
@@ -50692,102 +51202,102 @@
         </translation>
     </message>
     <message>
-        <location filename="../PipInterface/PipPackagesWidget.py" line="888"/>
+        <location filename="../PipInterface/PipPackagesWidget.py" line="898"/>
         <source>Search PyPI</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../PipInterface/PipPackagesWidget.py" line="673"/>
+        <location filename="../PipInterface/PipPackagesWidget.py" line="683"/>
         <source>&lt;p&gt;The package search did not return anything.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../PipInterface/PipPackagesWidget.py" line="710"/>
+        <location filename="../PipInterface/PipPackagesWidget.py" line="720"/>
         <source>&lt;p&gt;The package search failed.&lt;/p&gt;&lt;p&gt;Reason: {0}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../PipInterface/PipPackagesWidget.py" line="715"/>
+        <location filename="../PipInterface/PipPackagesWidget.py" line="725"/>
         <source>Error: {0}</source>
         <translation type="unfinished">Chyby: {0}</translation>
     </message>
     <message>
-        <location filename="../PipInterface/PipPackagesWidget.py" line="848"/>
+        <location filename="../PipInterface/PipPackagesWidget.py" line="858"/>
         <source>Show Package Details</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../PipInterface/PipPackagesWidget.py" line="848"/>
+        <location filename="../PipInterface/PipPackagesWidget.py" line="858"/>
         <source>Select the package version:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../PipInterface/PipPackagesWidget.py" line="888"/>
+        <location filename="../PipInterface/PipPackagesWidget.py" line="898"/>
         <source>&lt;p&gt;No package details info for &lt;b&gt;{0}&lt;/b&gt; available.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../PipInterface/PipPackagesWidget.py" line="904"/>
+        <location filename="../PipInterface/PipPackagesWidget.py" line="914"/>
         <source>Install Pip</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../PipInterface/PipPackagesWidget.py" line="907"/>
-        <source>Install Pip to User-Site</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../PipInterface/PipPackagesWidget.py" line="910"/>
-        <source>Repair Pip</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../PipInterface/PipPackagesWidget.py" line="1005"/>
-        <source>Install Packages</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../PipInterface/PipPackagesWidget.py" line="917"/>
-        <source>Install Local Package</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../PipInterface/PipPackagesWidget.py" line="921"/>
-        <source>Install Requirements</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../PipInterface/PipPackagesWidget.py" line="924"/>
-        <source>Uninstall Requirements</source>
+        <source>Install Pip to User-Site</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../PipInterface/PipPackagesWidget.py" line="920"/>
+        <source>Repair Pip</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../PipInterface/PipPackagesWidget.py" line="1015"/>
+        <source>Install Packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../PipInterface/PipPackagesWidget.py" line="927"/>
+        <source>Install Local Package</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../PipInterface/PipPackagesWidget.py" line="931"/>
+        <source>Install Requirements</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../PipInterface/PipPackagesWidget.py" line="934"/>
+        <source>Uninstall Requirements</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../PipInterface/PipPackagesWidget.py" line="937"/>
         <source>Generate Requirements...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../PipInterface/PipPackagesWidget.py" line="932"/>
+        <location filename="../PipInterface/PipPackagesWidget.py" line="942"/>
         <source>Edit User Configuration...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../PipInterface/PipPackagesWidget.py" line="935"/>
+        <location filename="../PipInterface/PipPackagesWidget.py" line="945"/>
         <source>Edit Environment Configuration...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../PipInterface/PipPackagesWidget.py" line="940"/>
+        <location filename="../PipInterface/PipPackagesWidget.py" line="950"/>
         <source>Configure...</source>
         <translation type="unfinished">Konfigurovat...</translation>
     </message>
     <message>
-        <location filename="../PipInterface/PipPackagesWidget.py" line="1118"/>
+        <location filename="../PipInterface/PipPackagesWidget.py" line="1128"/>
         <source>Edit Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../PipInterface/PipPackagesWidget.py" line="1118"/>
+        <location filename="../PipInterface/PipPackagesWidget.py" line="1128"/>
         <source>No valid configuration path determined. Aborting</source>
         <translation type="unfinished"></translation>
     </message>
@@ -52064,17 +52574,17 @@
 <context>
     <name>Preferences</name>
     <message>
-        <location filename="../Preferences/__init__.py" line="1624"/>
+        <location filename="../Preferences/__init__.py" line="1640"/>
         <source>Export Preferences</source>
         <translation>Předvolby exportu</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1652"/>
+        <location filename="../Preferences/__init__.py" line="1668"/>
         <source>Import Preferences</source>
         <translation>Předvolby importu</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1652"/>
+        <location filename="../Preferences/__init__.py" line="1668"/>
         <source>Properties File (*.ini);;All Files (*)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -52281,7 +52791,7 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/PrinterPage.ui" line="77"/>
         <source>Colour</source>
-        <translation>Barva</translation>
+        <translation type="obsolete">Barva</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/PrinterPage.ui" line="84"/>
@@ -52321,7 +52831,7 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/PrinterPage.ui" line="49"/>
         <source>Colour Mode:</source>
-        <translation>Barevný mód:</translation>
+        <translation type="obsolete">Barevný mód:</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/PrinterPage.ui" line="94"/>
@@ -52373,6 +52883,16 @@
         <source> DPI</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/PrinterPage.ui" line="49"/>
+        <source>Color Mode:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/PrinterPage.ui" line="77"/>
+        <source>Color</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ProgramsDialog</name>
@@ -52605,192 +53125,192 @@
         <translation>Ostatní</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="805"/>
+        <location filename="../Project/Project.py" line="817"/>
         <source>Read project file</source>
         <translation>Načíst soubor projektu</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="908"/>
+        <location filename="../Project/Project.py" line="920"/>
         <source>Save project file</source>
         <translation>Uložit soubor projektu</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="944"/>
+        <location filename="../Project/Project.py" line="956"/>
         <source>Read user project properties</source>
         <translation>Načíst uživatelská nastavení projektu</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="968"/>
+        <location filename="../Project/Project.py" line="980"/>
         <source>Save user project properties</source>
         <translation>Uložit uživatelská nastavení projektu</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1026"/>
+        <location filename="../Project/Project.py" line="1038"/>
         <source>Read project session</source>
         <translation>Načíst relaci projektu</translation>
     </message>
     <message>
+        <location filename="../Project/Project.py" line="1263"/>
+        <source>Please save the project first.</source>
+        <translation>Prosím, nejdříve uložte projekt.</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="1074"/>
+        <source>Save project session</source>
+        <translation>Uložit relaci projektu</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="1103"/>
+        <source>Delete project session</source>
+        <translation>Smazat relaci projektu</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="1137"/>
+        <source>Read tasks</source>
+        <translation>Načíst úlohy</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="1157"/>
+        <source>Save tasks</source>
+        <translation>Uložit úlohy</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="1216"/>
+        <source>Read debugger properties</source>
+        <translation>Načíst nastavení debuggeru</translation>
+    </message>
+    <message>
         <location filename="../Project/Project.py" line="1251"/>
-        <source>Please save the project first.</source>
-        <translation>Prosím, nejdříve uložte projekt.</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="1062"/>
-        <source>Save project session</source>
-        <translation>Uložit relaci projektu</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="1091"/>
-        <source>Delete project session</source>
-        <translation>Smazat relaci projektu</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="1125"/>
-        <source>Read tasks</source>
-        <translation>Načíst úlohy</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="1145"/>
-        <source>Save tasks</source>
-        <translation>Uložit úlohy</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="1204"/>
-        <source>Read debugger properties</source>
-        <translation>Načíst nastavení debuggeru</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="1239"/>
         <source>Save debugger properties</source>
         <translation>Uložit nastavení debuggeru</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1265"/>
+        <location filename="../Project/Project.py" line="1277"/>
         <source>Delete debugger properties</source>
         <translation>Smazat nastavení debuggeru</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1393"/>
+        <location filename="../Project/Project.py" line="1405"/>
         <source>Add Language</source>
         <translation>Přidat jazyk</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1519"/>
+        <location filename="../Project/Project.py" line="1531"/>
         <source>Delete translation</source>
         <translation>Smazat překlad</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1684"/>
+        <location filename="../Project/Project.py" line="1696"/>
         <source>Add file</source>
         <translation>Přidat soubor</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1816"/>
+        <location filename="../Project/Project.py" line="1828"/>
         <source>The target directory must not be empty.</source>
         <translation>Cílový adresář nesmí být prázdný.</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1827"/>
+        <location filename="../Project/Project.py" line="1839"/>
         <source>Add directory</source>
         <translation>Přidat adresář</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1827"/>
+        <location filename="../Project/Project.py" line="1839"/>
         <source>The source directory must not be empty.</source>
         <translation>Cílový adresář nesmí být prázdný.</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1964"/>
+        <location filename="../Project/Project.py" line="1976"/>
         <source>Rename file</source>
         <translation>Přejmenovat soubor</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1988"/>
+        <location filename="../Project/Project.py" line="2000"/>
         <source>Rename File</source>
         <translation>Přejmenovat soubor</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="2233"/>
+        <location filename="../Project/Project.py" line="2250"/>
         <source>Delete file</source>
         <translation>Smazat soubor</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="2263"/>
+        <location filename="../Project/Project.py" line="2280"/>
         <source>Delete directory</source>
         <translation>Smazat adresář</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="2358"/>
+        <location filename="../Project/Project.py" line="2375"/>
         <source>Create project directory</source>
         <translation>Vytvořit adresář projektu</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="2965"/>
+        <location filename="../Project/Project.py" line="2982"/>
         <source>New Project</source>
         <translation>Nový projekt</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="2474"/>
+        <location filename="../Project/Project.py" line="2491"/>
         <source>Add existing files to the project?</source>
         <translation>Přidat existující soubory do projektu?</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="2601"/>
+        <location filename="../Project/Project.py" line="2618"/>
         <source>Would you like to edit the VCS command options?</source>
         <translation>Chcete editovat parametry VCS příkazu?</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3831"/>
+        <location filename="../Project/Project.py" line="3866"/>
         <source>New project</source>
         <translation>Nový projekt</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="2544"/>
+        <location filename="../Project/Project.py" line="2561"/>
         <source>Shall the project file be added to the repository?</source>
         <translation>Má být projekt přidán do repozitáře?</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="2573"/>
+        <location filename="../Project/Project.py" line="2590"/>
         <source>Select version control system for the project</source>
         <translation>Výběr verzovacího systému projektu</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3845"/>
+        <location filename="../Project/Project.py" line="3880"/>
         <source>Open project</source>
         <translation>Otevřít projekt</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3115"/>
+        <location filename="../Project/Project.py" line="3132"/>
         <source>Project Files (*.e4p)</source>
         <translation>Soubory projektu (*.e4p)</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3882"/>
+        <location filename="../Project/Project.py" line="3917"/>
         <source>Save project as</source>
         <translation>Uložit projekt jako</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3130"/>
+        <location filename="../Project/Project.py" line="3147"/>
         <source>Save File</source>
         <translation>Uložit soubor</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3166"/>
+        <location filename="../Project/Project.py" line="3183"/>
         <source>Close Project</source>
         <translation>Zavřít projekt</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3166"/>
+        <location filename="../Project/Project.py" line="3183"/>
         <source>The current project has unsaved changes.</source>
         <translation>Aktuální projekt obsahuje neuložené změny.</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3343"/>
+        <location filename="../Project/Project.py" line="3360"/>
         <source>Syntax errors detected</source>
         <translation>Zjištěny syntaktické chyby</translation>
     </message>
     <message numerus="yes">
-        <location filename="../Project/Project.py" line="3343"/>
+        <location filename="../Project/Project.py" line="3360"/>
         <source>The project contains %n file(s) with syntax errors.</source>
         <translation>
             <numerusform>Projekt obsahuje %n soubor se syntaktickými chybami.</numerusform>
@@ -52799,582 +53319,582 @@
         </translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3831"/>
+        <location filename="../Project/Project.py" line="3866"/>
         <source>&amp;New...</source>
         <translation>&amp;Nový...</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3836"/>
+        <location filename="../Project/Project.py" line="3871"/>
         <source>Generate a new project</source>
         <translation>Vygenerovat nový projekt</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3837"/>
+        <location filename="../Project/Project.py" line="3872"/>
         <source>&lt;b&gt;New...&lt;/b&gt;&lt;p&gt;This opens a dialog for entering the info for a new project.&lt;/p&gt;</source>
         <translation>&lt;b&gt;Nový...&lt;/b&gt;&lt;p&gt;Otevře se dialogové okno pro zadání informací o novém projektu.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3845"/>
+        <location filename="../Project/Project.py" line="3880"/>
         <source>&amp;Open...</source>
         <translation>&amp;Otevřít...</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3850"/>
+        <location filename="../Project/Project.py" line="3885"/>
         <source>Open an existing project</source>
         <translation>Otevřít existující projekt</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3851"/>
-        <source>&lt;b&gt;Open...&lt;/b&gt;&lt;p&gt;This opens an existing project.&lt;/p&gt;</source>
-        <translation>&lt;b&gt;Otevřít....&lt;/b&gt;&lt;p&gt;Otevře existující projekt.&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="3858"/>
-        <source>Close project</source>
-        <translation>Zavřít projekt</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="3858"/>
-        <source>&amp;Close</source>
-        <translation>&amp;Zavřít</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="3862"/>
-        <source>Close the current project</source>
-        <translation>Uzavře aktuální projekt</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="3863"/>
-        <source>&lt;b&gt;Close&lt;/b&gt;&lt;p&gt;This closes the current project.&lt;/p&gt;</source>
-        <translation>&lt;b&gt;Zavřít&lt;/b&gt;&lt;p&gt;Aktuální projekt se uzavře.&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="3870"/>
-        <source>Save project</source>
-        <translation>Uložit projekt</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4062"/>
-        <source>&amp;Save</source>
-        <translation>&amp;Uložit</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="3874"/>
-        <source>Save the current project</source>
-        <translation>Uložit aktuální projekt</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="3875"/>
-        <source>&lt;b&gt;Save&lt;/b&gt;&lt;p&gt;This saves the current project.&lt;/p&gt;</source>
-        <translation>&lt;b&gt;Uložit&lt;/b&gt;&lt;p&gt;Aktuální projekt se uloží.&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="3882"/>
-        <source>Save &amp;as...</source>
-        <translation>Uložit j&amp;ako...</translation>
-    </message>
-    <message>
         <location filename="../Project/Project.py" line="3886"/>
-        <source>Save the current project to a new file</source>
-        <translation>Uloží aktuální projekt do nového souboru</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="3888"/>
-        <source>&lt;b&gt;Save as&lt;/b&gt;&lt;p&gt;This saves the current project to a new file.&lt;/p&gt;</source>
-        <translation>&lt;b&gt;Uložit jako&lt;/b&gt;&lt;p&gt;Uloží aktuální projekt do nového souboru.&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="3897"/>
-        <source>Add files to project</source>
-        <translation>Přidat soubory do projektu</translation>
+        <source>&lt;b&gt;Open...&lt;/b&gt;&lt;p&gt;This opens an existing project.&lt;/p&gt;</source>
+        <translation>&lt;b&gt;Otevřít....&lt;/b&gt;&lt;p&gt;Otevře existující projekt.&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="3893"/>
+        <source>Close project</source>
+        <translation>Zavřít projekt</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="3893"/>
+        <source>&amp;Close</source>
+        <translation>&amp;Zavřít</translation>
     </message>
     <message>
         <location filename="../Project/Project.py" line="3897"/>
+        <source>Close the current project</source>
+        <translation>Uzavře aktuální projekt</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="3898"/>
+        <source>&lt;b&gt;Close&lt;/b&gt;&lt;p&gt;This closes the current project.&lt;/p&gt;</source>
+        <translation>&lt;b&gt;Zavřít&lt;/b&gt;&lt;p&gt;Aktuální projekt se uzavře.&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="3905"/>
+        <source>Save project</source>
+        <translation>Uložit projekt</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4097"/>
+        <source>&amp;Save</source>
+        <translation>&amp;Uložit</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="3909"/>
+        <source>Save the current project</source>
+        <translation>Uložit aktuální projekt</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="3910"/>
+        <source>&lt;b&gt;Save&lt;/b&gt;&lt;p&gt;This saves the current project.&lt;/p&gt;</source>
+        <translation>&lt;b&gt;Uložit&lt;/b&gt;&lt;p&gt;Aktuální projekt se uloží.&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="3917"/>
+        <source>Save &amp;as...</source>
+        <translation>Uložit j&amp;ako...</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="3921"/>
+        <source>Save the current project to a new file</source>
+        <translation>Uloží aktuální projekt do nového souboru</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="3923"/>
+        <source>&lt;b&gt;Save as&lt;/b&gt;&lt;p&gt;This saves the current project to a new file.&lt;/p&gt;</source>
+        <translation>&lt;b&gt;Uložit jako&lt;/b&gt;&lt;p&gt;Uloží aktuální projekt do nového souboru.&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="3932"/>
+        <source>Add files to project</source>
+        <translation>Přidat soubory do projektu</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="3932"/>
         <source>Add &amp;files...</source>
         <translation>&amp;Přidat soubory...</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3902"/>
+        <location filename="../Project/Project.py" line="3937"/>
         <source>Add files to the current project</source>
         <translation>Přidat soubory do aktuálního projektu</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3904"/>
+        <location filename="../Project/Project.py" line="3939"/>
         <source>&lt;b&gt;Add files...&lt;/b&gt;&lt;p&gt;This opens a dialog for adding files to the current project. The place to add is determined by the file extension.&lt;/p&gt;</source>
         <translation>&lt;b&gt;Přidat soubory...&lt;/b&gt;&lt;p&gt;Otevře dialog pri přidání souborů do aktuálního projektu. Místo pro přidání je definováno extenzí souborů.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3913"/>
+        <location filename="../Project/Project.py" line="3948"/>
         <source>Add directory to project</source>
         <translation>Přidat adresář do projektu</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3913"/>
+        <location filename="../Project/Project.py" line="3948"/>
         <source>Add directory...</source>
         <translation>Přidat adresář...</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3918"/>
+        <location filename="../Project/Project.py" line="3953"/>
         <source>Add a directory to the current project</source>
         <translation>Přidat adresář do aktuálního projektu</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3920"/>
+        <location filename="../Project/Project.py" line="3955"/>
         <source>&lt;b&gt;Add directory...&lt;/b&gt;&lt;p&gt;This opens a dialog for adding a directory to the current project.&lt;/p&gt;</source>
         <translation>&lt;b&gt;Přidat adresář...&lt;/b&gt;&lt;p&gt;Otevře dialog pro přičtení adresáře do aktuálního projektu.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3928"/>
+        <location filename="../Project/Project.py" line="3963"/>
         <source>Add translation to project</source>
         <translation>Přidat překlad do projektu</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3928"/>
+        <location filename="../Project/Project.py" line="3963"/>
         <source>Add &amp;translation...</source>
         <translation>Přida&amp;t překlad...</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3933"/>
+        <location filename="../Project/Project.py" line="3968"/>
         <source>Add a translation to the current project</source>
         <translation>Přidat překlad do aktuálního projektu</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3935"/>
+        <location filename="../Project/Project.py" line="3970"/>
         <source>&lt;b&gt;Add translation...&lt;/b&gt;&lt;p&gt;This opens a dialog for add a translation to the current project.&lt;/p&gt;</source>
         <translation>&lt;b&gt;Přidat překlad&lt;/b&gt;&lt;p&gt;Otevře dialog pro přidání překladu do aktuálního projektu.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3943"/>
+        <location filename="../Project/Project.py" line="3978"/>
         <source>Search new files</source>
         <translation>Hledat nové soubory</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3943"/>
-        <source>Searc&amp;h new files...</source>
-        <translation>&amp;Hledat nové soubory...</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="3947"/>
-        <source>Search new files in the project directory.</source>
-        <translation>Hledat nové soubory v adresáři projektu.</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="3973"/>
-        <source>Project properties</source>
-        <translation>Nastavení projektu</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="3973"/>
-        <source>&amp;Properties...</source>
-        <translation>&amp;Natavení...</translation>
-    </message>
-    <message>
         <location filename="../Project/Project.py" line="3978"/>
+        <source>Searc&amp;h new files...</source>
+        <translation>&amp;Hledat nové soubory...</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="3982"/>
+        <source>Search new files in the project directory.</source>
+        <translation>Hledat nové soubory v adresáři projektu.</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4008"/>
+        <source>Project properties</source>
+        <translation>Nastavení projektu</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4008"/>
+        <source>&amp;Properties...</source>
+        <translation>&amp;Natavení...</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4013"/>
         <source>Show the project properties</source>
         <translation>Zobrazit nastavení projektu</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3979"/>
+        <location filename="../Project/Project.py" line="4014"/>
         <source>&lt;b&gt;Properties...&lt;/b&gt;&lt;p&gt;This shows a dialog to edit the project properties.&lt;/p&gt;</source>
         <translation>&lt;b&gt;Nastavení...&lt;/b&gt;&lt;p&gt;Zobrazí dialog s editací nastavení projektu.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3986"/>
+        <location filename="../Project/Project.py" line="4021"/>
         <source>User project properties</source>
         <translation>Uživatelská nastavení projektu</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3986"/>
+        <location filename="../Project/Project.py" line="4021"/>
         <source>&amp;User Properties...</source>
         <translation>Uživat&amp;elská nastavení...</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3991"/>
+        <location filename="../Project/Project.py" line="4026"/>
         <source>Show the user specific project properties</source>
         <translation>Zobrazit uživatelem definovaná nastavení projektu</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3993"/>
+        <location filename="../Project/Project.py" line="4028"/>
         <source>&lt;b&gt;User Properties...&lt;/b&gt;&lt;p&gt;This shows a dialog to edit the user specific project properties.&lt;/p&gt;</source>
         <translation>&lt;b&gt;Uživatelská nastavení...&lt;/b&gt;&lt;p&gt;Zobrazí dialog s editací uživatelských nastavení projektu.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4001"/>
+        <location filename="../Project/Project.py" line="4036"/>
         <source>Filetype Associations</source>
         <translation>Asociace typů souborů</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4001"/>
+        <location filename="../Project/Project.py" line="4036"/>
         <source>Filetype Associations...</source>
         <translation>Asociace typů souborů...</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4005"/>
+        <location filename="../Project/Project.py" line="4040"/>
         <source>Show the project filetype associations</source>
         <translation>Zobrazit asociace typů souborů</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4037"/>
+        <location filename="../Project/Project.py" line="4072"/>
         <source>Debugger Properties</source>
         <translation>Nastavení debugeru</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4037"/>
+        <location filename="../Project/Project.py" line="4072"/>
         <source>Debugger &amp;Properties...</source>
         <translation>Nastavení &amp;debuggeru...</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4041"/>
+        <location filename="../Project/Project.py" line="4076"/>
         <source>Show the debugger properties</source>
         <translation>Zobrazit nastavení debugeru</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4042"/>
+        <location filename="../Project/Project.py" line="4077"/>
         <source>&lt;b&gt;Debugger Properties...&lt;/b&gt;&lt;p&gt;This shows a dialog to edit project specific debugger settings.&lt;/p&gt;</source>
         <translation>&lt;b&gt;Nastavení debugeru...&lt;/b&gt;&lt;p&gt;Zobrazí dialog s editací nastavení debugeru.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4050"/>
+        <location filename="../Project/Project.py" line="4085"/>
         <source>Load</source>
         <translation>Načíst</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4050"/>
+        <location filename="../Project/Project.py" line="4085"/>
         <source>&amp;Load</source>
         <translation>&amp;Načíst</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4054"/>
+        <location filename="../Project/Project.py" line="4089"/>
         <source>Load the debugger properties</source>
         <translation>Načíst nastavení debugeru</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4055"/>
+        <location filename="../Project/Project.py" line="4090"/>
         <source>&lt;b&gt;Load Debugger Properties&lt;/b&gt;&lt;p&gt;This loads the project specific debugger settings.&lt;/p&gt;</source>
         <translation>&lt;b&gt;Načíst nastavení debugeru&lt;/b&gt;&lt;p&gt;Načtou se nastavení debugeru do projektu.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4062"/>
+        <location filename="../Project/Project.py" line="4097"/>
         <source>Save</source>
         <translation>Uložit</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4066"/>
-        <source>Save the debugger properties</source>
-        <translation>Uložit nastavení debugeru</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4067"/>
-        <source>&lt;b&gt;Save Debugger Properties&lt;/b&gt;&lt;p&gt;This saves the project specific debugger settings.&lt;/p&gt;</source>
-        <translation>&lt;b&gt;Uložit nastavení debugeru&lt;/b&gt;&lt;p&gt;Uloží nastavení debugeru definovaná v projektu..&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4074"/>
-        <source>Delete</source>
-        <translation>Smazat</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4074"/>
-        <source>&amp;Delete</source>
-        <translation>Sma&amp;zat</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4078"/>
-        <source>Delete the debugger properties</source>
-        <translation>Smazat nastavení debugeru</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4079"/>
-        <source>&lt;b&gt;Delete Debugger Properties&lt;/b&gt;&lt;p&gt;This deletes the file containing the project specific debugger settings.&lt;/p&gt;</source>
-        <translation>&lt;b&gt;Smazat nastavení debugeru&lt;/b&gt;&lt;p&gt;Smaže se soubor obsahující nastavení debugeru v daném projektu.&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4087"/>
-        <source>Reset</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4087"/>
-        <source>&amp;Reset</source>
-        <translation>&amp;Reset</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4091"/>
-        <source>Reset the debugger properties</source>
-        <translation>Reset nastavení debugeru</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4092"/>
-        <source>&lt;b&gt;Reset Debugger Properties&lt;/b&gt;&lt;p&gt;This resets the project specific debugger settings.&lt;/p&gt;</source>
-        <translation>&lt;b&gt;Reset nastavení debugeru&lt;/b&gt;&lt;p&gt;Zresetuje nastavení debugeru v projektu.&lt;/p&gt;</translation>
-    </message>
-    <message>
         <location filename="../Project/Project.py" line="4101"/>
+        <source>Save the debugger properties</source>
+        <translation>Uložit nastavení debugeru</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4102"/>
+        <source>&lt;b&gt;Save Debugger Properties&lt;/b&gt;&lt;p&gt;This saves the project specific debugger settings.&lt;/p&gt;</source>
+        <translation>&lt;b&gt;Uložit nastavení debugeru&lt;/b&gt;&lt;p&gt;Uloží nastavení debugeru definovaná v projektu..&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4109"/>
+        <source>Delete</source>
+        <translation>Smazat</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4109"/>
+        <source>&amp;Delete</source>
+        <translation>Sma&amp;zat</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4113"/>
+        <source>Delete the debugger properties</source>
+        <translation>Smazat nastavení debugeru</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4114"/>
+        <source>&lt;b&gt;Delete Debugger Properties&lt;/b&gt;&lt;p&gt;This deletes the file containing the project specific debugger settings.&lt;/p&gt;</source>
+        <translation>&lt;b&gt;Smazat nastavení debugeru&lt;/b&gt;&lt;p&gt;Smaže se soubor obsahující nastavení debugeru v daném projektu.&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4122"/>
+        <source>Reset</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4122"/>
+        <source>&amp;Reset</source>
+        <translation>&amp;Reset</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4126"/>
+        <source>Reset the debugger properties</source>
+        <translation>Reset nastavení debugeru</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4127"/>
+        <source>&lt;b&gt;Reset Debugger Properties&lt;/b&gt;&lt;p&gt;This resets the project specific debugger settings.&lt;/p&gt;</source>
+        <translation>&lt;b&gt;Reset nastavení debugeru&lt;/b&gt;&lt;p&gt;Zresetuje nastavení debugeru v projektu.&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4136"/>
         <source>Load session</source>
         <translation>Načíst relaci</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4105"/>
+        <location filename="../Project/Project.py" line="4140"/>
         <source>Load the projects session file.</source>
         <translation>Načíst soubor s relací projektu.</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4106"/>
-        <source>&lt;b&gt;Load session&lt;/b&gt;&lt;p&gt;This loads the projects session file. The session consists of the following data.&lt;br&gt;- all open source files&lt;br&gt;- all breakpoint&lt;br&gt;- the commandline arguments&lt;br&gt;- the working directory&lt;br&gt;- the exception reporting flag&lt;/p&gt;</source>
-        <translation>&lt;b&gt;Načíst relaci&lt;/b&gt;&lt;p&gt;Načte soubor s relací projektu. Relace obsahuje následující údaje:&lt;br&gt;- všechny otevřené zdrojové soubory&lt;br&gt;- všechny breakpointy&lt;br&gt;- argumenty příkazové řádky &lt;br&gt;- pracovní adresář&lt;br&gt;- příznak výjimky&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4119"/>
-        <source>Save session</source>
-        <translation>Uložit relaci</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4123"/>
-        <source>Save the projects session file.</source>
-        <translation>Uložit soubor s relací projektu.</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4124"/>
-        <source>&lt;b&gt;Save session&lt;/b&gt;&lt;p&gt;This saves the projects session file. The session consists of the following data.&lt;br&gt;- all open source files&lt;br&gt;- all breakpoint&lt;br&gt;- the commandline arguments&lt;br&gt;- the working directory&lt;br&gt;- the exception reporting flag&lt;/p&gt;</source>
-        <translation>&lt;b&gt;Uložit relaci&lt;/b&gt;&lt;p&gt;Uloží soubor s relací projektu. Relace obsahuje následující údaje:&lt;br&gt;- všechny otevřené zdrojové soubory&lt;br&gt;- všechny breakpointy&lt;br&gt;- argumenty příkazové řádky &lt;br&gt;- pracovní adresář&lt;br&gt;- příznak výjimky&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4137"/>
-        <source>Delete session</source>
-        <translation>Smazat relaci</translation>
-    </message>
-    <message>
         <location filename="../Project/Project.py" line="4141"/>
+        <source>&lt;b&gt;Load session&lt;/b&gt;&lt;p&gt;This loads the projects session file. The session consists of the following data.&lt;br&gt;- all open source files&lt;br&gt;- all breakpoint&lt;br&gt;- the commandline arguments&lt;br&gt;- the working directory&lt;br&gt;- the exception reporting flag&lt;/p&gt;</source>
+        <translation>&lt;b&gt;Načíst relaci&lt;/b&gt;&lt;p&gt;Načte soubor s relací projektu. Relace obsahuje následující údaje:&lt;br&gt;- všechny otevřené zdrojové soubory&lt;br&gt;- všechny breakpointy&lt;br&gt;- argumenty příkazové řádky &lt;br&gt;- pracovní adresář&lt;br&gt;- příznak výjimky&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4154"/>
+        <source>Save session</source>
+        <translation>Uložit relaci</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4158"/>
+        <source>Save the projects session file.</source>
+        <translation>Uložit soubor s relací projektu.</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4159"/>
+        <source>&lt;b&gt;Save session&lt;/b&gt;&lt;p&gt;This saves the projects session file. The session consists of the following data.&lt;br&gt;- all open source files&lt;br&gt;- all breakpoint&lt;br&gt;- the commandline arguments&lt;br&gt;- the working directory&lt;br&gt;- the exception reporting flag&lt;/p&gt;</source>
+        <translation>&lt;b&gt;Uložit relaci&lt;/b&gt;&lt;p&gt;Uloží soubor s relací projektu. Relace obsahuje následující údaje:&lt;br&gt;- všechny otevřené zdrojové soubory&lt;br&gt;- všechny breakpointy&lt;br&gt;- argumenty příkazové řádky &lt;br&gt;- pracovní adresář&lt;br&gt;- příznak výjimky&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4172"/>
+        <source>Delete session</source>
+        <translation>Smazat relaci</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4176"/>
         <source>Delete the projects session file.</source>
         <translation>Smaže soubor s relací projektu.</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4142"/>
+        <location filename="../Project/Project.py" line="4177"/>
         <source>&lt;b&gt;Delete session&lt;/b&gt;&lt;p&gt;This deletes the projects session file&lt;/p&gt;</source>
         <translation>&lt;b&gt;Smazat relaci&lt;/b&gt;&lt;p&gt;Smaže soubor s relací projektu.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4151"/>
+        <location filename="../Project/Project.py" line="4186"/>
         <source>Code Metrics</source>
         <translation>Metriky kódu</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4151"/>
+        <location filename="../Project/Project.py" line="4186"/>
         <source>&amp;Code Metrics...</source>
         <translation>Metriky &amp;kódu...</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4155"/>
+        <location filename="../Project/Project.py" line="4190"/>
         <source>Show some code metrics for the project.</source>
         <translation>Zobrazit metriky kódu projektu.</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4157"/>
+        <location filename="../Project/Project.py" line="4192"/>
         <source>&lt;b&gt;Code Metrics...&lt;/b&gt;&lt;p&gt;This shows some code metrics for all Python files in the project.&lt;/p&gt;</source>
         <translation>&lt;b&gt;Metriky kódu...&lt;/b&gt;&lt;p&gt;Zobrazí se metriky kódu všech python souborů v projektu.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4165"/>
+        <location filename="../Project/Project.py" line="4200"/>
         <source>Python Code Coverage</source>
         <translation>Pokrytí python kódu</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4165"/>
-        <source>Code Co&amp;verage...</source>
-        <translation>Pokr&amp;ytí kódu...</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4169"/>
-        <source>Show code coverage information for the project.</source>
-        <translation>Zobrazit informace pokrytí kódu projektu.</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4171"/>
-        <source>&lt;b&gt;Code Coverage...&lt;/b&gt;&lt;p&gt;This shows the code coverage information for all Python files in the project.&lt;/p&gt;</source>
-        <translation>&lt;b&gt;Pokrytí kódu...&lt;/b&gt;&lt;p&gt;Zobrazí informace o pokrytí kódu ve všech python souborech projektu.&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="5053"/>
-        <source>Profile Data</source>
-        <translation>Profilovat data</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4179"/>
-        <source>&amp;Profile Data...</source>
-        <translation>&amp;Profilovat data...</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4183"/>
-        <source>Show profiling data for the project.</source>
-        <translation>Zobrazit profilování dat projektu.</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4185"/>
-        <source>&lt;b&gt;Profile Data...&lt;/b&gt;&lt;p&gt;This shows the profiling data for the project.&lt;/p&gt;</source>
-        <translation>&lt;b&gt;Profilovat data&lt;/b&gt;&lt;p&gt;Zobrazí se profilování dat projektu.&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="5107"/>
-        <source>Application Diagram</source>
-        <translation>Diagram aplikace</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4194"/>
-        <source>&amp;Application Diagram...</source>
-        <translation>Diagram &amp;aplikace...</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4198"/>
-        <source>Show a diagram of the project.</source>
-        <translation>Zobrazit diagram projektu.</translation>
-    </message>
-    <message>
         <location filename="../Project/Project.py" line="4200"/>
+        <source>Code Co&amp;verage...</source>
+        <translation>Pokr&amp;ytí kódu...</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4204"/>
+        <source>Show code coverage information for the project.</source>
+        <translation>Zobrazit informace pokrytí kódu projektu.</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4206"/>
+        <source>&lt;b&gt;Code Coverage...&lt;/b&gt;&lt;p&gt;This shows the code coverage information for all Python files in the project.&lt;/p&gt;</source>
+        <translation>&lt;b&gt;Pokrytí kódu...&lt;/b&gt;&lt;p&gt;Zobrazí informace o pokrytí kódu ve všech python souborech projektu.&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="5088"/>
+        <source>Profile Data</source>
+        <translation>Profilovat data</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4214"/>
+        <source>&amp;Profile Data...</source>
+        <translation>&amp;Profilovat data...</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4218"/>
+        <source>Show profiling data for the project.</source>
+        <translation>Zobrazit profilování dat projektu.</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4220"/>
+        <source>&lt;b&gt;Profile Data...&lt;/b&gt;&lt;p&gt;This shows the profiling data for the project.&lt;/p&gt;</source>
+        <translation>&lt;b&gt;Profilovat data&lt;/b&gt;&lt;p&gt;Zobrazí se profilování dat projektu.&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="5142"/>
+        <source>Application Diagram</source>
+        <translation>Diagram aplikace</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4229"/>
+        <source>&amp;Application Diagram...</source>
+        <translation>Diagram &amp;aplikace...</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4233"/>
+        <source>Show a diagram of the project.</source>
+        <translation>Zobrazit diagram projektu.</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4235"/>
         <source>&lt;b&gt;Application Diagram...&lt;/b&gt;&lt;p&gt;This shows a diagram of the project.&lt;/p&gt;</source>
         <translation>&lt;b&gt;Diagram aplikace...&lt;/b&gt;&lt;p&gt;Zobrazí diagram projektu.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4325"/>
+        <location filename="../Project/Project.py" line="4360"/>
         <source>&amp;Project</source>
         <translation>&amp;Projekt</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4326"/>
+        <location filename="../Project/Project.py" line="4361"/>
         <source>Open &amp;Recent Projects</source>
         <translation>Otevřít poslední p&amp;rojekty</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4331"/>
+        <location filename="../Project/Project.py" line="4366"/>
         <source>&amp;Version Control</source>
         <translation>Kontrola &amp;verzí</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4335"/>
+        <location filename="../Project/Project.py" line="4370"/>
         <source>Chec&amp;k</source>
         <translation>Zkontro&amp;lovat</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4337"/>
+        <location filename="../Project/Project.py" line="4372"/>
         <source>Sho&amp;w</source>
         <translation>Zo&amp;brazit</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4338"/>
+        <location filename="../Project/Project.py" line="4373"/>
         <source>&amp;Diagrams</source>
         <translation>&amp;Diagramy</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4327"/>
+        <location filename="../Project/Project.py" line="4362"/>
         <source>Session</source>
         <translation>Relace</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4340"/>
+        <location filename="../Project/Project.py" line="4375"/>
         <source>Source &amp;Documentation</source>
         <translation>Zd&amp;rojová dokumentace</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4328"/>
+        <location filename="../Project/Project.py" line="4363"/>
         <source>Debugger</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4339"/>
+        <location filename="../Project/Project.py" line="4374"/>
         <source>Pac&amp;kagers</source>
         <translation>Balíč&amp;ky</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4465"/>
+        <location filename="../Project/Project.py" line="4500"/>
         <source>Project</source>
         <translation>Projekt</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4531"/>
+        <location filename="../Project/Project.py" line="4566"/>
         <source>&amp;Clear</source>
         <translation>&amp;Vyčistit</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4704"/>
+        <location filename="../Project/Project.py" line="4739"/>
         <source>Search New Files</source>
         <translation>Hledat nové soubory</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4704"/>
+        <location filename="../Project/Project.py" line="4739"/>
         <source>There were no new files found to be added.</source>
         <translation>Nebyly nalezeny žádné soubory, které je možné přidat.</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4850"/>
+        <location filename="../Project/Project.py" line="4885"/>
         <source>Version Control System</source>
         <translation>Version Control System</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4980"/>
+        <location filename="../Project/Project.py" line="5015"/>
         <source>Coverage Data</source>
         <translation>Datové pokrytí</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5030"/>
+        <location filename="../Project/Project.py" line="5065"/>
         <source>There is no main script defined for the current project. Aborting</source>
         <translation>V aktuálním projektu nebyl určen hlavní skript. Zrušeno</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5003"/>
+        <location filename="../Project/Project.py" line="5038"/>
         <source>Code Coverage</source>
         <translation>Pokrytí kódu</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5003"/>
+        <location filename="../Project/Project.py" line="5038"/>
         <source>Please select a coverage file</source>
         <translation>Prosím, vyberte soubor pokrytí</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5053"/>
+        <location filename="../Project/Project.py" line="5088"/>
         <source>Please select a profile file</source>
         <translation>Prosím, vyberte soubor s profilem</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5107"/>
+        <location filename="../Project/Project.py" line="5142"/>
         <source>Include module names?</source>
         <translation>Včetně jmen modulů?</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5300"/>
+        <location filename="../Project/Project.py" line="5335"/>
         <source>Create Package List</source>
         <translation>Vytvořit seznam balíčků</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4223"/>
+        <location filename="../Project/Project.py" line="4258"/>
         <source>Create &amp;Package List</source>
         <translation type="unfinished">Vytvořit Plugin &amp;archiv</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5574"/>
+        <location filename="../Project/Project.py" line="5609"/>
         <source>Create Plugin Archive</source>
         <translation>Vytvořit Plugin archiv</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5251"/>
+        <location filename="../Project/Project.py" line="5286"/>
         <source>&lt;p&gt;The file &lt;b&gt;PKGLIST&lt;/b&gt; already exists.&lt;/p&gt;&lt;p&gt;Overwrite it?&lt;/p&gt;</source>
         <translation>&lt;p&gt;Soubor &lt;b&gt;PKGLIST&lt;/b&gt; již existuje.&lt;/p&gt;&lt;p&gt;Přepsat jej?&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5319"/>
+        <location filename="../Project/Project.py" line="5354"/>
         <source>The project does not have a main script defined. Aborting...</source>
         <translation>Projekt nemá definován hlavní skript. Zrušeno...</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1715"/>
+        <location filename="../Project/Project.py" line="1727"/>
         <source>&lt;p&gt;The source directory doesn&apos;t contain any files belonging to the selected category.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Zdrojový adresář neobsahuje žádné soubory související s danou kategorií.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="2965"/>
+        <location filename="../Project/Project.py" line="2982"/>
         <source>Select Version Control System</source>
         <translation>Vybrat Version Control System</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="2580"/>
+        <location filename="../Project/Project.py" line="2597"/>
         <source>None</source>
         <translation>None</translation>
     </message>
@@ -53384,42 +53904,42 @@
         <translation>Zaregistrovat typ projektu</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4239"/>
+        <location filename="../Project/Project.py" line="4274"/>
         <source>Create Plugin &amp;Archives</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1393"/>
+        <location filename="../Project/Project.py" line="1405"/>
         <source>You have to specify a translation pattern first.</source>
         <translation>Nejdříve musíte specifikovat vzor překladu.</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="2684"/>
+        <location filename="../Project/Project.py" line="2701"/>
         <source>Translation Pattern</source>
         <translation>Vzor překladu</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="2684"/>
+        <location filename="../Project/Project.py" line="2701"/>
         <source>Enter the path pattern for translation files (use &apos;%language%&apos; in place of the language code):</source>
         <translation>Zadejte vzor cesty pro soubory s překlady (použijte  &apos;%language%&apos; na místě s kódem jazyka):</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4019"/>
+        <location filename="../Project/Project.py" line="4054"/>
         <source>Lexer Associations</source>
         <translation>Spojení lexeru</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4019"/>
+        <location filename="../Project/Project.py" line="4054"/>
         <source>Lexer Associations...</source>
         <translation>Spojení lexeru...</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4023"/>
+        <location filename="../Project/Project.py" line="4058"/>
         <source>Show the project lexer associations (overriding defaults)</source>
         <translation>Zobrazit spojení lexeru projektu (přepíše výchozí)</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4025"/>
+        <location filename="../Project/Project.py" line="4060"/>
         <source>&lt;b&gt;Lexer Associations...&lt;/b&gt;&lt;p&gt;This shows a dialog to edit the lexer associations of the project. These associations override the global lexer associations. Lexers are used to highlight the editor text.&lt;/p&gt;</source>
         <translation>&lt;b&gt;Spojení lexeru...&lt;/b&gt;&lt;p&gt;Zobrazuje dialog s editací spojení lexeru projektu. Tato spojení přepisují globální lexer spojení. Lexer je použit pro zvýraznění textu v editoru.&lt;/p&gt;</translation>
     </message>
@@ -53439,112 +53959,112 @@
         <translation>Python3 soubory (*.py *.py3);;Python3 GUI soubory (*.pyw *.pyw3);;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="805"/>
+        <location filename="../Project/Project.py" line="817"/>
         <source>&lt;p&gt;The project file &lt;b&gt;{0}&lt;/b&gt; could not be read.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Soubor projektu &lt;b&gt;{0}&lt;/b&gt; nelze načíst.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="908"/>
+        <location filename="../Project/Project.py" line="920"/>
         <source>&lt;p&gt;The project file &lt;b&gt;{0}&lt;/b&gt; could not be written.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Do souboru projektu &lt;b&gt;{0}&lt;/b&gt; nelze zapisovat.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="944"/>
+        <location filename="../Project/Project.py" line="956"/>
         <source>&lt;p&gt;The user specific project properties file &lt;b&gt;{0}&lt;/b&gt; could not be read.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Uživatelská nastavení projektu &lt;b&gt;{0}&lt;/b&gt; nelze načíst.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="968"/>
+        <location filename="../Project/Project.py" line="980"/>
         <source>&lt;p&gt;The user specific project properties file &lt;b&gt;{0}&lt;/b&gt; could not be written.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Do souboru s uživatelskými nastaveními  &lt;b&gt;{0}&lt;/b&gt; nelze zapisovat.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1026"/>
+        <location filename="../Project/Project.py" line="1038"/>
         <source>&lt;p&gt;The project session file &lt;b&gt;{0}&lt;/b&gt; could not be read.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Soubor s relací projektu &lt;b&gt;{0}&lt;/b&gt; nelze načíst.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1062"/>
+        <location filename="../Project/Project.py" line="1074"/>
         <source>&lt;p&gt;The project session file &lt;b&gt;{0}&lt;/b&gt; could not be written.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Do souboru s relací projektu &lt;b&gt;{0}&lt;/b&gt; nelze zapisovat.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1091"/>
+        <location filename="../Project/Project.py" line="1103"/>
         <source>&lt;p&gt;The project session file &lt;b&gt;{0}&lt;/b&gt; could not be deleted.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Soubor s relací projektu &lt;b&gt;{0}&lt;/b&gt; nelze smazat.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1125"/>
+        <location filename="../Project/Project.py" line="1137"/>
         <source>&lt;p&gt;The tasks file &lt;b&gt;{0}&lt;/b&gt; could not be read.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Soubor s úlohami &lt;b&gt;{0}&lt;/b&gt; nelze načíst.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1145"/>
+        <location filename="../Project/Project.py" line="1157"/>
         <source>&lt;p&gt;The tasks file &lt;b&gt;{0}&lt;/b&gt; could not be written.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Do souboru s úlohami &lt;b&gt;{0}&lt;/b&gt; nelze zapisovat.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1204"/>
+        <location filename="../Project/Project.py" line="1216"/>
         <source>&lt;p&gt;The project debugger properties file &lt;b&gt;{0}&lt;/b&gt; could not be read.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Soubor s nastaveními debuggeru &lt;b&gt;{0}&lt;/b&gt; nelze načíst.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1239"/>
+        <location filename="../Project/Project.py" line="1251"/>
         <source>&lt;p&gt;The project debugger properties file &lt;b&gt;{0}&lt;/b&gt; could not be written.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Do souboru s nastaveními debuggeru &lt;b&gt;{0}&lt;/b&gt; nelze zapisovat.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1265"/>
+        <location filename="../Project/Project.py" line="1277"/>
         <source>&lt;p&gt;The project debugger properties file &lt;b&gt;{0}&lt;/b&gt; could not be deleted.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Soubor s nastaveními debuggeru &lt;b&gt;{0}&lt;/b&gt; nelze smazat.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1748"/>
+        <location filename="../Project/Project.py" line="1760"/>
         <source>&lt;p&gt;The file &lt;b&gt;{0}&lt;/b&gt; already exists.&lt;/p&gt;&lt;p&gt;Overwrite it?&lt;/p&gt;</source>
         <translation>&lt;p&gt;Soubor &lt;b&gt;{0}&lt;/b&gt; již existuje.&lt;/p&gt;&lt;p&gt;Má se přepsat?&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3130"/>
+        <location filename="../Project/Project.py" line="3147"/>
         <source>&lt;p&gt;The file &lt;b&gt;{0}&lt;/b&gt; already exists. Overwrite it?&lt;/p&gt;</source>
         <translation>&lt;p&gt;Soubor &lt;b&gt;{0}&lt;/b&gt; již existuje.&lt;/p&gt;&lt;p&gt;Má se přepsat?&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1988"/>
+        <location filename="../Project/Project.py" line="2000"/>
         <source>&lt;p&gt;The file &lt;b&gt;{0}&lt;/b&gt; could not be renamed.&lt;br /&gt;Reason: {1}&lt;/p&gt;</source>
         <translation>&lt;p&gt;Soubor &lt;b&gt;{0}&lt;/b&gt; nemůže být přejmenován.&lt;br /&gt;Důvod: {1}&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="2358"/>
+        <location filename="../Project/Project.py" line="2375"/>
         <source>&lt;p&gt;The project directory &lt;b&gt;{0}&lt;/b&gt; could not be created.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Adresář projektu &lt;b&gt;{0}&lt;/b&gt; nelze vytvořit.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4850"/>
+        <location filename="../Project/Project.py" line="4885"/>
         <source>&lt;p&gt;The selected VCS &lt;b&gt;{0}&lt;/b&gt; could not be found.&lt;br/&gt;Disabling version control.&lt;/p&gt;&lt;p&gt;{1}&lt;/p&gt;</source>
         <translation>&lt;p&gt;Vybrané VCS &lt;b&gt;{0}&lt;/b&gt; nebylo nalezeno.&lt;br/&gt;Kontrola verzí vypnuta.&lt;/p&gt;&lt;p&gt;{1}&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5300"/>
+        <location filename="../Project/Project.py" line="5335"/>
         <source>&lt;p&gt;The file &lt;b&gt;PKGLIST&lt;/b&gt; could not be created.&lt;/p&gt;&lt;p&gt;Reason: {0}&lt;/p&gt;</source>
         <translation>&lt;p&gt;Soubor &lt;b&gt;PKGLIST&lt;/b&gt; nelze vytvořit.&lt;/p&gt;&lt;p&gt;Důvod: {0}&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5460"/>
+        <location filename="../Project/Project.py" line="5495"/>
         <source>&lt;p&gt;The file &lt;b&gt;{0}&lt;/b&gt; could not be stored in the archive. Ignoring it.&lt;/p&gt;&lt;p&gt;Reason: {1}&lt;/p&gt;</source>
         <translation>&lt;p&gt;Soubor &lt;b&gt;{0}&lt;/b&gt; nelze uložit do archivu. Ingorováno.&lt;/p&gt;&lt;p&gt;Důvod: {1}&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5533"/>
+        <location filename="../Project/Project.py" line="5568"/>
         <source>&lt;p&gt;The plugin file &lt;b&gt;{0}&lt;/b&gt; could not be read.&lt;/p&gt;&lt;p&gt;Reason: {1}&lt;/p&gt;</source>
         <translation>&lt;p&gt;Plugin soubor &lt;b&gt;{0}&lt;/b&gt; nelze přečíst.&lt;/p&gt;&lt;p&gt;Důvod: {1}&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1671"/>
+        <location filename="../Project/Project.py" line="1683"/>
         <source>&lt;p&gt;The selected file &lt;b&gt;{0}&lt;/b&gt; could not be added to &lt;b&gt;{1}&lt;/b&gt;.&lt;/p&gt;&lt;p&gt;Reason: {2}&lt;/p&gt;</source>
         <translation>&lt;p&gt;Vybraný soubor &lt;b&gt;{0}&lt;/b&gt; nelze přidat do &lt;b&gt;{1}&lt;/b&gt;.&lt;/p&gt;&lt;p&gt;Důvod: {2}&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1730"/>
+        <location filename="../Project/Project.py" line="1742"/>
         <source>&lt;p&gt;The target directory &lt;b&gt;{0}&lt;/b&gt; could not be created.&lt;/p&gt;&lt;p&gt;Reason: {1}&lt;/p&gt;</source>
         <translation>&lt;p&gt;Cílový adresář &lt;b&gt;{0}&lt;/b&gt; nelze vytvořit.&lt;/p&gt;&lt;p&gt;Důvod: {1}&lt;/p&gt;</translation>
     </message>
@@ -53554,32 +54074,32 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="2441"/>
+        <location filename="../Project/Project.py" line="2458"/>
         <source>Create main script</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="2441"/>
+        <location filename="../Project/Project.py" line="2458"/>
         <source>&lt;p&gt;The mainscript &lt;b&gt;{0}&lt;/b&gt; could not be created.&lt;br/&gt;Reason: {1}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4208"/>
+        <location filename="../Project/Project.py" line="4243"/>
         <source>Load Diagram</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4208"/>
+        <location filename="../Project/Project.py" line="4243"/>
         <source>&amp;Load Diagram...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4212"/>
+        <location filename="../Project/Project.py" line="4247"/>
         <source>Load a diagram from file.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4214"/>
+        <location filename="../Project/Project.py" line="4249"/>
         <source>&lt;b&gt;Load Diagram...&lt;/b&gt;&lt;p&gt;This loads a diagram from file.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -53609,37 +54129,37 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4839"/>
+        <location filename="../Project/Project.py" line="4874"/>
         <source>&lt;p&gt;The selected VCS &lt;b&gt;{0}&lt;/b&gt; could not be found. &lt;br/&gt;Reverting override.&lt;/p&gt;&lt;p&gt;{1}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5574"/>
+        <location filename="../Project/Project.py" line="5609"/>
         <source>&lt;p&gt;The plugin file &lt;b&gt;{0}&lt;/b&gt; could not be read.&lt;/p&gt; &lt;p&gt;Reason: {1}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4228"/>
+        <location filename="../Project/Project.py" line="4263"/>
         <source>Create an initial PKGLIST file for an eric6 plugin.</source>
         <translation type="unfinished">Vytvořit soubor eric5 plugin archivu. {6 ?}</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4230"/>
+        <location filename="../Project/Project.py" line="4265"/>
         <source>&lt;b&gt;Create Package List&lt;/b&gt;&lt;p&gt;This creates an initial list of files to include in an eric6 plugin archive. The list is created from the project file.&lt;/p&gt;</source>
         <translation type="unfinished">&lt;b&gt;Vytvořit Plugin archiv&lt;/b&gt;&lt;p&gt;Vytvoří soubor s eric5 plugin archivem za použití seznamu souborů daných v PKGLIST souboru. Jméno archivu je odvozeno ze jména hlavního skriptu.&lt;/p&gt; {6 ?}</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4244"/>
+        <location filename="../Project/Project.py" line="4279"/>
         <source>Create eric6 plugin archive files.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4246"/>
+        <location filename="../Project/Project.py" line="4281"/>
         <source>&lt;b&gt;Create Plugin Archives&lt;/b&gt;&lt;p&gt;This creates eric6 plugin archive files using the list of files given in a PKGLIST* file. The archive name is built from the main script name if not designated in the package list file.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5424"/>
+        <location filename="../Project/Project.py" line="5459"/>
         <source>&lt;p&gt;The eric6 plugin archive file &lt;b&gt;{0}&lt;/b&gt; could not be created.&lt;/p&gt;&lt;p&gt;Reason: {1}&lt;/p&gt;</source>
         <translation type="unfinished">&lt;p&gt;Soubor s eric5 plugin archivem &lt;b&gt;{0}&lt;/b&gt; nelze vytvořit. Zrušeno...&lt;/p&gt;&lt;p&gt;Důvod: {1}&lt;/p&gt; {6 ?} {0}?} {1}?}</translation>
     </message>
@@ -53649,213 +54169,213 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="2933"/>
+        <location filename="../Project/Project.py" line="2950"/>
         <source>Create project management directory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="2933"/>
+        <location filename="../Project/Project.py" line="2950"/>
         <source>&lt;p&gt;The project directory &lt;b&gt;{0}&lt;/b&gt; is not writable.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3958"/>
+        <location filename="../Project/Project.py" line="3993"/>
         <source>Alt+Ctrl+P</source>
         <comment>Project|Search Project File</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3964"/>
+        <location filename="../Project/Project.py" line="3999"/>
         <source>Search for a file in the project list of files.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3966"/>
+        <location filename="../Project/Project.py" line="4001"/>
         <source>&lt;b&gt;Search Project File&lt;/b&gt;&lt;p&gt;This searches for a file in the project list of files.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3958"/>
+        <location filename="../Project/Project.py" line="3993"/>
         <source>Search Project File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3958"/>
+        <location filename="../Project/Project.py" line="3993"/>
         <source>Search Project File...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5355"/>
+        <location filename="../Project/Project.py" line="5390"/>
         <source>Create Plugin Archives</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4256"/>
+        <location filename="../Project/Project.py" line="4291"/>
         <source>Create Plugin Archives (Snapshot)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4256"/>
+        <location filename="../Project/Project.py" line="4291"/>
         <source>Create Plugin Archives (&amp;Snapshot)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4261"/>
+        <location filename="../Project/Project.py" line="4296"/>
         <source>Create eric6 plugin archive files (snapshot releases).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4263"/>
+        <location filename="../Project/Project.py" line="4298"/>
         <source>&lt;b&gt;Create Plugin Archives (Snapshot)&lt;/b&gt;&lt;p&gt;This creates eric6 plugin archive files using the list of files given in the PKGLIST* file. The archive name is built from the main script name if not designated in the package list file. The version entry of the main script is modified to reflect a snapshot release.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5333"/>
-        <source>Select package lists:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="5351"/>
-        <source>Creating plugin archives...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="5351"/>
-        <source>Abort</source>
-        <translation type="unfinished">Přerušit</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="5351"/>
-        <source>%v/%m Archives</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Project/Project.py" line="5368"/>
+        <source>Select package lists:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="5386"/>
+        <source>Creating plugin archives...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="5386"/>
+        <source>Abort</source>
+        <translation type="unfinished">Přerušit</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="5386"/>
+        <source>%v/%m Archives</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="5403"/>
         <source>&lt;p&gt;The file &lt;b&gt;{0}&lt;/b&gt; could not be read.&lt;/p&gt;&lt;p&gt;Reason: {1}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5479"/>
+        <location filename="../Project/Project.py" line="5514"/>
         <source>&lt;p&gt;The eric6 plugin archive files were created with some errors.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5482"/>
+        <location filename="../Project/Project.py" line="5517"/>
         <source>&lt;p&gt;The eric6 plugin archive files were created successfully.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5344"/>
+        <location filename="../Project/Project.py" line="5379"/>
         <source>&lt;p&gt;No package list files (PKGLIST*) available or selected. Aborting...&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5396"/>
+        <location filename="../Project/Project.py" line="5431"/>
         <source>&lt;p&gt;The file &lt;b&gt;{0}&lt;/b&gt; is not ready yet.&lt;/p&gt;&lt;p&gt;Please rework it and delete the&apos;; initial_list&apos; line of the header.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3949"/>
+        <location filename="../Project/Project.py" line="3984"/>
         <source>&lt;b&gt;Search new files...&lt;/b&gt;&lt;p&gt;This searches for new files (sources, *.ui, *.idl, *.proto) in the project directory and registered subdirectories.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4007"/>
+        <location filename="../Project/Project.py" line="4042"/>
         <source>&lt;b&gt;Filetype Associations...&lt;/b&gt;&lt;p&gt;This shows a dialog to edit the file type associations of the project. These associations determine the type (source, form, interface, protocol or others) with a filename pattern. They are used when adding a file to the project and when performing a search for new files.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1519"/>
+        <location filename="../Project/Project.py" line="1531"/>
         <source>&lt;p&gt;The selected translation file &lt;b&gt;{0}&lt;/b&gt; could not be deleted.&lt;/p&gt;&lt;p&gt;Reason: {1}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="2233"/>
+        <location filename="../Project/Project.py" line="2250"/>
         <source>&lt;p&gt;The selected file &lt;b&gt;{0}&lt;/b&gt; could not be deleted.&lt;/p&gt;&lt;p&gt;Reason: {1}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="2263"/>
+        <location filename="../Project/Project.py" line="2280"/>
         <source>&lt;p&gt;The selected directory &lt;b&gt;{0}&lt;/b&gt; could not be deleted.&lt;/p&gt;&lt;p&gt;Reason: {1}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="2756"/>
+        <location filename="../Project/Project.py" line="2773"/>
         <source>Create Makefile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="2756"/>
+        <location filename="../Project/Project.py" line="2773"/>
         <source>&lt;p&gt;The makefile &lt;b&gt;{0}&lt;/b&gt; could not be created.&lt;br/&gt;Reason: {1}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5760"/>
+        <location filename="../Project/Project.py" line="5795"/>
         <source>Execute Make</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4277"/>
+        <location filename="../Project/Project.py" line="4312"/>
         <source>&amp;Execute Make</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4281"/>
+        <location filename="../Project/Project.py" line="4316"/>
         <source>Perform a &apos;make&apos; run.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4283"/>
+        <location filename="../Project/Project.py" line="4318"/>
         <source>&lt;b&gt;Execute Make&lt;/b&gt;&lt;p&gt;This performs a &apos;make&apos; run to rebuild the configured target.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5740"/>
+        <location filename="../Project/Project.py" line="5775"/>
         <source>Test for Changes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4291"/>
+        <location filename="../Project/Project.py" line="4326"/>
         <source>&amp;Test for Changes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4295"/>
+        <location filename="../Project/Project.py" line="4330"/>
         <source>Question &apos;make&apos;, if a rebuild is needed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4297"/>
+        <location filename="../Project/Project.py" line="4332"/>
         <source>&lt;b&gt;Test for Changes&lt;/b&gt;&lt;p&gt;This questions &apos;make&apos;, if a rebuild of the configured target is necessary.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4342"/>
+        <location filename="../Project/Project.py" line="4377"/>
         <source>Make</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5688"/>
+        <location filename="../Project/Project.py" line="5723"/>
         <source>The make process did not start.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5733"/>
+        <location filename="../Project/Project.py" line="5768"/>
         <source>The make process crashed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5743"/>
+        <location filename="../Project/Project.py" line="5778"/>
         <source>&lt;p&gt;There are changes that require the configured make target &lt;b&gt;{0}&lt;/b&gt; to be rebuilt.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5748"/>
+        <location filename="../Project/Project.py" line="5783"/>
         <source>&lt;p&gt;There are changes that require the default make target to be rebuilt.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5760"/>
+        <location filename="../Project/Project.py" line="5795"/>
         <source>The makefile contains errors.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -53870,7 +54390,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4330"/>
+        <location filename="../Project/Project.py" line="4365"/>
         <source>Project-T&amp;ools</source>
         <translation type="unfinished"></translation>
     </message>
@@ -53974,7 +54494,7 @@
         <translation>VCS Status</translation>
     </message>
     <message>
-        <location filename="../Project/ProjectBrowserModel.py" line="782"/>
+        <location filename="../Project/ProjectBrowserModel.py" line="798"/>
         <source>local</source>
         <translation>lokální</translation>
     </message>
@@ -53989,12 +54509,12 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/ProjectBrowserPage.ui" line="37"/>
         <source>Colours</source>
-        <translation>Barvy</translation>
+        <translation type="obsolete">Barvy</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/ProjectBrowserPage.ui" line="56"/>
         <source>Select the colour for highlighted entries in the Others viewer.</source>
-        <translation>Výběr barvy pro zvýraznění vstupů v Ostatních prohlížečích.</translation>
+        <translation type="obsolete">Výběr barvy pro zvýraznění vstupů v Ostatních prohlížečích.</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/ProjectBrowserPage.ui" line="43"/>
@@ -54126,6 +54646,16 @@
         <source>Protocols (protobuf) Browser</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/ProjectBrowserPage.ui" line="37"/>
+        <source>Colors</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/ProjectBrowserPage.ui" line="56"/>
+        <source>Select the color for highlighted entries in the Others viewer.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ProjectFormsBrowser</name>
@@ -63912,17 +64442,17 @@
         <translation>Vyčistit</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="839"/>
+        <location filename="../QScintilla/Shell.py" line="843"/>
         <source>No.</source>
         <translation>Č.</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="2157"/>
+        <location filename="../QScintilla/Shell.py" line="2161"/>
         <source>Drop Error</source>
         <translation>Zahodit chybu</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="835"/>
+        <location filename="../QScintilla/Shell.py" line="839"/>
         <source>Passive Debug Mode</source>
         <translation>Pasivní debug mód</translation>
     </message>
@@ -63942,17 +64472,17 @@
         <translation>Zobrazit</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="767"/>
+        <location filename="../QScintilla/Shell.py" line="771"/>
         <source>Select History</source>
         <translation>Vybrat historii</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="767"/>
+        <location filename="../QScintilla/Shell.py" line="771"/>
         <source>Select the history entry to execute (most recent shown last).</source>
         <translation>Vybrat vstup historie pro vykonání (nejaktuálnější zobrazen poslední).</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="836"/>
+        <location filename="../QScintilla/Shell.py" line="840"/>
         <source>
 Not connected</source>
         <translation>Nepřipojen</translation>
@@ -63968,22 +64498,22 @@
         <translation>Vyjmout</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="841"/>
+        <location filename="../QScintilla/Shell.py" line="845"/>
         <source>{0} on {1}, {2}</source>
         <translation>{0} na {1}, {2}</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="1030"/>
+        <location filename="../QScintilla/Shell.py" line="1034"/>
         <source>StdOut: {0}</source>
         <translation>StdOut: {0}</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="1038"/>
+        <location filename="../QScintilla/Shell.py" line="1042"/>
         <source>StdErr: {0}</source>
         <translation>StdErr: {0}</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="2157"/>
+        <location filename="../QScintilla/Shell.py" line="2161"/>
         <source>&lt;p&gt;&lt;b&gt;{0}&lt;/b&gt; is not a file.&lt;/p&gt;</source>
         <translation>&lt;p&gt;&lt;b&gt;{0}&lt;/b&gt; není soubor.&lt;/p&gt;</translation>
     </message>
@@ -63993,7 +64523,7 @@
         <translation type="unfinished">Hledat</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="888"/>
+        <location filename="../QScintilla/Shell.py" line="892"/>
         <source>Exception &quot;{0}&quot;
 {1}
 File: {2}, Line: {3}
@@ -64001,32 +64531,32 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="923"/>
+        <location filename="../QScintilla/Shell.py" line="927"/>
         <source>Unspecified syntax error.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="898"/>
+        <location filename="../QScintilla/Shell.py" line="902"/>
         <source>Exception &quot;{0}&quot;
 {1}
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="925"/>
+        <location filename="../QScintilla/Shell.py" line="929"/>
         <source>Syntax error &quot;{1}&quot; in file {0} at line {2}, character {3}.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="948"/>
+        <location filename="../QScintilla/Shell.py" line="952"/>
         <source>Signal &quot;{0}&quot; generated in file {1} at line {2}.
 Function: {3}({4})</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="2015"/>
+        <location filename="../QScintilla/Shell.py" line="2019"/>
         <source>Project</source>
         <translation type="unfinished">Projekt</translation>
     </message>
@@ -64056,14 +64586,14 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="1835"/>
+        <location filename="../QScintilla/Shell.py" line="1839"/>
         <source>Available Virtual Environments:
 {0}
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="1876"/>
+        <location filename="../QScintilla/Shell.py" line="1880"/>
         <source>Current Virtual Environment: &apos;{0}&apos;
 </source>
         <translation type="unfinished"></translation>
@@ -72159,7 +72689,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/Sync/SyncCheckPage.py" line="56"/>
+        <location filename="../WebBrowser/Sync/SyncCheckPage.py" line="50"/>
         <source>Host:</source>
         <translation type="unfinished">Host:</translation>
     </message>
@@ -72189,22 +72719,22 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/Sync/SyncCheckPage.py" line="55"/>
+        <location filename="../WebBrowser/Sync/SyncCheckPage.py" line="49"/>
         <source>FTP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/Sync/SyncCheckPage.py" line="68"/>
+        <location filename="../WebBrowser/Sync/SyncCheckPage.py" line="62"/>
         <source>No Synchronization</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/Sync/SyncCheckPage.py" line="211"/>
+        <location filename="../WebBrowser/Sync/SyncCheckPage.py" line="204"/>
         <source>&lt;font color=&quot;#FF0000&quot;&gt;&lt;b&gt;Error:&lt;/b&gt; {0}&lt;/font&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/Sync/SyncCheckPage.py" line="63"/>
+        <location filename="../WebBrowser/Sync/SyncCheckPage.py" line="57"/>
         <source>Shared Directory</source>
         <translation type="unfinished"></translation>
     </message>
@@ -72214,7 +72744,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/Sync/SyncCheckPage.py" line="64"/>
+        <location filename="../WebBrowser/Sync/SyncCheckPage.py" line="58"/>
         <source>Directory:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -73886,12 +74416,12 @@
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/TasksPage.ui" line="105"/>
-        <source>Tasks Background Colours</source>
+        <source>Tasks Background Colors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/TasksPage.ui" line="206"/>
-        <source>Select the background colour for these tasks.</source>
+        <source>Select the background color for these tasks.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -74939,27 +75469,27 @@
 <context>
     <name>Translator</name>
     <message>
-        <location filename="../Plugins/UiExtensionPlugins/Translator/Translator.py" line="52"/>
+        <location filename="../Plugins/UiExtensionPlugins/Translator/Translator.py" line="63"/>
         <source>Translator</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/UiExtensionPlugins/Translator/Translator.py" line="52"/>
+        <location filename="../Plugins/UiExtensionPlugins/Translator/Translator.py" line="63"/>
         <source>T&amp;ranslator</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/UiExtensionPlugins/Translator/Translator.py" line="52"/>
+        <location filename="../Plugins/UiExtensionPlugins/Translator/Translator.py" line="63"/>
         <source>Alt+Shift+R</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/UiExtensionPlugins/Translator/Translator.py" line="58"/>
+        <location filename="../Plugins/UiExtensionPlugins/Translator/Translator.py" line="69"/>
         <source>Switch the input focus to the Translator window.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/UiExtensionPlugins/Translator/Translator.py" line="60"/>
+        <location filename="../Plugins/UiExtensionPlugins/Translator/Translator.py" line="71"/>
         <source>&lt;b&gt;Activate Translator&lt;/b&gt;&lt;p&gt;This switches the input focus to the Translator window.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -74967,52 +75497,52 @@
 <context>
     <name>TranslatorEngines</name>
     <message>
-        <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorEngines/__init__.py" line="37"/>
+        <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorEngines/__init__.py" line="39"/>
         <source>Google V.1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorEngines/__init__.py" line="39"/>
-        <source>MyMemory</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorEngines/__init__.py" line="41"/>
-        <source>Glosbe</source>
+        <source>MyMemory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorEngines/__init__.py" line="43"/>
-        <source>PROMT</source>
+        <source>Glosbe</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorEngines/__init__.py" line="45"/>
-        <source>Yandex</source>
+        <source>PROMT</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorEngines/__init__.py" line="47"/>
-        <source>Google V.2</source>
+        <source>Yandex</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorEngines/__init__.py" line="49"/>
+        <source>Google V.2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorEngines/__init__.py" line="51"/>
         <source>Microsoft</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorEngines/__init__.py" line="57"/>
+        <source>Unknow translation service name ({0})</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorEngines/__init__.py" line="55"/>
-        <source>Unknow translation service name ({0})</source>
+        <source>IBM Watson</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorEngines/__init__.py" line="53"/>
-        <source>IBM Watson</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorEngines/__init__.py" line="51"/>
         <source>DeepL Pro</source>
         <translation type="unfinished"></translation>
     </message>
@@ -75261,12 +75791,12 @@
     </message>
     <message>
         <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorLanguagesDb.py" line="79"/>
-        <source>Chinese S</source>
+        <source>Chinese (China)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorLanguagesDb.py" line="80"/>
-        <source>Chinese T</source>
+        <source>Chinese (Taiwan)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -75446,7 +75976,7 @@
 <context>
     <name>TranslatorPlugin</name>
     <message>
-        <location filename="../Plugins/PluginTranslator.py" line="65"/>
+        <location filename="../Plugins/PluginTranslator.py" line="71"/>
         <source>Translator</source>
         <translation type="unfinished"></translation>
     </message>
@@ -77419,7 +77949,7 @@
         <translation>&lt;b&gt;Klávesové zkratky&lt;/b&gt;&lt;p&gt;Nastavení klávesových zkratek aplikace podle zvyklostí uživatele.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="6329"/>
+        <location filename="../UI/UserInterface.py" line="6327"/>
         <source>Export Keyboard Shortcuts</source>
         <translation>Exportovat klávesové zkratky</translation>
     </message>
@@ -77439,7 +77969,7 @@
         <translation>&lt;b&gt;Export klávesových zkratek&lt;/b&gt;&lt;p&gt;Exportují se klávesové zkratky z aplikace.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="6353"/>
+        <location filename="../UI/UserInterface.py" line="6351"/>
         <source>Import Keyboard Shortcuts</source>
         <translation>Import klávesových zkratek</translation>
     </message>
@@ -77579,7 +78109,7 @@
         <translation type="obsolete">&lt;h3&gt;Čísla verzí&lt;/h3&gt;&lt;table&gt;</translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="7326"/>
+        <location filename="../UI/UserInterface.py" line="7324"/>
         <source>&lt;/table&gt;</source>
         <translation>&lt;/table&gt;</translation>
     </message>
@@ -77644,27 +78174,27 @@
         <translation type="unfinished">&lt;p&gt;Počátek dokumentace PySide nebyl nastaven.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="6523"/>
+        <location filename="../UI/UserInterface.py" line="6521"/>
         <source>Save tasks</source>
         <translation>Uložit úlohy</translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="6552"/>
+        <location filename="../UI/UserInterface.py" line="6550"/>
         <source>Read tasks</source>
         <translation>Načíst úlohy</translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="6916"/>
+        <location filename="../UI/UserInterface.py" line="6914"/>
         <source>Drop Error</source>
         <translation>Zahodit chybu</translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="7287"/>
+        <location filename="../UI/UserInterface.py" line="7285"/>
         <source>Error during updates check</source>
         <translation>Chyba během zjišťování aktualizací</translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="7268"/>
+        <location filename="../UI/UserInterface.py" line="7266"/>
         <source>Update available</source>
         <translation>Byla nalezena aktualizace</translation>
     </message>
@@ -77679,17 +78209,17 @@
         <translation>Zobrazit externí nás&amp;troje</translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="7287"/>
+        <location filename="../UI/UserInterface.py" line="7285"/>
         <source>Could not perform updates check.</source>
         <translation>Kontrolu updatů nelze provést.</translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="7101"/>
+        <location filename="../UI/UserInterface.py" line="7099"/>
         <source>&amp;Cancel</source>
         <translation>&amp;Zrušit</translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="7363"/>
+        <location filename="../UI/UserInterface.py" line="7361"/>
         <source>First time usage</source>
         <translation>Spuštěno poprvé</translation>
     </message>
@@ -77784,7 +78314,7 @@
         <translation>Zobrazit dostupné verze ke stažení</translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="7311"/>
+        <location filename="../UI/UserInterface.py" line="7309"/>
         <source>&lt;h3&gt;Available versions&lt;/h3&gt;&lt;table&gt;</source>
         <translation>&lt;h3&gt;Dostupné verze&lt;/h3&gt;&lt;table&gt;</translation>
     </message>
@@ -77879,12 +78409,12 @@
         <translation>Prohlížeč &amp;multiprojektu</translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="6648"/>
+        <location filename="../UI/UserInterface.py" line="6646"/>
         <source>Save session</source>
         <translation>Uložit relaci</translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="6632"/>
+        <location filename="../UI/UserInterface.py" line="6630"/>
         <source>Read session</source>
         <translation>Načíst relaci</translation>
     </message>
@@ -78228,32 +78758,32 @@
         <translation>&lt;p&gt;Adresář dokumentace &quot;&lt;b&gt;{0}&lt;/b&gt;&quot; nebyl nalezen.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="6523"/>
+        <location filename="../UI/UserInterface.py" line="6521"/>
         <source>&lt;p&gt;The tasks file &lt;b&gt;{0}&lt;/b&gt; could not be written.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Do souboru s úlohami &lt;b&gt;{0}&lt;/b&gt; nelze zapisovat.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="6552"/>
+        <location filename="../UI/UserInterface.py" line="6550"/>
         <source>&lt;p&gt;The tasks file &lt;b&gt;{0}&lt;/b&gt; could not be read.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Soubor s úlohami &lt;b&gt;{0}&lt;/b&gt; nelze načíst.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="6586"/>
+        <location filename="../UI/UserInterface.py" line="6584"/>
         <source>&lt;p&gt;The session file &lt;b&gt;{0}&lt;/b&gt; could not be written.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Zápis do souboru relace session &lt;b&gt;{0}&lt;/b&gt; se nezdařil.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="6632"/>
+        <location filename="../UI/UserInterface.py" line="6630"/>
         <source>&lt;p&gt;The session file &lt;b&gt;{0}&lt;/b&gt; could not be read.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Soubor relace session &lt;b&gt;{0}&lt;/b&gt; nelze přečíst.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="6916"/>
+        <location filename="../UI/UserInterface.py" line="6914"/>
         <source>&lt;p&gt;&lt;b&gt;{0}&lt;/b&gt; is not a file.&lt;/p&gt;</source>
         <translation>&lt;p&gt;&lt;b&gt;{0}&lt;/b&gt; není soubor.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="7110"/>
+        <location filename="../UI/UserInterface.py" line="7108"/>
         <source>Trying host {0}</source>
         <translation>Zkouším host {0}</translation>
     </message>
@@ -78288,7 +78818,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="6353"/>
+        <location filename="../UI/UserInterface.py" line="6351"/>
         <source>Keyboard shortcut file (*.e4k)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -78328,27 +78858,27 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="7176"/>
+        <location filename="../UI/UserInterface.py" line="7174"/>
         <source>Error getting versions information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="7169"/>
+        <location filename="../UI/UserInterface.py" line="7167"/>
         <source>The versions information could not be downloaded. Please go online and try again.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="6121"/>
+        <location filename="../UI/UserInterface.py" line="6119"/>
         <source>Open Browser</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="6121"/>
+        <location filename="../UI/UserInterface.py" line="6119"/>
         <source>Could not start a web browser</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="7176"/>
+        <location filename="../UI/UserInterface.py" line="7174"/>
         <source>The versions information could not be downloaded for the last 7 days. Please go online and try again.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -78439,7 +78969,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="7382"/>
+        <location filename="../UI/UserInterface.py" line="7380"/>
         <source>Select Workspace Directory</source>
         <translation type="unfinished"></translation>
     </message>
@@ -78814,7 +79344,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="7101"/>
+        <location filename="../UI/UserInterface.py" line="7099"/>
         <source>%v/%m</source>
         <translation type="unfinished"></translation>
     </message>
@@ -78834,7 +79364,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="7105"/>
+        <location filename="../UI/UserInterface.py" line="7103"/>
         <source>Version Check</source>
         <translation type="unfinished"></translation>
     </message>
@@ -78909,22 +79439,22 @@
         <translation type="unfinished">Qt v.3 není podporováno v eric5. {3 ?} {6.?}</translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="7268"/>
+        <location filename="../UI/UserInterface.py" line="7266"/>
         <source>The update to &lt;b&gt;{0}&lt;/b&gt; of eric6 is available at &lt;b&gt;{1}&lt;/b&gt;. Would you like to get it?</source>
         <translation type="unfinished">Aktualizace &lt;b&gt;{0}&lt;/b&gt; eric5 je připravena na &lt;b&gt;{1}&lt;/b&gt;. Chcete ji stáhnout a nainstalovat? {0}?} {6 ?} {1}?}</translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="7280"/>
+        <location filename="../UI/UserInterface.py" line="7278"/>
         <source>Eric6 is up to date</source>
         <translation type="unfinished">Eric5 je aktuální {6 ?}</translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="7280"/>
+        <location filename="../UI/UserInterface.py" line="7278"/>
         <source>You are using the latest version of eric6</source>
         <translation type="unfinished">Používáte poslední verzi eric6</translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="7363"/>
+        <location filename="../UI/UserInterface.py" line="7361"/>
         <source>eric6 has not been configured yet. The configuration dialog will be started.</source>
         <translation type="unfinished">eric5 nebyl ještě nakonfigurován. Bude spuštěn konfigurační dialog. {6 ?}</translation>
     </message>
@@ -78944,7 +79474,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="7121"/>
+        <location filename="../UI/UserInterface.py" line="7119"/>
         <source>The versions information cannot not be downloaded because you are &lt;b&gt;offline&lt;/b&gt;. Please go online and try again.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -78989,7 +79519,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="6670"/>
+        <location filename="../UI/UserInterface.py" line="6668"/>
         <source>Load session</source>
         <translation type="unfinished">Načíst relaci</translation>
     </message>
@@ -79004,17 +79534,17 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="6670"/>
+        <location filename="../UI/UserInterface.py" line="6668"/>
         <source>eric6 Session Files (*.e5s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="6721"/>
+        <location filename="../UI/UserInterface.py" line="6719"/>
         <source>Crash Session found!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="6721"/>
+        <location filename="../UI/UserInterface.py" line="6719"/>
         <source>A session file of a crashed session was found. Shall this session be restored?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -79029,17 +79559,17 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="7256"/>
+        <location filename="../UI/UserInterface.py" line="7254"/>
         <source>Update Check</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="7256"/>
+        <location filename="../UI/UserInterface.py" line="7254"/>
         <source>You installed eric directly from the source code. There is no possibility to check for the availability of an update.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="7246"/>
+        <location filename="../UI/UserInterface.py" line="7244"/>
         <source>You are using a snapshot release of eric6. A more up-to-date stable release might be available.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -80035,7 +80565,7 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="128"/>
         <source>Colours</source>
-        <translation>Barvy</translation>
+        <translation type="obsolete">Barvy</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="193"/>
@@ -80045,7 +80575,7 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="206"/>
         <source>Select the background colour for entries with VCS status &quot;modified&quot;.</source>
-        <translation>Výběr barvy pozadí pro vstupy s VCS statusem &quot;změněno&quot;.</translation>
+        <translation type="obsolete">Výběr barvy pozadí pro vstupy s VCS statusem &quot;změněno&quot;.</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="134"/>
@@ -80055,7 +80585,7 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="147"/>
         <source>Select the background colour for entries with VCS status &quot;added&quot;.</source>
-        <translation>Výběr barvy pozadí pro vstupy s VCS statusem &quot;přidáno&quot;.</translation>
+        <translation type="obsolete">Výběr barvy pozadí pro vstupy s VCS statusem &quot;přidáno&quot;.</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="239"/>
@@ -80065,7 +80595,7 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="252"/>
         <source>Select the background colour for entries with VCS status &quot;needs update&quot;.</source>
-        <translation>Výběr barvy pozadí pro vstupy s VCS statusem &quot;nutno obnovit&quot;.</translation>
+        <translation type="obsolete">Výběr barvy pozadí pro vstupy s VCS statusem &quot;nutno obnovit&quot;.</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="157"/>
@@ -80075,7 +80605,7 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="170"/>
         <source>Select the background colour for entries with VCS status &quot;conflict&quot;.</source>
-        <translation>Výběr barvy pozadí pro vstupy s VCS statusem &quot;konflikt&quot;.</translation>
+        <translation type="obsolete">Výběr barvy pozadí pro vstupy s VCS statusem &quot;konflikt&quot;.</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="216"/>
@@ -80085,7 +80615,7 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="229"/>
         <source>Select the background colour for entries with VCS status &quot;replaced&quot;.</source>
-        <translation>Výběr barvy pozadí pro vstupy s VCS statusem &quot;nahrazeno&quot;.</translation>
+        <translation type="obsolete">Výběr barvy pozadí pro vstupy s VCS statusem &quot;nahrazeno&quot;.</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="115"/>
@@ -80105,7 +80635,42 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="275"/>
         <source>Select the background colour for entries with VCS status &quot;removed&quot;.</source>
-        <translation>Výběr barvy pozadí pro vstupy s VCS statusem &quot;odebráno&quot;.</translation>
+        <translation type="obsolete">Výběr barvy pozadí pro vstupy s VCS statusem &quot;odebráno&quot;.</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="128"/>
+        <source>Colors</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="147"/>
+        <source>Select the background color for entries with VCS status &quot;added&quot;.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="170"/>
+        <source>Select the background color for entries with VCS status &quot;conflict&quot;.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="206"/>
+        <source>Select the background color for entries with VCS status &quot;modified&quot;.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="229"/>
+        <source>Select the background color for entries with VCS status &quot;replaced&quot;.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="252"/>
+        <source>Select the background color for entries with VCS status &quot;needs update&quot;.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="275"/>
+        <source>Select the background color for entries with VCS status &quot;removed&quot;.</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -85062,17 +85627,17 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="279"/>
         <source>Colours</source>
-        <translation type="unfinished">Barvy</translation>
+        <translation type="obsolete">Barvy</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="285"/>
         <source>Background colour of secure URLs:</source>
-        <translation type="unfinished">Barva pozadí pro bezpečné URL:</translation>
+        <translation type="obsolete">Barva pozadí pro bezpečné URL:</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="298"/>
         <source>Select the background colour for secure URLs.</source>
-        <translation type="unfinished">Vybrat barvu pozadí pro bezpečné URL.</translation>
+        <translation type="obsolete">Vybrat barvu pozadí pro bezpečné URL.</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="324"/>
@@ -85174,6 +85739,21 @@
         <source>Show Scrollbars</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="279"/>
+        <source>Colors</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="285"/>
+        <source>Background color of secure URLs:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="298"/>
+        <source>Select the background color for secure URLs.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>WebBrowserClearPrivateDataDialog</name>
@@ -86068,12 +86648,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserPage.py" line="171"/>
+        <location filename="../WebBrowser/WebBrowserPage.py" line="172"/>
         <source>Suspicuous URL detected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserPage.py" line="171"/>
+        <location filename="../WebBrowser/WebBrowserPage.py" line="172"/>
         <source>&lt;p&gt;The URL &lt;b&gt;{0}&lt;/b&gt; was found in the Safe Browsing database.&lt;/p&gt;{1}</source>
         <translation type="unfinished"></translation>
     </message>
@@ -86358,112 +86938,112 @@
 <context>
     <name>WebBrowserTabWidget</name>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="124"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="122"/>
         <source>Show a navigation menu</source>
         <translation type="unfinished">Zobrazit menu navigace</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="137"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="135"/>
         <source>Show a navigation menu for closed tabs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="151"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="149"/>
         <source>Open a new web browser tab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="165"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="163"/>
         <source>New Tab</source>
         <translation type="unfinished">Nový Tab</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="169"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="167"/>
         <source>Move Left</source>
         <translation type="unfinished">Posun doleva</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="172"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="170"/>
         <source>Move Right</source>
         <translation type="unfinished">Posun doprava</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="176"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="174"/>
         <source>Duplicate Page</source>
         <translation type="unfinished">Duplikovat stranu</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="179"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="177"/>
         <source>Close</source>
         <translation type="unfinished">Zavřít</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="182"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="180"/>
         <source>Close Others</source>
         <translation type="unfinished">Zavřít ostatní</translation>
     </message>
     <message>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="211"/>
+        <source>Close All</source>
+        <translation type="unfinished">Zavřít vše</translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="186"/>
+        <source>Print Preview</source>
+        <translation type="unfinished">Náhled tisku</translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="189"/>
+        <source>Print</source>
+        <translation type="unfinished">Tisk</translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="192"/>
+        <source>Print as PDF</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../WebBrowser/WebBrowserTabWidget.py" line="213"/>
-        <source>Close All</source>
-        <translation type="unfinished">Zavřít vše</translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="188"/>
-        <source>Print Preview</source>
-        <translation type="unfinished">Náhled tisku</translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="191"/>
-        <source>Print</source>
-        <translation type="unfinished">Tisk</translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="194"/>
-        <source>Print as PDF</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="215"/>
         <source>Reload All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="218"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="216"/>
         <source>Bookmark All Tabs</source>
         <translation type="unfinished">Vytvořit záložky pro všechny taby</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="222"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="220"/>
         <source>Restore Closed Tab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="458"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="456"/>
         <source>...</source>
         <translation type="unfinished">...</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="898"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="892"/>
         <source>Loading...</source>
         <translation type="unfinished">Načítám...</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="918"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="912"/>
         <source>Finished loading</source>
         <translation type="unfinished">Načteno</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="920"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="914"/>
         <source>Failed to load</source>
         <translation type="unfinished">Načtení selhalo</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="961"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="955"/>
         <source>Are you sure you want to close the window?</source>
         <translation type="unfinished"></translation>
     </message>
     <message numerus="yes">
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="961"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="955"/>
         <source>Are you sure you want to close the window?
 You have %n tab(s) open.</source>
         <translation type="unfinished">
@@ -86473,47 +87053,47 @@
         </translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="968"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="962"/>
         <source>&amp;Quit</source>
         <translation type="unfinished">&amp;Konec</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="971"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="965"/>
         <source>C&amp;lose Current Tab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="1152"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="1146"/>
         <source>Restore All Closed Tabs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="1154"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="1148"/>
         <source>Clear List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="252"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="250"/>
         <source>Unmute Tab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="256"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="254"/>
         <source>Mute Tab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="755"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="753"/>
         <source>Print to PDF</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="705"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="703"/>
         <source>&lt;p&gt;The file &lt;b&gt;{0}&lt;/b&gt; exists already. Shall it be overwritten?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="755"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="753"/>
         <source>&lt;p&gt;The PDF could not be written to file &lt;b&gt;{0}&lt;/b&gt;.&lt;/p&gt;&lt;p&gt;&lt;b&gt;Error:&lt;/b&gt; {1}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
Binary file eric6/i18n/eric6_de.qm has changed
--- a/eric6/i18n/eric6_de.ts	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/i18n/eric6_de.ts	Sat May 02 13:51:07 2020 +0200
@@ -1197,12 +1197,12 @@
         <translation>&lt;&lt;Sonstige&gt;&gt;</translation>
     </message>
     <message>
-        <location filename="../Graphics/ApplicationDiagramBuilder.py" line="292"/>
+        <location filename="../Graphics/ApplicationDiagramBuilder.py" line="294"/>
         <source>Load Diagram</source>
         <translation>Diagramm laden</translation>
     </message>
     <message>
-        <location filename="../Graphics/ApplicationDiagramBuilder.py" line="292"/>
+        <location filename="../Graphics/ApplicationDiagramBuilder.py" line="294"/>
         <source>&lt;p&gt;The diagram belongs to the project &lt;b&gt;{0}&lt;/b&gt;. Shall this project be opened?&lt;/p&gt;</source>
         <translation>&lt;p&gt;Das Diagramm gehört zum Projekt &lt;b&gt;{0}&lt;/b&gt;. Soll dieses Projekt geöffnet werden?&lt;/p&gt;</translation>
     </message>
@@ -2347,32 +2347,32 @@
 <context>
     <name>BrowserModel</name>
     <message>
-        <location filename="../UI/BrowserModel.py" line="62"/>
+        <location filename="../UI/BrowserModel.py" line="63"/>
         <source>Name</source>
         <translation>Name</translation>
     </message>
     <message>
-        <location filename="../UI/BrowserModel.py" line="730"/>
+        <location filename="../UI/BrowserModel.py" line="731"/>
         <source>Attributes</source>
         <translation>Attribute</translation>
     </message>
     <message>
-        <location filename="../UI/BrowserModel.py" line="654"/>
+        <location filename="../UI/BrowserModel.py" line="655"/>
         <source>Coding: {0}</source>
         <translation>Kodierung: {0}</translation>
     </message>
     <message>
-        <location filename="../UI/BrowserModel.py" line="660"/>
+        <location filename="../UI/BrowserModel.py" line="661"/>
         <source>Globals</source>
         <translation>Globale Variablen</translation>
     </message>
     <message>
-        <location filename="../UI/BrowserModel.py" line="740"/>
+        <location filename="../UI/BrowserModel.py" line="741"/>
         <source>Class Attributes</source>
         <translation>Klassenattribute</translation>
     </message>
     <message>
-        <location filename="../UI/BrowserModel.py" line="666"/>
+        <location filename="../UI/BrowserModel.py" line="667"/>
         <source>Imports</source>
         <translation>Importe</translation>
     </message>
@@ -3039,54 +3039,54 @@
 <context>
     <name>CodeDocumentationViewer</name>
     <message>
-        <location filename="../UI/CodeDocumentationViewer.py" line="175"/>
+        <location filename="../UI/CodeDocumentationViewer.py" line="211"/>
         <source>Code Info Provider:</source>
         <translation>Code Info Provider:</translation>
     </message>
     <message>
-        <location filename="../UI/CodeDocumentationViewer.py" line="188"/>
+        <location filename="../UI/CodeDocumentationViewer.py" line="224"/>
         <source>Select the code info provider</source>
         <translation>Wähle den Code Info Provider</translation>
     </message>
     <message>
-        <location filename="../UI/CodeDocumentationViewer.py" line="190"/>
+        <location filename="../UI/CodeDocumentationViewer.py" line="226"/>
         <source>&lt;disabled&gt;</source>
         <translation>&lt;deaktiviert&gt;</translation>
     </message>
     <message>
-        <location filename="../UI/CodeDocumentationViewer.py" line="371"/>
+        <location filename="../UI/CodeDocumentationViewer.py" line="407"/>
         <source>No documentation available</source>
         <translation>Keine Dokumentation verfügbar</translation>
     </message>
     <message>
-        <location filename="../UI/CodeDocumentationViewer.py" line="392"/>
+        <location filename="../UI/CodeDocumentationViewer.py" line="428"/>
         <source>No source code documentation provider has been registered. This function has been disabled.</source>
         <translation>Es ist kein Provider für Code Dokumentation registriert. Diese Funktion wurde deaktiviert.</translation>
     </message>
     <message>
-        <location filename="../UI/CodeDocumentationViewer.py" line="397"/>
+        <location filename="../UI/CodeDocumentationViewer.py" line="433"/>
         <source>This function has been disabled.</source>
         <translation>Diese Funktion wurde deaktiviert.</translation>
     </message>
     <message>
-        <location filename="../UI/CodeDocumentationViewerTemplate.py" line="137"/>
+        <location filename="../UI/CodeDocumentationViewerTemplate.py" line="139"/>
         <source>No further documentation available</source>
         <translation>Keine weitere Dokumentation verfügbar</translation>
     </message>
     <message>
-        <location filename="../UI/CodeDocumentationViewerTemplate.py" line="58"/>
+        <location filename="../UI/CodeDocumentationViewerTemplate.py" line="60"/>
         <source>&lt;p&gt;&lt;b&gt;Definition:&lt;/b&gt; &lt;span class=&quot;def&quot;&gt;@NAME@@ARGSPEC@&lt;/span&gt;&lt;/p&gt;</source>
         <comment>Just translate &apos;Definition:&apos; and leave the rest intact.</comment>
         <translation>&lt;p&gt;&lt;b&gt;Definition:&lt;/b&gt; &lt;span class=&quot;def&quot;&gt;@NAME@@ARGSPEC@&lt;/span&gt;&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../UI/CodeDocumentationViewerTemplate.py" line="68"/>
+        <location filename="../UI/CodeDocumentationViewerTemplate.py" line="70"/>
         <source>&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; @NOTE@&lt;/p&gt;</source>
         <comment>Just translate &apos;Note:&apos; and leave the rest intact.</comment>
         <translation>&lt;p&gt;&lt;b&gt;Hinweis:&lt;/b&gt; @NOTE@&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../UI/CodeDocumentationViewerTemplate.py" line="63"/>
+        <location filename="../UI/CodeDocumentationViewerTemplate.py" line="65"/>
         <source>&lt;p&gt;&lt;b&gt;Type:&lt;/b&gt; @TYPE@&lt;/p&gt;</source>
         <comment>Just translate &apos;Type:&apos; and leave the rest intact.</comment>
         <translation>&lt;p&gt;&lt;b&gt;Typ:&lt;/b&gt; @TYPE@&lt;/p&gt;</translation>
@@ -4165,11 +4165,6 @@
         <translation>QColorDialog-Assistent-Fehler</translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.py" line="72"/>
-        <source>&lt;p&gt;The colour &lt;b&gt;{0}&lt;/b&gt; is not valid.&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Die Farbe &lt;b&gt;{0}&lt;/b&gt; is ungültig.&lt;/p&gt;</translation>
-    </message>
-    <message>
         <location filename="../Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.ui" line="14"/>
         <source>QColorDialog Wizard</source>
         <translation>QColorDialog-Assistent</translation>
@@ -4185,11 +4180,6 @@
         <translation>Auswählen, um einen QColorDialog.getColor Dialog zu erzeugen</translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.ui" line="143"/>
-        <source>Colour</source>
-        <translation>Farbe</translation>
-    </message>
-    <message>
         <location filename="../Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.ui" line="42"/>
         <source>Select to generate a QColorDialog.getRgba dialog</source>
         <translation>Auswählen, um einen QColorDialog.getRgba Dialog zu erzeugen</translation>
@@ -4200,11 +4190,6 @@
         <translation>RGBA</translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.ui" line="155"/>
-        <source>Enter a variable name or a colour</source>
-        <translation>Gib einen Variablennamen oder eine Farbe ein</translation>
-    </message>
-    <message>
         <location filename="../Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.ui" line="167"/>
         <source>Qt.red</source>
         <translation>Qt.red</translation>
@@ -4375,11 +4360,6 @@
         <translation>Gib den Namen der Ergebnisvariablen ein</translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.ui" line="292"/>
-        <source>Colour Variable</source>
-        <translation>Farbvariable</translation>
-    </message>
-    <message>
         <location filename="../Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.ui" line="87"/>
         <source>Parent</source>
         <translation>Vorgänger</translation>
@@ -4419,6 +4399,26 @@
         <source>Enter the parent expression</source>
         <translation>Gib den Ausdruck für den Vorgänger ein</translation>
     </message>
+    <message>
+        <location filename="../Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.ui" line="143"/>
+        <source>Color</source>
+        <translation>Farbe</translation>
+    </message>
+    <message>
+        <location filename="../Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.ui" line="155"/>
+        <source>Enter a variable name or a color</source>
+        <translation>Gib einen Variablennamen oder eine Farbe ein</translation>
+    </message>
+    <message>
+        <location filename="../Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.ui" line="292"/>
+        <source>Color Variable</source>
+        <translation>Farbvariable</translation>
+    </message>
+    <message>
+        <location filename="../Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.py" line="72"/>
+        <source>&lt;p&gt;The color &lt;b&gt;{0}&lt;/b&gt; is not valid.&lt;/p&gt;</source>
+        <translation>&lt;p&gt;Die Farbe &lt;b&gt;{0}&lt;/b&gt; is ungültig.&lt;/p&gt;</translation>
+    </message>
 </context>
 <context>
     <name>CompareDialog</name>
@@ -6270,22 +6270,22 @@
         <translation>&amp;Filtere mit:</translation>
     </message>
     <message>
-        <location filename="../Project/CreateDialogCodeDialog.py" line="577"/>
+        <location filename="../Project/CreateDialogCodeDialog.py" line="580"/>
         <source>Code Generation</source>
         <translation>Codeerzeugung</translation>
     </message>
     <message>
-        <location filename="../Project/CreateDialogCodeDialog.py" line="437"/>
+        <location filename="../Project/CreateDialogCodeDialog.py" line="440"/>
         <source>&lt;p&gt;Could not open the code template file &quot;{0}&quot;.&lt;/p&gt;&lt;p&gt;Reason: {1}&lt;/p&gt;</source>
         <translation>&lt;p&gt;Die Codevorlagendatei „{0}“ konnte nicht geöffnet werden.&lt;/p&gt;&lt;p&gt;Ursache: {1}&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/CreateDialogCodeDialog.py" line="475"/>
+        <location filename="../Project/CreateDialogCodeDialog.py" line="478"/>
         <source>&lt;p&gt;Could not open the source file &quot;{0}&quot;.&lt;/p&gt;&lt;p&gt;Reason: {1}&lt;/p&gt;</source>
         <translation>&lt;p&gt;Die Quelltextdatei „{0}“ konnte nicht geöffnet werden.&lt;/p&gt;&lt;p&gt;Ursache: {1}&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/CreateDialogCodeDialog.py" line="577"/>
+        <location filename="../Project/CreateDialogCodeDialog.py" line="580"/>
         <source>&lt;p&gt;Could not write the source file &quot;{0}&quot;.&lt;/p&gt;&lt;p&gt;Reason: {1}&lt;/p&gt;</source>
         <translation>&lt;p&gt;Die Quelltextdatei „{0}“ konnte nicht geschrieben werden.&lt;/p&gt;&lt;p&gt;Ursache: {1}&lt;/p&gt;</translation>
     </message>
@@ -7526,21 +7526,6 @@
         <translation>Auswählen, wenn der Debugger remote gestartet werden soll</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="630"/>
-        <source>Background Colours</source>
-        <translation>Hintergrundfarben</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="659"/>
-        <source>Select the background colour for changed items.</source>
-        <translation>Wähle die Hintergrundfarbe für geänderte Einträge.</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="695"/>
-        <source>Select the background colour for elements which are loaded for the first time.</source>
-        <translation>Wähle die Hintergrundfarbe für Elemente, die erstmalig geladen wurden.</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="669"/>
         <source>Changed elements:</source>
         <translation>Geänderte Elemente:</translation>
@@ -7550,6 +7535,21 @@
         <source>First time opened elements:</source>
         <translation>Erstmalig geladene Elemente:</translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="630"/>
+        <source>Background Colors</source>
+        <translation>Hintergrundfarben</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="659"/>
+        <source>Select the background color for changed items.</source>
+        <translation>Wähle die Hintergrundfarbe für geänderte Einträge.</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="695"/>
+        <source>Select the background color for elements which are loaded for the first time.</source>
+        <translation>Wähle die Hintergrundfarbe für Elemente, die erstmalig geladen wurden.</translation>
+    </message>
 </context>
 <context>
     <name>DebuggerInterfacePython</name>
@@ -8037,110 +8037,110 @@
 <context>
     <name>DiffColoursPage</name>
     <message>
-        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="17"/>
-        <source>&lt;b&gt;Configure Diff colours&lt;/b&gt;</source>
-        <translation>&lt;b&gt;Diff Farben einstellen&lt;/b&gt;</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="39"/>
-        <source>Select the background colour for header lines</source>
-        <translation>Wähle die Hintergrundfarbe für Kopfzeilen</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="42"/>
-        <source>Header Colour</source>
-        <translation>Kopfzeilenfarbe</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="52"/>
         <source>Header Line</source>
         <translation>Kopfzeile</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="65"/>
-        <source>Select the background colour for bad whitespace</source>
-        <translation>Wähle die Hintergrundfarbe für ungültige Leerzeichen</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="68"/>
-        <source>Whitespace Colour</source>
-        <translation>Leerzeichenfarbe</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="88"/>
-        <source>Select the text foreground colour</source>
-        <translation>Wähle die Textfarbe aus</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="91"/>
-        <source>Text Colour</source>
-        <translation>Textfarbe</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="101"/>
         <source>Normal Text</source>
         <translation>Normaler Text</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="114"/>
-        <source>Select the background colour for additions</source>
-        <translation>Wähle die Hintergrundfarbe für Ergänzungen</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="117"/>
-        <source>Added Colour</source>
-        <translation>Ergänzungsfarbe</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="127"/>
         <source>Added Text</source>
         <translation>Hinzugefügter Text</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="140"/>
-        <source>Select the background colour for removed text</source>
-        <translation>Wähle die Hintergrundfarbe für entfernten Text</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="143"/>
-        <source>Removed Colour</source>
-        <translation>Löschungsfarbe</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="153"/>
         <source>Removed Text</source>
         <translation>Gelöschter Text</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="166"/>
-        <source>Select the background colour for replaced text</source>
-        <translation>Wähle die Hintergrundfarbe für geänderten Text</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="169"/>
-        <source>Replaced Colour</source>
-        <translation>Änderungsfarbe</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="179"/>
         <source>Replaced Text</source>
         <translation>Geänderter Text</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="192"/>
-        <source>Select the background colour for context lines</source>
-        <translation>Wähle die Hintergrundfarbe für Kontextzeilen</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="195"/>
-        <source>Context Colour</source>
-        <translation>Kontextfarbe</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="205"/>
         <source>Context Line</source>
         <translation>Kontextzeile</translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="17"/>
+        <source>&lt;b&gt;Configure Diff colors&lt;/b&gt;</source>
+        <translation>&lt;b&gt;Diff Farben einstellen&lt;/b&gt;</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="39"/>
+        <source>Select the background color for header lines</source>
+        <translation>Wähle die Hintergrundfarbe für Kopfzeilen</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="42"/>
+        <source>Header Color</source>
+        <translation>Kopfzeilenfarbe</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="65"/>
+        <source>Select the background color for bad whitespace</source>
+        <translation>Wähle die Hintergrundfarbe für ungültige Leerzeichen</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="68"/>
+        <source>Whitespace Color</source>
+        <translation>Leerzeichenfarbe</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="88"/>
+        <source>Select the text foreground color</source>
+        <translation>Wähle die Textfarbe aus</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="91"/>
+        <source>Text Color</source>
+        <translation>Textfarbe</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="114"/>
+        <source>Select the background color for additions</source>
+        <translation>Wähle die Hintergrundfarbe für Ergänzungen</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="117"/>
+        <source>Added Color</source>
+        <translation>Ergänzungsfarbe</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="140"/>
+        <source>Select the background color for removed text</source>
+        <translation>Wähle die Hintergrundfarbe für entfernten Text</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="143"/>
+        <source>Removed Color</source>
+        <translation>Löschungsfarbe</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="166"/>
+        <source>Select the background color for replaced text</source>
+        <translation>Wähle die Hintergrundfarbe für geänderten Text</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="169"/>
+        <source>Replaced Color</source>
+        <translation>Änderungsfarbe</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="192"/>
+        <source>Select the background color for context lines</source>
+        <translation>Wähle die Hintergrundfarbe für Kontextzeilen</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="195"/>
+        <source>Context Color</source>
+        <translation>Kontextfarbe</translation>
+    </message>
 </context>
 <context>
     <name>DiffDialog</name>
@@ -9306,7 +9306,7 @@
 <context>
     <name>E5GraphicsView</name>
     <message>
-        <location filename="../E5Graphics/E5GraphicsView.py" line="56"/>
+        <location filename="../E5Graphics/E5GraphicsView.py" line="58"/>
         <source>&lt;b&gt;Graphics View&lt;/b&gt;
 &lt;p&gt;This graphics view is used to show a diagram. 
 There are various actions available to manipulate the 
@@ -9339,7 +9339,7 @@
 </translation>
     </message>
     <message>
-        <location filename="../E5Graphics/E5GraphicsView.py" line="377"/>
+        <location filename="../E5Graphics/E5GraphicsView.py" line="416"/>
         <source>{0}, Page {1}</source>
         <translation>{0}, Seite {1}</translation>
     </message>
@@ -10752,12 +10752,12 @@
 <context>
     <name>Editor</name>
     <message>
-        <location filename="../QScintilla/Editor.py" line="3106"/>
+        <location filename="../QScintilla/Editor.py" line="3107"/>
         <source>Open File</source>
         <translation>Datei öffnen</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="3295"/>
+        <location filename="../QScintilla/Editor.py" line="3296"/>
         <source>Save File</source>
         <translation>Datei sichern</translation>
     </message>
@@ -10842,27 +10842,27 @@
         <translation>Drucken</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="2663"/>
+        <location filename="../QScintilla/Editor.py" line="2664"/>
         <source>Printing...</source>
         <translation>Drucke...</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="2680"/>
+        <location filename="../QScintilla/Editor.py" line="2681"/>
         <source>Printing completed</source>
         <translation>Drucken beendet</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="2682"/>
+        <location filename="../QScintilla/Editor.py" line="2683"/>
         <source>Error while printing</source>
         <translation>Fehler beim Drucken</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="2685"/>
+        <location filename="../QScintilla/Editor.py" line="2686"/>
         <source>Printing aborted</source>
         <translation>Drucken abgebrochen</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7001"/>
+        <location filename="../QScintilla/Editor.py" line="7009"/>
         <source>File changed</source>
         <translation>Datei geändert</translation>
     </message>
@@ -10872,7 +10872,7 @@
         <translation>Prüfen</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="3046"/>
+        <location filename="../QScintilla/Editor.py" line="3047"/>
         <source>File Modified</source>
         <translation>Datei geändert</translation>
     </message>
@@ -10907,12 +10907,12 @@
         <translation>Box Kommentar</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="1955"/>
+        <location filename="../QScintilla/Editor.py" line="1956"/>
         <source>Modification of Read Only file</source>
         <translation>Änderungsversuch für eine schreibgeschützte Datei</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="1955"/>
+        <location filename="../QScintilla/Editor.py" line="1956"/>
         <source>You are attempting to change a read only file. Please save to a different file first.</source>
         <translation>Sie versuchen, eine schreibgeschützte Datei zu ändern. Bitte speichern Sie sie zuerst in eine andere Datei.</translation>
     </message>
@@ -10927,57 +10927,57 @@
         <translation>Zurück zum letzten gesichert Zustand</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6718"/>
+        <location filename="../QScintilla/Editor.py" line="6726"/>
         <source>Macro Name</source>
         <translation>Makro Name</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6718"/>
+        <location filename="../QScintilla/Editor.py" line="6726"/>
         <source>Select a macro name:</source>
         <translation>Wähle einen Makro Namen:</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6789"/>
+        <location filename="../QScintilla/Editor.py" line="6797"/>
         <source>Macro files (*.macro)</source>
         <translation>Makrodateien (*.macro)</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6746"/>
+        <location filename="../QScintilla/Editor.py" line="6754"/>
         <source>Load macro file</source>
         <translation>Lade Makrodatei</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6769"/>
+        <location filename="../QScintilla/Editor.py" line="6777"/>
         <source>Error loading macro</source>
         <translation>Fehler beim Makro Laden</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6789"/>
+        <location filename="../QScintilla/Editor.py" line="6797"/>
         <source>Save macro file</source>
         <translation>Makrodatei schreiben</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6806"/>
+        <location filename="../QScintilla/Editor.py" line="6814"/>
         <source>Save macro</source>
         <translation>Makro speichern</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6822"/>
+        <location filename="../QScintilla/Editor.py" line="6830"/>
         <source>Error saving macro</source>
         <translation>Fehler beim Makro speichern</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6835"/>
+        <location filename="../QScintilla/Editor.py" line="6843"/>
         <source>Start Macro Recording</source>
         <translation>Makroaufzeichnung starten</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6861"/>
+        <location filename="../QScintilla/Editor.py" line="6869"/>
         <source>Macro Recording</source>
         <translation>Makroaufzeichnung</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6861"/>
+        <location filename="../QScintilla/Editor.py" line="6869"/>
         <source>Enter name of the macro:</source>
         <translation>Gib einen Namen für das Makro ein:</translation>
     </message>
@@ -11027,42 +11027,42 @@
         <translation>Haltepunkt bearbeiten...</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5607"/>
+        <location filename="../QScintilla/Editor.py" line="5615"/>
         <source>Enable breakpoint</source>
         <translation>Haltepunkt aktivieren</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5610"/>
+        <location filename="../QScintilla/Editor.py" line="5618"/>
         <source>Disable breakpoint</source>
         <translation>Haltepunkt deaktivieren</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5985"/>
+        <location filename="../QScintilla/Editor.py" line="5993"/>
         <source>Code Coverage</source>
         <translation>Quelltext Abdeckung</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5985"/>
+        <location filename="../QScintilla/Editor.py" line="5993"/>
         <source>Please select a coverage file</source>
         <translation>Bitte wählen Sie eine Datei mit Abdeckungsdaten</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6165"/>
+        <location filename="../QScintilla/Editor.py" line="6173"/>
         <source>Profile Data</source>
         <translation>Profildaten</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6165"/>
+        <location filename="../QScintilla/Editor.py" line="6173"/>
         <source>Please select a profile file</source>
         <translation>Bitte wählen Sie eine Datei mit Profildaten</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="4772"/>
+        <location filename="../QScintilla/Editor.py" line="4777"/>
         <source>Autocompletion</source>
         <translation>Automatische Vervollständigung</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="4772"/>
+        <location filename="../QScintilla/Editor.py" line="4777"/>
         <source>Autocompletion is not available because there is no autocompletion source set.</source>
         <translation>Die automatische Vervollständigung ist nicht verfügbar, da keine Quelle gesetzt ist.</translation>
     </message>
@@ -11092,7 +11092,7 @@
         <translation>Autom. Speicherung aktiv</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7307"/>
+        <location filename="../QScintilla/Editor.py" line="7320"/>
         <source>Drop Error</source>
         <translation>Drop Fehler</translation>
     </message>
@@ -11102,12 +11102,12 @@
         <translation>Zeige Syntaxfehlermeldung</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6327"/>
+        <location filename="../QScintilla/Editor.py" line="6335"/>
         <source>Syntax Error</source>
         <translation>Syntaxfehler</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6327"/>
+        <location filename="../QScintilla/Editor.py" line="6335"/>
         <source>No syntax error message available.</source>
         <translation>Keine Syntaxfehlermeldung verfügbar.</translation>
     </message>
@@ -11137,42 +11137,42 @@
         <translation>Vorige nichtabgedeckte Zeile</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6048"/>
+        <location filename="../QScintilla/Editor.py" line="6056"/>
         <source>Show Code Coverage Annotations</source>
         <translation>Zeilen ohne Abdeckung Markieren</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6041"/>
+        <location filename="../QScintilla/Editor.py" line="6049"/>
         <source>All lines have been covered.</source>
         <translation>Alle Zeilen sind abgedeckt.</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6048"/>
+        <location filename="../QScintilla/Editor.py" line="6056"/>
         <source>There is no coverage file available.</source>
         <translation>Es gibt keine Datei mit Abdeckungsinformationen.</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="3046"/>
+        <location filename="../QScintilla/Editor.py" line="3047"/>
         <source>&lt;p&gt;The file &lt;b&gt;{0}&lt;/b&gt; has unsaved changes.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Die Datei &lt;b&gt;{0}&lt;/b&gt; enthält ungesicherte Änderungen.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6760"/>
+        <location filename="../QScintilla/Editor.py" line="6768"/>
         <source>&lt;p&gt;The macro file &lt;b&gt;{0}&lt;/b&gt; could not be read.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Die Makrodatei &lt;b&gt;{0}&lt;/b&gt; kann nicht gelesen werden.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6769"/>
+        <location filename="../QScintilla/Editor.py" line="6777"/>
         <source>&lt;p&gt;The macro file &lt;b&gt;{0}&lt;/b&gt; is corrupt.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Die Makrodatei &lt;b&gt;{0}&lt;/b&gt; ist zerstört.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6822"/>
+        <location filename="../QScintilla/Editor.py" line="6830"/>
         <source>&lt;p&gt;The macro file &lt;b&gt;{0}&lt;/b&gt; could not be written.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Die Makrodatei &lt;b&gt;{0}&lt;/b&gt; kann nicht geschrieben werden.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7307"/>
+        <location filename="../QScintilla/Editor.py" line="7320"/>
         <source>&lt;p&gt;&lt;b&gt;{0}&lt;/b&gt; is not a file.&lt;/p&gt;</source>
         <translation>&lt;p&gt;&lt;b&gt;{0}&lt;/b&gt; ist keine Datei.&lt;/p&gt;</translation>
     </message>
@@ -11212,82 +11212,82 @@
         <translation>Keine Sprache</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7166"/>
+        <location filename="../QScintilla/Editor.py" line="7179"/>
         <source>{0} (ro)</source>
         <translation>{0} (ro)</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7328"/>
-        <source>Resources</source>
-        <translation>Ressourcen</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="7330"/>
-        <source>Add file...</source>
-        <translation>Datei hinzufügen...</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="7332"/>
-        <source>Add files...</source>
-        <translation>Dateien hinzufügen...</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="7334"/>
-        <source>Add aliased file...</source>
-        <translation>Aliased-Datei hinzufügen...</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="7337"/>
-        <source>Add localized resource...</source>
-        <translation>Lokalisierte Ressource hinzufügen...</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="7360"/>
-        <source>Add file resource</source>
-        <translation>Dateiressource hinzufügen</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="7376"/>
-        <source>Add file resources</source>
-        <translation>Dateiressourcen hinzufügen</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="7403"/>
-        <source>Add aliased file resource</source>
-        <translation>Aliased-Dateiressourcen hinzufügen</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="7403"/>
-        <source>Alias for file &lt;b&gt;{0}&lt;/b&gt;:</source>
-        <translation>Alias für Datei &lt;b&gt;{0}&lt;/b&gt;:</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="7469"/>
-        <source>Package Diagram</source>
-        <translation>Package-Diagramm</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="7469"/>
-        <source>Include class attributes?</source>
-        <translation>Klassenattribute anzeigen?</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="7505"/>
-        <source>Application Diagram</source>
-        <translation>Applikations-Diagramm</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="7505"/>
-        <source>Include module names?</source>
-        <translation>Modulnamen anzeigen?</translation>
-    </message>
-    <message>
         <location filename="../QScintilla/Editor.py" line="7341"/>
+        <source>Resources</source>
+        <translation>Ressourcen</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="7343"/>
+        <source>Add file...</source>
+        <translation>Datei hinzufügen...</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="7345"/>
+        <source>Add files...</source>
+        <translation>Dateien hinzufügen...</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="7347"/>
+        <source>Add aliased file...</source>
+        <translation>Aliased-Datei hinzufügen...</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="7350"/>
+        <source>Add localized resource...</source>
+        <translation>Lokalisierte Ressource hinzufügen...</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="7373"/>
+        <source>Add file resource</source>
+        <translation>Dateiressource hinzufügen</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="7389"/>
+        <source>Add file resources</source>
+        <translation>Dateiressourcen hinzufügen</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="7416"/>
+        <source>Add aliased file resource</source>
+        <translation>Aliased-Dateiressourcen hinzufügen</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="7416"/>
+        <source>Alias for file &lt;b&gt;{0}&lt;/b&gt;:</source>
+        <translation>Alias für Datei &lt;b&gt;{0}&lt;/b&gt;:</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="7482"/>
+        <source>Package Diagram</source>
+        <translation>Package-Diagramm</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="7482"/>
+        <source>Include class attributes?</source>
+        <translation>Klassenattribute anzeigen?</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="7518"/>
+        <source>Application Diagram</source>
+        <translation>Applikations-Diagramm</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="7518"/>
+        <source>Include module names?</source>
+        <translation>Modulnamen anzeigen?</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="7354"/>
         <source>Add resource frame</source>
         <translation>Ressourcenrahmen hinzufügen</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6835"/>
+        <location filename="../QScintilla/Editor.py" line="6843"/>
         <source>Macro recording is already active. Start new?</source>
         <translation>Eine Makroaufzeichnung ist bereits aktiv. Neu starten?</translation>
     </message>
@@ -11337,12 +11337,12 @@
         <translation>Kein Exportformat angegeben. Abbruch...</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7491"/>
+        <location filename="../QScintilla/Editor.py" line="7504"/>
         <source>Imports Diagram</source>
         <translation>Imports Diagramm</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7491"/>
+        <location filename="../QScintilla/Editor.py" line="7504"/>
         <source>Include imports from external modules?</source>
         <translation>Imports externer Module anzeigen?</translation>
     </message>
@@ -11417,7 +11417,7 @@
         <translation>Wähle den anzuwendenden Pygments Lexer.</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7834"/>
+        <location filename="../QScintilla/Editor.py" line="7847"/>
         <source>Check spelling...</source>
         <translation>Rechtschreibprüfung...</translation>
     </message>
@@ -11427,12 +11427,12 @@
         <translation>Rechtschreibprüfung für Auswahl...</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7837"/>
+        <location filename="../QScintilla/Editor.py" line="7850"/>
         <source>Add to dictionary</source>
         <translation>Zum Wörterbuch hinzufügen</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7839"/>
+        <location filename="../QScintilla/Editor.py" line="7852"/>
         <source>Ignore All</source>
         <translation>Alle ignorieren</translation>
     </message>
@@ -11442,12 +11442,12 @@
         <translation>Aus dem Wörterbuch entfernen</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="3106"/>
+        <location filename="../QScintilla/Editor.py" line="3107"/>
         <source>&lt;p&gt;The file &lt;b&gt;{0}&lt;/b&gt; could not be opened.&lt;/p&gt;&lt;p&gt;Reason: {1}&lt;/p&gt;</source>
         <translation>&lt;p&gt;Die Datei &lt;b&gt;{0}&lt;/b&gt; konnte nicht geöffnet werden.&lt;br /&gt;Ursache: {1}&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="3232"/>
+        <location filename="../QScintilla/Editor.py" line="3233"/>
         <source>&lt;p&gt;The file &lt;b&gt;{0}&lt;/b&gt; could not be saved.&lt;br/&gt;Reason: {1}&lt;/p&gt;</source>
         <translation>&lt;p&gt;Die Datei &lt;b&gt;{0}&lt;/b&gt; konnte nicht gesichert werden.&lt;br/&gt;Grund: {1}&lt;/p&gt;</translation>
     </message>
@@ -11472,27 +11472,27 @@
         <translation>Warnungen löschen</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="3295"/>
+        <location filename="../QScintilla/Editor.py" line="3296"/>
         <source>&lt;p&gt;The file &lt;b&gt;{0}&lt;/b&gt; already exists. Overwrite it?&lt;/p&gt;</source>
         <translation>&lt;p&gt;Die Datei &lt;b&gt;{0}&lt;/b&gt; existiert bereits. Überschreiben?&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6806"/>
+        <location filename="../QScintilla/Editor.py" line="6814"/>
         <source>&lt;p&gt;The macro file &lt;b&gt;{0}&lt;/b&gt; already exists. Overwrite it?&lt;/p&gt;</source>
         <translation>&lt;p&gt;Die Makrodatei &lt;b&gt;{0}&lt;/b&gt; existiert bereits. Überschreiben?&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6606"/>
+        <location filename="../QScintilla/Editor.py" line="6614"/>
         <source>Warning: {0}</source>
         <translation>Warnung: {0}</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6613"/>
+        <location filename="../QScintilla/Editor.py" line="6621"/>
         <source>Error: {0}</source>
         <translation>Fehler: {0}</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6997"/>
+        <location filename="../QScintilla/Editor.py" line="7005"/>
         <source>&lt;br&gt;&lt;b&gt;Warning:&lt;/b&gt; You will lose your changes upon reopening it.</source>
         <translation>&lt;br&gt;&lt;b&gt;Warnung:&lt;/b&gt; Vorgenommenen Änderungen gehen beim neu einlesen verloren.</translation>
     </message>
@@ -11517,27 +11517,27 @@
         <translation>Vorherige Änderung</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="8255"/>
+        <location filename="../QScintilla/Editor.py" line="8268"/>
         <source>Sort Lines</source>
         <translation>Zeilen sortieren</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="8255"/>
+        <location filename="../QScintilla/Editor.py" line="8268"/>
         <source>The selection contains illegal data for a numerical sort.</source>
         <translation>Die Auswahl enthält für eine numerische Sortierung ungültige Daten.</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6541"/>
+        <location filename="../QScintilla/Editor.py" line="6549"/>
         <source>Warning</source>
         <translation>Warnung</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6541"/>
+        <location filename="../QScintilla/Editor.py" line="6549"/>
         <source>No warning messages available.</source>
         <translation>Keine Warnmeldungen verfügbar.</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6603"/>
+        <location filename="../QScintilla/Editor.py" line="6611"/>
         <source>Style: {0}</source>
         <translation>Stil: {0}</translation>
     </message>
@@ -11562,7 +11562,7 @@
         <translation>Öffnen mit Kodierung</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6991"/>
+        <location filename="../QScintilla/Editor.py" line="6999"/>
         <source>&lt;p&gt;The file &lt;b&gt;{0}&lt;/b&gt; has been changed while it was opened in eric6. Reread it?&lt;/p&gt;</source>
         <translation>&lt;p&gt;Die Datei &lt;b&gt;{0}&lt;/b&gt; wurde geändert, während sie in eric6 geöffnet war. Neu einlesen?&lt;/p&gt;</translation>
     </message>
@@ -11577,32 +11577,32 @@
         <translation>Vervollständigen</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="4902"/>
+        <location filename="../QScintilla/Editor.py" line="4907"/>
         <source>Auto-Completion Provider</source>
         <translation>Provider für automatische Vervollständigungen</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="4902"/>
+        <location filename="../QScintilla/Editor.py" line="4907"/>
         <source>The completion list provider &apos;{0}&apos; was already registered. Ignoring duplicate request.</source>
         <translation>Der Provider für automatische Vervollständigungen namens &apos;{0}&apos; ist bereits registriert. Die Wiederholung wird ignoriert.</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5177"/>
+        <location filename="../QScintilla/Editor.py" line="5185"/>
         <source>Call-Tips Provider</source>
         <translation>Calltipps-Provider</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5177"/>
+        <location filename="../QScintilla/Editor.py" line="5185"/>
         <source>The call-tips provider &apos;{0}&apos; was already registered. Ignoring duplicate request.</source>
         <translation>Der Calltipps-Provider namens &apos;{0}&apos; ist bereits registriert. Die Wiederholung wird ignoriert.</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="8344"/>
+        <location filename="../QScintilla/Editor.py" line="8357"/>
         <source>Register Mouse Click Handler</source>
         <translation>Maus Klick Handler registrieren</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="8344"/>
+        <location filename="../QScintilla/Editor.py" line="8357"/>
         <source>A mouse click handler for &quot;{0}&quot; was already registered by &quot;{1}&quot;. Aborting request by &quot;{2}&quot;...</source>
         <translation>Ein Maus Klick Handler für &quot;{0}&quot; wurde bereits durch &quot;{1}&quot; registriert. Die Anfrage durch &quot;{2}&quot; wird abgebrochen...</translation>
     </message>
@@ -11632,12 +11632,12 @@
         <translation>Auswahl in Konsole ausführen</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="8465"/>
+        <location filename="../QScintilla/Editor.py" line="8478"/>
         <source>EditorConfig Properties</source>
         <translation>EditorConfig Eigenschaften</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="8465"/>
+        <location filename="../QScintilla/Editor.py" line="8478"/>
         <source>&lt;p&gt;The EditorConfig properties for file &lt;b&gt;{0}&lt;/b&gt; could not be loaded.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Die EditorConfig Eigenschaften für die Datei &lt;b&gt;{0}&lt;/b&gt; konnten nicht geladen werden.&lt;/p&gt;</translation>
     </message>
@@ -12157,21 +12157,6 @@
         <translation>&lt;b&gt;Calltips einstellen&lt;/b&gt;</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="122"/>
-        <source>Colours</source>
-        <translation>Farben</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="128"/>
-        <source>Background colour:</source>
-        <translation>Hintergrundfarbe:</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="141"/>
-        <source>Select the background colour for calltips.</source>
-        <translation>Wähle die Hintergrundfarbe für Calltips.</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="74"/>
         <source>Move to set the maximum number of calltips shown (0 = all available)</source>
         <translation>Verschieben, um die Anzahl der angezeigten Calltips zu wählen (0 = alle verfügbaren)</translation>
@@ -12182,7 +12167,7 @@
         <translation>Zeigt die gewählte Maximalzahl der angezeigten Calltips an</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="167"/>
+        <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="213"/>
         <source>Plug-In Behavior</source>
         <translation>Plugin Verhalten</translation>
     </message>
@@ -12217,20 +12202,55 @@
         <translation>Automatische Calltips aktiv</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="176"/>
+        <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="222"/>
         <source>Qscintilla provided calltips are shown, if this option is enabled and calltips shall be provided by plug-ins (see calltips sub-page of the plug-in) and the plugin-ins don&apos;t deliver any calltips.</source>
         <translation>QScintilla-Calltips werden angezeigt, wenn diese Option angewählt ist und Calltips durch Plug-ins erzeugt werden sollen (siehe Calltips-Unterseite des Plugi-ns) , dieses Plug-ins aber keine liefern.</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="179"/>
+        <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="225"/>
         <source>Show QScintilla calltips, if plug-ins fail</source>
         <translation>Zeige QScintilla Calltips, falls Plug-ins keine liefern</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="173"/>
+        <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="219"/>
         <source>Select to show QScintilla provided calltips, if the selected plug-ins fail</source>
         <translation>Auswählen, um QScintilla Calltips anzuzeigen, wenn die ausgewählten Plug-ins keine liefern</translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="122"/>
+        <source>Colors</source>
+        <translation>Farben</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="128"/>
+        <source>Background color:</source>
+        <translation>Hintergrundfarbe:</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="141"/>
+        <source>Select the background color for calltips.</source>
+        <translation>Wähle die Hintergrundfarbe für Calltips.</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="164"/>
+        <source>Foreground color:</source>
+        <translation>Textfarbe:</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="177"/>
+        <source>Select the foreground color for calltips.</source>
+        <translation>Wähle die Textfarbe für Calltips.</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="187"/>
+        <source>Highlight color:</source>
+        <translation>Hervorhebungsfarbe:</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="200"/>
+        <source>Select the highlight color for calltips.</source>
+        <translation>Wähle die Hervorhebungsfarbe für Calltips.</translation>
+    </message>
 </context>
 <context>
     <name>EditorCalltipsQScintillaPage</name>
@@ -13182,31 +13202,11 @@
         <translation>Alle Schriftarten</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="273"/>
-        <source>Select the background colour for all styles</source>
-        <translation>Wähle die Hintergrundfarbe für alle Stile</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="276"/>
-        <source>All Background Colours</source>
-        <translation>Alle Hintergrundfarben</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="325"/>
         <source>Sample Text</source>
         <translation>Beispieltext</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="184"/>
-        <source>Select the background colour.</source>
-        <translation>Wähle die Hintergrundfarbe aus.</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="187"/>
-        <source>Background Colour</source>
-        <translation>Hintergrundfarbe</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="194"/>
         <source>Select the font.</source>
         <translation>Wähle die Schriftart aus.</translation>
@@ -13217,16 +13217,6 @@
         <translation>Schriftart</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="174"/>
-        <source>Select the foreground colour.</source>
-        <translation>Wähle die Textfarbe aus.</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="177"/>
-        <source>Foreground Colour</source>
-        <translation>Textfarbe</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="17"/>
         <source>&lt;b&gt;Configure syntax highlighting&lt;/b&gt;</source>
         <translation>&lt;b&gt;Syntaxhervorhebung einstellen&lt;/b&gt;</translation>
@@ -13426,6 +13416,36 @@
         <source>Press to set all sub-styles to default values</source>
         <translation>Drücken, um alle Unterstile auf Standardwerte zu setzen</translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="174"/>
+        <source>Select the foreground color.</source>
+        <translation>Wähle die Textfarbe aus.</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="177"/>
+        <source>Foreground Color</source>
+        <translation>Textfarbe</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="184"/>
+        <source>Select the background color.</source>
+        <translation>Wähle die Hintergrundfarbe aus.</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="187"/>
+        <source>Background Color</source>
+        <translation>Hintergrundfarbe</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="273"/>
+        <source>Select the background color for all styles</source>
+        <translation>Wähle die Hintergrundfarbe für alle Stile</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="276"/>
+        <source>All Background Colors</source>
+        <translation>Alle Hintergrundfarben</translation>
+    </message>
 </context>
 <context>
     <name>EditorKeywordsPage</name>
@@ -14215,16 +14235,6 @@
         <translation>Suchmarkierungen</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorSearchPage.ui" line="127"/>
-        <source>Marker Colour:</source>
-        <translation>Farbe der Markierung:</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorSearchPage.ui" line="140"/>
-        <source>Select the colour for the search markers.</source>
-        <translation>Wähle die Farbe der Suchmarkierungen.</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorSearchPage.ui" line="53"/>
         <source>Select, whether search markers shall be shown for a standard search</source>
         <translation>Auswählen, um Suchmarkierungen für eine Standardsuche anzuzeigen</translation>
@@ -14294,6 +14304,16 @@
         <source>QScintilla Extended  Mode (C++11)</source>
         <translation>Erweiterter QScintilla Modus (C++ 11)</translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorSearchPage.ui" line="127"/>
+        <source>Marker Color:</source>
+        <translation>Farbe der Markierung:</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorSearchPage.ui" line="140"/>
+        <source>Select the color for the search markers.</source>
+        <translation>Wähle die Farbe der Suchmarkierungen.</translation>
+    </message>
 </context>
 <context>
     <name>EditorSpellCheckingPage</name>
@@ -14333,16 +14353,6 @@
         <translation>Wähle die Standardsprache</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorSpellCheckingPage.ui" line="221"/>
-        <source>Marker Colour:</source>
-        <translation>Farbe der Markierung:</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorSpellCheckingPage.ui" line="234"/>
-        <source>Select the colour for the spelling markers.</source>
-        <translation>Wähle die Farbe der Rechtschreibmarkierungen.</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorSpellCheckingPage.ui" line="17"/>
         <source>&lt;b&gt;Configure editor spell checking options&lt;/b&gt;</source>
         <translation>&lt;b&gt;Rechtschreibprüfung des Editors einstellen&lt;/b&gt;</translation>
@@ -14368,11 +14378,6 @@
         <translation>Nur Zeichenketten prüfen</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorSpellCheckingPage.ui" line="215"/>
-        <source>Colours</source>
-        <translation>Farben</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorSpellCheckingPage.ui" line="260"/>
         <source>Personal lists</source>
         <translation>Persönliche Listen</translation>
@@ -14459,6 +14464,21 @@
         <translation>&lt;b&gt;Textdateien&lt;/b&gt;
 &lt;p&gt;Gib die Dateierweiterungen für reine Textdateien ein. Der vollständige Inhalt von Dateien mit diesen Erweiterungen werden geprüft.&lt;/p&gt;</translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorSpellCheckingPage.ui" line="215"/>
+        <source>Colors</source>
+        <translation>Farben</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorSpellCheckingPage.ui" line="221"/>
+        <source>Marker Color:</source>
+        <translation>Farbe der Markierung:</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorSpellCheckingPage.ui" line="234"/>
+        <source>Select the color for the spelling markers.</source>
+        <translation>Wähle die Farbe der Rechtschreibmarkierungen.</translation>
+    </message>
 </context>
 <context>
     <name>EditorStylesPage</name>
@@ -14608,31 +14628,6 @@
         <translation>Auswahl</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="515"/>
-        <source>Select to use custom selection colours</source>
-        <translation>Auswählen, um eigene Farben für die Auswahl zu verwenden</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="518"/>
-        <source>&lt;b&gt;Use custom selection colours&lt;/b&gt;&lt;p&gt;Select this entry in order to use custom selection colours in the editor and shell windows. The colours for the selection foreground and background are defined on the colours page.&lt;/p&gt;</source>
-        <translation>&lt;b&gt;Eigene Farben für Auswahl&lt;/b&gt;&lt;p&gt;Diesen Eintrag auswählen, um eigene Farben für die Auswahl in Editor- und Shell-Fenstern zu verwenden. Die Farben für den Auswahlvorder- und -hintergrund werden auf der Farbkonfigurationsseite eingestellt.&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="521"/>
-        <source>Use custom selection colours</source>
-        <translation>Eigene Farben für Auswahl</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="528"/>
-        <source>Select, if selected text should be colourized by the lexer.</source>
-        <translation>Auswählen, um den ausgewählten Text durch den Lexer einzufärben.</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="531"/>
-        <source>Colourize selected text</source>
-        <translation>Ausgewählten Text einfärben</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="538"/>
         <source>Select to extend selection to end of line</source>
         <translation>Auswählen, um die Auswahl bis zum Zeilenende zu erweitern</translation>
@@ -14648,21 +14643,11 @@
         <translation>Vordergrund der Auswahl:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="565"/>
-        <source>Select the foreground colour for the selection.</source>
-        <translation>Wählt die Textfarbe für die Auswahl.</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="575"/>
         <source>Selection background:</source>
         <translation>Hintergrund der Auswahl:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="588"/>
-        <source>Select the background colour for the selection.</source>
-        <translation>Wähle die Hintergrundfarbe für die Auswahl.</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="609"/>
         <source>Caret</source>
         <translation>Einfügemarke</translation>
@@ -14678,16 +14663,6 @@
         <translation>Zeile der Einfügemarke hervorheben</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="648"/>
-        <source>Select the colour for the caret.</source>
-        <translation>Wähle die Farbe für die Einfügemarke.</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="761"/>
-        <source>Select the background colour for the line containing the caret.</source>
-        <translation>Wähle die Hintergrundfarbe für die Zeile mit der Einfügemarke.</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="857"/>
         <source>Braces</source>
         <translation>Klammern</translation>
@@ -14708,41 +14683,21 @@
         <translation>Passende Klammer:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="886"/>
-        <source>Select the colour for highlighting matching braces.</source>
-        <translation>Wähle die Farbe zur Hervorhebung passender Klammerung.</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="896"/>
         <source>Matched braces background:</source>
         <translation>Hintergrund passende Klammer:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="909"/>
-        <source>Select the background colour for highlighting matching braces.</source>
-        <translation>Wähle die Hintergrundfarbe zur Hervorhebung passender Klammerung.</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="925"/>
         <source>Unmatched brace:</source>
         <translation>Ungültige Klammer:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="932"/>
-        <source>Select the colour for  highlighting nonmatching braces.</source>
-        <translation>Wähle die Farbe zur Hervorhebung ungültiger Klammerung.</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="948"/>
         <source>Unmatched brace background:</source>
         <translation>Hintergrund ungültige Klammer:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="955"/>
-        <source>Select the background colour for  highlighting nonmatching braces.</source>
-        <translation>Wähle die Hintergrundfarbe zur Hervorhebung ungültiger Klammerung.</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="968"/>
         <source>End of Line</source>
         <translation>Zeilenende</translation>
@@ -14768,16 +14723,6 @@
         <translation>Seitenrand</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1124"/>
-        <source>Select the colour for the edge marker.</source>
-        <translation>Wähle die Farbe für den Seitenrand.</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1134"/>
-        <source>Background colour:</source>
-        <translation>Hintergrundfarbe:</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1147"/>
         <source>Move to set the edge column.</source>
         <translation>Bewegen Sie den Schieber, um die Seitenbreite zu setzen.</translation>
@@ -14808,11 +14753,6 @@
         <translation>Zeichne Linie</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1222"/>
-        <source>Change Background Colour</source>
-        <translation>Ändere Hintergrundfarbe</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="2077"/>
         <source>Various</source>
         <translation>Verschiedenes</translation>
@@ -14843,31 +14783,16 @@
         <translation>Spaltenvordergrund:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="351"/>
-        <source>Select the foreground colour for the margins</source>
-        <translation>Wähle die Vordergrundfarbe der Spalten</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="361"/>
         <source>Margins background:</source>
         <translation>Spaltenhintergrund:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="374"/>
-        <source>Select the background colour for the margins</source>
-        <translation>Wähle die Hintergrundfarbe der Spalten</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="384"/>
         <source>Foldmargin background:</source>
         <translation>Hintergrund der Faltungsspalte:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="397"/>
-        <source>Select the background colour for the foldmargin</source>
-        <translation>Wähle die Hintergrundfarbe der Faltungsspalte</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1236"/>
         <source>Zoom</source>
         <translation>Vergrößerung</translation>
@@ -14903,21 +14828,11 @@
         <translation>Faltmarkenvordergrund:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="420"/>
-        <source>Select the foreground colour of the foldmarkers</source>
-        <translation>Wähle die Vordergrundfarbe der Faltmarken</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="430"/>
         <source>Foldmarkers background:</source>
         <translation>Faltmarkenhintergrund:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="443"/>
-        <source>Select the background colour of the foldmarkers</source>
-        <translation>Wähle die Hintergrundfarbe der Faltmarken</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="37"/>
         <source>&lt;b&gt;Note:&lt;/b&gt; Fonts and colors of the syntax highlighters have to be configured on the syntax highlighter styles page.</source>
         <translation>&lt;b&gt;Hinweis:&lt;/b&gt; Schriftarten und Farben der Syntaxhervorhebungen müssen auf der Seite „Syntaxhervorhebung, Stile“ konfiguriert werden.</translation>
@@ -14943,21 +14858,11 @@
         <translation>Warnungen</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1402"/>
-        <source>Press to select the foreground colour</source>
-        <translation>Drücken, um die Vordergrundfarbe zu wählen</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1405"/>
         <source>Foreground</source>
         <translation>Vordergrund</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1412"/>
-        <source>Press to select the background colour</source>
-        <translation>Drücken, um die Hintergrundfarbe zu wählen</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1415"/>
         <source>Background</source>
         <translation>Hintergrund</translation>
@@ -14988,56 +14893,21 @@
         <translation>Leerzeichenvordergrund:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1636"/>
-        <source>Select the foreground colour for visible whitespace</source>
-        <translation>Wähle die Vordergrundfarbe für sichtbare Leerzeichen</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1646"/>
         <source>Whitespace background:</source>
         <translation>Leerzeichenhintergrund:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1659"/>
-        <source>Select the background colour for visible whitespace</source>
-        <translation>Wähle die Hintergrundfarbe für sichtbare Leerzeichen</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="53"/>
-        <source>Select to set the colour of the edit area different to the default style</source>
-        <translation>Auswählen, um die Farbe des Editorbereiches unabhängig vom Standardstil zu setzen</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="56"/>
-        <source>Override edit area colours</source>
-        <translation>Farben des Editorbereiches überschreiben</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="68"/>
         <source>Edit area foreground:</source>
         <translation>Vordergrund:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="81"/>
-        <source>Select the foreground colour for the edit area.</source>
-        <translation>Wähle die Vordergrundfarbe des Editorbereiches.</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="91"/>
         <source>Edit area background:</source>
         <translation>Hintergrund:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="104"/>
-        <source>Select the background colour for the edit area.</source>
-        <translation>Wähle die Hintergrundfarbe des Editorbereiches.</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="47"/>
-        <source>Colours</source>
-        <translation>Farben</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1444"/>
         <source>Change Tracing</source>
         <translation>Änderungsverfolgung</translation>
@@ -15068,26 +14938,6 @@
         <translation> ms</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1514"/>
-        <source>Unsaved changes colour:</source>
-        <translation>Farbe für ungesicherte Änderungen:</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1527"/>
-        <source>Select the colour for the change marker for unsaved changes.</source>
-        <translation>Wähle die Farbe für die Änderungsmarkierung für ungesicherte Änderungen.</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1537"/>
-        <source>Saved changes colour:</source>
-        <translation>Farbe für gesicherte Änderungen:</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1550"/>
-        <source>Select the colour for the change marker for saved changes.</source>
-        <translation>Wähle die Farbe für die Änderungsmarkierung für gesicherte Änderungen.</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1003"/>
         <source>Select the wrap mode for long lines</source>
         <translation>Wähle dem Umbruchmodus für lange Zeilen</translation>
@@ -15163,91 +15013,46 @@
         <translation>Fehler:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1782"/>
-        <source>Select the colour for error markers</source>
-        <translation>Wähle die Farbe für Fehlermarkierungen</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1792"/>
         <source>Warnings:</source>
         <translation>Warnungen:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1805"/>
-        <source>Select the colour for warning markers</source>
-        <translation>Wähle die Farbe für Warnungsmarkierungen</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1815"/>
         <source>Bookmarks:</source>
         <translation>Lesezeichen:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1828"/>
-        <source>Select the colour for bookmark markers</source>
-        <translation>Wähle die Farbe für Lesezeichenmarkierungen</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1838"/>
         <source>Breakpoints:</source>
         <translation>Haltepunkte:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1851"/>
-        <source>Select the colour for breakpoint markers</source>
-        <translation>Wähle die Farbe für Haltepunktemarkierungen</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1861"/>
         <source>Tasks:</source>
         <translation>Aufgaben:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1874"/>
-        <source>Select the colour for task markers</source>
-        <translation>Wähle die Farbe für Aufgabenmarkierungen</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1884"/>
         <source>Changes:</source>
         <translation>Änderungen:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1897"/>
-        <source>Select the colour for change markers</source>
-        <translation>Wähle die Farbe für Änderungsmarkierungen</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1907"/>
         <source>Coverage:</source>
         <translation>Abdeckung:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1920"/>
-        <source>Select the colour for coverage markers</source>
-        <translation>Wähle die Farbe für Abdeckungsmarkierungen</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1930"/>
         <source>Current Line:</source>
         <translation>Aktuelle Zeile:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1943"/>
-        <source>Select the colour for the current line marker</source>
-        <translation>Wähle die Farbe der Markierung für die aktuelle Zeile</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1999"/>
         <source>Background:</source>
         <translation>Hintergrund:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="2012"/>
-        <source>Select the background colour for the marker map</source>
-        <translation>Wähle die Hintergrundfarbe der Markierungsübersicht</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1674"/>
         <source>Indentation Guides</source>
         <translation>Einrückungsmarkierungen</translation>
@@ -15268,31 +15073,16 @@
         <translation>Einrückungsmarkierungenvordergrund:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1705"/>
-        <source>Select the foreground colour for indentation guides</source>
-        <translation>Wähle die Vordergrundfarbe der Einrückungsmarkierungen</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1715"/>
         <source>Indentation Guides background:</source>
         <translation>Einrückungsmarkierungenhintergrund:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1728"/>
-        <source>Select the background colour for indentation guides</source>
-        <translation>Wähle die Hintergrundfarbe der Einrückungsmarkierungen</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1953"/>
         <source>Search Markers:</source>
         <translation>Suchmarkierungen:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1966"/>
-        <source>Select the colour for the search marker</source>
-        <translation>Wähle die Farbe der Suchmarkierung</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="2093"/>
         <source>Select to hide the Format Buttons bar when formatting is not supported</source>
         <translation>Auswählen, um die Formatbuttonsleiste auszublenden, wenn dies nicht unterstützt wird</translation>
@@ -15308,11 +15098,6 @@
         <translation>Debug-Zeilenmarken</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="801"/>
-        <source>Use background colours</source>
-        <translation>Verwende farbigen Hintergrund</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="808"/>
         <source>Current line marker:</source>
         <translation>Aktuelle Zeile:</translation>
@@ -15323,31 +15108,11 @@
         <translation>Fehlerzeile:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="798"/>
-        <source>Select to indicate the debug markers using coloured line backgrounds, arrow indicators otherwise</source>
-        <translation>Auswählen, um Debugmarken durch farbige Zeilenhintergründe anzuzeigen, ansonsten durch Pfeilindikatoren</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="821"/>
-        <source>Select the colour for the current line marker.</source>
-        <translation>Wähle die Farbe der Markierung für die aktuelle Zeile.</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="844"/>
-        <source>Select the colour for the error line marker.</source>
-        <translation>Wähle die Farbe der Markierung für die Fehlerzeile.</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1976"/>
         <source>Conflict Marker Line:</source>
         <translation>Konfliktmarkierungen:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1989"/>
-        <source>Select the colour for the conflict marker line marker</source>
-        <translation>Wähle die Farbe der Markierung für Zeilen mit Konfliktmarkierungen</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1749"/>
         <source>Select to show the marker map right of the editor</source>
         <translation>Auswählen, um die Markierungenübersicht rechts des Editors anzuzeigen</translation>
@@ -15495,10 +15260,265 @@
         <translation>Hervorhebung:</translation>
     </message>
     <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="47"/>
+        <source>Colors</source>
+        <translation>Farben</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="53"/>
+        <source>Select to set the color of the edit area different to the default style</source>
+        <translation>Auswählen, um die Farbe des Editorbereiches unabhängig vom Standardstil zu setzen</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="56"/>
+        <source>Override edit area colors</source>
+        <translation>Farben des Editorbereiches überschreiben</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="81"/>
+        <source>Select the foreground color for the edit area.</source>
+        <translation>Wähle die Textfarbe des Editorbereiches.</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="104"/>
+        <source>Select the background color for the edit area.</source>
+        <translation>Wähle die Hintergrundfarbe des Editorbereiches.</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="648"/>
+        <source>Select the color for the caret.</source>
+        <translation>Wähle die Farbe für die Einfügemarke.</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="351"/>
+        <source>Select the foreground color for the margins</source>
+        <translation>Wähle die Textfarbe der Ränder</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="374"/>
+        <source>Select the background color for the margins</source>
+        <translation>Wähle die Hintergrundfarbe der Ränder</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="397"/>
+        <source>Select the background color for the foldmargin</source>
+        <translation>Wähle die Hintergrundfarbe des Faltungsrandes</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="420"/>
+        <source>Select the foreground color of the foldmarkers</source>
+        <translation>Wähle die Vordergrundfarbe der Faltmarken</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="443"/>
+        <source>Select the background color of the foldmarkers</source>
+        <translation>Wähle die Hintergrundfarbe der Faltmarken</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="515"/>
+        <source>Select to use custom selection colors</source>
+        <translation>Auswählen, um eigene Farben für die Auswahl zu verwenden</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="518"/>
+        <source>&lt;b&gt;Use custom selection colors&lt;/b&gt;&lt;p&gt;Select this entry in order to use custom selection colors in the editor and shell windows. The colors for the selection foreground and background are defined on the colors page.&lt;/p&gt;</source>
+        <translation>&lt;b&gt;Eigene Farben für Auswahl&lt;/b&gt;&lt;p&gt;Diesen Eintrag auswählen, um eigene Farben für die Auswahl in Editor- und Shell-Fenstern zu verwenden. Die Farben für den Auswahlvorder- und -hintergrund werden auf der Farbkonfigurationsseite eingestellt.&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="521"/>
+        <source>Use custom selection colors</source>
+        <translation>Eigene Farben für Auswahl</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="528"/>
+        <source>Select, if selected text should be colorized by the lexer.</source>
+        <translation>Auswählen, um den ausgewählten Text durch den Lexer einzufärben.</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="531"/>
+        <source>Colorize selected text</source>
+        <translation>Ausgewählten Text einfärben</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="565"/>
+        <source>Select the foreground color for the selection.</source>
+        <translation>Wählt die Textfarbe für die Auswahl.</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="588"/>
+        <source>Select the background color for the selection.</source>
+        <translation>Wähle die Hintergrundfarbe für die Auswahl.</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="761"/>
+        <source>Select the background color for the line containing the caret.</source>
+        <translation>Wähle die Hintergrundfarbe für die Zeile mit der Einfügemarke.</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="798"/>
+        <source>Select to indicate the debug markers using colored line backgrounds, arrow indicators otherwise</source>
+        <translation>Auswählen, um Debugmarken durch farbige Zeilenhintergründe anzuzeigen, ansonsten durch Pfeilindikatoren</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="801"/>
+        <source>Use background colors</source>
+        <translation>Verwende farbigen Hintergrund</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="821"/>
+        <source>Select the color for the current line marker.</source>
+        <translation>Wähle die Farbe der Markierung für die aktuelle Zeile.</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="844"/>
+        <source>Select the color for the error line marker.</source>
+        <translation>Wähle die Farbe der Markierung für die Fehlerzeile.</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="886"/>
+        <source>Select the color for highlighting matching braces.</source>
+        <translation>Wähle die Farbe zur Hervorhebung passender Klammerung.</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="909"/>
+        <source>Select the background color for highlighting matching braces.</source>
+        <translation>Wähle die Hintergrundfarbe zur Hervorhebung passender Klammerung.</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="932"/>
+        <source>Select the color for  highlighting nonmatching braces.</source>
+        <translation>Wähle die Farbe zur Hervorhebung ungültiger Klammerung.</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="955"/>
+        <source>Select the background color for  highlighting nonmatching braces.</source>
+        <translation>Wähle die Hintergrundfarbe zur Hervorhebung ungültiger Klammerung.</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1124"/>
+        <source>Select the color for the edge marker.</source>
+        <translation>Wähle die Farbe für den Seitenrand.</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1134"/>
+        <source>Background color:</source>
+        <translation>Hintergrundfarbe:</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1222"/>
+        <source>Change Background Color</source>
+        <translation>Hintergrundfarbe ändern</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1402"/>
+        <source>Press to select the foreground color</source>
+        <translation>Drücken, um die Vordergrundfarbe zu wählen</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1412"/>
+        <source>Press to select the background color</source>
+        <translation>Drücken, um die Hintergrundfarbe zu wählen</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1514"/>
+        <source>Unsaved changes color:</source>
+        <translation>Farbe für ungesicherte Änderungen:</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1527"/>
+        <source>Select the color for the change marker for unsaved changes.</source>
+        <translation>Wähle die Farbe für die Änderungsmarkierung für ungesicherte Änderungen.</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1537"/>
+        <source>Saved changes color:</source>
+        <translation>Farbe für gesicherte Änderungen:</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1550"/>
+        <source>Select the color for the change marker for saved changes.</source>
+        <translation>Wähle die Farbe für die Änderungsmarkierung für gesicherte Änderungen.</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1636"/>
+        <source>Select the foreground color for visible whitespace</source>
+        <translation>Wähle die Vordergrundfarbe für sichtbare Leerzeichen</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1659"/>
+        <source>Select the background color for visible whitespace</source>
+        <translation>Wähle die Hintergrundfarbe für sichtbare Leerzeichen</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1705"/>
+        <source>Select the foreground color for indentation guides</source>
+        <translation>Wähle die Vordergrundfarbe der Einrückungsmarkierungen</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1728"/>
+        <source>Select the background color for indentation guides</source>
+        <translation>Wähle die Hintergrundfarbe der Einrückungsmarkierungen</translation>
+    </message>
+    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1763"/>
-        <source>Marker Colours</source>
+        <source>Marker Colors</source>
         <translation>Markierungsfarben</translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1782"/>
+        <source>Select the color for error markers</source>
+        <translation>Wähle die Farbe für Fehlermarkierungen</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1805"/>
+        <source>Select the color for warning markers</source>
+        <translation>Wähle die Farbe für Warnungsmarkierungen</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1828"/>
+        <source>Select the color for bookmark markers</source>
+        <translation>Wähle die Farbe für Lesezeichenmarkierungen</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1851"/>
+        <source>Select the color for breakpoint markers</source>
+        <translation>Wähle die Farbe für Haltepunktemarkierungen</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1874"/>
+        <source>Select the color for task markers</source>
+        <translation>Wähle die Farbe für Aufgabenmarkierungen</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1897"/>
+        <source>Select the color for change markers</source>
+        <translation>Wähle die Farbe für Änderungsmarkierungen</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1920"/>
+        <source>Select the color for coverage markers</source>
+        <translation>Wähle die Farbe für Abdeckungsmarkierungen</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1943"/>
+        <source>Select the color for the current line marker</source>
+        <translation>Wähle die Farbe der Markierung für die aktuelle Zeile</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1966"/>
+        <source>Select the color for the search marker</source>
+        <translation>Wähle die Farbe der Suchmarkierung</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1989"/>
+        <source>Select the color for the conflict marker line marker</source>
+        <translation>Wähle die Farbe der Markierung für Zeilen mit Konfliktmarkierungen</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="2012"/>
+        <source>Select the background color for the marker map</source>
+        <translation>Wähle die Hintergrundfarbe der Markierungsübersicht</translation>
+    </message>
 </context>
 <context>
     <name>EditorSyntaxPage</name>
@@ -16585,111 +16605,51 @@
         <translation>Stildatei</translation>
     </message>
     <message>
-        <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="252"/>
-        <source>Enter the filename of a CSS style sheet. Leave empty to use the colours defined below.</source>
-        <translation>Gib den Dateinamen einer CSS-Stildatei ein. Leer lassen, um die unten definierten Farben zu verwenden.</translation>
-    </message>
-    <message>
-        <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="262"/>
-        <source>Colours</source>
-        <translation>Farben</translation>
-    </message>
-    <message>
-        <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="268"/>
-        <source>Press to select the class and function header background colour.</source>
-        <translation>Drücken, um die Hintergrundfarbe für Klassen und Funktionen Titel zu wählen.</translation>
-    </message>
-    <message>
         <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="271"/>
         <source>Class/Function Header Background</source>
         <translation>Hintergrund für Klassen/Funktionen Titel</translation>
     </message>
     <message>
-        <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="278"/>
-        <source>Press to select the class and function header foreground colour.</source>
-        <translation>Drücken, um die Vordergrundfarbe für Klassen und Funktionen Titel zu wählen.</translation>
-    </message>
-    <message>
         <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="281"/>
         <source>Class/Function Header Foreground</source>
         <translation>Vordergrund für Klassen/Funktionen Titel</translation>
     </message>
     <message>
-        <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="288"/>
-        <source>Press to select the level 2 header background colour.</source>
-        <translation>Drücken, um die Hintergrundfarbe für Ebene 2 Titel zu wählen.</translation>
-    </message>
-    <message>
         <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="291"/>
         <source>Level 2 Header Background</source>
         <translation>Hintergrund für Ebene 2 Titel</translation>
     </message>
     <message>
-        <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="298"/>
-        <source>Press to select the level 2 header foreground colour.</source>
-        <translation>Drücken, um die Vordergrundfarbe für Ebene 2 Titel zu wählen.</translation>
-    </message>
-    <message>
         <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="301"/>
         <source>Level 2 Header Foreground</source>
         <translation>Vordergrund für Ebene 2 Titel</translation>
     </message>
     <message>
-        <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="308"/>
-        <source>Press to select the level 1 header background colour.</source>
-        <translation>Drücken, um die Hintergrundfarbe für Ebene 1 Titel zu wählen.</translation>
-    </message>
-    <message>
         <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="311"/>
         <source>Level 1 Header Background</source>
         <translation>Hintergrund für Ebene 1 Titel</translation>
     </message>
     <message>
-        <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="318"/>
-        <source>Press to select the level 1 header foreground colour.</source>
-        <translation>Drücken, um die Vordergrundfarbe für Ebene 1 Titel zu wählen.</translation>
-    </message>
-    <message>
         <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="321"/>
         <source>Level 1 Header Foreground</source>
         <translation>Vordergrund für Ebene 1 Titel</translation>
     </message>
     <message>
-        <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="328"/>
-        <source>Press to select the body background colour.</source>
-        <translation>Drücken, um die Hintergrundfarbe für normalen Text zu wählen.</translation>
-    </message>
-    <message>
         <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="331"/>
         <source>Body Background</source>
         <translation>Hintergrundfarbe Text</translation>
     </message>
     <message>
-        <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="338"/>
-        <source>Press to select the body foreground colour.</source>
-        <translation>Drücken, um die Vordergrundfarbe für normalen Text zu wählen.</translation>
-    </message>
-    <message>
         <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="341"/>
         <source>Body Foreground</source>
         <translation>Vordergrundfarbe Text</translation>
     </message>
     <message>
-        <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="348"/>
-        <source>Press to select the foreground colour of links.</source>
-        <translation>Drücken, um die Vordergrundfarbe für Verweise zu wählen.</translation>
-    </message>
-    <message>
         <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="351"/>
         <source>Links</source>
         <translation>Verweise</translation>
     </message>
     <message>
-        <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="358"/>
-        <source>This shows an example of the selected colours.</source>
-        <translation>Dies zeigt ein Beispiel für die ausgewählten Farben.</translation>
-    </message>
-    <message>
         <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="150"/>
         <source>Exclude Files:</source>
         <translation>Ignoriere Dateien:</translation>
@@ -16779,6 +16739,66 @@
         <source>&lt;?xml version=&quot;1.0&quot; encoding=&quot;utf-8&quot;?&gt;&lt;!DOCTYPE html PUBLIC &quot;-//W3C//DTD XHTML 1.0 Strict//EN&quot;&quot;http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd&quot;&gt;&lt;html&gt;&lt;head&gt;&lt;title&gt;&lt;/title&gt;&lt;/head&gt;&lt;body style=&quot;background-color:{BodyBgColor};color:{BodyColor}&quot;&gt;&lt;h1 style=&quot;background-color:{Level1HeaderBgColor};color:{Level1HeaderColor}&quot;&gt;Level 1 Header&lt;/h1&gt;&lt;h3 style=&quot;background-color:{Level2HeaderBgColor};color:{Level2HeaderColor}&quot;&gt;Level 2 Header&lt;/h3&gt;&lt;h2 style=&quot;background-color:{CFBgColor};color:{CFColor}&quot;&gt;Class and Function Header&lt;/h2&gt;Standard body text with &lt;a style=&quot;color:{LinkColor}&quot;&gt;some links&lt;/a&gt; embedded.&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;?xml version=&quot;1.0&quot; encoding=&quot;utf-8&quot;?&gt;&lt;!DOCTYPE html PUBLIC &quot;-//W3C//DTD XHTML 1.0 Strict//EN&quot;&quot;http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd&quot;&gt;&lt;html&gt;&lt;head&gt;&lt;title&gt;&lt;/title&gt;&lt;/head&gt;&lt;body style=&quot;background-color:{BodyBgColor};color:{BodyColor}&quot;&gt;&lt;h1 style=&quot;background-color:{Level1HeaderBgColor};color:{Level1HeaderColor}&quot;&gt;Ebene-1-Titel&lt;/h1&gt;&lt;h3 style=&quot;background-color:{Level2HeaderBgColor};color:{Level2HeaderColor}&quot;&gt;Ebene-2-Titel&lt;/h3&gt;&lt;h2 style=&quot;background-color:{CFBgColor};color:{CFColor}&quot;&gt;Klassen- und Funktionen-Titel&lt;/h2&gt;Normaler Text mit eingebetteten &lt;a style=&quot;color:{LinkColor}&quot;&gt;Verweisen&lt;/a&gt;.&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
+    <message>
+        <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="252"/>
+        <source>Enter the filename of a CSS style sheet. Leave empty to use the colors defined below.</source>
+        <translation>Gib den Dateinamen einer CSS-Stildatei ein. Leer lassen, um die unten definierten Farben zu verwenden.</translation>
+    </message>
+    <message>
+        <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="262"/>
+        <source>Colors</source>
+        <translation>Farben</translation>
+    </message>
+    <message>
+        <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="268"/>
+        <source>Press to select the class and function header background color.</source>
+        <translation>Drücken, um die Hintergrundfarbe für Klassen und Funktionen Titel zu wählen.</translation>
+    </message>
+    <message>
+        <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="278"/>
+        <source>Press to select the class and function header foreground color.</source>
+        <translation>Drücken, um die Textfarbe für Klassen und Funktionen Titel zu wählen.</translation>
+    </message>
+    <message>
+        <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="288"/>
+        <source>Press to select the level 2 header background color.</source>
+        <translation>Drücken, um die Hintergrundfarbe für Ebene 2 Titel zu wählen.</translation>
+    </message>
+    <message>
+        <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="298"/>
+        <source>Press to select the level 2 header foreground color.</source>
+        <translation>Drücken, um die Textfarbe für Ebene 2 Titel zu wählen.</translation>
+    </message>
+    <message>
+        <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="308"/>
+        <source>Press to select the level 1 header background color.</source>
+        <translation>Drücken, um die Hintergrundfarbe für Ebene 2 Titel zu wählen.</translation>
+    </message>
+    <message>
+        <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="318"/>
+        <source>Press to select the level 1 header foreground color.</source>
+        <translation>Drücken, um die Textfarbe für Ebene 2 Titel zu wählen.</translation>
+    </message>
+    <message>
+        <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="328"/>
+        <source>Press to select the body background color.</source>
+        <translation>Drücken, um die Hintergrundfarbe für normalen Text zu wählen.</translation>
+    </message>
+    <message>
+        <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="338"/>
+        <source>Press to select the body foreground color.</source>
+        <translation>Drücken, um die Textfarbe für normalen Text zu wählen.</translation>
+    </message>
+    <message>
+        <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="348"/>
+        <source>Press to select the foreground color of links.</source>
+        <translation>Drücken, um die Textfarbe für Verweise zu wählen.</translation>
+    </message>
+    <message>
+        <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="358"/>
+        <source>This shows an example of the selected colors.</source>
+        <translation>Dies zeigt ein Beispiel für die ausgewählten Farben.</translation>
+    </message>
 </context>
 <context>
     <name>EricdocExecDialog</name>
@@ -17261,12 +17281,12 @@
 <context>
     <name>ExporterHTML</name>
     <message>
-        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="516"/>
+        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="537"/>
         <source>Export source</source>
         <translation>Quelltext exportieren</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="448"/>
+        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="466"/>
         <source>&lt;p&gt;The source could not be exported to &lt;b&gt;{0}&lt;/b&gt;.&lt;/p&gt;&lt;p&gt;Reason: {1}&lt;/p&gt;</source>
         <translation>&lt;p&gt;Der Quelltext konnte nicht nach &lt;b&gt;{0}&lt;/b&gt; exportiert werden.&lt;/p&gt;&lt;p&gt;Ursache: {1}&lt;/p&gt;</translation>
     </message>
@@ -17276,20 +17296,40 @@
         <translation>HTML-Dateien (*.html)</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="457"/>
+        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="475"/>
         <source>&lt;p&gt;The source could not be exported to &lt;b&gt;{0}&lt;/b&gt;.&lt;/p&gt;&lt;p&gt;Reason: No HTML code generated.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Der Quelltext konnte nicht nach &lt;b&gt;{0}&lt;/b&gt; exportiert werden.&lt;/p&gt;&lt;p&gt;Ursache: Es wurde kein HTML Quelltext erzeugt.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="516"/>
+        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="537"/>
         <source>&lt;p&gt;Markdown export requires the &lt;b&gt;python-markdown&lt;/b&gt; package.&lt;br/&gt;Install it with your package manager, &apos;pip install docutils&apos; or see &lt;a href=&quot;http://pythonhosted.org/Markdown/install.html&quot;&gt; installation instructions.&lt;/a&gt;&lt;/p&gt;</source>
         <translation>&lt;p&gt;Der Markdown-Export erfordert das &lt;b&gt;python-markdown&lt;/b&gt;-Paket.&lt;br/&gt;Installiere es mit dem Paketmanager, &apos;pip install docutils&apos; oder siehe &lt;a href=&quot;http://pythonhosted.org/Markdown/install.html&quot;&gt;die Installationsanleitung.&lt;/a&gt;&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="484"/>
+        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="502"/>
         <source>&lt;p&gt;ReStructuredText export requires the &lt;b&gt;python-docutils&lt;/b&gt; package.&lt;br/&gt;Install it with your package manager, &apos;pip install docutils&apos; or see &lt;a href=&quot;http://pypi.python.org/pypi/docutils&quot;&gt;this page.&lt;/a&gt;&lt;/p&gt;</source>
         <translation>&lt;p&gt;Der ReStructuredText-Export erfordert das &lt;b&gt;python-docutils&lt;/b&gt;-Paket.&lt;br/&gt;Installiere es mit dem Paketmanager,&apos;pip install docutils&apos; oder siehe &lt;a href=&quot;http://pypi.python.org/pypi/docutils&quot;&gt;diese Seite.&lt;/a&gt;&lt;/p&gt;</translation>
     </message>
+    <message>
+        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="412"/>
+        <source>Light Background Color</source>
+        <translation>Helle Hintergrundfarbe</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="413"/>
+        <source>Dark Background Color</source>
+        <translation>Dunkle Hintergrundfarbe</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="416"/>
+        <source>Markdown Export</source>
+        <translation>Markdown Export</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="416"/>
+        <source>Select color scheme:</source>
+        <translation>Wähle das Farbschema:</translation>
+    </message>
 </context>
 <context>
     <name>ExporterODT</name>
@@ -21005,22 +21045,22 @@
         <translation>Wähle das als Filter zu verwendende Feld</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="102"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="107"/>
         <source>Author</source>
         <translation>Autor</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="103"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="108"/>
         <source>Committer</source>
         <translation>Revisionsersteller</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1792"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1794"/>
         <source>Branch</source>
         <translation>Zweig</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="104"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="109"/>
         <source>Subject</source>
         <translation>Betreff</translation>
     </message>
@@ -21090,178 +21130,178 @@
         <translation>Wähle eine Aktion aus dem Menü</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="88"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="93"/>
         <source>&amp;Refresh</source>
         <translation>&amp;Aktualisieren</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="90"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="95"/>
         <source>Press to refresh the list of commits</source>
         <translation>Drücken, um die Protokollliste zu aktualisieren</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="197"/>
-        <source>Added</source>
-        <translation>Hinzugefügt</translation>
-    </message>
-    <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="198"/>
-        <source>Deleted</source>
-        <translation>Gelöscht</translation>
-    </message>
-    <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="199"/>
-        <source>Modified</source>
-        <translation>Modifiziert</translation>
-    </message>
-    <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="200"/>
-        <source>Copied</source>
-        <translation>Kopiert</translation>
-    </message>
-    <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="201"/>
-        <source>Renamed</source>
-        <translation>Umbenannt</translation>
-    </message>
-    <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="202"/>
-        <source>Type changed</source>
-        <translation>Typ geändert</translation>
-    </message>
-    <message>
         <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="203"/>
+        <source>Added</source>
+        <translation>Hinzugefügt</translation>
+    </message>
+    <message>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="204"/>
+        <source>Deleted</source>
+        <translation>Gelöscht</translation>
+    </message>
+    <message>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="205"/>
+        <source>Modified</source>
+        <translation>Modifiziert</translation>
+    </message>
+    <message>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="206"/>
+        <source>Copied</source>
+        <translation>Kopiert</translation>
+    </message>
+    <message>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="207"/>
+        <source>Renamed</source>
+        <translation>Umbenannt</translation>
+    </message>
+    <message>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="208"/>
+        <source>Type changed</source>
+        <translation>Typ geändert</translation>
+    </message>
+    <message>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="209"/>
         <source>Unmerged</source>
         <translation>Nicht zusammengeführt</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="250"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="256"/>
         <source>Show Author Columns</source>
         <translation>Autor Spalten anzeigen</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="252"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="258"/>
         <source>Press to show the author columns</source>
         <translation>Drücken, um die Autor Spalten anzuzeigen</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="260"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="266"/>
         <source>Show Committer Columns</source>
         <translation>Revisionsersteller Spalten anzeigen</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="262"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="268"/>
         <source>Press to show the committer columns</source>
         <translation>Drücken, um die Revisionsersteller Spalten anzuzeigen</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="309"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="315"/>
         <source>Copy Commits</source>
         <translation>Revisionen kopieren</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="311"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="317"/>
         <source>Cherry-pick the selected commits to the current branch</source>
         <translation>Die ausgewählten Revisionen in den aktuellen Zweig kopieren</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="316"/>
-        <source>Tag</source>
-        <translation>Marke setzen</translation>
-    </message>
-    <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="318"/>
-        <source>Tag the selected commit</source>
-        <translation>Ausgewählte Revision mit einer Marke versehen</translation>
-    </message>
-    <message>
         <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="322"/>
-        <source>Create a new branch at the selected commit.</source>
-        <translation>Neuen Zweig mit der ausgewählten Revision erzeugen.</translation>
+        <source>Tag</source>
+        <translation>Marke setzen</translation>
     </message>
     <message>
         <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="324"/>
+        <source>Tag the selected commit</source>
+        <translation>Ausgewählte Revision mit einer Marke versehen</translation>
+    </message>
+    <message>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="328"/>
+        <source>Create a new branch at the selected commit.</source>
+        <translation>Neuen Zweig mit der ausgewählten Revision erzeugen.</translation>
+    </message>
+    <message>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="330"/>
         <source>Branch &amp;&amp; Switch</source>
         <translation>Zweig erzeugen &amp;&amp; Umschalten</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="326"/>
-        <source>Create a new branch at the selected commit and switch the work tree to it.</source>
-        <translation>Neuen Zweig mit der ausgewählten Revision erzeugen und das Arbeitsverzeichnis umschalten.</translation>
-    </message>
-    <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1844"/>
-        <source>Switch</source>
-        <translation>Umschalten</translation>
-    </message>
-    <message>
         <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="332"/>
-        <source>Switch the working directory to the selected commit</source>
-        <translation>Schaltet das Arbeitsverzeichnis auf die ausgewählte Revision um</translation>
-    </message>
-    <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1870"/>
-        <source>Show Short Log</source>
-        <translation>Kurzprotokoll anzeigen</translation>
+        <source>Create a new branch at the selected commit and switch the work tree to it.</source>
+        <translation>Neuen Zweig mit der ausgewählten Revision erzeugen und das Arbeitsverzeichnis umschalten.</translation>
+    </message>
+    <message>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1846"/>
+        <source>Switch</source>
+        <translation>Umschalten</translation>
     </message>
     <message>
         <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="338"/>
+        <source>Switch the working directory to the selected commit</source>
+        <translation>Schaltet das Arbeitsverzeichnis auf die ausgewählte Revision um</translation>
+    </message>
+    <message>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1872"/>
+        <source>Show Short Log</source>
+        <translation>Kurzprotokoll anzeigen</translation>
+    </message>
+    <message>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="344"/>
         <source>Show a dialog with a log output for release notes</source>
         <translation>Zeigt einen Dialog mit einem Kurzprotokoll zur Verwendung in Freigabemitteilungen</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="341"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="347"/>
         <source>Describe</source>
         <translation>Beschreibe</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="343"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="349"/>
         <source>Show the most recent tag reachable from a commit</source>
         <translation>Zeigt die letzte von einer Revision erreichbare Marke</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="632"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="634"/>
         <source>The git process did not finish within 30s.</source>
         <translation>Der git-Prozess endete nicht innerhalb von 30s.</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="635"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="637"/>
         <source>Could not start the git executable.</source>
         <translation>Das git Programm konnte nicht gestartet werden.</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="638"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="640"/>
         <source>Git Error</source>
         <translation>Git Fehler</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="754"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="756"/>
         <source>{0} ({1}%)</source>
         <comment>action, confidence</comment>
         <translation>{0} ({1}%)</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="820"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="822"/>
         <source>Process Generation Error</source>
         <translation>Fehler beim Prozessstart</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="820"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="822"/>
         <source>The process {0} could not be started. Ensure, that it is in the search path.</source>
         <translation>Der Prozess {0} konnte nicht gestartet werden. Stellen Sie sicher, dass er sich im Suchpfad befindet.</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1706"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1708"/>
         <source>Copy Changesets</source>
         <translation>Änderungssätze kopieren</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1844"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1846"/>
         <source>The project should be reread. Do this now?</source>
         <translation>Das Projekt sollte neu gelesen werde. Jetzt durchführen?</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="204"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="210"/>
         <source>Unknown</source>
         <translation>Unbekannt</translation>
     </message>
@@ -21271,17 +21311,17 @@
         <translation>Zweige</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1870"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1872"/>
         <source>Select a branch</source>
         <translation>Zweig auswählen</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1823"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1825"/>
         <source>Select a default branch</source>
         <translation>Standardzweig auswählen</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1823"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1825"/>
         <source>Branch &amp; Switch</source>
         <translation>Zweig erzeugen &amp; Umschalten</translation>
     </message>
@@ -21301,37 +21341,37 @@
         <translation>Drücken, um das nächste Vorkommen zu finden</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="101"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="106"/>
         <source>Commit ID</source>
         <translation>Revisions-ID</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="98"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="103"/>
         <source>Find</source>
         <translation>Finden</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="99"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="104"/>
         <source>Filter</source>
         <translation>Filtern</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="140"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="146"/>
         <source>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Branches&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</source>
         <translation>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Zweige&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="143"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="149"/>
         <source>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Tags&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</source>
         <translation>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Marken&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2052"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2054"/>
         <source>&apos;{0}&apos; was not found.</source>
         <translation>&apos;{0}&apos; wurde nicht gefunden.</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2052"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2054"/>
         <source>Find Commit</source>
         <translation>Revision finden</translation>
     </message>
@@ -21341,7 +21381,7 @@
         <translation>Gib den regulären Ausdruck zum Filtern oder Suchen ein</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="105"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="110"/>
         <source>File</source>
         <translation>Datei</translation>
     </message>
@@ -21366,7 +21406,7 @@
         <translation>Löschungen</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2098"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2100"/>
         <source>Differences</source>
         <translation>Unterschiede</translation>
     </message>
@@ -21376,97 +21416,97 @@
         <translation>&lt;a href=&quot;save:me&quot;&gt;Speichern&lt;/a&gt;</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="122"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="128"/>
         <source>&lt;table&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Commit ID&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Date&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{1}&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Author&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{2} &amp;lt;{3}&amp;gt;&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Commit Date&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{4}&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Committer&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{5} &amp;lt;{6}&amp;gt;&lt;/td&gt;&lt;/tr&gt;{7}&lt;tr&gt;&lt;td&gt;&lt;b&gt;Subject&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{8}&lt;/td&gt;&lt;/tr&gt;{9}&lt;/table&gt;</source>
         <translation>&lt;table&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Revisions-ID&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Datum&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{1}&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Autor&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{2} &amp;lt;{3}&amp;gt;&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Revisionsdatum&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{4}&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Revisionsersteller&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{5} &amp;lt;{6}&amp;gt;&lt;/td&gt;&lt;/tr&gt;{7}&lt;tr&gt;&lt;td&gt;&lt;b&gt;Betreff&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{8}&lt;/td&gt;&lt;/tr&gt;{9}&lt;/table&gt;</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="134"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="140"/>
         <source>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Parents&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</source>
         <translation>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Vorgänger&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="137"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="143"/>
         <source>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Children&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</source>
         <translation>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Nachfolger&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="146"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="152"/>
         <source>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Message&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</source>
         <translation>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Beschreibung&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1265"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1267"/>
         <source>Side-by-Side Diff to Parent {0}</source>
         <translation>Unterschiede nebeneinander zu Vorgänger {0}</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1277"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1279"/>
         <source>&lt;a href=&quot;sbsdiff:{0}_{1}&quot;&gt;Side-by-Side Compare&lt;/a&gt;</source>
         <translation>&lt;a href=&quot;sbsdiff:{0}_{1}&quot;&gt;Unterschiede nebeneinander&lt;/a&gt;</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2112"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2114"/>
         <source>Differences to Parent {0}</source>
         <translation>Unterschiede zu Vorgänger {0}</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2127"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2129"/>
         <source>Diff to Parent {0}</source>
         <translation>Diff zu Vorgänger {0}</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2153"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2155"/>
         <source>There is no difference.</source>
         <translation>Es gibt keinen Unterschied.</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2316"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2318"/>
         <source>Save Diff</source>
         <translation>Diff speichern</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2282"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2284"/>
         <source>Patch Files (*.diff)</source>
         <translation>Patchdateien (*.diff)</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2299"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2301"/>
         <source>&lt;p&gt;The patch file &lt;b&gt;{0}&lt;/b&gt; already exists. Overwrite it?&lt;/p&gt;</source>
         <translation>&lt;p&gt;Die Patchdatei &lt;b&gt;{0}&lt;/b&gt; existiert bereits. Überschreiben?&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2316"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2318"/>
         <source>&lt;p&gt;The patch file &lt;b&gt;{0}&lt;/b&gt; could not be saved.&lt;br&gt;Reason: {1}&lt;/p&gt;</source>
         <translation>&lt;p&gt;Die Patchdatei &lt;b&gt;{0}&lt;/b&gt; konnte nicht gespeichert werden.&lt;br&gt;Grund: {1}&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="240"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="246"/>
         <source>Show Commit ID Column</source>
         <translation>Commit ID Spalte anzeigen</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="242"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="248"/>
         <source>Press to show the commit ID column</source>
         <translation>Drücken, um die Commit ID Spalte anzuzeigen</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="270"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="276"/>
         <source>Show Branches Column</source>
         <translation>Zweige Spalte anzeigen</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="272"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="278"/>
         <source>Press to show the branches column</source>
         <translation>Drücken, um die Zweige Spalte anzuzeigen</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="280"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="286"/>
         <source>Show Tags Column</source>
         <translation>Marken Spalte anzeigen</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="282"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="288"/>
         <source>Press to show the Tags column</source>
         <translation>Drücken, um die Marken Spalte anzuzeigen</translation>
     </message>
@@ -25919,20 +25959,60 @@
 <context>
     <name>GraphicsPage</name>
     <message>
-        <location filename="../Preferences/ConfigurationPages/GraphicsPage.ui" line="16"/>
+        <location filename="../Preferences/ConfigurationPages/GraphicsPage.ui" line="17"/>
         <source>&lt;b&gt;Configure graphics settings&lt;/b&gt;</source>
         <translation>&lt;b&gt;Grafikeinstellungen&lt;/b&gt;</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/GraphicsPage.ui" line="38"/>
+        <location filename="../Preferences/ConfigurationPages/GraphicsPage.ui" line="43"/>
         <source>Press to select the font for the graphic items</source>
         <translation>Drücken, um die Schriftart für die Grafik auszuwählen</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/GraphicsPage.ui" line="51"/>
+        <location filename="../Preferences/ConfigurationPages/GraphicsPage.ui" line="56"/>
         <source>Graphics Font</source>
         <translation>Schriftart für Grafik</translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/GraphicsPage.ui" line="37"/>
+        <source>Font</source>
+        <translation>Schriftart</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/GraphicsPage.ui" line="72"/>
+        <source>Drawing Mode</source>
+        <translation>Zeichenmodus</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/GraphicsPage.ui" line="78"/>
+        <source>Select to determine the drawing mode automatically</source>
+        <translation>Auswählen, um den Zeichenmodus automatisch zu ermitteln</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/GraphicsPage.ui" line="81"/>
+        <source>Automatic</source>
+        <translation>Automatisch</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/GraphicsPage.ui" line="91"/>
+        <source>Select to draw black shapes on a white background</source>
+        <translation>Auswählen, um schwarze Formen auf weißem Hintergrund zu zeichnen</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/GraphicsPage.ui" line="94"/>
+        <source>Black On White</source>
+        <translation>Schwarz auf Weiß</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/GraphicsPage.ui" line="101"/>
+        <source>Select to draw white shapes on a black background</source>
+        <translation>Auswählen, um weiße Formen auf schwarzem Hintergrund zu zeichnen</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/GraphicsPage.ui" line="104"/>
+        <source>White On Black</source>
+        <translation>Weiß auf Schwarz</translation>
+    </message>
 </context>
 <context>
     <name>GreaseMonkeyAddScriptDialog</name>
@@ -27662,21 +27742,11 @@
         <translation>Vordergrund:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/HexEditorPage.ui" line="142"/>
-        <source>Select the foreground colour of the address area</source>
-        <translation>Wähle die Vordergrundfarbe für den Adressbereich aus</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/HexEditorPage.ui" line="291"/>
         <source>Background:</source>
         <translation>Hintergrund:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/HexEditorPage.ui" line="165"/>
-        <source>Select the background colour of the address area</source>
-        <translation>Wähle die Hintergrundfarbe für den Adressbereich aus</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/HexEditorPage.ui" line="178"/>
         <source>ASCII Area</source>
         <translation>ASCII Bereich</translation>
@@ -27707,31 +27777,11 @@
         <translation>Veränderte Daten hervorheben</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/HexEditorPage.ui" line="226"/>
-        <source>Select the foreground colour for highlighted data</source>
-        <translation>Wählt die Vordergrundfarbe für hervorgehobene Daten aus</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/HexEditorPage.ui" line="249"/>
-        <source>Select the background colour for highlighted data</source>
-        <translation>Wählt die Hintergrundfarbe für hervorgehobene Daten aus</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/HexEditorPage.ui" line="262"/>
         <source>Selection</source>
         <translation>Auswahl</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/HexEditorPage.ui" line="281"/>
-        <source>Select the foreground colour of the selection</source>
-        <translation>Wählt die Vordergrundfarbe der Auswahl aus</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/HexEditorPage.ui" line="304"/>
-        <source>Select the background colour of the selection</source>
-        <translation>Wählt die Hintergrundfarbe der Auswahl aus</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/HexEditorPage.ui" line="317"/>
         <source>Font</source>
         <translation>Schriftart</translation>
@@ -27761,6 +27811,36 @@
         <source>Enter the number of recent files to remember</source>
         <translation>Gib die zu merkende Anzahl an zuletzt geöffneter Dateien ein</translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/HexEditorPage.ui" line="142"/>
+        <source>Select the foreground color of the address area</source>
+        <translation>Wähle die Textfarbe für den Adressbereich aus</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/HexEditorPage.ui" line="165"/>
+        <source>Select the background color of the address area</source>
+        <translation>Wähle die Hintergrundfarbe für den Adressbereich aus</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/HexEditorPage.ui" line="226"/>
+        <source>Select the foreground color for highlighted data</source>
+        <translation>Wählt die Textfarbe für hervorgehobene Daten aus</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/HexEditorPage.ui" line="249"/>
+        <source>Select the background color for highlighted data</source>
+        <translation>Wählt die Hintergrundfarbe für hervorgehobene Daten aus</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/HexEditorPage.ui" line="281"/>
+        <source>Select the foreground color of the selection</source>
+        <translation>Wählt die Textfarbe der Auswahl aus</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/HexEditorPage.ui" line="304"/>
+        <source>Select the background color of the selection</source>
+        <translation>Wählt die Hintergrundfarbe der Auswahl aus</translation>
+    </message>
 </context>
 <context>
     <name>Hg</name>
@@ -30300,7 +30380,7 @@
 <context>
     <name>HgLogBrowserDialog</name>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="92"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="98"/>
         <source>Mercurial Log</source>
         <translation>Mercurial-Log</translation>
     </message>
@@ -30330,17 +30410,17 @@
         <translation>Wähle das als Filter zu verwendende Feld</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="122"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="128"/>
         <source>Revision</source>
         <translation>Revision</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="123"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="129"/>
         <source>Author</source>
         <translation>Autor</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="124"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="130"/>
         <source>Message</source>
         <translation>Nachricht</translation>
     </message>
@@ -30410,22 +30490,22 @@
         <translation>&lt;b&gt;Mercurial-Log-Fehler&lt;/b&gt;&lt;p&gt;Dies zeigt mögliche Fehlermeldungen des hg log-Befehls.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="200"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="206"/>
         <source>Added</source>
         <translation>Hinzugefügt</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="201"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="207"/>
         <source>Deleted</source>
         <translation>Gelöscht</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="202"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="208"/>
         <source>Modified</source>
         <translation>Modifiziert</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="840"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="845"/>
         <source>Mercurial Error</source>
         <translation>Mercurial-Fehler</translation>
     </message>
@@ -30445,63 +30525,63 @@
         <translation>Wähle den als Filter zu verwendenden Zweig</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="182"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="188"/>
         <source>All</source>
         <translation>Alle</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="94"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="100"/>
         <source>Mercurial Log (Incoming)</source>
         <translation>Mercurial-Log (Eingang)</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="96"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="102"/>
         <source>Mercurial Log (Outgoing)</source>
         <translation>Mercurial-Log (Ausgang)</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="217"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="223"/>
         <source>Bookmarks</source>
         <translation>Lesezeichen</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="111"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="117"/>
         <source>Press to refresh the list of changesets</source>
         <translation>Drücken, um die Liste der Änderungssätze zu erneuern</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="109"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="115"/>
         <source>&amp;Refresh</source>
         <translation>&amp;Erneuern</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="126"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="132"/>
         <source>Phase</source>
         <translation>Phase</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="268"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="275"/>
         <source>Change the phase of the selected revisions</source>
         <translation>Ändert die Phase der ausgewählten Revisionen</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="270"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="277"/>
         <source>&lt;b&gt;Change Phase&lt;/b&gt;
 &lt;p&gt;This changes the phase of the selected revisions. The selected revisions have to have the same current phase.&lt;/p&gt;</source>
         <translation>&lt;b&gt;Phase ändern&lt;/b&gt;&lt;p&gt;Dies ändert die Phase der ausgewählten Revisionen. Die ausgewählten Revisionen müssen sich in der gleichen Phase befinden.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="266"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="273"/>
         <source>Change Phase</source>
         <translation>Phase ändern</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2000"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2005"/>
         <source>Copy Changesets</source>
         <translation>Änderungssätze kopieren</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2343"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2348"/>
         <source>The project should be reread. Do this now?</source>
         <translation>Das Projekt sollte neu gelesen werde. Jetzt durchführen?</translation>
     </message>
@@ -30511,42 +30591,42 @@
         <translation>Wähle eine Aktion aus dem Menü</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="257"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="264"/>
         <source>Copy the selected changesets to the current branch</source>
         <translation>Ausgewählte Änderungssätze in den aktuellen Zweig kopieren</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="275"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="282"/>
         <source>Tag</source>
         <translation>Marke setzen</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="278"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="285"/>
         <source>Tag the selected revision</source>
         <translation>Ausgewählte Revision mit einer Marke versehen</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2072"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2077"/>
         <source>Switch</source>
         <translation>Umschalten</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="288"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="295"/>
         <source>Switch the working directory to the selected revision</source>
         <translation>Schaltet das Arbeitsverzeichnis auf die ausgewählte Revision um</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="311"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="318"/>
         <source>Pull Large Files</source>
         <translation>Binärriesen herunterladen</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="313"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="320"/>
         <source>Pull large files for selected revisions</source>
         <translation>Binärriesen der ausgewählten Revisionen herunterladen</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1130"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1135"/>
         <source>{0} (large file)</source>
         <translation>{0} (Binärriese)</translation>
     </message>
@@ -30571,147 +30651,147 @@
         <translation>Drücken, um das nächste Vorkommen zu suchen</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="119"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="125"/>
         <source>Find</source>
         <translation>Suchen</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="120"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="126"/>
         <source>Filter</source>
         <translation>Filter</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="164"/>
-        <source>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Tags&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</source>
-        <translation>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Marken&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</translation>
-    </message>
-    <message>
         <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="170"/>
+        <source>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Tags&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</source>
+        <translation>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Marken&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</translation>
+    </message>
+    <message>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="176"/>
         <source>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Bookmarks&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</source>
         <translation>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Lesezeichen&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2485"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2490"/>
         <source>Find Commit</source>
         <translation>Revision finden</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2485"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2490"/>
         <source>&apos;{0}&apos; was not found.</source>
         <translation>„{0}“ wurde nicht gefunden.</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="125"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="131"/>
         <source>File</source>
         <translation>Datei</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="206"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="212"/>
         <source>Draft</source>
         <translation>Entwurf</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="207"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="213"/>
         <source>Public</source>
         <translation>Öffentlich</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="208"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="214"/>
         <source>Secret</source>
         <translation>Geheim</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2205"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2210"/>
         <source>Pull Changes</source>
         <translation>Änderungen herunterladen</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="309"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="316"/>
         <source>Pull changes from a remote repository</source>
         <translation>Änderungen von einem entfernten Repository herunterladen</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="322"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="329"/>
         <source>Push Selected Changes</source>
         <translation>Ausgewählte Änderungen hochladen</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="325"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="332"/>
         <source>Push changes of the selected changeset and its ancestors to a remote repository</source>
         <translation>Änderungen des ausgewählten Änderungssatzes und aller Vorgänger in ein entferntes Repository hochladen</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="328"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="335"/>
         <source>Push All Changes</source>
         <translation>Alle Änderungen hochladen</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="331"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="338"/>
         <source>Push all changes to a remote repository</source>
         <translation>Alle Änderungen an ein entferntes Repository hochladen</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2170"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2175"/>
         <source>Fetch Changes</source>
         <translation>Änderungen abholen</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2251"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2256"/>
         <source>Strip Changesets</source>
         <translation>Änderungssätze löschen</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="317"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="324"/>
         <source>Fetch changes from a remote repository</source>
         <translation>Änderungen von einem entfernten Repository herunterladen und einarbeiten</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="374"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="381"/>
         <source>Strip changesets from a repository</source>
         <translation>Änderungssätze aus einem Repository löschen</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="293"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="300"/>
         <source>Define Bookmark...</source>
         <translation>Lesezeichen hinzufügen …</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="296"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="303"/>
         <source>Bookmark the selected revision</source>
         <translation>Lesezeichen für die ausgewählte Revision erzeugen</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="298"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="305"/>
         <source>Move Bookmark...</source>
         <translation>Lesezeichen verschieben …</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="301"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="308"/>
         <source>Move bookmark to the selected revision</source>
         <translation>Verschiebe ein Lesezeichen zur ausgewählten Revision</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2095"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2100"/>
         <source>Define Bookmark</source>
         <translation>Lesezeichen hinzufügen</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2095"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2100"/>
         <source>Enter bookmark name for changeset &quot;{0}&quot;:</source>
         <translation>Gib einen Lesezeichennamen für den Änderungssatz &quot;{0}&quot; ein:</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2119"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2124"/>
         <source>Move Bookmark</source>
         <translation>Lesezeichen verschieben</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2119"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2124"/>
         <source>Select the bookmark to be moved  to changeset &quot;{0}&quot;:</source>
         <translation>Wähle ein Lesezeichen aus, das zum Änderungssatz &quot;{0}&quot; verschoben werden soll:</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2058"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2063"/>
         <source>Select bookmark to switch to (leave empty to use revision):</source>
         <translation>Wähle das Lesezeichen aus, auf das umgeschaltet werden soll (leer lassen, um Revision zu verwenden):</translation>
     </message>
@@ -30726,149 +30806,149 @@
         <translation>Drücken, um in der Historie nach unten zu gehen</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="167"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="173"/>
         <source>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Latest Tag&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</source>
         <translation>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Letzte Marke&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="148"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="154"/>
         <source>&lt;table&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Revision&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Date&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{1}&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Author&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{2}&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Branch&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{3}&lt;/td&gt;&lt;/tr&gt;{4}&lt;tr&gt;&lt;td&gt;&lt;b&gt;Message&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{5}&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;</source>
         <translation>&lt;table&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Revision&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Datum&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{1}&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Autor&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{2}&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Zweig&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{3}&lt;/td&gt;&lt;/tr&gt;{4}&lt;tr&gt;&lt;td&gt;&lt;b&gt;Nachricht&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{5}&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="158"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="164"/>
         <source>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Parents&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</source>
         <translation>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Vorgänger&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="161"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="167"/>
         <source>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Children&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</source>
         <translation>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Nachfolger&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="260"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="267"/>
         <source>Merge with Changeset</source>
         <translation>Mit Änderungssatz zusammenführen</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="263"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="270"/>
         <source>Merge the working directory with the selected changeset</source>
         <translation>Führe das Arbeitsverzeichnis mit dem gewählten Änderungssatz zusammen</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="336"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="343"/>
         <source>Create Changegroup</source>
         <translation>Änderungsgruppe erzeugen</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="339"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="346"/>
         <source>Create a changegroup file containing the selected changesets</source>
         <translation>Erzeuge eine Änderungsgruppendatei für die ausgewählten Änderungssätze</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="341"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="348"/>
         <source>&lt;b&gt;Create Changegroup&lt;/b&gt;
 &lt;p&gt;This creates a changegroup file containing the selected revisions. If no revisions are selected, all changesets will be bundled. If one revision is selected, it will be interpreted as the base revision. Otherwise the lowest revision will be used as the base revision and all other revision will be bundled. If the dialog is showing outgoing changesets, all selected changesets will be bundled.&lt;/p&gt;</source>
         <translation>&lt;b&gt;Änderungsgruppe erzeugen&lt;/b&gt;
 &lt;p&gt;Dies erzeugt eine Änderungsgruppendatei für die ausgewählten Änderungssätze. Ist keine Änderung ausgewählt, werden alle in die Datei geschrieben. Ist ein Änderungssatz ausgewählt, so wird er als Basis verwendet. Ansonsten wird die kleinste, ausgewählte Revision als Basis verwendet und alle anderen werden in die Datei geschrieben. Zeigt der Dialog ausgehende Änderungssätze an, so werden alle ausgewählten in die Datei geschrieben.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2343"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2348"/>
         <source>Apply Changegroup</source>
         <translation>Änderungsgruppe anwenden</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="353"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="360"/>
         <source>Apply the currently viewed changegroup file</source>
         <translation>Wende die aktuell inspizierte Änderungsgruppendatei an</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="358"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="365"/>
         <source>Sign Revisions</source>
         <translation>Revisionen signieren</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="361"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="368"/>
         <source>Add a signature for the selected revisions</source>
         <translation>Den ausgewählten Revisionen eine Signatur hinzufügen</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="363"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="370"/>
         <source>Verify Signatures</source>
         <translation>Signaturen verifizieren</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="366"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="373"/>
         <source>Verify all signatures there may be for the selected revision</source>
         <translation>Alle Signaturen der ausgewählten Revision verifizieren</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="379"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="386"/>
         <source>Select All Entries</source>
         <translation>Alle Einträge auswählen</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="381"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="388"/>
         <source>Deselect All Entries</source>
         <translation>Alle Einträge abwählen</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1369"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1374"/>
         <source>Side-by-Side Diff to Parent {0}</source>
         <translation>Unterschiede nebeneinander zu Vorgänger {0}</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1380"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1385"/>
         <source>&lt;a href=&quot;sbsdiff:{0}_{1}&quot;&gt;Side-by-Side Compare&lt;/a&gt;</source>
         <translation>&lt;a href=&quot;sbsdiff:{0}_{1}&quot;&gt;Unterschiede nebeneinander&lt;/a&gt;</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1521"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1526"/>
         <source>Pull Selected Changes</source>
         <translation>Ausgewählte Änderungen herunterladen</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1522"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1527"/>
         <source>Fetch Selected Changes</source>
         <translation>Ausgewählte Änderungen herunterladen und zusammenführen</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2529"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2534"/>
         <source>Differences</source>
         <translation>Unterschiede</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2539"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2544"/>
         <source>Differences to Parent {0}</source>
         <translation>Unterschiede zu Vorgänger {0}</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2555"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2560"/>
         <source>Diff to Parent {0}{1}</source>
         <translation>Diff zu Vorgänger {0}{1}</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2580"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2585"/>
         <source>There is no difference.</source>
         <translation>Es gibt keinen Unterschied.</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2723"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2728"/>
         <source>Save Diff</source>
         <translation>Diff speichern</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2690"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2695"/>
         <source>Patch Files (*.diff)</source>
         <translation>Patchdateien (*.diff)</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2707"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2712"/>
         <source>&lt;p&gt;The patch file &lt;b&gt;{0}&lt;/b&gt; already exists. Overwrite it?&lt;/p&gt;</source>
         <translation>&lt;p&gt;Die Patchdatei &lt;b&gt;{0}&lt;/b&gt; existiert bereits. Überschreiben?&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2723"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2728"/>
         <source>&lt;p&gt;The patch file &lt;b&gt;{0}&lt;/b&gt; could not be saved.&lt;br&gt;Reason: {1}&lt;/p&gt;</source>
         <translation>&lt;p&gt;Die Patchdatei &lt;b&gt;{0}&lt;/b&gt; konnte nicht gespeichert werden.&lt;br&gt;Grund: {1}&lt;/p&gt;</translation>
     </message>
@@ -30878,22 +30958,22 @@
         <translation>&lt;a href=&quot;save:me&quot;&gt;Speichern&lt;/a&gt;</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2528"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2533"/>
         <source>Generating differences ...</source>
         <translation>Erzeuge Unterschiede ...</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="98"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="104"/>
         <source>Mercurial Full Log</source>
         <translation>Mercurial-Log (vollständig)</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="280"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="287"/>
         <source>Close Heads</source>
         <translation>Köpfe schließen</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="283"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="290"/>
         <source>Close the selected heads</source>
         <translation>Schließe die ausgewählten Köpfe</translation>
     </message>
@@ -31313,12 +31393,12 @@
         <translation>Alle versionierten Verzeichniseinträge auswählen</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="833"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="835"/>
         <source>Remove from repository only</source>
         <translation>Nur vom Repository löschen</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="833"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="835"/>
         <source>Do you really want to remove these files from the repository?</source>
         <translation>Wollen Sie wirklich diese Dateien vom Repository löschen?</translation>
     </message>
@@ -33876,52 +33956,52 @@
 <context>
     <name>HgServeDialog</name>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py" line="49"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py" line="57"/>
         <source>Start Server</source>
         <translation>Server starten</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py" line="55"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py" line="63"/>
         <source>Stop Server</source>
         <translation>Server anhalten</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py" line="61"/>
-        <source>Start Browser</source>
-        <translation>Browser starten</translation>
-    </message>
-    <message>
         <location filename="../Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py" line="69"/>
+        <source>Start Browser</source>
+        <translation>Browser starten</translation>
+    </message>
+    <message>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py" line="77"/>
         <source>Enter the server port</source>
         <translation>Gib den Serverport ein</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py" line="75"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py" line="83"/>
         <source>Select the style to use</source>
         <translation>Wähle den Stil aus</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py" line="79"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py" line="87"/>
         <source>Server</source>
         <translation>Server</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py" line="86"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py" line="94"/>
         <source>Browser</source>
         <translation>Browser</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py" line="140"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py" line="148"/>
         <source>Process Generation Error</source>
         <translation>Fehler beim Prozessstart</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py" line="140"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py" line="148"/>
         <source>The process {0} could not be started. Ensure, that it is in the search path.</source>
         <translation>Der Prozess {0} konnte nicht gestartet werden. Stellen Sie sicher, dass er sich im Suchpfad befindet.</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py" line="47"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py" line="50"/>
         <source>Mercurial Server</source>
         <translation>Mercurial-Server</translation>
     </message>
@@ -37223,37 +37303,37 @@
 <context>
     <name>IconsPage</name>
     <message>
-        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="118"/>
+        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="220"/>
         <source>Delete</source>
         <translation>Löschen</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="128"/>
+        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="230"/>
         <source>Press to add the entered directory to the list</source>
         <translation>Fügt das ausgewählte Verzeichnis zu der Liste hinzu</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="131"/>
+        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="233"/>
         <source>Add</source>
         <translation>Hinzufügen</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="156"/>
+        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="258"/>
         <source>Show</source>
         <translation>Zeige</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="75"/>
+        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="177"/>
         <source>Up</source>
         <translation>Auf</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="85"/>
+        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="187"/>
         <source>Down</source>
         <translation>Ab</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="44"/>
+        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="146"/>
         <source>List of icon directories</source>
         <translation>Liste von Symbolverzeichnissen</translation>
     </message>
@@ -37268,18 +37348,103 @@
         <translation>&lt;font color=&quot;#FF0000&quot;&gt;&lt;b&gt;Hinweis:&lt;/b&gt; Diese Einstellungen werden erst beim nächsten Programmstart aktiv.&lt;/font&gt;</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="115"/>
+        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="217"/>
         <source>Press to delete the selected directory from the list</source>
         <translation>Löscht das ausgewählte Verzeichnis aus der Liste</translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="44"/>
+        <source>Default Icons</source>
+        <translation>Standard Icons</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="52"/>
+        <source>Select to select between Breeze (dark) and Breeze (light) based on the window lightness</source>
+        <translation>Auswählen, um automatisch zwischen Breeze (dunkel) und Breeze (hell) basierend auf der Fensterhelligkeit zu wählen</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="55"/>
+        <source>Automatic</source>
+        <translation>Automatisch</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="65"/>
+        <source>Select to use the Breeze vector icons for light window background</source>
+        <translation>Auswählen, um die Breeze Vektoricons für hellen Fensterhintergrund zu nutzen</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="68"/>
+        <source>Breeze (light)</source>
+        <translation>Breeze (hell)</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="75"/>
+        <source>Select to use the Breeze vector icons for dark window background</source>
+        <translation>Auswählen, um die Breeze Vektoricons für dunklen Fensterhintergrund zu nutzen</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="78"/>
+        <source>Breeze (dark)</source>
+        <translation>Breeze (dunkel)</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="85"/>
+        <source>Select to use the Oxygen pixmap icons</source>
+        <translation>Auswählen, um die Qxygen Pixelicons zu nutzen</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="88"/>
+        <source>Oxygen</source>
+        <translation>Oxygen</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="112"/>
+        <source>Press to show a dialog with a preview of the selected default icon set</source>
+        <translation>Drücken, um einen Dialog mit einer Vorschau der gewählten Standardicons anzuzeigen</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="140"/>
+        <source>Custom Icon Directories</source>
+        <translation>Nutzerspezifische Iconverzeichnisse</translation>
+    </message>
 </context>
 <context>
     <name>IconsPreviewDialog</name>
     <message>
-        <location filename="../Preferences/ConfigurationPages/IconsPreviewDialog.ui" line="13"/>
+        <location filename="../Preferences/ConfigurationPages/IconsPreviewDialog.ui" line="14"/>
         <source>Icons Preview</source>
         <translation>Symbole Vorschau</translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IconsPreviewDialog.ui" line="25"/>
+        <source>Directory:</source>
+        <translation>Verzeichnis:</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IconsPreviewDialog.ui" line="38"/>
+        <source>Select the icons directory to be shown</source>
+        <translation>Wählen das anzuzeigende Iconsverzeichnis</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IconsPreviewDialog.ui" line="74"/>
+        <source>Invert Background</source>
+        <translation>Hintergrund Invers</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IconsPreviewDialog.ui" line="87"/>
+        <source>Refresh</source>
+        <translation>Aktualisieren</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IconsPreviewDialog.ui" line="84"/>
+        <source>Select to refresh the icons display</source>
+        <translation>Auswählen, um die Iconanzeige zu aktualisieren</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IconsPreviewDialog.ui" line="71"/>
+        <source>Select to invert the background color</source>
+        <translation>Auswählen, um den Hintergrund zu invertieren</translation>
+    </message>
 </context>
 <context>
     <name>IdlCompilerDefineNameDialog</name>
@@ -39409,126 +39574,61 @@
         <translation>Datum anzeigen</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="102"/>
-        <source>Colours</source>
-        <translation>Farben</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="108"/>
         <source>Network Messages:</source>
         <translation>Netzwerkmeldungen:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="121"/>
-        <source>Select the colour for network messages</source>
-        <translation>Wähle die Farbe für Netzwerkmeldungen</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="131"/>
         <source>Nick Names:</source>
         <translation>Spitznamen:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="144"/>
-        <source>Select the colour for nick names</source>
-        <translation>Wähle die Farbe für Spitznamen</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="154"/>
         <source>Server Messages:</source>
         <translation>Servermeldungen:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="167"/>
-        <source>Select the colour for server messages</source>
-        <translation>Wähle die Farbe für Servermeldungen</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="177"/>
         <source>Own Nick Name:</source>
         <translation>Eigener Spitzname:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="190"/>
-        <source>Select the colour for own nick name</source>
-        <translation>Wähle die Farbe für den eigenen Spitznamen</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="200"/>
         <source>Channel Messages:</source>
         <translation>Kanalnachrichten:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="213"/>
-        <source>Select the colour for channel messages</source>
-        <translation>Wähle die Farbe für Kanalmeldungen</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="223"/>
         <source>Join Channel:</source>
         <translation>Kanal betreten:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="236"/>
-        <source>Select the colour for join channel messages</source>
-        <translation>Wähle die Farbe für Meldungen zum Betreten eines Kanals</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="246"/>
         <source>Error Messages:</source>
         <translation>Fehlermeldungen:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="259"/>
-        <source>Select the colour for error messages</source>
-        <translation>Wähle die Farbe für Fehlermeldungen</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="269"/>
         <source>Leave Channel:</source>
         <translation>Kanal verlassen:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="282"/>
-        <source>Select the colour for leave channel messages</source>
-        <translation>Wähle die Farbe für Meldungen zum Verlassen eines Kanals</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="292"/>
         <source>Timestamp:</source>
         <translation>Zeitstempel:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="305"/>
-        <source>Select the colour for timestamps</source>
-        <translation>Wähle die Farbe für den Zeitstempel</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="315"/>
         <source>Channel Info:</source>
         <translation>Kanalinformationen:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="328"/>
-        <source>Select the colour for channel info messages</source>
-        <translation>Wähle die Farbe für Kanalinformationsmeldungen</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="338"/>
         <source>Hyperlink:</source>
         <translation>Hyperlink:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="351"/>
-        <source>Select the colour for hyperlinks</source>
-        <translation>Wähle die Farbe für Hyperlinks</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="364"/>
-        <source>Enable to allow coloured text in IRC messages</source>
-        <translation>Auswählen, um farbigen Text in IRC-Nachrichten zuzulassen</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="367"/>
         <source>Allow Colored Text in IRC Messages</source>
         <translation>Farbigen Text in IRC-Nachrichten zulassen</translation>
@@ -39634,21 +39734,11 @@
         <translation>Vordergrundfarbe der Markierung:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="824"/>
-        <source>Select the foreground colour for the marker</source>
-        <translation>Wähle die Vordergrundfarbe der Markierung aus</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="834"/>
         <source>Marker Background:</source>
         <translation>Hintergrundfarbe der Markierung:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="847"/>
-        <source>Select the background colour for the marker</source>
-        <translation>Wähle die Hintergrundfarbe der Markierung aus</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="862"/>
         <source>Shutdown</source>
         <translation>Beenden</translation>
@@ -39663,6 +39753,81 @@
         <source>Confirm Shutdown When Connected</source>
         <translation>Beenden bei bestehender Verbindung bestätigen</translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="102"/>
+        <source>Colors</source>
+        <translation>Farben</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="121"/>
+        <source>Select the color for network messages</source>
+        <translation>Wähle die Farbe für Netzwerkmeldungen</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="144"/>
+        <source>Select the color for nick names</source>
+        <translation>Wähle die Farbe für Spitznamen</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="167"/>
+        <source>Select the color for server messages</source>
+        <translation>Wähle die Farbe für Servermeldungen</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="190"/>
+        <source>Select the color for own nick name</source>
+        <translation>Wähle die Farbe für den eigenen Spitznamen</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="213"/>
+        <source>Select the color for channel messages</source>
+        <translation>Wähle die Farbe für Kanalmeldungen</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="236"/>
+        <source>Select the color for join channel messages</source>
+        <translation>Wähle die Farbe für Meldungen zum Betreten eines Kanals</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="259"/>
+        <source>Select the color for error messages</source>
+        <translation>Wähle die Farbe für Fehlermeldungen</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="282"/>
+        <source>Select the color for leave channel messages</source>
+        <translation>Wähle die Farbe für Meldungen zum Verlassen eines Kanals</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="305"/>
+        <source>Select the color for timestamps</source>
+        <translation>Wähle die Farbe für den Zeitstempel</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="328"/>
+        <source>Select the color for channel info messages</source>
+        <translation>Wähle die Farbe für Kanalinformationsmeldungen</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="351"/>
+        <source>Select the color for hyperlinks</source>
+        <translation>Wähle die Farbe für Hyperlinks</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="364"/>
+        <source>Enable to allow colored text in IRC messages</source>
+        <translation>Auswählen, um farbigen Text in IRC-Nachrichten zuzulassen</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="824"/>
+        <source>Select the foreground color for the marker</source>
+        <translation>Wähle die Textfarbe der Markierung aus</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="847"/>
+        <source>Select the background color for the marker</source>
+        <translation>Wähle die Hintergrundfarbe der Markierung aus</translation>
+    </message>
 </context>
 <context>
     <name>IrcServerEditDialog</name>
@@ -41039,257 +41204,257 @@
 <context>
     <name>LexerPygments</name>
     <message>
-        <location filename="../QScintilla/Lexers/LexerPygments.py" line="180"/>
+        <location filename="../QScintilla/Lexers/LexerPygments.py" line="196"/>
         <source>Default</source>
         <translation>Standard</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/LexerPygments.py" line="181"/>
-        <source>Comment</source>
-        <translation>Kommentar</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/LexerPygments.py" line="182"/>
-        <source>Preprocessor</source>
-        <translation>Präprozessor</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/LexerPygments.py" line="183"/>
-        <source>Keyword</source>
-        <translation>Schlüsselwort</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/LexerPygments.py" line="184"/>
-        <source>Pseudo Keyword</source>
-        <translation>Pseudo-Schlüsselwort</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/LexerPygments.py" line="185"/>
-        <source>Type Keyword</source>
-        <translation>Typ-Schlüsselwort</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/LexerPygments.py" line="186"/>
-        <source>Operator</source>
-        <translation>Operator</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/LexerPygments.py" line="187"/>
-        <source>Word</source>
-        <translation>Wort</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/LexerPygments.py" line="188"/>
-        <source>Builtin</source>
-        <translation>Intern</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/LexerPygments.py" line="189"/>
-        <source>Function or method name</source>
-        <translation>Funktions- oder Methodenname</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/LexerPygments.py" line="190"/>
-        <source>Class name</source>
-        <translation>Klassenname</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/LexerPygments.py" line="191"/>
-        <source>Namespace</source>
-        <translation>Namensraum</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/LexerPygments.py" line="192"/>
-        <source>Exception</source>
-        <translation>Ausnahme</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/LexerPygments.py" line="193"/>
-        <source>Identifier</source>
-        <translation>Bezeichner</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/LexerPygments.py" line="194"/>
-        <source>Constant</source>
-        <translation>Konstante</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/LexerPygments.py" line="195"/>
-        <source>Label</source>
-        <translation>Marke</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/LexerPygments.py" line="196"/>
-        <source>Entity</source>
-        <translation>Entität</translation>
-    </message>
-    <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="197"/>
-        <source>Attribute</source>
-        <translation>Attribut</translation>
+        <source>Comment</source>
+        <translation>Kommentar</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="198"/>
-        <source>Tag</source>
-        <translation>Tag</translation>
+        <source>Preprocessor</source>
+        <translation>Präprozessor</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="199"/>
-        <source>Decorator</source>
-        <translation>Dekorator</translation>
+        <source>Keyword</source>
+        <translation>Schlüsselwort</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="200"/>
-        <source>String</source>
-        <translation>Zeichenkette</translation>
+        <source>Pseudo Keyword</source>
+        <translation>Pseudo-Schlüsselwort</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="201"/>
-        <source>Documentation string</source>
-        <translation>Dokumentationszeichenkette</translation>
+        <source>Type Keyword</source>
+        <translation>Typ-Schlüsselwort</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="202"/>
-        <source>Scalar</source>
-        <translation>Skalar</translation>
+        <source>Operator</source>
+        <translation>Operator</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="203"/>
-        <source>Escape</source>
-        <translation>Escape</translation>
+        <source>Word</source>
+        <translation>Wort</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="204"/>
-        <source>Regular expression</source>
-        <translation>Regulärer Ausdruck</translation>
+        <source>Builtin</source>
+        <translation>Intern</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="205"/>
-        <source>Symbol</source>
-        <translation>Symbol</translation>
+        <source>Function or method name</source>
+        <translation>Funktions- oder Methodenname</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="206"/>
-        <source>Other string</source>
-        <translation>sonstige Zeichenkette</translation>
+        <source>Class name</source>
+        <translation>Klassenname</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="207"/>
-        <source>Number</source>
-        <translation>Zahl</translation>
+        <source>Namespace</source>
+        <translation>Namensraum</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="208"/>
-        <source>Heading</source>
-        <translation>Überschrift</translation>
+        <source>Exception</source>
+        <translation>Ausnahme</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="209"/>
-        <source>Subheading</source>
-        <translation>Unterüberschrift</translation>
+        <source>Identifier</source>
+        <translation>Bezeichner</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="210"/>
-        <source>Deleted</source>
-        <translation>Gelöscht</translation>
+        <source>Constant</source>
+        <translation>Konstante</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="211"/>
-        <source>Inserted</source>
-        <translation>Eingefügt</translation>
+        <source>Label</source>
+        <translation>Marke</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="212"/>
-        <source>Generic error</source>
-        <translation>Allgemeiner Fehler</translation>
+        <source>Entity</source>
+        <translation>Entität</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="213"/>
-        <source>Emphasized text</source>
-        <translation>Hervorgehobener Text</translation>
+        <source>Attribute</source>
+        <translation>Attribut</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="214"/>
-        <source>Strong text</source>
-        <translation>Fetter Text</translation>
+        <source>Tag</source>
+        <translation>Tag</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="215"/>
-        <source>Prompt</source>
-        <translation>Eingabeaufforderung</translation>
+        <source>Decorator</source>
+        <translation>Dekorator</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="216"/>
-        <source>Output</source>
-        <translation>Ausgabe</translation>
+        <source>String</source>
+        <translation>Zeichenkette</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="217"/>
-        <source>Traceback</source>
-        <translation>Traceback</translation>
+        <source>Documentation string</source>
+        <translation>Dokumentationszeichenkette</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="218"/>
-        <source>Error</source>
-        <translation>Fehler</translation>
+        <source>Scalar</source>
+        <translation>Skalar</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="219"/>
-        <source>Comment block</source>
-        <translation>Kommentarblock</translation>
+        <source>Escape</source>
+        <translation>Escape</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="220"/>
-        <source>Property</source>
-        <translation>Eigenschaft</translation>
+        <source>Regular expression</source>
+        <translation>Regulärer Ausdruck</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="221"/>
-        <source>Character</source>
-        <translation>Zeichen</translation>
+        <source>Symbol</source>
+        <translation>Symbol</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="222"/>
-        <source>Here document</source>
-        <translation>Here Dokument</translation>
+        <source>Other string</source>
+        <translation>sonstige Zeichenkette</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="223"/>
-        <source>Punctuation</source>
-        <translation>Satzzeichen</translation>
+        <source>Number</source>
+        <translation>Zahl</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="224"/>
-        <source>Hashbang</source>
-        <translation>Hashbang</translation>
+        <source>Heading</source>
+        <translation>Überschrift</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="225"/>
-        <source>Reserved Keyword</source>
-        <translation>Reserviertes Schlüsselwort</translation>
+        <source>Subheading</source>
+        <translation>Unterüberschrift</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="226"/>
-        <source>Literal</source>
-        <translation>Literal</translation>
+        <source>Deleted</source>
+        <translation>Gelöscht</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="227"/>
-        <source>Double quoted string</source>
-        <translation>Zeichenkette in Anführungszeichen</translation>
+        <source>Inserted</source>
+        <translation>Eingefügt</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="228"/>
-        <source>Single quoted string</source>
-        <translation>Zeichenkette in Hochkomma</translation>
+        <source>Generic error</source>
+        <translation>Allgemeiner Fehler</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="229"/>
-        <source>Backtick string</source>
-        <translation>Zeichenkette in Rückwärtshochkomma</translation>
+        <source>Emphasized text</source>
+        <translation>Hervorgehobener Text</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="230"/>
+        <source>Strong text</source>
+        <translation>Fetter Text</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/LexerPygments.py" line="231"/>
+        <source>Prompt</source>
+        <translation>Eingabeaufforderung</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/LexerPygments.py" line="232"/>
+        <source>Output</source>
+        <translation>Ausgabe</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/LexerPygments.py" line="233"/>
+        <source>Traceback</source>
+        <translation>Traceback</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/LexerPygments.py" line="234"/>
+        <source>Error</source>
+        <translation>Fehler</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/LexerPygments.py" line="235"/>
+        <source>Comment block</source>
+        <translation>Kommentarblock</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/LexerPygments.py" line="236"/>
+        <source>Property</source>
+        <translation>Eigenschaft</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/LexerPygments.py" line="237"/>
+        <source>Character</source>
+        <translation>Zeichen</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/LexerPygments.py" line="238"/>
+        <source>Here document</source>
+        <translation>Here Dokument</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/LexerPygments.py" line="239"/>
+        <source>Punctuation</source>
+        <translation>Satzzeichen</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/LexerPygments.py" line="240"/>
+        <source>Hashbang</source>
+        <translation>Hashbang</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/LexerPygments.py" line="241"/>
+        <source>Reserved Keyword</source>
+        <translation>Reserviertes Schlüsselwort</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/LexerPygments.py" line="242"/>
+        <source>Literal</source>
+        <translation>Literal</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/LexerPygments.py" line="243"/>
+        <source>Double quoted string</source>
+        <translation>Zeichenkette in Anführungszeichen</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/LexerPygments.py" line="244"/>
+        <source>Single quoted string</source>
+        <translation>Zeichenkette in Hochkomma</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/LexerPygments.py" line="245"/>
+        <source>Backtick string</source>
+        <translation>Zeichenkette in Rückwärtshochkomma</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/LexerPygments.py" line="246"/>
         <source>Whitespace</source>
         <translation>Leerzeichen</translation>
     </message>
@@ -42354,16 +42519,6 @@
         <translation>Anzeigen bei neuen Ausgaben</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/LogViewerPage.ui" line="49"/>
-        <source>Error Colour:</source>
-        <translation>Fehlerfarbe:</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/LogViewerPage.ui" line="62"/>
-        <source>Select the colour for text sent to stderr</source>
-        <translation>Wähle die Farbe für den Text des Standardfehlerkanals</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/LogViewerPage.ui" line="87"/>
         <source>Message Filters:</source>
         <translation>Meldungsfilter:</translation>
@@ -42398,6 +42553,16 @@
         <source>&lt;b&gt;Message Filters for both&lt;/b&gt;&lt;p&gt;This list shows the configured message filters used to suppress messages received via stdout or stderr.&lt;/p&gt;</source>
         <translation>&lt;b&gt;Meldungsfilter für beide&lt;/b&gt;&lt;p&gt;Diese Liste zeigt alle konfigurierten Meldungsfilter zur Unterdrückung von Meldungen des Standardausgabekanals oder des Standardfehlerkanals.&lt;/p&gt;</translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/LogViewerPage.ui" line="49"/>
+        <source>Error Color:</source>
+        <translation>Fehlerfarbe:</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/LogViewerPage.ui" line="62"/>
+        <source>Select the color for text sent to stderr</source>
+        <translation>Wähle die Farbe für den Text des Standardfehlerkanals</translation>
+    </message>
 </context>
 <context>
     <name>MakePropertiesDialog</name>
@@ -43185,27 +43350,27 @@
 <context>
     <name>MicroPythonDevice</name>
     <message>
-        <location filename="../MicroPython/MicroPythonDevices.py" line="207"/>
+        <location filename="../MicroPython/MicroPythonDevices.py" line="214"/>
         <source>Unsupported Device</source>
         <translation>Nicht unterstütztes Gerät</translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonDevices.py" line="217"/>
+        <location filename="../MicroPython/MicroPythonDevices.py" line="224"/>
         <source>REPL is not supported by this device.</source>
         <translation>REPL wird von diesem Gerät nicht unterstützt.</translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonDevices.py" line="236"/>
+        <location filename="../MicroPython/MicroPythonDevices.py" line="243"/>
         <source>Plotter is not supported by this device.</source>
         <translation>Der Plotter wird von diesem Gerät nicht unterstützt.</translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonDevices.py" line="255"/>
+        <location filename="../MicroPython/MicroPythonDevices.py" line="262"/>
         <source>Running scripts is not supported by this device.</source>
         <translation>Die Ausführung von Skripten wird von diesem Gerät nicht unterstützt.</translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonDevices.py" line="275"/>
+        <location filename="../MicroPython/MicroPythonDevices.py" line="282"/>
         <source>File Manager is not supported by this device.</source>
         <translation>Der Dateimanager wird von diesem Gerät nicht unterstützt.</translation>
     </message>
@@ -43469,27 +43634,27 @@
 <context>
     <name>MicroPythonGraphWidget</name>
     <message>
-        <location filename="../MicroPython/MicroPythonGraphWidget.py" line="63"/>
+        <location filename="../MicroPython/MicroPythonGraphWidget.py" line="64"/>
         <source>Press to save the raw data</source>
         <translation>Drücken, um die Rohdaten zu speichern</translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonGraphWidget.py" line="72"/>
+        <location filename="../MicroPython/MicroPythonGraphWidget.py" line="73"/>
         <source>max. X:</source>
         <translation>max. X:</translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonGraphWidget.py" line="81"/>
+        <location filename="../MicroPython/MicroPythonGraphWidget.py" line="82"/>
         <source>Enter the maximum number of data points to be plotted.</source>
         <translation>Gib die maximale Anzahl an zu zeichnenden Datenpunkten ein.</translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonGraphWidget.py" line="311"/>
+        <location filename="../MicroPython/MicroPythonGraphWidget.py" line="329"/>
         <source>Save Chart Data</source>
         <translation>Chartdaten speichern</translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonGraphWidget.py" line="311"/>
+        <location filename="../MicroPython/MicroPythonGraphWidget.py" line="329"/>
         <source>&lt;p&gt;The chart data could not be saved into file &lt;b&gt;{0}&lt;/b&gt;.&lt;/p&gt;&lt;p&gt;Reason: {1}&lt;/p&gt;</source>
         <translation>&lt;p&gt;Die Chartdaten konnten nicht in die Datei &lt;b&gt;{0}&lt;/b&gt; gespeichert werden.&lt;/p&gt;&lt;p&gt;Ursache: {1}&lt;/p&gt;</translation>
     </message>
@@ -43557,94 +43722,169 @@
         <translation>Lange Zeilen umbrechen</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="140"/>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="169"/>
         <source>MPY Cross Compiler</source>
         <translation>MPY Cross Compiler</translation>
     </message>
     <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="175"/>
+        <source>Program:</source>
+        <translation>Programm:</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="191"/>
+        <source>Enter the path of the cross compiler executable</source>
+        <translation>Gib den Pfad für den Crosscompiler ein</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.py" line="67"/>
+        <source>All Files (*)</source>
+        <translation>Alle Dateien (*)</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="298"/>
+        <source>Documentation</source>
+        <translation>Dokumentation</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="304"/>
+        <source>MicroPython:</source>
+        <translation>MicroPython:</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="311"/>
+        <source>Enter the URL for the MicroPython documentation</source>
+        <translation>Gib die URL für die MicroPython Dokumentation ein</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="318"/>
+        <source>CircuitPython:</source>
+        <translation>CircuitPython:</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="325"/>
+        <source>Enter the URL for the CircuitPython documentation</source>
+        <translation>Gib die URL für die CircuitPython Dokumentation ein</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="332"/>
+        <source>BBC micro:bit:</source>
+        <translation>BBC micro:bit:</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="339"/>
+        <source>Enter the URL for the BBC micro:bit MicroPython documentation</source>
+        <translation>Gib die URL für die BBC micro:bit MicroPython Dokumentation ein</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="201"/>
+        <source>PyBoard</source>
+        <translation>PyBoard</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="207"/>
+        <source>dfu-util Path:</source>
+        <translation>Pfad zu dfu-util:</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="223"/>
+        <source>Enter the path of the dfu-util flashing executable</source>
+        <translation>Gib den Pfad des &apos;dfu-util&apos; Flashing Programms ein</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="233"/>
+        <source>Firmware</source>
+        <translation>Firmware</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="246"/>
+        <source>Enter the URL for the MicroPython firmware for PyBoard, ESP8266 and ESP32</source>
+        <translation>Gib die URL zur MicroPython Firmware für PyBoard, ESP8266 und ESP32 ein</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="260"/>
+        <source>Enter the URL for the CircuitPython firmware</source>
+        <translation>Gib die URL zur CircuitPython Firmware ein</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="274"/>
+        <source>Enter the URL for the BBC micro:bit Firmware</source>
+        <translation>Gib die URL zur BBC micro:bit Firmware ein</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="140"/>
+        <source>Chart Pane</source>
+        <translation>Diagramm</translation>
+    </message>
+    <message>
         <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="146"/>
-        <source>Program:</source>
-        <translation>Programm:</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="162"/>
-        <source>Enter the path of the cross compiler executable</source>
-        <translation>Gib den Pfad für den Crosscompiler ein</translation>
+        <source>Color Theme:</source>
+        <translation>Farbschema:</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="159"/>
+        <source>Select the color scheme of the chart</source>
+        <translation>Wähle das Farbschema für Diagramme</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/MicroPythonPage.py" line="42"/>
-        <source>All Files (*)</source>
-        <translation>Alle Dateien (*)</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="255"/>
-        <source>Documentation</source>
-        <translation>Dokumentation</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="261"/>
-        <source>MicroPython:</source>
-        <translation>MicroPython:</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="268"/>
-        <source>Enter the URL for the MicroPython documentation</source>
-        <translation>Gib die URL für die MicroPython Dokumentation ein</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="275"/>
-        <source>CircuitPython:</source>
-        <translation>CircuitPython:</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="282"/>
-        <source>Enter the URL for the CircuitPython documentation</source>
-        <translation>Gib die URL für die CircuitPython Dokumentation ein</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="289"/>
-        <source>BBC micro:bit:</source>
-        <translation>BBC micro:bit:</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="296"/>
-        <source>Enter the URL for the BBC micro:bit MicroPython documentation</source>
-        <translation>Gib die URL für die BBC micro:bit MicroPython Dokumentation ein</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="172"/>
-        <source>PyBoard</source>
-        <translation>PyBoard</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="178"/>
-        <source>dfu-util Path:</source>
-        <translation>Pfad zu dfu-util:</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="194"/>
-        <source>Enter the path of the dfu-util flashing executable</source>
-        <translation>Gib den Pfad des &apos;dfu-util&apos; Flashing Programms ein</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="204"/>
-        <source>Firmware</source>
-        <translation>Firmware</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="217"/>
-        <source>Enter the URL for the MicroPython firmware for PyBoard, ESP8266 and ESP32</source>
-        <translation>Gib die URL zur MicroPython Firmware für PyBoard, ESP8266 und ESP32 ein</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="231"/>
-        <source>Enter the URL for the CircuitPython firmware</source>
-        <translation>Gib die URL zur CircuitPython Firmware ein</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="245"/>
-        <source>Enter the URL for the BBC micro:bit Firmware</source>
-        <translation>Gib die URL zur BBC micro:bit Firmware ein</translation>
+        <source>Automatic</source>
+        <translation>Automatisch</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.py" line="44"/>
+        <source>Light</source>
+        <translation>Hell</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.py" line="46"/>
+        <source>Dark</source>
+        <translation>Dunkel</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.py" line="48"/>
+        <source>Blue Cerulean</source>
+        <translation>Zweckhaftes Blau</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.py" line="50"/>
+        <source>Brown Sand</source>
+        <translation>Brauner Sand</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.py" line="52"/>
+        <source>Blue NCS</source>
+        <translation>NCS Blau</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.py" line="54"/>
+        <source>High Contrast</source>
+        <translation>Hoher Kontrast</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.py" line="56"/>
+        <source>Blue Icy</source>
+        <translation>Eisblau</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.py" line="58"/>
+        <source>Qt</source>
+        <translation>Qt</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="346"/>
+        <source>Calliope mini:</source>
+        <translation>Calliope mini:</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="288"/>
+        <source>Enter the URL for the Callope mini Firmware</source>
+        <translation>Gib die URL zur Callope mini Firmware ein</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="353"/>
+        <source>Enter the URL for the Calliope mini MicroPython documentation</source>
+        <translation>Gib die URL für die Callope mini MicroPython Dokumentation ein</translation>
     </message>
 </context>
 <context>
@@ -43688,17 +43928,17 @@
         <translation>Drücken, um ein Chartfenster zur Darstellung der vom ausgewählten Gerät empfangenen Daten zu öffnen</translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="420"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="460"/>
         <source>Press to connect the selected device</source>
         <translation>Drücken, um eine Verbindung mit den ausgewählten Gerät herzustellen</translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="226"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="263"/>
         <source>&lt;h3&gt;The QtSerialPort package is not available.&lt;br/&gt;MicroPython support is deactivated.&lt;/h3&gt;</source>
         <translation>&lt;h3&gt;Das Paket QtSerialPort ist nicht verfügbar.&lt;br/&gt;Die MicroPython Unterstützung wird deaktiviert.&lt;/h3&gt;</translation>
     </message>
     <message numerus="yes">
-        <location filename="../MicroPython/MicroPythonWidget.py" line="263"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="300"/>
         <source>%n supported device(s) detected.</source>
         <translation>
             <numerusform>%n unterstütztes Gerät gefunden.</numerusform>
@@ -43706,42 +43946,42 @@
         </translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="269"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="306"/>
         <source>{0} at {1}</source>
         <translation>{0} an {1}</translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="277"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="314"/>
         <source>No supported devices detected.</source>
         <translation>Keine unterstützten Geräte gefunden.</translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="390"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="430"/>
         <source>Clear</source>
         <translation>Löschen</translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="392"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="432"/>
         <source>Copy</source>
         <translation>Kopieren</translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="393"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="433"/>
         <source>Paste</source>
         <translation>Einfügen</translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="415"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="455"/>
         <source>Press to disconnect the current device</source>
         <translation>Drücken, um die Verbindung zum aktuelle Geräte zu trennen</translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="436"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="476"/>
         <source>No device attached</source>
         <translation>Kein Gerät angeschlossen</translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="436"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="476"/>
         <source>Please ensure the device is plugged into your computer and selected.
 
 It must have a version of MicroPython (or CircuitPython) flashed onto it before anything will work.
@@ -43754,217 +43994,217 @@
 Drücke zum Abschluss den Resetknopf des Gerätes und warte ein paar Sekunden vor einem neuen Versuch.</translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="463"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="503"/>
         <source>Start REPL</source>
         <translation>REPL starten</translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="463"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="503"/>
         <source>&lt;p&gt;The REPL cannot be started.&lt;/p&gt;&lt;p&gt;Reason: {0}&lt;/p&gt;</source>
         <translation>&lt;p&gt;Die Eingabeaufforderung kann nicht gestartet werden.&lt;/p&gt;&lt;p&gt;Ursache: {0}&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="853"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="893"/>
         <source>Serial Device Connect</source>
         <translation>Serielle Verbindung</translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="853"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="893"/>
         <source>&lt;p&gt;Cannot connect to device at serial port &lt;b&gt;{0}&lt;/b&gt;.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Kann keine Verbindung zum Gerät an der seriellen Schnittstelle &lt;b&gt;{0}&lt;/b&gt; herstellen.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="898"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="938"/>
         <source>Run Script</source>
         <translation>Skript ausführen</translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="881"/>
-        <source>There is no editor open. Abort...</source>
-        <translation>Es ist kein Editor offen. Abbruch...</translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="889"/>
-        <source>The current editor does not contain a script. Abort...</source>
-        <translation>Der aktuelle Editortext enthält kein Skript. Abbruch...</translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="898"/>
-        <source>&lt;p&gt;Cannot run script.&lt;/p&gt;&lt;p&gt;Reason: {0}&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Das Skript kann nicht ausgeführt werden.&lt;/p&gt;&lt;p&gt;Ursache: {0}&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="921"/>
-        <source>Open Python File</source>
-        <translation>Pythondatei öffnen</translation>
-    </message>
-    <message>
         <location filename="../MicroPython/MicroPythonWidget.py" line="921"/>
+        <source>There is no editor open. Abort...</source>
+        <translation>Es ist kein Editor offen. Abbruch...</translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="929"/>
+        <source>The current editor does not contain a script. Abort...</source>
+        <translation>Der aktuelle Editortext enthält kein Skript. Abbruch...</translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="938"/>
+        <source>&lt;p&gt;Cannot run script.&lt;/p&gt;&lt;p&gt;Reason: {0}&lt;/p&gt;</source>
+        <translation>&lt;p&gt;Das Skript kann nicht ausgeführt werden.&lt;/p&gt;&lt;p&gt;Ursache: {0}&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="961"/>
+        <source>Open Python File</source>
+        <translation>Pythondatei öffnen</translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="961"/>
         <source>Python3 Files (*.py);;All Files (*)</source>
         <translation>Python3 Dateien (*.py);;Alle Dateien (*)</translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="965"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1005"/>
         <source>Start Chart</source>
         <translation>Chart starten</translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="965"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1005"/>
         <source>&lt;p&gt;The Chart cannot be started.&lt;/p&gt;&lt;p&gt;Reason: {0}&lt;/p&gt;</source>
         <translation>&lt;p&gt;Das Chart kann nicht gestartet werden.&lt;/p&gt;&lt;p&gt;Ursache: {0}&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="994"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1034"/>
         <source>Unsaved Chart Data</source>
         <translation>Nich gesicherte Chart Daten</translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="994"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1034"/>
         <source>The chart contains unsaved data.</source>
         <translation>Das Chart enthält ungesicherte Daten.</translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1045"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1085"/>
         <source>Start File Manager</source>
         <translation>Dateimanager starten</translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1045"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1085"/>
         <source>&lt;p&gt;The File Manager cannot be started.&lt;/p&gt;&lt;p&gt;Reason: {0}&lt;/p&gt;</source>
         <translation>&lt;p&gt;Der Dateimanager kann nicht gestartet werden.&lt;/p&gt;&lt;p&gt;Ursache: {0}&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1096"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1136"/>
         <source>Show Version</source>
         <translation>Version anzeigen</translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1099"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1139"/>
         <source>Show Implementation</source>
         <translation>Implementierung anzeigen</translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1210"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1250"/>
         <source>Synchronize Time</source>
         <translation>Zeit synchronisieren</translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1107"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1147"/>
         <source>Show Device Time</source>
         <translation>Gerätezeit anzeigen</translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1110"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1150"/>
         <source>Show Local Time</source>
         <translation>Lokale Zeit anzeigen</translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1421"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1461"/>
         <source>Compile Python File</source>
         <translation>Python Datei übersetzen</translation>
     </message>
     <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1481"/>
+        <source>Compile Current Editor</source>
+        <translation>Aktuellen Editor übersetzen</translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1188"/>
+        <source>&lt;h3&gt;Device Version Information&lt;/h3&gt;</source>
+        <translation>&lt;h3&gt;Versionsinformationen des Gerätes&lt;/h3&gt;</translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1197"/>
+        <source>No version information available.</source>
+        <translation>Keine Versionsinformationen verfügbar.</translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1199"/>
+        <source>Device Version Information</source>
+        <translation>Versionsinformationen des Gerätes</translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1222"/>
+        <source>unknown</source>
+        <translation>unbekannt</translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1226"/>
+        <source>Device Implementation Information</source>
+        <translation>Informationen zur Implementierung</translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1226"/>
+        <source>&lt;h3&gt;Device Implementation Information&lt;/h3&gt;&lt;p&gt;This device contains &lt;b&gt;{0} {1}&lt;/b&gt;.&lt;/p&gt;</source>
+        <translation>&lt;h3&gt;Informationen zur Implementierung&lt;/h3&gt;&lt;p&gt;Dieses Gerät enthält &lt;b&gt;{0} {1}&lt;/b&gt;.&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1250"/>
+        <source>&lt;p&gt;The time of the connected device was synchronized with the local time.&lt;/p&gt;</source>
+        <translation>&lt;p&gt;Die Zeit des angeschlossenen Gerätes wurde mit der lokalen Zeit synchronisiert.&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1272"/>
+        <source>&lt;h3&gt;Device Date and Time&lt;/h3&gt;&lt;table&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Date&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Time&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{1}&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;</source>
+        <translation>&lt;h3&gt;Datum und Zeit des Gerätes&lt;/h3&gt;&lt;table&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Datum&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Zeit&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{1}&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;</translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1280"/>
+        <source>&lt;h3&gt;Device Date and Time&lt;/h3&gt;&lt;p&gt;{0}&lt;/p&gt;</source>
+        <translation>&lt;h3&gt;Datum und Zeit des Gerätes&lt;/h3&gt;&lt;p&gt;{0}&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1294"/>
+        <source>Device Date and Time</source>
+        <translation>Datum und Zeit des Gerätes</translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1307"/>
+        <source>Local Date and Time</source>
+        <translation>Lokales Datum und Zeit</translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1307"/>
+        <source>&lt;h3&gt;Local Date and Time&lt;/h3&gt;&lt;table&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Date&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Time&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{1}&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;</source>
+        <translation>&lt;h3&gt;Lokales Datum und Zeit&lt;/h3&gt;&lt;table&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Datum&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Zeit&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{1}&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;</translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1374"/>
+        <source>Error handling device</source>
+        <translation>Fehler bei Gerätekommunikation</translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1374"/>
+        <source>&lt;p&gt;There was an error communicating with the connected device.&lt;/p&gt;&lt;p&gt;Method: {0}&lt;/p&gt;&lt;p&gt;Message: {1}&lt;/p&gt;</source>
+        <translation>&lt;p&gt;Es trat ein Fehler bei der Kommunikation mit dem Gerät auf.&lt;/p&gt;&lt;p&gt;Methode: {0}&lt;/p&gt;&lt;p&gt;Nachricht: {1}&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1413"/>
+        <source>The MicroPython cross compiler &lt;b&gt;mpy-cross&lt;/b&gt; cannot be found. Ensure it is in the search path or configure it on the MicroPython configuration page.</source>
+        <translation>Der MicroPython Crosscompiler &lt;b&gt;mpy-cross&lt;/b&gt; kann nicht gefunden werden. Stelle sicher, dass er im Suchpfad liegt oder konfiguriere ihn auf der MicroPython Konfigurationsseite.</translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1431"/>
+        <source>Python Files (*.py);;All Files (*)</source>
+        <translation>Python-Dateien (*.py);;Alle Dateien (*)</translation>
+    </message>
+    <message>
         <location filename="../MicroPython/MicroPythonWidget.py" line="1441"/>
-        <source>Compile Current Editor</source>
-        <translation>Aktuellen Editor übersetzen</translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1148"/>
-        <source>&lt;h3&gt;Device Version Information&lt;/h3&gt;</source>
-        <translation>&lt;h3&gt;Versionsinformationen des Gerätes&lt;/h3&gt;</translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1157"/>
-        <source>No version information available.</source>
-        <translation>Keine Versionsinformationen verfügbar.</translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1159"/>
-        <source>Device Version Information</source>
-        <translation>Versionsinformationen des Gerätes</translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1182"/>
-        <source>unknown</source>
-        <translation>unbekannt</translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1186"/>
-        <source>Device Implementation Information</source>
-        <translation>Informationen zur Implementierung</translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1186"/>
-        <source>&lt;h3&gt;Device Implementation Information&lt;/h3&gt;&lt;p&gt;This device contains &lt;b&gt;{0} {1}&lt;/b&gt;.&lt;/p&gt;</source>
-        <translation>&lt;h3&gt;Informationen zur Implementierung&lt;/h3&gt;&lt;p&gt;Dieses Gerät enthält &lt;b&gt;{0} {1}&lt;/b&gt;.&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1210"/>
-        <source>&lt;p&gt;The time of the connected device was synchronized with the local time.&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Die Zeit des angeschlossenen Gerätes wurde mit der lokalen Zeit synchronisiert.&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1232"/>
-        <source>&lt;h3&gt;Device Date and Time&lt;/h3&gt;&lt;table&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Date&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Time&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{1}&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;</source>
-        <translation>&lt;h3&gt;Datum und Zeit des Gerätes&lt;/h3&gt;&lt;table&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Datum&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Zeit&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{1}&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;</translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1240"/>
-        <source>&lt;h3&gt;Device Date and Time&lt;/h3&gt;&lt;p&gt;{0}&lt;/p&gt;</source>
-        <translation>&lt;h3&gt;Datum und Zeit des Gerätes&lt;/h3&gt;&lt;p&gt;{0}&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1254"/>
-        <source>Device Date and Time</source>
-        <translation>Datum und Zeit des Gerätes</translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1267"/>
-        <source>Local Date and Time</source>
-        <translation>Lokales Datum und Zeit</translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1267"/>
-        <source>&lt;h3&gt;Local Date and Time&lt;/h3&gt;&lt;table&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Date&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Time&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{1}&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;</source>
-        <translation>&lt;h3&gt;Lokales Datum und Zeit&lt;/h3&gt;&lt;table&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Datum&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Zeit&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{1}&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;</translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1334"/>
-        <source>Error handling device</source>
-        <translation>Fehler bei Gerätekommunikation</translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1334"/>
-        <source>&lt;p&gt;There was an error communicating with the connected device.&lt;/p&gt;&lt;p&gt;Method: {0}&lt;/p&gt;&lt;p&gt;Message: {1}&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Es trat ein Fehler bei der Kommunikation mit dem Gerät auf.&lt;/p&gt;&lt;p&gt;Methode: {0}&lt;/p&gt;&lt;p&gt;Nachricht: {1}&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1373"/>
-        <source>The MicroPython cross compiler &lt;b&gt;mpy-cross&lt;/b&gt; cannot be found. Ensure it is in the search path or configure it on the MicroPython configuration page.</source>
-        <translation>Der MicroPython Crosscompiler &lt;b&gt;mpy-cross&lt;/b&gt; kann nicht gefunden werden. Stelle sicher, dass er im Suchpfad liegt oder konfiguriere ihn auf der MicroPython Konfigurationsseite.</translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1391"/>
-        <source>Python Files (*.py);;All Files (*)</source>
-        <translation>Python-Dateien (*.py);;Alle Dateien (*)</translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1401"/>
         <source>The Python file &lt;b&gt;{0}&lt;/b&gt; does not exist. Aborting...</source>
         <translation>Die Python Datei &lt;b&gt;{0}&lt;/b&gt; existiert nicht. Abbruch...</translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1411"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1451"/>
         <source>&apos;mpy-cross&apos; Output</source>
         <translation>&apos;mpy-cross&apos; Ausgabe</translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1434"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1474"/>
         <source>The current editor does not contain a Python file. Aborting...</source>
         <translation>Der aktuelle Editortext enthält keine Pythondatei. Abbruch...</translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="175"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="211"/>
         <source>MicroPython Menu</source>
         <translation>MicroPython MenÜ</translation>
     </message>
@@ -43974,47 +44214,47 @@
         <translation>Drücken, um einen Dateimanager zum ausgewählten Gerät zu öffnen</translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="978"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1018"/>
         <source>&#xc2;&#xb5;Py Chart</source>
         <translation>µPy Chart</translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1058"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1098"/>
         <source>&#xc2;&#xb5;Py Files</source>
         <translation>µPy Dateien</translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1134"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1174"/>
         <source>Show Documentation</source>
         <translation>Dokumentation anzeigen</translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1138"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1178"/>
         <source>Configure</source>
         <translation>Einstellungen</translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1113"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1153"/>
         <source>Show Time</source>
         <translation>Zeit anzeigen</translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1130"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1170"/>
         <source>Download Firmware</source>
         <translation>Firmware herunterladen</translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1310"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1350"/>
         <source>Date and Time</source>
         <translation>Datum und Zeit</translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1293"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1333"/>
         <source>&lt;table&gt;&lt;tr&gt;&lt;th&gt;&lt;/th&gt;&lt;th&gt;Local Date and Time&lt;/th&gt;&lt;th&gt;Device Date and Time&lt;/th&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Date&lt;/b&gt;&lt;/td&gt;&lt;td align=&apos;center&apos;&gt;{0}&lt;/td&gt;&lt;td align=&apos;center&apos;&gt;{2}&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Time&lt;/b&gt;&lt;/td&gt;&lt;td align=&apos;center&apos;&gt;{1}&lt;/td&gt;&lt;td align=&apos;center&apos;&gt;{3}&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;</source>
         <translation>&lt;table&gt;&lt;tr&gt;&lt;th&gt;&lt;/th&gt;&lt;th&gt;Lokales Datum und Zeit&lt;/th&gt;&lt;th&gt;Datum und Zeit des Gerätes&lt;/th&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Datum&lt;/b&gt;&lt;/td&gt;&lt;td align=&apos;center&apos;&gt;{0}&lt;/td&gt;&lt;td align=&apos;center&apos;&gt;{2}&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Zeit&lt;/b&gt;&lt;/td&gt;&lt;td align=&apos;center&apos;&gt;{1}&lt;/td&gt;&lt;td align=&apos;center&apos;&gt;{3}&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;</translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1310"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1350"/>
         <source>&lt;table&gt;&lt;tr&gt;&lt;th&gt;Local Date and Time&lt;/th&gt;&lt;th&gt;Device Date and Time&lt;/th&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td align=&apos;center&apos;&gt;{0} {1}&lt;/td&gt;&lt;td align=&apos;center&apos;&gt;{2}&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;</source>
         <translation>&lt;table&gt;&lt;tr&gt;&lt;th&gt;Lokales Datum und Zeit&lt;/th&gt;&lt;th&gt;Datum und Zeit des Gerätes&lt;/th&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td align=&apos;center&apos;&gt;{0} {1}&lt;/td&gt;&lt;td align=&apos;center&apos;&gt;{2}&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;</translation>
     </message>
@@ -44022,89 +44262,94 @@
 <context>
     <name>MicrobitDevice</name>
     <message>
-        <location filename="../MicroPython/MicrobitDevices.py" line="67"/>
+        <location filename="../MicroPython/MicrobitDevices.py" line="74"/>
         <source>BBC micro:bit</source>
         <translation>BBC micro:bit</translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicrobitDevices.py" line="134"/>
+        <location filename="../MicroPython/MicrobitDevices.py" line="149"/>
         <source>Workspace Directory</source>
         <translation>Arbeitsverzeichnis</translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicrobitDevices.py" line="134"/>
-        <source>Could not find an attached BBC micro:bit.
-
-Please make sure the device is plugged into this computer.</source>
-        <translation>Konnte keinen eingebundenen BBC micro:bit finden.
-
-Bitte stelle sicher, dass das Gerät an diesem Computer angesteckt ist.</translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicrobitDevices.py" line="171"/>
+        <location filename="../MicroPython/MicrobitDevices.py" line="186"/>
         <source>Save Script as &apos;main.py&apos;</source>
         <translation>Skript als &apos;main.py&apos; speichern</translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicrobitDevices.py" line="173"/>
+        <location filename="../MicroPython/MicrobitDevices.py" line="188"/>
         <source>Save the current script as &apos;main.py&apos; on the connected device</source>
         <translation>Speichert das aktuelle Skript als &apos;main.py&apos; auf das angeschlossene Gerät</translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicrobitDevices.py" line="177"/>
-        <source>Reset micro:bit</source>
-        <translation>micro:bit zurücksetzen</translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicrobitDevices.py" line="201"/>
+        <location filename="../MicroPython/MicrobitDevices.py" line="241"/>
         <source>MicroPython Firmware Files (*.hex);;All Files (*)</source>
         <translation>MicroPython Firmwaredateien (*.hex);;Alle Dateien (*)</translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicrobitDevices.py" line="246"/>
+        <location filename="../MicroPython/MicrobitDevices.py" line="286"/>
         <source>The script is empty. Aborting.</source>
         <translation>Das Skript ist leer. Abbruch.</translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicrobitDevices.py" line="236"/>
+        <location filename="../MicroPython/MicrobitDevices.py" line="276"/>
         <source>The current editor does not contain a Python script. Write it anyway?</source>
         <translation>Der aktuelle Editor enthält kein Python Skript. Trotzdem schreiben?</translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicrobitDevices.py" line="274"/>
+        <location filename="../MicroPython/MicrobitDevices.py" line="314"/>
         <source>&lt;p&gt;The script could not be saved to the device.&lt;/p&gt;&lt;p&gt;Reason: {0}&lt;/p&gt;</source>
         <translation>&lt;p&gt;Das Skript konnte nicht auf dem Gerät gespeichert werden&lt;/p&gt;&lt;p&gt;Ursache: {0}&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicrobitDevices.py" line="201"/>
+        <location filename="../MicroPython/MicrobitDevices.py" line="241"/>
         <source>Flash MicroPython Firmware</source>
         <translation>MicroPython Firmware flashen</translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicrobitDevices.py" line="233"/>
+        <location filename="../MicroPython/MicrobitDevices.py" line="273"/>
         <source>Save Script</source>
         <translation>Skript speichern</translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicrobitDevices.py" line="190"/>
-        <source>The BBC micro:bit is not ready for flashing. See the &lt;a href=&quot;https://microbit.org/guide/firmware/&quot;&gt;micro:bit web site&lt;/a&gt; for details.</source>
-        <translation>Der BBC micro:bit ist nicht zum Flashen bereit. Siehe &lt;a href=&quot;https://microbit.org/guide/firmware/&quot;&gt;micro:bit Webseite&lt;/a&gt; für Details.</translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicrobitDevices.py" line="263"/>
+        <location filename="../MicroPython/MicrobitDevices.py" line="303"/>
         <source>Save Script as &apos;{0}&apos;</source>
         <translation>Skript als &apos;{0}&apos; speichern</translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicrobitDevices.py" line="254"/>
+        <location filename="../MicroPython/MicrobitDevices.py" line="294"/>
         <source>Enter a file name on the device:</source>
         <translation>Gib einen Dateinamen auf dem Gerät ein:</translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicrobitDevices.py" line="168"/>
+        <location filename="../MicroPython/MicrobitDevices.py" line="183"/>
         <source>Save the current script to the selected device</source>
         <translation>Speichert das aktuelle Skript auf das angeschlossene Gerät</translation>
     </message>
+    <message>
+        <location filename="../MicroPython/MicrobitDevices.py" line="77"/>
+        <source>Calliope mini</source>
+        <translation>Calliope mini</translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicrobitDevices.py" line="232"/>
+        <source>Could not find an attached {0}.
+
+Please make sure the device is plugged into this computer.</source>
+        <translation>Konnte keinen eingebundenen {0} finden.
+
+Bitte stelle sicher, dass das Gerät an diesem Computer angesteckt ist.</translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicrobitDevices.py" line="192"/>
+        <source>Reset {0}</source>
+        <translation>{0} zurücksetzen</translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicrobitDevices.py" line="213"/>
+        <source>&lt;p&gt;The BBC micro:bit is not ready for flashing. Follow these instructions.&lt;/p&gt;&lt;ul&gt;&lt;li&gt;unplug USB cable and any batteries&lt;/li&gt;&lt;li&gt;keep RESET button pressed an plug USB cable back in&lt;/li&gt;&lt;li&gt;a drive called MAINTENANCE should be available&lt;/li&gt;&lt;/ul&gt;&lt;p&gt;See the &lt;a href=&quot;https://microbit.org/guide/firmware/&quot;&gt;micro:bit web site&lt;/a&gt; for details.&lt;/p&gt;</source>
+        <translation>&lt;p&gt;Der BBC micro:bit ist nicht bereit zum Flashen. Folge diesen Anweisungen.&lt;/p&gt;&lt;ul&gt;&lt;li&gt;ziehe das USB Kabel und alle Batterien heraus&lt;/li&gt;&lt;li&gt;halte den RESET Knopf gedrückt und stecke das USB Kabel wieder ein&lt;/li&gt;&lt;li&gt;ein Laufwerk mit Namen MAINTENANCE sollte verfügbar sein&lt;/li&gt;&lt;/ul&gt;&lt;p&gt;Siehe auch die &lt;a href=&quot;https://microbit.org/guide/firmware/&quot;&gt;micro:bit Web Seite&lt;/a&gt;für Details.&lt;/p&gt;</translation>
+    </message>
 </context>
 <context>
     <name>MicrosoftEngine</name>
@@ -47894,7 +48139,7 @@
         <translation>Ermittle veraltete Pakete...</translation>
     </message>
     <message numerus="yes">
-        <location filename="../PipInterface/PipPackagesWidget.py" line="635"/>
+        <location filename="../PipInterface/PipPackagesWidget.py" line="645"/>
         <source>%n package(s) found.</source>
         <translation>
             <numerusform>%n Paket gefunden.</numerusform>
@@ -47902,102 +48147,102 @@
         </translation>
     </message>
     <message>
-        <location filename="../PipInterface/PipPackagesWidget.py" line="888"/>
+        <location filename="../PipInterface/PipPackagesWidget.py" line="898"/>
         <source>Search PyPI</source>
         <translation>PyPI durchsuchen</translation>
     </message>
     <message>
-        <location filename="../PipInterface/PipPackagesWidget.py" line="673"/>
+        <location filename="../PipInterface/PipPackagesWidget.py" line="683"/>
         <source>&lt;p&gt;The package search did not return anything.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Die Paketsuche lieferte keine Ergebnisse.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../PipInterface/PipPackagesWidget.py" line="710"/>
+        <location filename="../PipInterface/PipPackagesWidget.py" line="720"/>
         <source>&lt;p&gt;The package search failed.&lt;/p&gt;&lt;p&gt;Reason: {0}&lt;/p&gt;</source>
         <translation>&lt;p&gt;Die Paketsuche schlug fehl.&lt;/p&gt;&lt;p&gt;Ursache: {0}&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../PipInterface/PipPackagesWidget.py" line="715"/>
+        <location filename="../PipInterface/PipPackagesWidget.py" line="725"/>
         <source>Error: {0}</source>
         <translation>Fehler: {0}</translation>
     </message>
     <message>
-        <location filename="../PipInterface/PipPackagesWidget.py" line="848"/>
+        <location filename="../PipInterface/PipPackagesWidget.py" line="858"/>
         <source>Show Package Details</source>
         <translation>Paketdetails anzeigen</translation>
     </message>
     <message>
-        <location filename="../PipInterface/PipPackagesWidget.py" line="848"/>
+        <location filename="../PipInterface/PipPackagesWidget.py" line="858"/>
         <source>Select the package version:</source>
         <translation>Wähle die Paketversion aus:</translation>
     </message>
     <message>
-        <location filename="../PipInterface/PipPackagesWidget.py" line="888"/>
+        <location filename="../PipInterface/PipPackagesWidget.py" line="898"/>
         <source>&lt;p&gt;No package details info for &lt;b&gt;{0}&lt;/b&gt; available.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Keine detaillierten Paketinformationen für &lt;b&gt;{0}&lt;/b&gt; verfügbar.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../PipInterface/PipPackagesWidget.py" line="904"/>
+        <location filename="../PipInterface/PipPackagesWidget.py" line="914"/>
         <source>Install Pip</source>
         <translation>Pip installieren</translation>
     </message>
     <message>
-        <location filename="../PipInterface/PipPackagesWidget.py" line="907"/>
-        <source>Install Pip to User-Site</source>
-        <translation>Pip in Nutzerverzeichnis installieren</translation>
-    </message>
-    <message>
-        <location filename="../PipInterface/PipPackagesWidget.py" line="910"/>
-        <source>Repair Pip</source>
-        <translation>Pip reparieren</translation>
-    </message>
-    <message>
-        <location filename="../PipInterface/PipPackagesWidget.py" line="1005"/>
-        <source>Install Packages</source>
-        <translation>Pakete installieren</translation>
-    </message>
-    <message>
         <location filename="../PipInterface/PipPackagesWidget.py" line="917"/>
-        <source>Install Local Package</source>
-        <translation>Lokales Paket installieren</translation>
-    </message>
-    <message>
-        <location filename="../PipInterface/PipPackagesWidget.py" line="921"/>
-        <source>Install Requirements</source>
-        <translation>Paketanforderungen installieren</translation>
-    </message>
-    <message>
-        <location filename="../PipInterface/PipPackagesWidget.py" line="924"/>
-        <source>Uninstall Requirements</source>
-        <translation>Paketanforderungen deinstallieren</translation>
+        <source>Install Pip to User-Site</source>
+        <translation>Pip in Nutzerverzeichnis installieren</translation>
+    </message>
+    <message>
+        <location filename="../PipInterface/PipPackagesWidget.py" line="920"/>
+        <source>Repair Pip</source>
+        <translation>Pip reparieren</translation>
+    </message>
+    <message>
+        <location filename="../PipInterface/PipPackagesWidget.py" line="1015"/>
+        <source>Install Packages</source>
+        <translation>Pakete installieren</translation>
     </message>
     <message>
         <location filename="../PipInterface/PipPackagesWidget.py" line="927"/>
+        <source>Install Local Package</source>
+        <translation>Lokales Paket installieren</translation>
+    </message>
+    <message>
+        <location filename="../PipInterface/PipPackagesWidget.py" line="931"/>
+        <source>Install Requirements</source>
+        <translation>Paketanforderungen installieren</translation>
+    </message>
+    <message>
+        <location filename="../PipInterface/PipPackagesWidget.py" line="934"/>
+        <source>Uninstall Requirements</source>
+        <translation>Paketanforderungen deinstallieren</translation>
+    </message>
+    <message>
+        <location filename="../PipInterface/PipPackagesWidget.py" line="937"/>
         <source>Generate Requirements...</source>
         <translation>Anforderungen erzeugen...</translation>
     </message>
     <message>
-        <location filename="../PipInterface/PipPackagesWidget.py" line="932"/>
+        <location filename="../PipInterface/PipPackagesWidget.py" line="942"/>
         <source>Edit User Configuration...</source>
         <translation>Nutzerkonfiguration bearbeiten...</translation>
     </message>
     <message>
-        <location filename="../PipInterface/PipPackagesWidget.py" line="935"/>
+        <location filename="../PipInterface/PipPackagesWidget.py" line="945"/>
         <source>Edit Environment Configuration...</source>
         <translation>Umgebungskonfiguration bearbeiten...</translation>
     </message>
     <message>
-        <location filename="../PipInterface/PipPackagesWidget.py" line="940"/>
+        <location filename="../PipInterface/PipPackagesWidget.py" line="950"/>
         <source>Configure...</source>
         <translation>Einstellungen...</translation>
     </message>
     <message>
-        <location filename="../PipInterface/PipPackagesWidget.py" line="1118"/>
+        <location filename="../PipInterface/PipPackagesWidget.py" line="1128"/>
         <source>Edit Configuration</source>
         <translation>Konfiguration bearbeiten</translation>
     </message>
     <message>
-        <location filename="../PipInterface/PipPackagesWidget.py" line="1118"/>
+        <location filename="../PipInterface/PipPackagesWidget.py" line="1128"/>
         <source>No valid configuration path determined. Aborting</source>
         <translation>Es konnte kein gültiger Konfigurationspfad ermittelt werden. Abbruch</translation>
     </message>
@@ -49265,17 +49510,17 @@
 <context>
     <name>Preferences</name>
     <message>
-        <location filename="../Preferences/__init__.py" line="1624"/>
+        <location filename="../Preferences/__init__.py" line="1640"/>
         <source>Export Preferences</source>
         <translation>Einstellungen exportieren</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1652"/>
+        <location filename="../Preferences/__init__.py" line="1668"/>
         <source>Import Preferences</source>
         <translation>Einstellungen importieren</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1652"/>
+        <location filename="../Preferences/__init__.py" line="1668"/>
         <source>Properties File (*.ini);;All Files (*)</source>
         <translation>Properties-Dateien (*.ini);;Alle Dateien (*)</translation>
     </message>
@@ -49475,11 +49720,6 @@
 <context>
     <name>PrinterPage</name>
     <message>
-        <location filename="../Preferences/ConfigurationPages/PrinterPage.ui" line="77"/>
-        <source>Colour</source>
-        <translation>Farbe</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/PrinterPage.ui" line="84"/>
         <source>Gray Scale</source>
         <translation>Graustufen</translation>
@@ -49515,11 +49755,6 @@
         <translation>Drücken, um die Schriftart für die Kopfzeile auszuwählen</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/PrinterPage.ui" line="49"/>
-        <source>Colour Mode:</source>
-        <translation>Farbmodus:</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/PrinterPage.ui" line="94"/>
         <source>Page Order:</source>
         <translation>Seitenanordnung:</translation>
@@ -49574,6 +49809,16 @@
         <source> DPI</source>
         <translation> DPI</translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/PrinterPage.ui" line="49"/>
+        <source>Color Mode:</source>
+        <translation>Farbmodus:</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/PrinterPage.ui" line="77"/>
+        <source>Color</source>
+        <translation>Farbe</translation>
+    </message>
 </context>
 <context>
     <name>ProgramsDialog</name>
@@ -49796,527 +50041,527 @@
 <context>
     <name>Project</name>
     <message>
-        <location filename="../Project/Project.py" line="805"/>
+        <location filename="../Project/Project.py" line="817"/>
         <source>Read project file</source>
         <translation>Projektdatei lesen</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1519"/>
+        <location filename="../Project/Project.py" line="1531"/>
         <source>Delete translation</source>
         <translation>Übersetzung löschen</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1684"/>
+        <location filename="../Project/Project.py" line="1696"/>
         <source>Add file</source>
         <translation>Datei hinzufügen</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="2233"/>
+        <location filename="../Project/Project.py" line="2250"/>
         <source>Delete file</source>
         <translation>Datei löschen</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="2358"/>
+        <location filename="../Project/Project.py" line="2375"/>
         <source>Create project directory</source>
         <translation>Projektverzeichnis erstellen</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3845"/>
+        <location filename="../Project/Project.py" line="3880"/>
         <source>Open project</source>
         <translation>Projekt öffnen</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3882"/>
+        <location filename="../Project/Project.py" line="3917"/>
         <source>Save project as</source>
         <translation>Projekt speichern unter</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3130"/>
+        <location filename="../Project/Project.py" line="3147"/>
         <source>Save File</source>
         <translation>Datei speichern</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3166"/>
+        <location filename="../Project/Project.py" line="3183"/>
         <source>Close Project</source>
         <translation>Projekt schließen</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3166"/>
+        <location filename="../Project/Project.py" line="3183"/>
         <source>The current project has unsaved changes.</source>
         <translation>Das aktuelle Projekt hat ungesicherte Änderungen.</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4062"/>
+        <location filename="../Project/Project.py" line="4097"/>
         <source>&amp;Save</source>
         <translation>&amp;Speichern</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3831"/>
+        <location filename="../Project/Project.py" line="3866"/>
         <source>New project</source>
         <translation>Neues Projekt</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3831"/>
+        <location filename="../Project/Project.py" line="3866"/>
         <source>&amp;New...</source>
         <translation>&amp;Neu...</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3836"/>
+        <location filename="../Project/Project.py" line="3871"/>
         <source>Generate a new project</source>
         <translation>Erstelle ein neues Projekt</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3837"/>
+        <location filename="../Project/Project.py" line="3872"/>
         <source>&lt;b&gt;New...&lt;/b&gt;&lt;p&gt;This opens a dialog for entering the info for a new project.&lt;/p&gt;</source>
         <translation>&lt;b&gt;Neu...&lt;/b&gt;&lt;p&gt;Dies öffnet einen Dialog zur Eingabe der Informationen des neuen Projektes.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3845"/>
+        <location filename="../Project/Project.py" line="3880"/>
         <source>&amp;Open...</source>
         <translation>&amp;Öffnen...</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3850"/>
+        <location filename="../Project/Project.py" line="3885"/>
         <source>Open an existing project</source>
         <translation>Öffnet ein bestehendes Projekt</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3851"/>
-        <source>&lt;b&gt;Open...&lt;/b&gt;&lt;p&gt;This opens an existing project.&lt;/p&gt;</source>
-        <translation>&lt;b&gt;Öffnen...&lt;/b&gt;&lt;p&gt;Dies öffnet ein bestehendes Projekt.&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="3858"/>
-        <source>Close project</source>
-        <translation>Projekt schließen</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="3858"/>
-        <source>&amp;Close</source>
-        <translation>Schl&amp;ießen</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="3862"/>
-        <source>Close the current project</source>
-        <translation>Schließt das aktuelle Projekt</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="3863"/>
-        <source>&lt;b&gt;Close&lt;/b&gt;&lt;p&gt;This closes the current project.&lt;/p&gt;</source>
-        <translation>&lt;b&gt;Schließen&lt;/b&gt;&lt;p&gt;Dies schließt das aktuelle Projekt.&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="3870"/>
-        <source>Save project</source>
-        <translation>Projekt speichern</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="3874"/>
-        <source>Save the current project</source>
-        <translation>Speichert das aktuelle Projekt</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="3875"/>
-        <source>&lt;b&gt;Save&lt;/b&gt;&lt;p&gt;This saves the current project.&lt;/p&gt;</source>
-        <translation>&lt;b&gt;Speichern&lt;/b&gt;&lt;p&gt;Dies speichert das aktuelle Projekt.&lt;/p&gt;</translation>
-    </message>
-    <message>
         <location filename="../Project/Project.py" line="3886"/>
+        <source>&lt;b&gt;Open...&lt;/b&gt;&lt;p&gt;This opens an existing project.&lt;/p&gt;</source>
+        <translation>&lt;b&gt;Öffnen...&lt;/b&gt;&lt;p&gt;Dies öffnet ein bestehendes Projekt.&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="3893"/>
+        <source>Close project</source>
+        <translation>Projekt schließen</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="3893"/>
+        <source>&amp;Close</source>
+        <translation>Schl&amp;ießen</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="3897"/>
+        <source>Close the current project</source>
+        <translation>Schließt das aktuelle Projekt</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="3898"/>
+        <source>&lt;b&gt;Close&lt;/b&gt;&lt;p&gt;This closes the current project.&lt;/p&gt;</source>
+        <translation>&lt;b&gt;Schließen&lt;/b&gt;&lt;p&gt;Dies schließt das aktuelle Projekt.&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="3905"/>
+        <source>Save project</source>
+        <translation>Projekt speichern</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="3909"/>
+        <source>Save the current project</source>
+        <translation>Speichert das aktuelle Projekt</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="3910"/>
+        <source>&lt;b&gt;Save&lt;/b&gt;&lt;p&gt;This saves the current project.&lt;/p&gt;</source>
+        <translation>&lt;b&gt;Speichern&lt;/b&gt;&lt;p&gt;Dies speichert das aktuelle Projekt.&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="3921"/>
         <source>Save the current project to a new file</source>
         <translation>Speichert das aktuelle Projekt in eine neue Datei</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3888"/>
+        <location filename="../Project/Project.py" line="3923"/>
         <source>&lt;b&gt;Save as&lt;/b&gt;&lt;p&gt;This saves the current project to a new file.&lt;/p&gt;</source>
         <translation>&lt;b&gt;Speichern unter&lt;/b&gt;&lt;p&gt;Dies speichert das aktuelle Projekt in eine neue Datei.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3928"/>
+        <location filename="../Project/Project.py" line="3963"/>
         <source>Add translation to project</source>
         <translation>Übersetzung zum Projekt hinzufügen</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3928"/>
+        <location filename="../Project/Project.py" line="3963"/>
         <source>Add &amp;translation...</source>
         <translation>&amp;Übersetzung hinzufügen...</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3933"/>
+        <location filename="../Project/Project.py" line="3968"/>
         <source>Add a translation to the current project</source>
         <translation>Eine Übersetzung zum aktuellen Projekt hinzufügen</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3935"/>
+        <location filename="../Project/Project.py" line="3970"/>
         <source>&lt;b&gt;Add translation...&lt;/b&gt;&lt;p&gt;This opens a dialog for add a translation to the current project.&lt;/p&gt;</source>
         <translation>&lt;b&gt;Übersetzung hinzufügen...&lt;/b&gt;&lt;p&gt;Dies öffnet einen Dialog, mit dem eine Übersetzung zum aktuellen Projekt hinzugefügt werden kann.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3973"/>
+        <location filename="../Project/Project.py" line="4008"/>
         <source>Project properties</source>
         <translation>Projekteigenschaften</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3973"/>
+        <location filename="../Project/Project.py" line="4008"/>
         <source>&amp;Properties...</source>
         <translation>&amp;Eigenschaften...</translation>
     </message>
     <message>
+        <location filename="../Project/Project.py" line="4013"/>
+        <source>Show the project properties</source>
+        <translation>Zeigt die Projekteigenschaften an</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4014"/>
+        <source>&lt;b&gt;Properties...&lt;/b&gt;&lt;p&gt;This shows a dialog to edit the project properties.&lt;/p&gt;</source>
+        <translation>&lt;b&gt;Eigenschaften...&lt;/b&gt;&lt;p&gt;Dies zeigt einen Dialog an, mit dem die Projekteigenschaften bearbeitet werden können.&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4361"/>
+        <source>Open &amp;Recent Projects</source>
+        <translation>Zu&amp;letzt geöffnete Projekte</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="1828"/>
+        <source>The target directory must not be empty.</source>
+        <translation>Das Zielverzeichnis darf nicht leer sein.</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="3978"/>
+        <source>Search new files</source>
+        <translation>Neue Dateien suchen</translation>
+    </message>
+    <message>
         <location filename="../Project/Project.py" line="3978"/>
-        <source>Show the project properties</source>
-        <translation>Zeigt die Projekteigenschaften an</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="3979"/>
-        <source>&lt;b&gt;Properties...&lt;/b&gt;&lt;p&gt;This shows a dialog to edit the project properties.&lt;/p&gt;</source>
-        <translation>&lt;b&gt;Eigenschaften...&lt;/b&gt;&lt;p&gt;Dies zeigt einen Dialog an, mit dem die Projekteigenschaften bearbeitet werden können.&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4326"/>
-        <source>Open &amp;Recent Projects</source>
-        <translation>Zu&amp;letzt geöffnete Projekte</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="1816"/>
-        <source>The target directory must not be empty.</source>
-        <translation>Das Zielverzeichnis darf nicht leer sein.</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="3943"/>
-        <source>Search new files</source>
-        <translation>Neue Dateien suchen</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="3943"/>
         <source>Searc&amp;h new files...</source>
         <translation>Neue &amp;Dateien suchen...</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3947"/>
+        <location filename="../Project/Project.py" line="3982"/>
         <source>Search new files in the project directory.</source>
         <translation>Sucht neue Dateien im Projektverzeichnis.</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1827"/>
+        <location filename="../Project/Project.py" line="1839"/>
         <source>Add directory</source>
         <translation>Verzeichnis hinzufügen</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1827"/>
+        <location filename="../Project/Project.py" line="1839"/>
         <source>The source directory must not be empty.</source>
         <translation>Das Quellverzeichnis darf nicht leer sein.</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1393"/>
+        <location filename="../Project/Project.py" line="1405"/>
         <source>Add Language</source>
         <translation>Sprache hinzufügen</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3882"/>
+        <location filename="../Project/Project.py" line="3917"/>
         <source>Save &amp;as...</source>
         <translation>Speichern &amp;unter...</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4850"/>
+        <location filename="../Project/Project.py" line="4885"/>
         <source>Version Control System</source>
         <translation>Versionskontrollsystem</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4704"/>
+        <location filename="../Project/Project.py" line="4739"/>
         <source>Search New Files</source>
         <translation>Neue Dateien suchen</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4704"/>
+        <location filename="../Project/Project.py" line="4739"/>
         <source>There were no new files found to be added.</source>
         <translation>Es wurden keine neuen Dateien gefunden.</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1026"/>
+        <location filename="../Project/Project.py" line="1038"/>
         <source>Read project session</source>
         <translation>Projektsitzung lesen</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1251"/>
+        <location filename="../Project/Project.py" line="1263"/>
         <source>Please save the project first.</source>
         <translation>Bitte speichern Sie zuerst das Projekt.</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1062"/>
+        <location filename="../Project/Project.py" line="1074"/>
         <source>Save project session</source>
         <translation>Projektsitzung speichern</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4101"/>
+        <location filename="../Project/Project.py" line="4136"/>
         <source>Load session</source>
         <translation>Sitzung laden</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4105"/>
+        <location filename="../Project/Project.py" line="4140"/>
         <source>Load the projects session file.</source>
         <translation>Laden der Projektsitzung.</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4119"/>
+        <location filename="../Project/Project.py" line="4154"/>
         <source>Save session</source>
         <translation>Sitzung speichern</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4123"/>
+        <location filename="../Project/Project.py" line="4158"/>
         <source>Save the projects session file.</source>
         <translation>Speichern der Projektsitzung.</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4106"/>
+        <location filename="../Project/Project.py" line="4141"/>
         <source>&lt;b&gt;Load session&lt;/b&gt;&lt;p&gt;This loads the projects session file. The session consists of the following data.&lt;br&gt;- all open source files&lt;br&gt;- all breakpoint&lt;br&gt;- the commandline arguments&lt;br&gt;- the working directory&lt;br&gt;- the exception reporting flag&lt;/p&gt;</source>
         <translation>&lt;b&gt;Sitzung laden&lt;/b&gt;&lt;p&gt;Dies lädt eine Projektsitzungsdatei. Die Sitzung enthält die folgenden Daten.&lt;br&gt;- alle offenen Quelltextdateien&lt;br&gt;- alle Haltepunkte&lt;br&gt;- die Kommandozeilenparameter&lt;br&gt;- das Arbeitsverzeichnis&lt;br&gt;- das Ausnahmemeldungsflag&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4124"/>
+        <location filename="../Project/Project.py" line="4159"/>
         <source>&lt;b&gt;Save session&lt;/b&gt;&lt;p&gt;This saves the projects session file. The session consists of the following data.&lt;br&gt;- all open source files&lt;br&gt;- all breakpoint&lt;br&gt;- the commandline arguments&lt;br&gt;- the working directory&lt;br&gt;- the exception reporting flag&lt;/p&gt;</source>
         <translation>&lt;b&gt;Sitzung speichern&lt;/b&gt;&lt;p&gt;Dies speichert eine Projektsitzungsdatei. Die Sitzung enthält die folgenden Daten.&lt;br&gt;- alle offenen Quelltextdateien&lt;br&gt;- alle Haltepunkte&lt;br&gt;- die Kommandozeilenparameter&lt;br&gt;- das Arbeitsverzeichnis&lt;br&gt;- das Ausnahmemeldungsflag&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4340"/>
+        <location filename="../Project/Project.py" line="4375"/>
         <source>Source &amp;Documentation</source>
         <translation>&amp;Quelltextdokumentation</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4335"/>
+        <location filename="../Project/Project.py" line="4370"/>
         <source>Chec&amp;k</source>
         <translation>&amp;Prüfen</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4151"/>
+        <location filename="../Project/Project.py" line="4186"/>
         <source>Code Metrics</source>
         <translation>Quelltextmetriken</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4151"/>
+        <location filename="../Project/Project.py" line="4186"/>
         <source>&amp;Code Metrics...</source>
         <translation>&amp;Quelltextmetriken...</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4155"/>
+        <location filename="../Project/Project.py" line="4190"/>
         <source>Show some code metrics for the project.</source>
         <translation>Zeige einige Quelltextmetriken für das Projekt.</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4157"/>
+        <location filename="../Project/Project.py" line="4192"/>
         <source>&lt;b&gt;Code Metrics...&lt;/b&gt;&lt;p&gt;This shows some code metrics for all Python files in the project.&lt;/p&gt;</source>
         <translation>&lt;b&gt;Quelltextmetriken...&lt;/b&gt;&lt;p&gt;Dies zeigt einige Quelltextmetriken für alle Python-Dateien des Projektes.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4165"/>
+        <location filename="../Project/Project.py" line="4200"/>
         <source>Python Code Coverage</source>
         <translation>Python-Quelltext-Abdeckung</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4165"/>
-        <source>Code Co&amp;verage...</source>
-        <translation>&amp;Quelltext Abdeckung...</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4169"/>
-        <source>Show code coverage information for the project.</source>
-        <translation>Zeige die Quelltextabdeckung für das Projekt.</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4171"/>
-        <source>&lt;b&gt;Code Coverage...&lt;/b&gt;&lt;p&gt;This shows the code coverage information for all Python files in the project.&lt;/p&gt;</source>
-        <translation>&lt;b&gt;Quelltext Abdeckung...&lt;/b&gt;&lt;p&gt;Dies zeigt die Quelltextabdeckung für alle Python-Dateien des Projektes an.&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="5053"/>
-        <source>Profile Data</source>
-        <translation>Profildaten</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4179"/>
-        <source>&amp;Profile Data...</source>
-        <translation>&amp;Profildaten...</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4183"/>
-        <source>Show profiling data for the project.</source>
-        <translation>Zeige Profildaten des aktuellen Projektes.</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4185"/>
-        <source>&lt;b&gt;Profile Data...&lt;/b&gt;&lt;p&gt;This shows the profiling data for the project.&lt;/p&gt;</source>
-        <translation>&lt;b&gt;Profildaten...&lt;/b&gt;&lt;p&gt;Dies zeigt die Profildaten des Projektes.&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4337"/>
-        <source>Sho&amp;w</source>
-        <translation>&amp;Zeige</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="5030"/>
-        <source>There is no main script defined for the current project. Aborting</source>
-        <translation>Für das aktuelle Projekt ist kein Hauptskript festgelegt. Abbruch</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4980"/>
-        <source>Coverage Data</source>
-        <translation>Quelltext Abdeckungsdaten</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4331"/>
-        <source>&amp;Version Control</source>
-        <translation>&amp;Versionskontrolle</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="5107"/>
-        <source>Application Diagram</source>
-        <translation>Applikations-Diagramm</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4194"/>
-        <source>&amp;Application Diagram...</source>
-        <translation>&amp;Applikations-Diagramm...</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4198"/>
-        <source>Show a diagram of the project.</source>
-        <translation>Zeigt ein Diagramm des Projektes.</translation>
-    </message>
-    <message>
         <location filename="../Project/Project.py" line="4200"/>
+        <source>Code Co&amp;verage...</source>
+        <translation>&amp;Quelltext Abdeckung...</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4204"/>
+        <source>Show code coverage information for the project.</source>
+        <translation>Zeige die Quelltextabdeckung für das Projekt.</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4206"/>
+        <source>&lt;b&gt;Code Coverage...&lt;/b&gt;&lt;p&gt;This shows the code coverage information for all Python files in the project.&lt;/p&gt;</source>
+        <translation>&lt;b&gt;Quelltext Abdeckung...&lt;/b&gt;&lt;p&gt;Dies zeigt die Quelltextabdeckung für alle Python-Dateien des Projektes an.&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="5088"/>
+        <source>Profile Data</source>
+        <translation>Profildaten</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4214"/>
+        <source>&amp;Profile Data...</source>
+        <translation>&amp;Profildaten...</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4218"/>
+        <source>Show profiling data for the project.</source>
+        <translation>Zeige Profildaten des aktuellen Projektes.</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4220"/>
+        <source>&lt;b&gt;Profile Data...&lt;/b&gt;&lt;p&gt;This shows the profiling data for the project.&lt;/p&gt;</source>
+        <translation>&lt;b&gt;Profildaten...&lt;/b&gt;&lt;p&gt;Dies zeigt die Profildaten des Projektes.&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4372"/>
+        <source>Sho&amp;w</source>
+        <translation>&amp;Zeige</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="5065"/>
+        <source>There is no main script defined for the current project. Aborting</source>
+        <translation>Für das aktuelle Projekt ist kein Hauptskript festgelegt. Abbruch</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="5015"/>
+        <source>Coverage Data</source>
+        <translation>Quelltext Abdeckungsdaten</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4366"/>
+        <source>&amp;Version Control</source>
+        <translation>&amp;Versionskontrolle</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="5142"/>
+        <source>Application Diagram</source>
+        <translation>Applikations-Diagramm</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4229"/>
+        <source>&amp;Application Diagram...</source>
+        <translation>&amp;Applikations-Diagramm...</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4233"/>
+        <source>Show a diagram of the project.</source>
+        <translation>Zeigt ein Diagramm des Projektes.</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4235"/>
         <source>&lt;b&gt;Application Diagram...&lt;/b&gt;&lt;p&gt;This shows a diagram of the project.&lt;/p&gt;</source>
         <translation>&lt;b&gt;Applikations-Diagramm...&lt;/b&gt;&lt;p&gt;Dies zeigt ein Diagramm des Projektes.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4338"/>
+        <location filename="../Project/Project.py" line="4373"/>
         <source>&amp;Diagrams</source>
         <translation>&amp;Diagramme</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="908"/>
+        <location filename="../Project/Project.py" line="920"/>
         <source>Save project file</source>
         <translation>Projektdatei speichern</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5003"/>
+        <location filename="../Project/Project.py" line="5038"/>
         <source>Code Coverage</source>
         <translation>Quelltext Abdeckung</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5003"/>
+        <location filename="../Project/Project.py" line="5038"/>
         <source>Please select a coverage file</source>
         <translation>Bitte wählen Sie eine Datei mit Abdeckungsdaten</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5053"/>
+        <location filename="../Project/Project.py" line="5088"/>
         <source>Please select a profile file</source>
         <translation>Bitte wählen Sie eine Datei mit Profildaten</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3913"/>
+        <location filename="../Project/Project.py" line="3948"/>
         <source>Add directory to project</source>
         <translation>Verzeichnis zum Projekt hinzufügen</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3913"/>
+        <location filename="../Project/Project.py" line="3948"/>
         <source>Add directory...</source>
         <translation>Verzeichnis hinzufügen...</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3918"/>
+        <location filename="../Project/Project.py" line="3953"/>
         <source>Add a directory to the current project</source>
         <translation>Füge den Inhalt eines Verzeichnisses zum Projekt hinzu</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3920"/>
+        <location filename="../Project/Project.py" line="3955"/>
         <source>&lt;b&gt;Add directory...&lt;/b&gt;&lt;p&gt;This opens a dialog for adding a directory to the current project.&lt;/p&gt;</source>
         <translation>&lt;b&gt;Verzeichnis hinzufügen&lt;/b&gt;&lt;p&gt;Dies öffnet einen Dialog, mit dem ein Verzeichnis bzw. der Inhalt eines Verzeichnisses zum aktuellen Projekt hinzugefügt werden kann.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1964"/>
+        <location filename="../Project/Project.py" line="1976"/>
         <source>Rename file</source>
         <translation>Datei umbenennen</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1988"/>
+        <location filename="../Project/Project.py" line="2000"/>
         <source>Rename File</source>
         <translation>Datei umbenennen</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="2544"/>
+        <location filename="../Project/Project.py" line="2561"/>
         <source>Shall the project file be added to the repository?</source>
         <translation>Soll die Projektdatei zum Repository hinzugefügt werden?</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="2965"/>
+        <location filename="../Project/Project.py" line="2982"/>
         <source>New Project</source>
         <translation>Neues Projekt</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="2474"/>
+        <location filename="../Project/Project.py" line="2491"/>
         <source>Add existing files to the project?</source>
         <translation>Existierende Dateien dem Projekt hinzufügen?</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="2601"/>
+        <location filename="../Project/Project.py" line="2618"/>
         <source>Would you like to edit the VCS command options?</source>
         <translation>Möchten Sie die VCS-Befehlsoptionen bearbeiten?</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="2573"/>
+        <location filename="../Project/Project.py" line="2590"/>
         <source>Select version control system for the project</source>
         <translation>Wähle das Versionskontrollsystem für das Projekt</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="805"/>
+        <location filename="../Project/Project.py" line="817"/>
         <source>&lt;p&gt;The project file &lt;b&gt;{0}&lt;/b&gt; could not be read.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Die Projektdatei &lt;b&gt;{0}&lt;/b&gt; konnte nicht gelesen werden.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="908"/>
+        <location filename="../Project/Project.py" line="920"/>
         <source>&lt;p&gt;The project file &lt;b&gt;{0}&lt;/b&gt; could not be written.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Die Projektdatei &lt;b&gt;{0}&lt;/b&gt; konnte nicht geschrieben werden.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1026"/>
+        <location filename="../Project/Project.py" line="1038"/>
         <source>&lt;p&gt;The project session file &lt;b&gt;{0}&lt;/b&gt; could not be read.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Die Projektsitzungsdatei &lt;b&gt;{0}&lt;/b&gt; konnte nicht gelesen werden.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1062"/>
+        <location filename="../Project/Project.py" line="1074"/>
         <source>&lt;p&gt;The project session file &lt;b&gt;{0}&lt;/b&gt; could not be written.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Die Projektsitzungsdatei &lt;b&gt;{0}&lt;/b&gt; konnte nicht gespeichert werden.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3130"/>
+        <location filename="../Project/Project.py" line="3147"/>
         <source>&lt;p&gt;The file &lt;b&gt;{0}&lt;/b&gt; already exists. Overwrite it?&lt;/p&gt;</source>
         <translation>&lt;p&gt;Die Datei &lt;b&gt;{0}&lt;/b&gt; existiert bereits. Überschreiben?&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="2358"/>
+        <location filename="../Project/Project.py" line="2375"/>
         <source>&lt;p&gt;The project directory &lt;b&gt;{0}&lt;/b&gt; could not be created.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Das Projektverzeichnis &lt;b&gt;{0}&lt;/b&gt; konnte nicht erstellt werden.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1091"/>
+        <location filename="../Project/Project.py" line="1103"/>
         <source>Delete project session</source>
         <translation>Projektsitzung löschen</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1091"/>
+        <location filename="../Project/Project.py" line="1103"/>
         <source>&lt;p&gt;The project session file &lt;b&gt;{0}&lt;/b&gt; could not be deleted.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Die Projektsitzungsdatei &lt;b&gt;{0}&lt;/b&gt; konnte nicht gelöscht werden.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4137"/>
+        <location filename="../Project/Project.py" line="4172"/>
         <source>Delete session</source>
         <translation>Sitzung löschen</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4141"/>
+        <location filename="../Project/Project.py" line="4176"/>
         <source>Delete the projects session file.</source>
         <translation>Löscht die Projektsitzungsdatei.</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4142"/>
+        <location filename="../Project/Project.py" line="4177"/>
         <source>&lt;b&gt;Delete session&lt;/b&gt;&lt;p&gt;This deletes the projects session file&lt;/p&gt;</source>
         <translation>&lt;b&gt;Sitzung löschen&lt;/b&gt;&lt;p&gt;Dies löscht die Sitzungsdatei des Projektes.&lt;/p&gt;</translation>
     </message>
@@ -50331,287 +50576,287 @@
         <translation>Sonstige</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5107"/>
+        <location filename="../Project/Project.py" line="5142"/>
         <source>Include module names?</source>
         <translation>Modulnamen anzeigen?</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="2263"/>
+        <location filename="../Project/Project.py" line="2280"/>
         <source>Delete directory</source>
         <translation>Verzeichnis löschen</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1125"/>
+        <location filename="../Project/Project.py" line="1137"/>
         <source>Read tasks</source>
         <translation>Aufgaben lesen</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1125"/>
+        <location filename="../Project/Project.py" line="1137"/>
         <source>&lt;p&gt;The tasks file &lt;b&gt;{0}&lt;/b&gt; could not be read.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Die Aufgabendatei &lt;b&gt;{0}&lt;/b&gt; konnte nicht gelesen werden.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1145"/>
+        <location filename="../Project/Project.py" line="1157"/>
         <source>Save tasks</source>
         <translation>Aufgaben speichern</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1145"/>
+        <location filename="../Project/Project.py" line="1157"/>
         <source>&lt;p&gt;The tasks file &lt;b&gt;{0}&lt;/b&gt; could not be written.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Die Aufgabendatei &lt;b&gt;{0}&lt;/b&gt; konnte nicht geschrieben werden.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1204"/>
+        <location filename="../Project/Project.py" line="1216"/>
         <source>Read debugger properties</source>
         <translation>Debugger-Eigenschaften lesen</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1204"/>
+        <location filename="../Project/Project.py" line="1216"/>
         <source>&lt;p&gt;The project debugger properties file &lt;b&gt;{0}&lt;/b&gt; could not be read.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Die Datei mit den projektspezifischen Debugger-Eigenschaften &lt;b&gt;{0}&lt;/b&gt; konnte nicht gelesen werden.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1239"/>
+        <location filename="../Project/Project.py" line="1251"/>
         <source>Save debugger properties</source>
         <translation>Debugger-Eigenschaften speichern</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1239"/>
+        <location filename="../Project/Project.py" line="1251"/>
         <source>&lt;p&gt;The project debugger properties file &lt;b&gt;{0}&lt;/b&gt; could not be written.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Die Datei mit den projektspezifischen Debugger-Eigenschaften &lt;b&gt;{0}&lt;/b&gt; konnte nicht gespeichert werden.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1265"/>
+        <location filename="../Project/Project.py" line="1277"/>
         <source>Delete debugger properties</source>
         <translation>Debugger-Eigenschaften löschen</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1265"/>
+        <location filename="../Project/Project.py" line="1277"/>
         <source>&lt;p&gt;The project debugger properties file &lt;b&gt;{0}&lt;/b&gt; could not be deleted.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Die Datei mit den projektspezifischen Debugger-Eigenschaften &lt;b&gt;{0}&lt;/b&gt; konnte nicht gelöscht werden.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4037"/>
+        <location filename="../Project/Project.py" line="4072"/>
         <source>Debugger Properties</source>
         <translation>Debugger-Eigenschaften</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4037"/>
+        <location filename="../Project/Project.py" line="4072"/>
         <source>Debugger &amp;Properties...</source>
         <translation>Debugger-&amp;Eigenschaften...</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4041"/>
+        <location filename="../Project/Project.py" line="4076"/>
         <source>Show the debugger properties</source>
         <translation>Debugger-Eigenschaften anzeigen</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4042"/>
+        <location filename="../Project/Project.py" line="4077"/>
         <source>&lt;b&gt;Debugger Properties...&lt;/b&gt;&lt;p&gt;This shows a dialog to edit project specific debugger settings.&lt;/p&gt;</source>
         <translation>&lt;b&gt;Debugger-Eigenschaften...&lt;/b&gt;&lt;p&gt;Dies zeigt einen Dialog an, um die projektspezifischen Debugger-Einstellungen zu bearbeiten.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4050"/>
+        <location filename="../Project/Project.py" line="4085"/>
         <source>Load</source>
         <translation>Laden</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4050"/>
+        <location filename="../Project/Project.py" line="4085"/>
         <source>&amp;Load</source>
         <translation>&amp;Laden</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4054"/>
+        <location filename="../Project/Project.py" line="4089"/>
         <source>Load the debugger properties</source>
         <translation>Debugger-Eigenschaften laden</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4062"/>
+        <location filename="../Project/Project.py" line="4097"/>
         <source>Save</source>
         <translation>Speichern</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4066"/>
+        <location filename="../Project/Project.py" line="4101"/>
         <source>Save the debugger properties</source>
         <translation>Debugger-Eigenschaften speichern</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4074"/>
+        <location filename="../Project/Project.py" line="4109"/>
         <source>Delete</source>
         <translation>Löschen</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4074"/>
+        <location filename="../Project/Project.py" line="4109"/>
         <source>&amp;Delete</source>
         <translation>&amp;Löschen</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4078"/>
+        <location filename="../Project/Project.py" line="4113"/>
         <source>Delete the debugger properties</source>
         <translation>Debugger-Eigenschaften löschen</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4087"/>
+        <location filename="../Project/Project.py" line="4122"/>
         <source>Reset</source>
         <translation>Zurücksetzen</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4087"/>
+        <location filename="../Project/Project.py" line="4122"/>
         <source>&amp;Reset</source>
         <translation>&amp;Zurücksetzen</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4091"/>
+        <location filename="../Project/Project.py" line="4126"/>
         <source>Reset the debugger properties</source>
         <translation>Debugger-Eigenschaften zurücksetzen</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4328"/>
+        <location filename="../Project/Project.py" line="4363"/>
         <source>Debugger</source>
         <translation>Debugger</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4327"/>
+        <location filename="../Project/Project.py" line="4362"/>
         <source>Session</source>
         <translation>Sitzung</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4055"/>
+        <location filename="../Project/Project.py" line="4090"/>
         <source>&lt;b&gt;Load Debugger Properties&lt;/b&gt;&lt;p&gt;This loads the project specific debugger settings.&lt;/p&gt;</source>
         <translation>&lt;b&gt;Debugger-Eigenschaften laden&lt;/b&gt;&lt;p&gt;Dies lädt die projektspezifischen Debugger-Einstellungen.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4067"/>
+        <location filename="../Project/Project.py" line="4102"/>
         <source>&lt;b&gt;Save Debugger Properties&lt;/b&gt;&lt;p&gt;This saves the project specific debugger settings.&lt;/p&gt;</source>
         <translation>&lt;b&gt;Debugger-Eigenschaften speichern&lt;/b&gt;&lt;p&gt;Dies speichert die projektspezifischen Debugger-Einstellungen.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4079"/>
+        <location filename="../Project/Project.py" line="4114"/>
         <source>&lt;b&gt;Delete Debugger Properties&lt;/b&gt;&lt;p&gt;This deletes the file containing the project specific debugger settings.&lt;/p&gt;</source>
         <translation>&lt;b&gt;Debugger-Eigenschaften löschen&lt;/b&gt;&lt;p&gt;Dies löscht die Datei mit den projektspezifischen Debugger-Einstellungen.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4092"/>
+        <location filename="../Project/Project.py" line="4127"/>
         <source>&lt;b&gt;Reset Debugger Properties&lt;/b&gt;&lt;p&gt;This resets the project specific debugger settings.&lt;/p&gt;</source>
         <translation>&lt;b&gt;Debugger-Eigenschaften zurücksetzen&lt;/b&gt;&lt;p&gt;Dies setzt die projektspezifischen Debugger-Einstellungen zurück.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4001"/>
+        <location filename="../Project/Project.py" line="4036"/>
         <source>Filetype Associations</source>
         <translation>Dateitypzuordnungen</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4001"/>
+        <location filename="../Project/Project.py" line="4036"/>
         <source>Filetype Associations...</source>
         <translation>Dateitypzuordnungen...</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4005"/>
+        <location filename="../Project/Project.py" line="4040"/>
         <source>Show the project filetype associations</source>
         <translation>Zeigt die Dateitypzuordnungen des Projektes</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4339"/>
+        <location filename="../Project/Project.py" line="4374"/>
         <source>Pac&amp;kagers</source>
         <translation>Pa&amp;ketierer</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3897"/>
+        <location filename="../Project/Project.py" line="3932"/>
         <source>Add files to project</source>
         <translation>Dateien zum Projekt hinzufügen</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3897"/>
+        <location filename="../Project/Project.py" line="3932"/>
         <source>Add &amp;files...</source>
         <translation>&amp;Dateien hinzufügen...</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3902"/>
+        <location filename="../Project/Project.py" line="3937"/>
         <source>Add files to the current project</source>
         <translation>Fügt Dateien zum aktuellen Projekt hinzu</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3904"/>
+        <location filename="../Project/Project.py" line="3939"/>
         <source>&lt;b&gt;Add files...&lt;/b&gt;&lt;p&gt;This opens a dialog for adding files to the current project. The place to add is determined by the file extension.&lt;/p&gt;</source>
         <translation>&lt;b&gt;Dateien hinzufügen...&lt;/b&gt;&lt;p&gt;Dies öffnet einen Dialog, mit dem Dateien zum aktuellen Projekt hinzugefügt werden kann. Der Ort, an dem sie eingefügt werden, wird durch die Dateinamenerweiterung bestimmt.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1988"/>
+        <location filename="../Project/Project.py" line="2000"/>
         <source>&lt;p&gt;The file &lt;b&gt;{0}&lt;/b&gt; could not be renamed.&lt;br /&gt;Reason: {1}&lt;/p&gt;</source>
         <translation>&lt;p&gt;Die Datei &lt;b&gt;{0}&lt;/b&gt; konnte nicht umbenannt werden.&lt;br /&gt;Ursache: {1}&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3115"/>
+        <location filename="../Project/Project.py" line="3132"/>
         <source>Project Files (*.e4p)</source>
         <translation>Projektdateien (*.e4p)</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4325"/>
+        <location filename="../Project/Project.py" line="4360"/>
         <source>&amp;Project</source>
         <translation>&amp;Projekt</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4465"/>
+        <location filename="../Project/Project.py" line="4500"/>
         <source>Project</source>
         <translation>Projekt</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4531"/>
+        <location filename="../Project/Project.py" line="4566"/>
         <source>&amp;Clear</source>
         <translation>&amp;Löschen</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1748"/>
+        <location filename="../Project/Project.py" line="1760"/>
         <source>&lt;p&gt;The file &lt;b&gt;{0}&lt;/b&gt; already exists.&lt;/p&gt;&lt;p&gt;Overwrite it?&lt;/p&gt;</source>
         <translation>&lt;p&gt;Die Datei &lt;b&gt;{0}&lt;/b&gt; existiert bereits. Überschreiben?&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="944"/>
+        <location filename="../Project/Project.py" line="956"/>
         <source>Read user project properties</source>
         <translation>Nutzer bezogene Projektdaten lesen</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="944"/>
+        <location filename="../Project/Project.py" line="956"/>
         <source>&lt;p&gt;The user specific project properties file &lt;b&gt;{0}&lt;/b&gt; could not be read.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Die Datei mit den Nutzer bezogenen Projektdaten &lt;b&gt;{0}&lt;/b&gt; konnte nicht gelesen werden.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="968"/>
+        <location filename="../Project/Project.py" line="980"/>
         <source>Save user project properties</source>
         <translation>Nutzer bezogene Projektdaten sichern</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="968"/>
+        <location filename="../Project/Project.py" line="980"/>
         <source>&lt;p&gt;The user specific project properties file &lt;b&gt;{0}&lt;/b&gt; could not be written.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Die Datei mit den Nutzer bezogenen Projektdaten &lt;b&gt;{0}&lt;/b&gt; konnte nicht geschrieben werden.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3986"/>
+        <location filename="../Project/Project.py" line="4021"/>
         <source>User project properties</source>
         <translation>Nutzer bezogene Projektdaten</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3986"/>
+        <location filename="../Project/Project.py" line="4021"/>
         <source>&amp;User Properties...</source>
         <translation>&amp;Nutzer bezogene Projektdaten...</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3991"/>
+        <location filename="../Project/Project.py" line="4026"/>
         <source>Show the user specific project properties</source>
         <translation>Zeigt die Nutzer bezogenen Projektdaten an</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3993"/>
+        <location filename="../Project/Project.py" line="4028"/>
         <source>&lt;b&gt;User Properties...&lt;/b&gt;&lt;p&gt;This shows a dialog to edit the user specific project properties.&lt;/p&gt;</source>
         <translation>&lt;b&gt;Nutzer bezogene Projektdaten...&lt;/b&gt;&lt;p&gt;Dies zeigt einen Dialog an, um Nutzer bezogene Projektdaten zu bearbeiten.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3343"/>
+        <location filename="../Project/Project.py" line="3360"/>
         <source>Syntax errors detected</source>
         <translation>Syntaxfehler gefunden</translation>
     </message>
     <message numerus="yes">
-        <location filename="../Project/Project.py" line="3343"/>
+        <location filename="../Project/Project.py" line="3360"/>
         <source>The project contains %n file(s) with syntax errors.</source>
         <translation>
             <numerusform>Das Projekt beinhaltet eine Datei mit Syntaxfehlern.</numerusform>
@@ -50619,47 +50864,47 @@
         </translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5300"/>
+        <location filename="../Project/Project.py" line="5335"/>
         <source>Create Package List</source>
         <translation>Erzeuge Paketliste</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4223"/>
+        <location filename="../Project/Project.py" line="4258"/>
         <source>Create &amp;Package List</source>
         <translation>Erzeuge &amp;Paketliste</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5574"/>
+        <location filename="../Project/Project.py" line="5609"/>
         <source>Create Plugin Archive</source>
         <translation>Erzeuge Plugin Archiv</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5251"/>
+        <location filename="../Project/Project.py" line="5286"/>
         <source>&lt;p&gt;The file &lt;b&gt;PKGLIST&lt;/b&gt; already exists.&lt;/p&gt;&lt;p&gt;Overwrite it?&lt;/p&gt;</source>
         <translation>&lt;p&gt;Die Datei &lt;b&gt;PKGLIST&lt;/b&gt; existiert bereits.&lt;/p&gt;&lt;p&gt;Überschreiben?&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5300"/>
+        <location filename="../Project/Project.py" line="5335"/>
         <source>&lt;p&gt;The file &lt;b&gt;PKGLIST&lt;/b&gt; could not be created.&lt;/p&gt;&lt;p&gt;Reason: {0}&lt;/p&gt;</source>
         <translation>&lt;p&gt;Die Datei &lt;b&gt;PKGLIST&lt;/b&gt; konnte nicht erzeugt werden.&lt;/p&gt;&lt;p&gt;Ursache: {0}&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5319"/>
+        <location filename="../Project/Project.py" line="5354"/>
         <source>The project does not have a main script defined. Aborting...</source>
         <translation>Für das Projekt wurde kein Hauptskript angegeben. Abbruch...</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1715"/>
+        <location filename="../Project/Project.py" line="1727"/>
         <source>&lt;p&gt;The source directory doesn&apos;t contain any files belonging to the selected category.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Das Quellverzeichnis enthält keine Dateien, die zur gewählten Kategorie gehören.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="2965"/>
+        <location filename="../Project/Project.py" line="2982"/>
         <source>Select Version Control System</source>
         <translation>Versionskontrollsystem auswählen</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="2580"/>
+        <location filename="../Project/Project.py" line="2597"/>
         <source>None</source>
         <translation>Keines</translation>
     </message>
@@ -50669,52 +50914,52 @@
         <translation>Projekttyp Registrierung</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5460"/>
+        <location filename="../Project/Project.py" line="5495"/>
         <source>&lt;p&gt;The file &lt;b&gt;{0}&lt;/b&gt; could not be stored in the archive. Ignoring it.&lt;/p&gt;&lt;p&gt;Reason: {1}&lt;/p&gt;</source>
         <translation>&lt;p&gt;Die Datei &lt;b&gt;{0}&lt;/b&gt; konnte nicht im Archiv gespeichert werde. Sie wird ignoriert.&lt;/p&gt;&lt;p&gt;Ursache: {1}&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5533"/>
+        <location filename="../Project/Project.py" line="5568"/>
         <source>&lt;p&gt;The plugin file &lt;b&gt;{0}&lt;/b&gt; could not be read.&lt;/p&gt;&lt;p&gt;Reason: {1}&lt;/p&gt;</source>
         <translation>&lt;p&gt;Die Plugindatei &lt;b&gt;{0}&lt;/b&gt; konnte nicht gelesen werden.&lt;br&gt;Grund: {1}&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1393"/>
+        <location filename="../Project/Project.py" line="1405"/>
         <source>You have to specify a translation pattern first.</source>
         <translation>Sie müssen zuerst ein Übersetzungsmuster festlegen.</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="2684"/>
+        <location filename="../Project/Project.py" line="2701"/>
         <source>Translation Pattern</source>
         <translation>Übersetzungsmuster</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="2684"/>
+        <location filename="../Project/Project.py" line="2701"/>
         <source>Enter the path pattern for translation files (use &apos;%language%&apos; in place of the language code):</source>
         <translation>Gib das Pfadmuster für Übersetzungsdateien ein (benutze „%language%“ anstelle des Sprachcodes):</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4850"/>
+        <location filename="../Project/Project.py" line="4885"/>
         <source>&lt;p&gt;The selected VCS &lt;b&gt;{0}&lt;/b&gt; could not be found.&lt;br/&gt;Disabling version control.&lt;/p&gt;&lt;p&gt;{1}&lt;/p&gt;</source>
         <translation>&lt;p&gt;Das ausgewählte Versionskontrollsystem &lt;b&gt;{0}&lt;/b&gt; konnte nicht gefunden werden.&lt;br/&gt;Versionskontrolle nicht möglich.&lt;/p&gt;&lt;p&gt;{1}&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4019"/>
+        <location filename="../Project/Project.py" line="4054"/>
         <source>Lexer Associations</source>
         <translation>Lexerzuordnungen</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4019"/>
+        <location filename="../Project/Project.py" line="4054"/>
         <source>Lexer Associations...</source>
         <translation>Lexerzuordnungen...</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4023"/>
+        <location filename="../Project/Project.py" line="4058"/>
         <source>Show the project lexer associations (overriding defaults)</source>
         <translation>Zeigt die projektspezifischen Lexerzuordnungen</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4025"/>
+        <location filename="../Project/Project.py" line="4060"/>
         <source>&lt;b&gt;Lexer Associations...&lt;/b&gt;&lt;p&gt;This shows a dialog to edit the lexer associations of the project. These associations override the global lexer associations. Lexers are used to highlight the editor text.&lt;/p&gt;</source>
         <translation>&lt;b&gt;Lexerzuordnungen&lt;/b&gt;&lt;p&gt;Dies öffnet einen Dialog, um die projektspezifischen Lexerzuordnungen zu bearbeiten. Diese Zuordnungen überschreiben die globalen Lexerzuordnungen. Lexer werden verwendet, um den Editortext einzufärben.&lt;/p&gt;</translation>
     </message>
@@ -50734,12 +50979,12 @@
         <translation>Python 3-Dateien (*.py *.py3);;Python 3-GUI-Dateien (*.pyw *.pyw3);;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1671"/>
+        <location filename="../Project/Project.py" line="1683"/>
         <source>&lt;p&gt;The selected file &lt;b&gt;{0}&lt;/b&gt; could not be added to &lt;b&gt;{1}&lt;/b&gt;.&lt;/p&gt;&lt;p&gt;Reason: {2}&lt;/p&gt;</source>
         <translation>&lt;p&gt;Die ausgewählte Datei &lt;b&gt;{0}&lt;/b&gt; konnte nicht zu &lt;b&gt;{1}&lt;/b&gt; hinzugefügt werden.&lt;/p&gt;&lt;p&gt;Ursache: {2}&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1730"/>
+        <location filename="../Project/Project.py" line="1742"/>
         <source>&lt;p&gt;The target directory &lt;b&gt;{0}&lt;/b&gt; could not be created.&lt;/p&gt;&lt;p&gt;Reason: {1}&lt;/p&gt;</source>
         <translation>&lt;p&gt;Das Zielverzeichnis &lt;b&gt;{0}&lt;/b&gt; konnte nicht erstellt werden.&lt;/p&gt;&lt;p&gt;Ursache: {1}&lt;/p&gt;</translation>
     </message>
@@ -50749,32 +50994,32 @@
         <translation>Python 2-Dateien (*.py2);;Python 2-GUI-Dateien (*.pyw2);;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="2441"/>
+        <location filename="../Project/Project.py" line="2458"/>
         <source>Create main script</source>
         <translation>Hauptskript erzeugen</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="2441"/>
+        <location filename="../Project/Project.py" line="2458"/>
         <source>&lt;p&gt;The mainscript &lt;b&gt;{0}&lt;/b&gt; could not be created.&lt;br/&gt;Reason: {1}&lt;/p&gt;</source>
         <translation>&lt;p&gt;Das Hauptskript &lt;b&gt;{0}&lt;/b&gt; konnte nicht erzeugt werden.&lt;br/&gt;Ursache: {1}&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4208"/>
+        <location filename="../Project/Project.py" line="4243"/>
         <source>Load Diagram</source>
         <translation>Diagramm laden</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4208"/>
+        <location filename="../Project/Project.py" line="4243"/>
         <source>&amp;Load Diagram...</source>
         <translation>Diagramm &amp;laden...</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4212"/>
+        <location filename="../Project/Project.py" line="4247"/>
         <source>Load a diagram from file.</source>
         <translation>Lade ein Diagramm aus einer Datei.</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4214"/>
+        <location filename="../Project/Project.py" line="4249"/>
         <source>&lt;b&gt;Load Diagram...&lt;/b&gt;&lt;p&gt;This loads a diagram from file.&lt;/p&gt;</source>
         <translation>&lt;b&gt;Diagramm laden...&lt;/b&gt;&lt;p&gt;Dies lädt ein Diagramm aus einer Datei.&lt;/p&gt;</translation>
     </message>
@@ -50804,27 +51049,27 @@
         <translation>PyQt5 Kommandozeile</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4839"/>
+        <location filename="../Project/Project.py" line="4874"/>
         <source>&lt;p&gt;The selected VCS &lt;b&gt;{0}&lt;/b&gt; could not be found. &lt;br/&gt;Reverting override.&lt;/p&gt;&lt;p&gt;{1}&lt;/p&gt;</source>
         <translation>&lt;p&gt;Das ausgewählte Versionskontrollsystem &lt;b&gt;{0}&lt;/b&gt; konnte nicht gefunden werden.&lt;br/&gt;Ignoriere Übersteuerung.&lt;/p&gt;&lt;p&gt;{1}&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5574"/>
+        <location filename="../Project/Project.py" line="5609"/>
         <source>&lt;p&gt;The plugin file &lt;b&gt;{0}&lt;/b&gt; could not be read.&lt;/p&gt; &lt;p&gt;Reason: {1}&lt;/p&gt;</source>
         <translation>&lt;p&gt;Die Plugindatei &lt;b&gt;{0}&lt;/b&gt; konnte nicht gelesen werden.&lt;br&gt;Ursache: {1}&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4228"/>
+        <location filename="../Project/Project.py" line="4263"/>
         <source>Create an initial PKGLIST file for an eric6 plugin.</source>
         <translation>Erzeugt eine erste PKGLIST-Datei für ein eric6-Plugin.</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4230"/>
+        <location filename="../Project/Project.py" line="4265"/>
         <source>&lt;b&gt;Create Package List&lt;/b&gt;&lt;p&gt;This creates an initial list of files to include in an eric6 plugin archive. The list is created from the project file.&lt;/p&gt;</source>
         <translation>&lt;b&gt;Erzeuge Paketliste&lt;/b&gt;&lt;p&gt;Dies erzeugt eine erste Liste von Dateien, die in ein eric6-Pluginarchive einbezogen werden sollen. Die Liste wird aus der Projektdatei erzeugt.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5424"/>
+        <location filename="../Project/Project.py" line="5459"/>
         <source>&lt;p&gt;The eric6 plugin archive file &lt;b&gt;{0}&lt;/b&gt; could not be created.&lt;/p&gt;&lt;p&gt;Reason: {1}&lt;/p&gt;</source>
         <translation>&lt;p&gt;Die eric6 Plugin Archivdatei &lt;b&gt;{0}&lt;/b&gt; konnte nicht erzeugt werden.&lt;/p&gt;&lt;p&gt;Ursache: {1}&lt;/p&gt;</translation>
     </message>
@@ -50834,228 +51079,228 @@
         <translation>Eric6 Plugin</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="2933"/>
+        <location filename="../Project/Project.py" line="2950"/>
         <source>Create project management directory</source>
         <translation>Projektverwaltungsverzeichnis erstellen</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="2933"/>
+        <location filename="../Project/Project.py" line="2950"/>
         <source>&lt;p&gt;The project directory &lt;b&gt;{0}&lt;/b&gt; is not writable.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Das Projektverzeichnis &lt;b&gt;{0}&lt;/b&gt; ist nicht beschreibbar.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3958"/>
+        <location filename="../Project/Project.py" line="3993"/>
         <source>Alt+Ctrl+P</source>
         <comment>Project|Search Project File</comment>
         <translation>Alt+Ctrl+P</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3964"/>
+        <location filename="../Project/Project.py" line="3999"/>
         <source>Search for a file in the project list of files.</source>
         <translation>Suche nach einer Datei in der Liste der Projektdateien.</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3966"/>
+        <location filename="../Project/Project.py" line="4001"/>
         <source>&lt;b&gt;Search Project File&lt;/b&gt;&lt;p&gt;This searches for a file in the project list of files.&lt;/p&gt;</source>
         <translation>&lt;b&gt;Projektdatei suchen&lt;/b&gt;&lt;p&gt;Dies sucht nach einer Datei in der Liste der Projektdateien.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3958"/>
+        <location filename="../Project/Project.py" line="3993"/>
         <source>Search Project File</source>
         <translation>Projektdatei suchen</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3958"/>
+        <location filename="../Project/Project.py" line="3993"/>
         <source>Search Project File...</source>
         <translation>Projektdatei suchen...</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5355"/>
+        <location filename="../Project/Project.py" line="5390"/>
         <source>Create Plugin Archives</source>
         <translation>Erzeuge Plugin Archive</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4239"/>
+        <location filename="../Project/Project.py" line="4274"/>
         <source>Create Plugin &amp;Archives</source>
         <translation>Erzeuge Plugin &amp;Archive</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4244"/>
+        <location filename="../Project/Project.py" line="4279"/>
         <source>Create eric6 plugin archive files.</source>
         <translation>Erzeugt eric6 Plugin Archivdateien.</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4246"/>
+        <location filename="../Project/Project.py" line="4281"/>
         <source>&lt;b&gt;Create Plugin Archives&lt;/b&gt;&lt;p&gt;This creates eric6 plugin archive files using the list of files given in a PKGLIST* file. The archive name is built from the main script name if not designated in the package list file.&lt;/p&gt;</source>
         <translation>&lt;b&gt;Erzeuge Pluginarchive&lt;/b&gt;&lt;p&gt;Dies erzeugt eric6-Pluginarchivdateien mit den Dateien, die in einer PKGLIST*-Datei angegeben wurden. Der Archivname wird aus dem Namen des Hauptskriptes generiert, falls er nicht in der Paketlistendatei angegeben ist.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4256"/>
+        <location filename="../Project/Project.py" line="4291"/>
         <source>Create Plugin Archives (Snapshot)</source>
         <translation>Erzeuge Plugin Archive (Snapshot)</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4256"/>
+        <location filename="../Project/Project.py" line="4291"/>
         <source>Create Plugin Archives (&amp;Snapshot)</source>
         <translation>Erzeuge Plugin Archive (&amp;Snapshot)</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4261"/>
+        <location filename="../Project/Project.py" line="4296"/>
         <source>Create eric6 plugin archive files (snapshot releases).</source>
         <translation>Erzeugt eric6 Plugin Archivdateien (Snapshot Releases).</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4263"/>
+        <location filename="../Project/Project.py" line="4298"/>
         <source>&lt;b&gt;Create Plugin Archives (Snapshot)&lt;/b&gt;&lt;p&gt;This creates eric6 plugin archive files using the list of files given in the PKGLIST* file. The archive name is built from the main script name if not designated in the package list file. The version entry of the main script is modified to reflect a snapshot release.&lt;/p&gt;</source>
         <translation>&lt;b&gt;Erzeuge Pluginarchive (Snapshot)&lt;/b&gt;&lt;p&gt;Dies erzeugt eric6-Pluginarchivdateien mit den Dateien, die in der PKGLIST*-Datei angegeben wurden. Der Archivname wird aus dem Namen des Hauptskriptes generiert, falls er nicht in der Paketlistendatei angegeben ist. Der Versionseintrag des Hauptskriptes wird verändert, um ein Snapshot Release anzuzeigen.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5333"/>
-        <source>Select package lists:</source>
-        <translation>Wähle Paketlisten:</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="5351"/>
-        <source>Creating plugin archives...</source>
-        <translation>Erzeuge Plugin Archive...</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="5351"/>
-        <source>Abort</source>
-        <translation>Abbruch</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="5351"/>
-        <source>%v/%m Archives</source>
-        <translation>%v/%m Archive</translation>
-    </message>
-    <message>
         <location filename="../Project/Project.py" line="5368"/>
+        <source>Select package lists:</source>
+        <translation>Wähle Paketlisten:</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="5386"/>
+        <source>Creating plugin archives...</source>
+        <translation>Erzeuge Plugin Archive...</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="5386"/>
+        <source>Abort</source>
+        <translation>Abbruch</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="5386"/>
+        <source>%v/%m Archives</source>
+        <translation>%v/%m Archive</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="5403"/>
         <source>&lt;p&gt;The file &lt;b&gt;{0}&lt;/b&gt; could not be read.&lt;/p&gt;&lt;p&gt;Reason: {1}&lt;/p&gt;</source>
         <translation>&lt;p&gt;Die Datei &lt;b&gt;{0}&lt;/b&gt; konnte nicht geladen werden.&lt;br/&gt;Grund: {1}&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5479"/>
+        <location filename="../Project/Project.py" line="5514"/>
         <source>&lt;p&gt;The eric6 plugin archive files were created with some errors.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Die eric6 Plugin Archivdateien wurden mit einigen Fehlern erzeugt.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5482"/>
+        <location filename="../Project/Project.py" line="5517"/>
         <source>&lt;p&gt;The eric6 plugin archive files were created successfully.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Die eric6 Plugin Archivdateien wurden erfolgreich erzeugt.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5344"/>
+        <location filename="../Project/Project.py" line="5379"/>
         <source>&lt;p&gt;No package list files (PKGLIST*) available or selected. Aborting...&lt;/p&gt;</source>
         <translation>&lt;p&gt;Keine Paketlistendateien (PKGLIST*) verfügbar oder ausgewählt. Abbruch...&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5396"/>
+        <location filename="../Project/Project.py" line="5431"/>
         <source>&lt;p&gt;The file &lt;b&gt;{0}&lt;/b&gt; is not ready yet.&lt;/p&gt;&lt;p&gt;Please rework it and delete the&apos;; initial_list&apos; line of the header.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Die Datei &lt;b&gt;{0}&lt;/b&gt; ist noch nicht bereit.&lt;/p&gt;&lt;p&gt;Bitte überarbeite sie und löschen die Zeile &apos;; initial_list&apos; des Dateikopfes.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3949"/>
+        <location filename="../Project/Project.py" line="3984"/>
         <source>&lt;b&gt;Search new files...&lt;/b&gt;&lt;p&gt;This searches for new files (sources, *.ui, *.idl, *.proto) in the project directory and registered subdirectories.&lt;/p&gt;</source>
         <translation>&lt;b&gt;Neue Dateien suchen...&lt;/b&gt;&lt;p&gt;Dies sucht im Projektverzeichnis und in registrierten Unterverzeichnissen nach neuen Dateien (Quellen, *.ui, *.idl, *.proto).&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4007"/>
+        <location filename="../Project/Project.py" line="4042"/>
         <source>&lt;b&gt;Filetype Associations...&lt;/b&gt;&lt;p&gt;This shows a dialog to edit the file type associations of the project. These associations determine the type (source, form, interface, protocol or others) with a filename pattern. They are used when adding a file to the project and when performing a search for new files.&lt;/p&gt;</source>
         <translation>&lt;b&gt;Dateitypzuordnungen...&lt;/b&gt;&lt;p&gt;Dies zeigt einen Dialog zur Eingabe der Dateitypzuordnungen des Projektes. Diese Zuordnungen bestimmen den Typ (Quellen, Formulare, Schnittstellen, Protokolle oder Sonstige) über ein Dateinamenmuster. Sie werden genutzt, wenn eine Datei zum Projekt hinzugefügt oder wenn nach neuen Dateien gesucht wird.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1519"/>
+        <location filename="../Project/Project.py" line="1531"/>
         <source>&lt;p&gt;The selected translation file &lt;b&gt;{0}&lt;/b&gt; could not be deleted.&lt;/p&gt;&lt;p&gt;Reason: {1}&lt;/p&gt;</source>
         <translation>&lt;p&gt;Die ausgewählte Übersetzungsdatei &lt;b&gt;{0}&lt;/b&gt; konnte nicht gelöscht werden.&lt;/p&gt;&lt;p&gt;Ursache: {1}&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="2233"/>
+        <location filename="../Project/Project.py" line="2250"/>
         <source>&lt;p&gt;The selected file &lt;b&gt;{0}&lt;/b&gt; could not be deleted.&lt;/p&gt;&lt;p&gt;Reason: {1}&lt;/p&gt;</source>
         <translation>&lt;p&gt;Die ausgewählte Datei &lt;b&gt;{0}&lt;/b&gt; konnte nicht gelöscht werden.&lt;/p&gt;&lt;p&gt;Ursache: {1}&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="2263"/>
+        <location filename="../Project/Project.py" line="2280"/>
         <source>&lt;p&gt;The selected directory &lt;b&gt;{0}&lt;/b&gt; could not be deleted.&lt;/p&gt;&lt;p&gt;Reason: {1}&lt;/p&gt;</source>
         <translation>&lt;p&gt;Das ausgewählte Verzeichnis &lt;b&gt;{0}&lt;/b&gt; konnte nicht gelöscht werden.&lt;/p&gt;&lt;p&gt;Ursache: {1}&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="2756"/>
+        <location filename="../Project/Project.py" line="2773"/>
         <source>Create Makefile</source>
         <translation>Makefile erzeugen</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="2756"/>
+        <location filename="../Project/Project.py" line="2773"/>
         <source>&lt;p&gt;The makefile &lt;b&gt;{0}&lt;/b&gt; could not be created.&lt;br/&gt;Reason: {1}&lt;/p&gt;</source>
         <translation>&lt;p&gt;Die make Datei &lt;b&gt;{0}&lt;/b&gt; konnte nicht erzeugt werden.&lt;br/&gt;Ursache: {1}&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5760"/>
+        <location filename="../Project/Project.py" line="5795"/>
         <source>Execute Make</source>
         <translation>Make ausführen</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4277"/>
+        <location filename="../Project/Project.py" line="4312"/>
         <source>&amp;Execute Make</source>
         <translation>&amp;Make ausführen</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4281"/>
+        <location filename="../Project/Project.py" line="4316"/>
         <source>Perform a &apos;make&apos; run.</source>
         <translation>Führt eine &apos;make&apos; Lauf aus.</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4283"/>
+        <location filename="../Project/Project.py" line="4318"/>
         <source>&lt;b&gt;Execute Make&lt;/b&gt;&lt;p&gt;This performs a &apos;make&apos; run to rebuild the configured target.&lt;/p&gt;</source>
         <translation>&lt;b&gt;Make ausführen&lt;/b&gt;&lt;p&gt;Die führt einen &apos;make&apos; Lauf aus, um das konfigurierte Ziel zu bauen.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5740"/>
+        <location filename="../Project/Project.py" line="5775"/>
         <source>Test for Changes</source>
         <translation>Auf Änderungen prüfen</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4291"/>
+        <location filename="../Project/Project.py" line="4326"/>
         <source>&amp;Test for Changes</source>
         <translation>Auf Änderungen &amp;prüfen</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4295"/>
+        <location filename="../Project/Project.py" line="4330"/>
         <source>Question &apos;make&apos;, if a rebuild is needed.</source>
         <translation>Fragt &apos;make&apos;, ob ein Neubau erforderlich ist.</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4297"/>
+        <location filename="../Project/Project.py" line="4332"/>
         <source>&lt;b&gt;Test for Changes&lt;/b&gt;&lt;p&gt;This questions &apos;make&apos;, if a rebuild of the configured target is necessary.&lt;/p&gt;</source>
         <translation>&lt;b&gt;Auf Änderungen prüfen&lt;/b&gt;&lt;p&gt;Dies fragt &apos;make&apos;, ob ein Neubau des konfigurierten Zieles erforderlich ist.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4342"/>
+        <location filename="../Project/Project.py" line="4377"/>
         <source>Make</source>
         <translation>Make</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5688"/>
+        <location filename="../Project/Project.py" line="5723"/>
         <source>The make process did not start.</source>
         <translation>Der make Prozess ist nicht gestartet.</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5733"/>
+        <location filename="../Project/Project.py" line="5768"/>
         <source>The make process crashed.</source>
         <translation>Der make Prozess ist abgestürzt.</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5743"/>
+        <location filename="../Project/Project.py" line="5778"/>
         <source>&lt;p&gt;There are changes that require the configured make target &lt;b&gt;{0}&lt;/b&gt; to be rebuilt.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Es gibt Änderungen, die einen Neubau des konfigurierten Zieles &lt;b&gt;{0}&lt;/b&gt; erfordern.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5748"/>
+        <location filename="../Project/Project.py" line="5783"/>
         <source>&lt;p&gt;There are changes that require the default make target to be rebuilt.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Es gibt Änderungen, die einen Neubau des Standardzieles erfordern.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5760"/>
+        <location filename="../Project/Project.py" line="5795"/>
         <source>The makefile contains errors.</source>
         <translation>Die make Datei enthält Fehler.</translation>
     </message>
@@ -51070,7 +51315,7 @@
         <translation>PySide2 Kommandozeile</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4330"/>
+        <location filename="../Project/Project.py" line="4365"/>
         <source>Project-T&amp;ools</source>
         <translation>Projekt&amp;werkzeuge</translation>
     </message>
@@ -51174,7 +51419,7 @@
         <translation>VCS-Status</translation>
     </message>
     <message>
-        <location filename="../Project/ProjectBrowserModel.py" line="782"/>
+        <location filename="../Project/ProjectBrowserModel.py" line="798"/>
         <source>local</source>
         <translation>lokal</translation>
     </message>
@@ -51182,11 +51427,6 @@
 <context>
     <name>ProjectBrowserPage</name>
     <message>
-        <location filename="../Preferences/ConfigurationPages/ProjectBrowserPage.ui" line="56"/>
-        <source>Select the colour for highlighted entries in the Others viewer.</source>
-        <translation>Wähle die Farbe für hervorgehobene Einträge im Sonstige Anzeiger.</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/ProjectBrowserPage.ui" line="43"/>
         <source>Highlighted entries (Others):</source>
         <translation>Hervorgehobene Einträge (Sonstige):</translation>
@@ -51197,11 +51437,6 @@
         <translation>&lt;b&gt;Projekt-Anzeiger einstellen&lt;/b&gt;</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/ProjectBrowserPage.ui" line="37"/>
-        <source>Colours</source>
-        <translation>Farben</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/ProjectBrowserPage.ui" line="219"/>
         <source>Select to hide sources generated from form files</source>
         <translation>Auswählen, um Quelltext, der aus Formulardateien erzeugt wurde, zu verstecken</translation>
@@ -51326,6 +51561,16 @@
         <source>Protocols (protobuf) Browser</source>
         <translation>Protokollebrowser (protobuf)</translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/ProjectBrowserPage.ui" line="37"/>
+        <source>Colors</source>
+        <translation>Farben</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/ProjectBrowserPage.ui" line="56"/>
+        <source>Select the color for highlighted entries in the Others viewer.</source>
+        <translation>Wähle die Farbe für hervorgehobene Einträge im Sonstiges Anzeiger.</translation>
+    </message>
 </context>
 <context>
     <name>ProjectFormsBrowser</name>
@@ -61155,17 +61400,17 @@
         <translation>Einfügen</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="2157"/>
+        <location filename="../QScintilla/Shell.py" line="2161"/>
         <source>Drop Error</source>
         <translation>Drop Fehler</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="839"/>
+        <location filename="../QScintilla/Shell.py" line="843"/>
         <source>No.</source>
         <translation>Nr.</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="2157"/>
+        <location filename="../QScintilla/Shell.py" line="2161"/>
         <source>&lt;p&gt;&lt;b&gt;{0}&lt;/b&gt; is not a file.&lt;/p&gt;</source>
         <translation>&lt;p&gt;&lt;b&gt;{0}&lt;/b&gt; ist keine Datei.&lt;/p&gt;</translation>
     </message>
@@ -61175,22 +61420,22 @@
         <translation>Starten</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="841"/>
+        <location filename="../QScintilla/Shell.py" line="845"/>
         <source>{0} on {1}, {2}</source>
         <translation>{0} auf {1}, {2}</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="835"/>
+        <location filename="../QScintilla/Shell.py" line="839"/>
         <source>Passive Debug Mode</source>
         <translation>Passiver Debugmodus</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="1030"/>
+        <location filename="../QScintilla/Shell.py" line="1034"/>
         <source>StdOut: {0}</source>
         <translation>StdOut: {0}</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="1038"/>
+        <location filename="../QScintilla/Shell.py" line="1042"/>
         <source>StdErr: {0}</source>
         <translation>StdErr: {0}</translation>
     </message>
@@ -61210,17 +61455,17 @@
         <translation>Zeige</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="767"/>
+        <location filename="../QScintilla/Shell.py" line="771"/>
         <source>Select History</source>
         <translation>Eintrag auswählen</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="767"/>
+        <location filename="../QScintilla/Shell.py" line="771"/>
         <source>Select the history entry to execute (most recent shown last).</source>
         <translation>Wähle den auszuführenden Eintrag aus (aktuellster ist zuletzt dargestellt).</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="836"/>
+        <location filename="../QScintilla/Shell.py" line="840"/>
         <source>
 Not connected</source>
         <translation>
@@ -61242,7 +61487,7 @@
         <translation>Suchen</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="888"/>
+        <location filename="../QScintilla/Shell.py" line="892"/>
         <source>Exception &quot;{0}&quot;
 {1}
 File: {2}, Line: {3}
@@ -61253,14 +61498,14 @@
 </translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="923"/>
+        <location filename="../QScintilla/Shell.py" line="927"/>
         <source>Unspecified syntax error.
 </source>
         <translation>Unspezifischer Syntaxfehler.
 </translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="898"/>
+        <location filename="../QScintilla/Shell.py" line="902"/>
         <source>Exception &quot;{0}&quot;
 {1}
 </source>
@@ -61269,21 +61514,21 @@
 </translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="925"/>
+        <location filename="../QScintilla/Shell.py" line="929"/>
         <source>Syntax error &quot;{1}&quot; in file {0} at line {2}, character {3}.
 </source>
         <translation>Syntaxfehler &quot;{1}&quot; in Datei {0}, Zeile {2}, Zeichen {3}.
 </translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="948"/>
+        <location filename="../QScintilla/Shell.py" line="952"/>
         <source>Signal &quot;{0}&quot; generated in file {1} at line {2}.
 Function: {3}({4})</source>
         <translation>Signal &quot;{0}&quot; in der Datei {1} in Zeile {2} erzeugt.
 Funktion: {3}({4})</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="2015"/>
+        <location filename="../QScintilla/Shell.py" line="2019"/>
         <source>Project</source>
         <translation>Projekt</translation>
     </message>
@@ -61313,7 +61558,7 @@
         <translation>Aktiver Name</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="1835"/>
+        <location filename="../QScintilla/Shell.py" line="1839"/>
         <source>Available Virtual Environments:
 {0}
 </source>
@@ -61322,7 +61567,7 @@
 </translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="1876"/>
+        <location filename="../QScintilla/Shell.py" line="1880"/>
         <source>Current Virtual Environment: &apos;{0}&apos;
 </source>
         <translation>Aktuelle virtuelle Umgebung: &apos;{0}&apos;
@@ -69430,7 +69675,7 @@
         <translation>Synchronisationsmethode:</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/Sync/SyncCheckPage.py" line="56"/>
+        <location filename="../WebBrowser/Sync/SyncCheckPage.py" line="50"/>
         <source>Host:</source>
         <translation>Rechner:</translation>
     </message>
@@ -69460,22 +69705,22 @@
         <translation>User-Agent-Einstellungen:</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/Sync/SyncCheckPage.py" line="55"/>
+        <location filename="../WebBrowser/Sync/SyncCheckPage.py" line="49"/>
         <source>FTP</source>
         <translation>FTP</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/Sync/SyncCheckPage.py" line="68"/>
+        <location filename="../WebBrowser/Sync/SyncCheckPage.py" line="62"/>
         <source>No Synchronization</source>
         <translation>keine Synchronisation</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/Sync/SyncCheckPage.py" line="211"/>
+        <location filename="../WebBrowser/Sync/SyncCheckPage.py" line="204"/>
         <source>&lt;font color=&quot;#FF0000&quot;&gt;&lt;b&gt;Error:&lt;/b&gt; {0}&lt;/font&gt;</source>
         <translation>&lt;font color=&quot;#FF0000&quot;&gt;&lt;b&gt;Fehler:&lt;/b&gt; {0}&lt;/font&gt;</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/Sync/SyncCheckPage.py" line="63"/>
+        <location filename="../WebBrowser/Sync/SyncCheckPage.py" line="57"/>
         <source>Shared Directory</source>
         <translation>Gemeinsames Verzeichnis</translation>
     </message>
@@ -69485,7 +69730,7 @@
         <translation>Schnellwahleinstellungen:</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/Sync/SyncCheckPage.py" line="64"/>
+        <location filename="../WebBrowser/Sync/SyncCheckPage.py" line="58"/>
         <source>Directory:</source>
         <translation>Verzeichnis:</translation>
     </message>
@@ -71159,12 +71404,12 @@
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/TasksPage.ui" line="105"/>
-        <source>Tasks Background Colours</source>
+        <source>Tasks Background Colors</source>
         <translation>Hintergrundfarbe für Aufgaben</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/TasksPage.ui" line="206"/>
-        <source>Select the background colour for these tasks.</source>
+        <source>Select the background color for these tasks.</source>
         <translation>Wähle die Hintergrundfarbe für diesen Aufgabentyp.</translation>
     </message>
 </context>
@@ -72225,27 +72470,27 @@
 <context>
     <name>Translator</name>
     <message>
-        <location filename="../Plugins/UiExtensionPlugins/Translator/Translator.py" line="52"/>
+        <location filename="../Plugins/UiExtensionPlugins/Translator/Translator.py" line="63"/>
         <source>Translator</source>
         <translation>Übersetzer</translation>
     </message>
     <message>
-        <location filename="../Plugins/UiExtensionPlugins/Translator/Translator.py" line="52"/>
+        <location filename="../Plugins/UiExtensionPlugins/Translator/Translator.py" line="63"/>
         <source>T&amp;ranslator</source>
         <translation>Übe&amp;rsetzer</translation>
     </message>
     <message>
-        <location filename="../Plugins/UiExtensionPlugins/Translator/Translator.py" line="52"/>
+        <location filename="../Plugins/UiExtensionPlugins/Translator/Translator.py" line="63"/>
         <source>Alt+Shift+R</source>
         <translation>Alt+Shift+R</translation>
     </message>
     <message>
-        <location filename="../Plugins/UiExtensionPlugins/Translator/Translator.py" line="58"/>
+        <location filename="../Plugins/UiExtensionPlugins/Translator/Translator.py" line="69"/>
         <source>Switch the input focus to the Translator window.</source>
         <translation>Schalte den Eingabefokus auf das Übersetzerfenster um.</translation>
     </message>
     <message>
-        <location filename="../Plugins/UiExtensionPlugins/Translator/Translator.py" line="60"/>
+        <location filename="../Plugins/UiExtensionPlugins/Translator/Translator.py" line="71"/>
         <source>&lt;b&gt;Activate Translator&lt;/b&gt;&lt;p&gt;This switches the input focus to the Translator window.&lt;/p&gt;</source>
         <translation>&lt;b&gt;Übersetzer aktivieren&lt;/b&gt;&lt;p&gt;Dies schaltet den Eingabefokus auf das Übersetzerfenster um.&lt;/p&gt;</translation>
     </message>
@@ -72253,52 +72498,52 @@
 <context>
     <name>TranslatorEngines</name>
     <message>
-        <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorEngines/__init__.py" line="37"/>
+        <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorEngines/__init__.py" line="39"/>
         <source>Google V.1</source>
         <translation>Google V.1</translation>
     </message>
     <message>
-        <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorEngines/__init__.py" line="39"/>
-        <source>MyMemory</source>
-        <translation>MyMemory</translation>
-    </message>
-    <message>
         <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorEngines/__init__.py" line="41"/>
-        <source>Glosbe</source>
-        <translation>Glosbe</translation>
+        <source>MyMemory</source>
+        <translation>MyMemory</translation>
     </message>
     <message>
         <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorEngines/__init__.py" line="43"/>
-        <source>PROMT</source>
-        <translation>PROMT</translation>
+        <source>Glosbe</source>
+        <translation>Glosbe</translation>
     </message>
     <message>
         <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorEngines/__init__.py" line="45"/>
-        <source>Yandex</source>
-        <translation>Yandex</translation>
-    </message>
-    <message>
-        <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorEngines/__init__.py" line="55"/>
-        <source>Unknow translation service name ({0})</source>
-        <translation>Unbekanter Übersetzungsdienst ({0})</translation>
+        <source>PROMT</source>
+        <translation>PROMT</translation>
     </message>
     <message>
         <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorEngines/__init__.py" line="47"/>
-        <source>Google V.2</source>
-        <translation>Google V.2</translation>
+        <source>Yandex</source>
+        <translation>Yandex</translation>
+    </message>
+    <message>
+        <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorEngines/__init__.py" line="57"/>
+        <source>Unknow translation service name ({0})</source>
+        <translation>Unbekanter Übersetzungsdienst ({0})</translation>
     </message>
     <message>
         <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorEngines/__init__.py" line="49"/>
+        <source>Google V.2</source>
+        <translation>Google V.2</translation>
+    </message>
+    <message>
+        <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorEngines/__init__.py" line="51"/>
         <source>Microsoft</source>
         <translation>Microsoft</translation>
     </message>
     <message>
+        <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorEngines/__init__.py" line="55"/>
+        <source>IBM Watson</source>
+        <translation>IBM Watson</translation>
+    </message>
+    <message>
         <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorEngines/__init__.py" line="53"/>
-        <source>IBM Watson</source>
-        <translation>IBM Watson</translation>
-    </message>
-    <message>
-        <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorEngines/__init__.py" line="51"/>
         <source>DeepL Pro</source>
         <translation>DeepL Pro</translation>
     </message>
@@ -72526,16 +72771,6 @@
         <translation>Vietnamesisch</translation>
     </message>
     <message>
-        <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorLanguagesDb.py" line="79"/>
-        <source>Chinese S</source>
-        <translation>Chinesisch (vereinfacht)</translation>
-    </message>
-    <message>
-        <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorLanguagesDb.py" line="80"/>
-        <source>Chinese T</source>
-        <translation>Chinesisch (traditionell)</translation>
-    </message>
-    <message>
         <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorLanguagesDb.py" line="31"/>
         <source>Afrikaans</source>
         <translation>Afrikaans</translation>
@@ -72555,6 +72790,16 @@
         <source>Hebrew (iw)</source>
         <translation>Hebräisch (iw)</translation>
     </message>
+    <message>
+        <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorLanguagesDb.py" line="79"/>
+        <source>Chinese (China)</source>
+        <translation>Chinesisch (China)</translation>
+    </message>
+    <message>
+        <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorLanguagesDb.py" line="80"/>
+        <source>Chinese (Taiwan)</source>
+        <translation>Chinesisch (Taiwan)</translation>
+    </message>
 </context>
 <context>
     <name>TranslatorPage</name>
@@ -72732,7 +72977,7 @@
 <context>
     <name>TranslatorPlugin</name>
     <message>
-        <location filename="../Plugins/PluginTranslator.py" line="65"/>
+        <location filename="../Plugins/PluginTranslator.py" line="71"/>
         <source>Translator</source>
         <translation>Übersetzer</translation>
     </message>
@@ -74374,7 +74619,7 @@
         <translation>&lt;b&gt;Fehler berichten...&lt;/b&gt;&lt;p&gt;Öffnet einen Dialog zum Senden eines Fehlerberichtes.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="6329"/>
+        <location filename="../UI/UserInterface.py" line="6327"/>
         <source>Export Keyboard Shortcuts</source>
         <translation>Tastaturkurzbefehle exportieren</translation>
     </message>
@@ -74394,7 +74639,7 @@
         <translation>&lt;b&gt;Tastaturkurzbefehle exportieren&lt;/b&gt;&lt;p&gt;Exportiert die Tastaturkurzbefehle der Applikation.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="6353"/>
+        <location filename="../UI/UserInterface.py" line="6351"/>
         <source>Import Keyboard Shortcuts</source>
         <translation>Tastaturkurzbefehle importieren</translation>
     </message>
@@ -74549,7 +74794,7 @@
         <translation>&lt;b&gt;Dateien Seite an Seite vergleichen&lt;/b&gt;&lt;p&gt;Öffnet einen Dialog zum Vergleich zweier Dateien und zur Anzeige des Ergebnisse Seite an Seite.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="6916"/>
+        <location filename="../UI/UserInterface.py" line="6914"/>
         <source>Drop Error</source>
         <translation>Drop-Fehler</translation>
     </message>
@@ -74644,7 +74889,7 @@
         <translation>&lt;p&gt;Der Werkzeugeeintrag &lt;b&gt;{0}&lt;/b&gt; konnte nicht gestartet werden.&lt;br&gt;Stellen Sie sicher, dass er als &lt;b&gt;{1}&lt;/b&gt; verfügbar ist.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="6916"/>
+        <location filename="../UI/UserInterface.py" line="6914"/>
         <source>&lt;p&gt;&lt;b&gt;{0}&lt;/b&gt; is not a file.&lt;/p&gt;</source>
         <translation>&lt;p&gt;&lt;b&gt;{0}&lt;/b&gt; ist keine Datei.&lt;/p&gt;</translation>
     </message>
@@ -74734,22 +74979,22 @@
         <translation>Aufgabenanzeige</translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="6523"/>
+        <location filename="../UI/UserInterface.py" line="6521"/>
         <source>Save tasks</source>
         <translation>Aufgaben speichern</translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="6523"/>
+        <location filename="../UI/UserInterface.py" line="6521"/>
         <source>&lt;p&gt;The tasks file &lt;b&gt;{0}&lt;/b&gt; could not be written.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Die Aufgabendatei &lt;b&gt;{0}&lt;/b&gt; konnte nicht geschrieben werden.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="6552"/>
+        <location filename="../UI/UserInterface.py" line="6550"/>
         <source>Read tasks</source>
         <translation>Aufgaben lesen</translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="6552"/>
+        <location filename="../UI/UserInterface.py" line="6550"/>
         <source>&lt;p&gt;The tasks file &lt;b&gt;{0}&lt;/b&gt; could not be read.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Die Aufgabendatei &lt;b&gt;{0}&lt;/b&gt; konnte nicht gelesen werden.&lt;/p&gt;</translation>
     </message>
@@ -74974,17 +75219,17 @@
         <translation>&lt;p&gt;Der PyQt4-Dokumentations-Startpunkt ist nicht konfiguriert.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="7287"/>
+        <location filename="../UI/UserInterface.py" line="7285"/>
         <source>Error during updates check</source>
         <translation>Fehler während der Aktualisierungsprüfung</translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="7268"/>
+        <location filename="../UI/UserInterface.py" line="7266"/>
         <source>Update available</source>
         <translation>Aktualisierung verfügbar</translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="7326"/>
+        <location filename="../UI/UserInterface.py" line="7324"/>
         <source>&lt;/table&gt;</source>
         <translation>&lt;/table&gt;</translation>
     </message>
@@ -75009,22 +75254,22 @@
         <translation>Zeige externe &amp;Werkzeuge</translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="7287"/>
+        <location filename="../UI/UserInterface.py" line="7285"/>
         <source>Could not perform updates check.</source>
         <translation>Konnte keine Aktualisierungsprüfung durchführen.</translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="7101"/>
+        <location filename="../UI/UserInterface.py" line="7099"/>
         <source>&amp;Cancel</source>
         <translation>&amp;Abbrechen</translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="7110"/>
+        <location filename="../UI/UserInterface.py" line="7108"/>
         <source>Trying host {0}</source>
         <translation>Prüfe Host {0}</translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="7363"/>
+        <location filename="../UI/UserInterface.py" line="7361"/>
         <source>First time usage</source>
         <translation>Erstmalige Nutzung</translation>
     </message>
@@ -75119,7 +75364,7 @@
         <translation>Zeige die verfügbaren eric-Versionen</translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="7311"/>
+        <location filename="../UI/UserInterface.py" line="7309"/>
         <source>&lt;h3&gt;Available versions&lt;/h3&gt;&lt;table&gt;</source>
         <translation>&lt;h3&gt;Verfügbare Versionen&lt;/h3&gt;&lt;table&gt;</translation>
     </message>
@@ -75229,22 +75474,22 @@
         <translation>&amp;Mehrfachprojektanzeige</translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="6648"/>
+        <location filename="../UI/UserInterface.py" line="6646"/>
         <source>Save session</source>
         <translation>Sitzung speichern</translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="6586"/>
+        <location filename="../UI/UserInterface.py" line="6584"/>
         <source>&lt;p&gt;The session file &lt;b&gt;{0}&lt;/b&gt; could not be written.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Die Sitzungsdatei &lt;b&gt;{0}&lt;/b&gt; konnte nicht geschrieben werden.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="6632"/>
+        <location filename="../UI/UserInterface.py" line="6630"/>
         <source>Read session</source>
         <translation>Sitzung lesen</translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="6632"/>
+        <location filename="../UI/UserInterface.py" line="6630"/>
         <source>&lt;p&gt;The session file &lt;b&gt;{0}&lt;/b&gt; could not be read.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Die Sitzungsdatei &lt;b&gt;{0}&lt;/b&gt; konnte nicht gelesen werden.&lt;/p&gt;</translation>
     </message>
@@ -75529,7 +75774,7 @@
         <translation>Alt+Shift+B</translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="6353"/>
+        <location filename="../UI/UserInterface.py" line="6351"/>
         <source>Keyboard shortcut file (*.e4k)</source>
         <translation>Tastaturkurzbefehlsdatei (*.e4k)</translation>
     </message>
@@ -75569,27 +75814,27 @@
         <translation>&lt;b&gt;Python 2-Dokumentation&lt;/b&gt;&lt;p&gt;Zeigt die Python 2-Dokumentation an. Ist kein Dokumentationsverzeichnis konfiguriert, so ist der Ort, an dem die Python 2-Dokumentation gesucht wird, unter Windows das Verzeichnis &lt;i&gt;doc&lt;/i&gt; unter dem Verzeichnis, in dem der konfigurierte Python 2-Interpreter installiert ist, und unter Unix das Verzeichnis &lt;i&gt;/usr/share/doc/packages/python/html/python-docs-html&lt;/i&gt;. Um dies zu überschreiben, können Sie die Umgebungsvariable PYTHON2DOCDIR setzen.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="7176"/>
+        <location filename="../UI/UserInterface.py" line="7174"/>
         <source>Error getting versions information</source>
         <translation>Fehler beim Herunterladen der Versionsinformationen</translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="7169"/>
+        <location filename="../UI/UserInterface.py" line="7167"/>
         <source>The versions information could not be downloaded. Please go online and try again.</source>
         <translation>Die Versionsinformationen konnten nicht heruntergeladen werden. Bitte gehen Sie online und versuchen Sie es erneut.</translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="6121"/>
+        <location filename="../UI/UserInterface.py" line="6119"/>
         <source>Open Browser</source>
         <translation>Browser starten</translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="6121"/>
+        <location filename="../UI/UserInterface.py" line="6119"/>
         <source>Could not start a web browser</source>
         <translation>Der Systemwebbrowser konnte nicht gestartet werden</translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="7176"/>
+        <location filename="../UI/UserInterface.py" line="7174"/>
         <source>The versions information could not be downloaded for the last 7 days. Please go online and try again.</source>
         <translation>Die Versionsinformationen konnten seit 7 Tagen nicht heruntergeladen werden. Bitte gehen Sie online und versuchen Sie es erneut.</translation>
     </message>
@@ -75680,7 +75925,7 @@
         <translation>&lt;p&gt;Die Bildschirmfotoanwendung konnte nicht gestartet werden.&lt;br&gt;Stellen Sie sicher, dass sie als &lt;b&gt;{0}&lt;/b&gt; verfügbar ist.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="7382"/>
+        <location filename="../UI/UserInterface.py" line="7380"/>
         <source>Select Workspace Directory</source>
         <translation>Wähle Arbeitsverzeichnis</translation>
     </message>
@@ -76055,7 +76300,7 @@
         <translation>&lt;b&gt;Python 3-Dokumentation&lt;/b&gt;&lt;p&gt;Zeigt die Python 3-Dokumentation an. Ist kein Dokumentationsverzeichnis konfiguriert, so ist der Ort, an dem die Python 3-Dokumentation gesucht wird, unter Windows das Verzeichnis &lt;i&gt;doc&lt;/i&gt; unter dem Verzeichnis, in dem der Python 3-Interpreter installiert ist, und unter Unix das Verzeichnis &lt;i&gt;/usr/share/doc/packages/python/html&lt;/i&gt;. Um dies zu überschreiben, können Sie die Umgebungsvariable PYTHON3DOCDIR setzen.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="7101"/>
+        <location filename="../UI/UserInterface.py" line="7099"/>
         <source>%v/%m</source>
         <translation>%v/%m</translation>
     </message>
@@ -76075,7 +76320,7 @@
         <translation>&lt;b&gt;Zeige Fehlerbericht...&lt;/b&gt;&lt;p&gt;Dies öffnet einen Dialog zur Anzeige des aktuellsten Fehlerberichtes.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="7105"/>
+        <location filename="../UI/UserInterface.py" line="7103"/>
         <source>Version Check</source>
         <translation>Versionsprüfung</translation>
     </message>
@@ -76151,22 +76396,22 @@
         <translation>Qt v.3 wird von eric6 nicht unterstützt.</translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="7268"/>
+        <location filename="../UI/UserInterface.py" line="7266"/>
         <source>The update to &lt;b&gt;{0}&lt;/b&gt; of eric6 is available at &lt;b&gt;{1}&lt;/b&gt;. Would you like to get it?</source>
         <translation>Eine Aktualisierung auf &lt;b&gt;{0}&lt;/b&gt; von Eric6 ist unter &lt;b&gt;{1}&lt;/b&gt; verfügbar. Wollen Sie sie laden?</translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="7280"/>
+        <location filename="../UI/UserInterface.py" line="7278"/>
         <source>Eric6 is up to date</source>
         <translation>Eric6 ist aktuell</translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="7280"/>
+        <location filename="../UI/UserInterface.py" line="7278"/>
         <source>You are using the latest version of eric6</source>
         <translation>Sie verwenden die aktuellste Version von eric6</translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="7363"/>
+        <location filename="../UI/UserInterface.py" line="7361"/>
         <source>eric6 has not been configured yet. The configuration dialog will be started.</source>
         <translation>eric6 wurde noch nicht konfiguriert. Der Konfigurationsdialog wird nun gestartet.</translation>
     </message>
@@ -76186,7 +76431,7 @@
         <translation>Keine Benutzerwerkzeuge konfiguriert</translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="7121"/>
+        <location filename="../UI/UserInterface.py" line="7119"/>
         <source>The versions information cannot not be downloaded because you are &lt;b&gt;offline&lt;/b&gt;. Please go online and try again.</source>
         <translation>Die Versionsinformationen konnten nicht heruntergeladen werden, da sie &lt;b&gt;nicht verbunden&lt;/b&gt; sind. Bitte gehen Sie online und versuchen Sie es erneut.</translation>
     </message>
@@ -76231,7 +76476,7 @@
         <translation>&lt;b&gt;Sitzung speichern...&lt;/b&gt;&lt;p&gt;Dies speichert die aktuelle Sitzung in eine Datei. Es wird ein Dialog zur Eingabe des Dateinamens geöffnet.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="6670"/>
+        <location filename="../UI/UserInterface.py" line="6668"/>
         <source>Load session</source>
         <translation>Sitzung laden</translation>
     </message>
@@ -76246,17 +76491,17 @@
         <translation>&lt;b&gt;Sitzung laden...&lt;/b&gt;&lt;p&gt;Dies lädt eine zuvor gesicherte Sitzung. Es wird ein Dialog zur Eingabe des Dateinamens geöffnet.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="6670"/>
+        <location filename="../UI/UserInterface.py" line="6668"/>
         <source>eric6 Session Files (*.e5s)</source>
         <translation>eric6 Sitzungsdateien (*.e5s)</translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="6721"/>
+        <location filename="../UI/UserInterface.py" line="6719"/>
         <source>Crash Session found!</source>
         <translation>Absturzsitzung gefunden!</translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="6721"/>
+        <location filename="../UI/UserInterface.py" line="6719"/>
         <source>A session file of a crashed session was found. Shall this session be restored?</source>
         <translation>Eine Sitzungsdatei einer abgestürzten Sitzung wurde gefunden. Soll diese Sitzung wiederhergestellt werden?</translation>
     </message>
@@ -76271,17 +76516,17 @@
         <translation>Initialisiere Plugins...</translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="7256"/>
+        <location filename="../UI/UserInterface.py" line="7254"/>
         <source>Update Check</source>
         <translation>Aktualisierungsprüfung</translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="7256"/>
+        <location filename="../UI/UserInterface.py" line="7254"/>
         <source>You installed eric directly from the source code. There is no possibility to check for the availability of an update.</source>
         <translation>Eric wurde direkt von vom Quelltext installiert. Eine Aktualitätsprüfung ist daher nicht möglich.</translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="7246"/>
+        <location filename="../UI/UserInterface.py" line="7244"/>
         <source>You are using a snapshot release of eric6. A more up-to-date stable release might be available.</source>
         <translation>Sie verwenden ein Snapshot-Release von eri6. Eine neueres, stabiles Release könnte verfügbar sein.</translation>
     </message>
@@ -77237,61 +77482,31 @@
         <translation>nur lokalen Status überwachen</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="128"/>
-        <source>Colours</source>
-        <translation>Farben</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="193"/>
         <source>VCS status &quot;modified&quot;:</source>
         <translation>VCS-Status „geändert“:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="206"/>
-        <source>Select the background colour for entries with VCS status &quot;modified&quot;.</source>
-        <translation>Wähle die Hintergrundfarbe für Einträge mit VCS-Status „geändert“.</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="134"/>
         <source>VCS status &quot;added&quot;:</source>
         <translation>VCS-Status „hinzugefügt“:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="147"/>
-        <source>Select the background colour for entries with VCS status &quot;added&quot;.</source>
-        <translation>Wähle die Hintergrundfarbe für Einträge mit VCS-Status „hinzugefügt“.</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="239"/>
         <source>VCS status &quot;needs update&quot;:</source>
         <translation>VCS-Status „benötigt Aktualisierung“:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="252"/>
-        <source>Select the background colour for entries with VCS status &quot;needs update&quot;.</source>
-        <translation>Wähle die Hintergrundfarbe für Einträge mit VCS-Status „benötigt Aktualisierung“.</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="157"/>
         <source>VCS status &quot;conflict&quot;:</source>
         <translation>VCS-Status „Konflikt“:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="170"/>
-        <source>Select the background colour for entries with VCS status &quot;conflict&quot;.</source>
-        <translation>Wähle die Hintergrundfarbe für Einträge mit VCS-Status „Konflikt“.</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="216"/>
         <source>VCS status &quot;replaced&quot;:</source>
         <translation>VCS-Status „Ersetzt“:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="229"/>
-        <source>Select the background colour for entries with VCS status &quot;replaced&quot;.</source>
-        <translation>Wähle die Hintergrundfarbe für Einträge mit VCS-Status „ersetzt“.</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="115"/>
         <source>Select to enable automatic updates</source>
         <translation>Auswählen, um automatische Updates zu aktivieren</translation>
@@ -77307,9 +77522,39 @@
         <translation>VCS-Status „Gelöscht“:</translation>
     </message>
     <message>
+        <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="128"/>
+        <source>Colors</source>
+        <translation>Farben</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="147"/>
+        <source>Select the background color for entries with VCS status &quot;added&quot;.</source>
+        <translation>Wähle die Hintergrundfarbe für Einträge mit VCS-Status „hinzugefügt“.</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="170"/>
+        <source>Select the background color for entries with VCS status &quot;conflict&quot;.</source>
+        <translation>Wähle die Hintergrundfarbe für Einträge mit VCS-Status „Konflikt“.</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="206"/>
+        <source>Select the background color for entries with VCS status &quot;modified&quot;.</source>
+        <translation>Wähle die Hintergrundfarbe für Einträge mit VCS-Status „geändert“.</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="229"/>
+        <source>Select the background color for entries with VCS status &quot;replaced&quot;.</source>
+        <translation>Wähle die Hintergrundfarbe für Einträge mit VCS-Status „ersetzt“.</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="252"/>
+        <source>Select the background color for entries with VCS status &quot;needs update&quot;.</source>
+        <translation>Wähle die Hintergrundfarbe für Einträge mit VCS-Status „benötigt Aktualisierung“.</translation>
+    </message>
+    <message>
         <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="275"/>
-        <source>Select the background colour for entries with VCS status &quot;removed&quot;.</source>
-        <translation>Wähle die Hintergrundfarbe für Einträge mit VCS-Status „gelöscht“.</translation>
+        <source>Select the background color for entries with VCS status &quot;removed&quot;.</source>
+        <translation>Wähle die Hintergrundfarbe für Einträge mit VCS-Status „entfernt“.</translation>
     </message>
 </context>
 <context>
@@ -82256,21 +82501,6 @@
         <translation>Minimale logische Schriftgröße:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="279"/>
-        <source>Colours</source>
-        <translation>Farben</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="285"/>
-        <source>Background colour of secure URLs:</source>
-        <translation>Hintergrundfarbe für sichere URLs:</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="298"/>
-        <source>Select the background colour for secure URLs.</source>
-        <translation>Wähle die Hintergrundfarbe für sichere URLs.</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="324"/>
         <source>Images</source>
         <translation>Grafiken</translation>
@@ -82365,6 +82595,21 @@
         <source>Show Scrollbars</source>
         <translation>Scrollbalken anzeigen</translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="279"/>
+        <source>Colors</source>
+        <translation>Farben</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="285"/>
+        <source>Background color of secure URLs:</source>
+        <translation>Hintergrundfarbe für sichere URLs:</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="298"/>
+        <source>Select the background color for secure URLs.</source>
+        <translation>Wähle die Hintergrundfarbe für sichere URLs.</translation>
+    </message>
 </context>
 <context>
     <name>WebBrowserClearPrivateDataDialog</name>
@@ -83254,12 +83499,12 @@
         <translation> s</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserPage.py" line="171"/>
+        <location filename="../WebBrowser/WebBrowserPage.py" line="172"/>
         <source>Suspicuous URL detected</source>
         <translation>Fragwürdige URL entdeckt</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserPage.py" line="171"/>
+        <location filename="../WebBrowser/WebBrowserPage.py" line="172"/>
         <source>&lt;p&gt;The URL &lt;b&gt;{0}&lt;/b&gt; was found in the Safe Browsing database.&lt;/p&gt;{1}</source>
         <translation>&lt;p&gt;Die URL &lt;b&gt;{0}&lt;/b&gt; wurde in der Safe Browsing Datenbank gefunden.&lt;/p&gt;{1}</translation>
     </message>
@@ -83563,112 +83808,112 @@
 <context>
     <name>WebBrowserTabWidget</name>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="124"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="122"/>
         <source>Show a navigation menu</source>
         <translation>Zeige ein Navigationsmenü an</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="137"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="135"/>
         <source>Show a navigation menu for closed tabs</source>
         <translation>Zeige ein Navigationsmenü für geschlossene Tabs an</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="151"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="149"/>
         <source>Open a new web browser tab</source>
         <translation>Öffne ein neues Web-Browser Register</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="165"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="163"/>
         <source>New Tab</source>
         <translation>Neues Register</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="169"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="167"/>
         <source>Move Left</source>
         <translation>nach links verschieben</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="172"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="170"/>
         <source>Move Right</source>
         <translation>nach rechts verschieben</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="176"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="174"/>
         <source>Duplicate Page</source>
         <translation>Seite duplizieren</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="179"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="177"/>
         <source>Close</source>
         <translation>Schließen</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="182"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="180"/>
         <source>Close Others</source>
         <translation>Andere schließen</translation>
     </message>
     <message>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="211"/>
+        <source>Close All</source>
+        <translation>Alle schließen</translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="186"/>
+        <source>Print Preview</source>
+        <translation>Druckvorschau</translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="189"/>
+        <source>Print</source>
+        <translation>Drucken</translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="192"/>
+        <source>Print as PDF</source>
+        <translation>Als PDF drucken</translation>
+    </message>
+    <message>
         <location filename="../WebBrowser/WebBrowserTabWidget.py" line="213"/>
-        <source>Close All</source>
-        <translation>Alle schließen</translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="188"/>
-        <source>Print Preview</source>
-        <translation>Druckvorschau</translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="191"/>
-        <source>Print</source>
-        <translation>Drucken</translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="194"/>
-        <source>Print as PDF</source>
-        <translation>Als PDF drucken</translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="215"/>
         <source>Reload All</source>
         <translation>Alle neu laden</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="218"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="216"/>
         <source>Bookmark All Tabs</source>
         <translation>Lesezeichen für alle Tabs</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="222"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="220"/>
         <source>Restore Closed Tab</source>
         <translation>Geschlossenen Tabs wiederherstellen</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="458"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="456"/>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="898"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="892"/>
         <source>Loading...</source>
         <translation>Lade...</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="918"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="912"/>
         <source>Finished loading</source>
         <translation>Seite geladen</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="920"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="914"/>
         <source>Failed to load</source>
         <translation>Fehler beim Laden</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="961"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="955"/>
         <source>Are you sure you want to close the window?</source>
         <translation>Möchten Sie das Fenster wirklich schließen?</translation>
     </message>
     <message numerus="yes">
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="961"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="955"/>
         <source>Are you sure you want to close the window?
 You have %n tab(s) open.</source>
         <translation>
@@ -83679,47 +83924,47 @@
         </translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="968"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="962"/>
         <source>&amp;Quit</source>
         <translation>B&amp;eenden</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="971"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="965"/>
         <source>C&amp;lose Current Tab</source>
         <translation>A&amp;ktuelles Unterfenster schließen</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="1152"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="1146"/>
         <source>Restore All Closed Tabs</source>
         <translation>Alle geschlossenen Tabs wiederherstellen</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="1154"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="1148"/>
         <source>Clear List</source>
         <translation>Liste löschen</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="252"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="250"/>
         <source>Unmute Tab</source>
         <translation>Ton einschalten</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="256"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="254"/>
         <source>Mute Tab</source>
         <translation>Stumm schalten</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="755"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="753"/>
         <source>Print to PDF</source>
         <translation>Als PDF drucken</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="705"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="703"/>
         <source>&lt;p&gt;The file &lt;b&gt;{0}&lt;/b&gt; exists already. Shall it be overwritten?&lt;/p&gt;</source>
         <translation>&lt;p&gt;Die Datei &lt;b&gt;{0}&lt;/b&gt; existiert bereits. Soll sie überschrieben werden?&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="755"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="753"/>
         <source>&lt;p&gt;The PDF could not be written to file &lt;b&gt;{0}&lt;/b&gt;.&lt;/p&gt;&lt;p&gt;&lt;b&gt;Error:&lt;/b&gt; {1}&lt;/p&gt;</source>
         <translation>&lt;p&gt;Das PDF konnte nicht in die Datei &lt;b&gt;{0}&lt;/b&gt; gespeichert werden.&lt;/p&gt;&lt;p&gt;&lt;b&gt;Fehler:&lt;/b&gt; {1}&lt;/p&gt;</translation>
     </message>
--- a/eric6/i18n/eric6_empty.ts	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/i18n/eric6_empty.ts	Sat May 02 13:51:07 2020 +0200
@@ -1191,12 +1191,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Graphics/ApplicationDiagramBuilder.py" line="292"/>
+        <location filename="../Graphics/ApplicationDiagramBuilder.py" line="294"/>
         <source>Load Diagram</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Graphics/ApplicationDiagramBuilder.py" line="292"/>
+        <location filename="../Graphics/ApplicationDiagramBuilder.py" line="294"/>
         <source>&lt;p&gt;The diagram belongs to the project &lt;b&gt;{0}&lt;/b&gt;. Shall this project be opened?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2325,32 +2325,32 @@
 <context>
     <name>BrowserModel</name>
     <message>
-        <location filename="../UI/BrowserModel.py" line="62"/>
+        <location filename="../UI/BrowserModel.py" line="63"/>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/BrowserModel.py" line="654"/>
+        <location filename="../UI/BrowserModel.py" line="655"/>
         <source>Coding: {0}</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/BrowserModel.py" line="660"/>
+        <location filename="../UI/BrowserModel.py" line="661"/>
         <source>Globals</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/BrowserModel.py" line="666"/>
+        <location filename="../UI/BrowserModel.py" line="667"/>
         <source>Imports</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/BrowserModel.py" line="730"/>
+        <location filename="../UI/BrowserModel.py" line="731"/>
         <source>Attributes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/BrowserModel.py" line="740"/>
+        <location filename="../UI/BrowserModel.py" line="741"/>
         <source>Class Attributes</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3006,54 +3006,54 @@
 <context>
     <name>CodeDocumentationViewer</name>
     <message>
-        <location filename="../UI/CodeDocumentationViewer.py" line="175"/>
+        <location filename="../UI/CodeDocumentationViewer.py" line="211"/>
         <source>Code Info Provider:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/CodeDocumentationViewer.py" line="188"/>
+        <location filename="../UI/CodeDocumentationViewer.py" line="224"/>
         <source>Select the code info provider</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/CodeDocumentationViewer.py" line="190"/>
+        <location filename="../UI/CodeDocumentationViewer.py" line="226"/>
         <source>&lt;disabled&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/CodeDocumentationViewer.py" line="371"/>
+        <location filename="../UI/CodeDocumentationViewer.py" line="407"/>
         <source>No documentation available</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/CodeDocumentationViewer.py" line="392"/>
+        <location filename="../UI/CodeDocumentationViewer.py" line="428"/>
         <source>No source code documentation provider has been registered. This function has been disabled.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/CodeDocumentationViewer.py" line="397"/>
+        <location filename="../UI/CodeDocumentationViewer.py" line="433"/>
         <source>This function has been disabled.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/CodeDocumentationViewerTemplate.py" line="137"/>
+        <location filename="../UI/CodeDocumentationViewerTemplate.py" line="139"/>
         <source>No further documentation available</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/CodeDocumentationViewerTemplate.py" line="58"/>
+        <location filename="../UI/CodeDocumentationViewerTemplate.py" line="60"/>
         <source>&lt;p&gt;&lt;b&gt;Definition:&lt;/b&gt; &lt;span class=&quot;def&quot;&gt;@NAME@@ARGSPEC@&lt;/span&gt;&lt;/p&gt;</source>
         <comment>Just translate &apos;Definition:&apos; and leave the rest intact.</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/CodeDocumentationViewerTemplate.py" line="68"/>
+        <location filename="../UI/CodeDocumentationViewerTemplate.py" line="70"/>
         <source>&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; @NOTE@&lt;/p&gt;</source>
         <comment>Just translate &apos;Note:&apos; and leave the rest intact.</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/CodeDocumentationViewerTemplate.py" line="63"/>
+        <location filename="../UI/CodeDocumentationViewerTemplate.py" line="65"/>
         <source>&lt;p&gt;&lt;b&gt;Type:&lt;/b&gt; @TYPE@&lt;/p&gt;</source>
         <comment>Just translate &apos;Type:&apos; and leave the rest intact.</comment>
         <translation type="unfinished"></translation>
@@ -4126,11 +4126,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.ui" line="143"/>
-        <source>Colour</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.ui" line="42"/>
         <source>Select to generate a QColorDialog.getRgba dialog</source>
         <translation type="unfinished"></translation>
@@ -4201,11 +4196,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.ui" line="155"/>
-        <source>Enter a variable name or a colour</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.ui" line="167"/>
         <source>Qt.red</source>
         <translation type="unfinished"></translation>
@@ -4311,11 +4301,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.ui" line="292"/>
-        <source>Colour Variable</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.ui" line="299"/>
         <source>Enter the alpha value</source>
         <translation type="unfinished"></translation>
@@ -4366,8 +4351,23 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.ui" line="143"/>
+        <source>Color</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.ui" line="155"/>
+        <source>Enter a variable name or a color</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.ui" line="292"/>
+        <source>Color Variable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.py" line="72"/>
-        <source>&lt;p&gt;The colour &lt;b&gt;{0}&lt;/b&gt; is not valid.&lt;/p&gt;</source>
+        <source>&lt;p&gt;The color &lt;b&gt;{0}&lt;/b&gt; is not valid.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -6233,22 +6233,22 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/CreateDialogCodeDialog.py" line="577"/>
+        <location filename="../Project/CreateDialogCodeDialog.py" line="580"/>
         <source>Code Generation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/CreateDialogCodeDialog.py" line="437"/>
+        <location filename="../Project/CreateDialogCodeDialog.py" line="440"/>
         <source>&lt;p&gt;Could not open the code template file &quot;{0}&quot;.&lt;/p&gt;&lt;p&gt;Reason: {1}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/CreateDialogCodeDialog.py" line="475"/>
+        <location filename="../Project/CreateDialogCodeDialog.py" line="478"/>
         <source>&lt;p&gt;Could not open the source file &quot;{0}&quot;.&lt;/p&gt;&lt;p&gt;Reason: {1}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/CreateDialogCodeDialog.py" line="577"/>
+        <location filename="../Project/CreateDialogCodeDialog.py" line="580"/>
         <source>&lt;p&gt;Could not write the source file &quot;{0}&quot;.&lt;/p&gt;&lt;p&gt;Reason: {1}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7452,21 +7452,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="630"/>
-        <source>Background Colours</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="659"/>
-        <source>Select the background colour for changed items.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="695"/>
-        <source>Select the background colour for elements which are loaded for the first time.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="669"/>
         <source>Changed elements:</source>
         <translation type="unfinished"></translation>
@@ -7476,6 +7461,21 @@
         <source>First time opened elements:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="630"/>
+        <source>Background Colors</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="659"/>
+        <source>Select the background color for changed items.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="695"/>
+        <source>Select the background color for elements which are loaded for the first time.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DebuggerInterfacePython</name>
@@ -7958,110 +7958,110 @@
 <context>
     <name>DiffColoursPage</name>
     <message>
-        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="17"/>
-        <source>&lt;b&gt;Configure Diff colours&lt;/b&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="39"/>
-        <source>Select the background colour for header lines</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="42"/>
-        <source>Header Colour</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="52"/>
         <source>Header Line</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="65"/>
-        <source>Select the background colour for bad whitespace</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="68"/>
-        <source>Whitespace Colour</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="88"/>
-        <source>Select the text foreground colour</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="91"/>
-        <source>Text Colour</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="101"/>
         <source>Normal Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="114"/>
-        <source>Select the background colour for additions</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="117"/>
-        <source>Added Colour</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="127"/>
         <source>Added Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="140"/>
-        <source>Select the background colour for removed text</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="143"/>
-        <source>Removed Colour</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="153"/>
         <source>Removed Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="166"/>
-        <source>Select the background colour for replaced text</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="169"/>
-        <source>Replaced Colour</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="179"/>
         <source>Replaced Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="192"/>
-        <source>Select the background colour for context lines</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="195"/>
-        <source>Context Colour</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="205"/>
         <source>Context Line</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="17"/>
+        <source>&lt;b&gt;Configure Diff colors&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="39"/>
+        <source>Select the background color for header lines</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="42"/>
+        <source>Header Color</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="65"/>
+        <source>Select the background color for bad whitespace</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="68"/>
+        <source>Whitespace Color</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="88"/>
+        <source>Select the text foreground color</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="91"/>
+        <source>Text Color</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="114"/>
+        <source>Select the background color for additions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="117"/>
+        <source>Added Color</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="140"/>
+        <source>Select the background color for removed text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="143"/>
+        <source>Removed Color</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="166"/>
+        <source>Select the background color for replaced text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="169"/>
+        <source>Replaced Color</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="192"/>
+        <source>Select the background color for context lines</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="195"/>
+        <source>Context Color</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DiffDialog</name>
@@ -9217,7 +9217,7 @@
 <context>
     <name>E5GraphicsView</name>
     <message>
-        <location filename="../E5Graphics/E5GraphicsView.py" line="56"/>
+        <location filename="../E5Graphics/E5GraphicsView.py" line="58"/>
         <source>&lt;b&gt;Graphics View&lt;/b&gt;
 &lt;p&gt;This graphics view is used to show a diagram. 
 There are various actions available to manipulate the 
@@ -9236,7 +9236,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../E5Graphics/E5GraphicsView.py" line="377"/>
+        <location filename="../E5Graphics/E5GraphicsView.py" line="416"/>
         <source>{0}, Page {1}</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10645,7 +10645,7 @@
 <context>
     <name>Editor</name>
     <message>
-        <location filename="../QScintilla/Editor.py" line="3106"/>
+        <location filename="../QScintilla/Editor.py" line="3107"/>
         <source>Open File</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10735,7 +10735,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7834"/>
+        <location filename="../QScintilla/Editor.py" line="7847"/>
         <source>Check spelling...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11005,7 +11005,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5607"/>
+        <location filename="../QScintilla/Editor.py" line="5615"/>
         <source>Enable breakpoint</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11120,387 +11120,387 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="1955"/>
+        <location filename="../QScintilla/Editor.py" line="1956"/>
         <source>Modification of Read Only file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="1955"/>
+        <location filename="../QScintilla/Editor.py" line="1956"/>
         <source>You are attempting to change a read only file. Please save to a different file first.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="2663"/>
+        <location filename="../QScintilla/Editor.py" line="2664"/>
         <source>Printing...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="2680"/>
+        <location filename="../QScintilla/Editor.py" line="2681"/>
         <source>Printing completed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="2682"/>
+        <location filename="../QScintilla/Editor.py" line="2683"/>
         <source>Error while printing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="2685"/>
+        <location filename="../QScintilla/Editor.py" line="2686"/>
         <source>Printing aborted</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="3046"/>
+        <location filename="../QScintilla/Editor.py" line="3047"/>
         <source>File Modified</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="3046"/>
+        <location filename="../QScintilla/Editor.py" line="3047"/>
         <source>&lt;p&gt;The file &lt;b&gt;{0}&lt;/b&gt; has unsaved changes.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="3106"/>
+        <location filename="../QScintilla/Editor.py" line="3107"/>
         <source>&lt;p&gt;The file &lt;b&gt;{0}&lt;/b&gt; could not be opened.&lt;/p&gt;&lt;p&gt;Reason: {1}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="3295"/>
+        <location filename="../QScintilla/Editor.py" line="3296"/>
         <source>Save File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="3232"/>
+        <location filename="../QScintilla/Editor.py" line="3233"/>
         <source>&lt;p&gt;The file &lt;b&gt;{0}&lt;/b&gt; could not be saved.&lt;br/&gt;Reason: {1}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="3295"/>
+        <location filename="../QScintilla/Editor.py" line="3296"/>
         <source>&lt;p&gt;The file &lt;b&gt;{0}&lt;/b&gt; already exists. Overwrite it?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="4772"/>
+        <location filename="../QScintilla/Editor.py" line="4777"/>
         <source>Autocompletion</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="4772"/>
+        <location filename="../QScintilla/Editor.py" line="4777"/>
         <source>Autocompletion is not available because there is no autocompletion source set.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="4902"/>
+        <location filename="../QScintilla/Editor.py" line="4907"/>
         <source>Auto-Completion Provider</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="4902"/>
+        <location filename="../QScintilla/Editor.py" line="4907"/>
         <source>The completion list provider &apos;{0}&apos; was already registered. Ignoring duplicate request.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5177"/>
+        <location filename="../QScintilla/Editor.py" line="5185"/>
         <source>Call-Tips Provider</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5177"/>
+        <location filename="../QScintilla/Editor.py" line="5185"/>
         <source>The call-tips provider &apos;{0}&apos; was already registered. Ignoring duplicate request.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5610"/>
+        <location filename="../QScintilla/Editor.py" line="5618"/>
         <source>Disable breakpoint</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5985"/>
+        <location filename="../QScintilla/Editor.py" line="5993"/>
         <source>Code Coverage</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5985"/>
+        <location filename="../QScintilla/Editor.py" line="5993"/>
         <source>Please select a coverage file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6048"/>
+        <location filename="../QScintilla/Editor.py" line="6056"/>
         <source>Show Code Coverage Annotations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6041"/>
+        <location filename="../QScintilla/Editor.py" line="6049"/>
         <source>All lines have been covered.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6048"/>
+        <location filename="../QScintilla/Editor.py" line="6056"/>
         <source>There is no coverage file available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6165"/>
+        <location filename="../QScintilla/Editor.py" line="6173"/>
         <source>Profile Data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6165"/>
+        <location filename="../QScintilla/Editor.py" line="6173"/>
         <source>Please select a profile file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6327"/>
+        <location filename="../QScintilla/Editor.py" line="6335"/>
         <source>Syntax Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6327"/>
+        <location filename="../QScintilla/Editor.py" line="6335"/>
         <source>No syntax error message available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6541"/>
+        <location filename="../QScintilla/Editor.py" line="6549"/>
         <source>Warning</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6541"/>
+        <location filename="../QScintilla/Editor.py" line="6549"/>
         <source>No warning messages available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6603"/>
+        <location filename="../QScintilla/Editor.py" line="6611"/>
         <source>Style: {0}</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6606"/>
+        <location filename="../QScintilla/Editor.py" line="6614"/>
         <source>Warning: {0}</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6613"/>
+        <location filename="../QScintilla/Editor.py" line="6621"/>
         <source>Error: {0}</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6718"/>
+        <location filename="../QScintilla/Editor.py" line="6726"/>
         <source>Macro Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6718"/>
+        <location filename="../QScintilla/Editor.py" line="6726"/>
         <source>Select a macro name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6746"/>
+        <location filename="../QScintilla/Editor.py" line="6754"/>
         <source>Load macro file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6789"/>
+        <location filename="../QScintilla/Editor.py" line="6797"/>
         <source>Macro files (*.macro)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6769"/>
+        <location filename="../QScintilla/Editor.py" line="6777"/>
         <source>Error loading macro</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6760"/>
+        <location filename="../QScintilla/Editor.py" line="6768"/>
         <source>&lt;p&gt;The macro file &lt;b&gt;{0}&lt;/b&gt; could not be read.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6769"/>
+        <location filename="../QScintilla/Editor.py" line="6777"/>
         <source>&lt;p&gt;The macro file &lt;b&gt;{0}&lt;/b&gt; is corrupt.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6789"/>
+        <location filename="../QScintilla/Editor.py" line="6797"/>
         <source>Save macro file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6806"/>
+        <location filename="../QScintilla/Editor.py" line="6814"/>
         <source>Save macro</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6806"/>
+        <location filename="../QScintilla/Editor.py" line="6814"/>
         <source>&lt;p&gt;The macro file &lt;b&gt;{0}&lt;/b&gt; already exists. Overwrite it?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6822"/>
+        <location filename="../QScintilla/Editor.py" line="6830"/>
         <source>Error saving macro</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6822"/>
+        <location filename="../QScintilla/Editor.py" line="6830"/>
         <source>&lt;p&gt;The macro file &lt;b&gt;{0}&lt;/b&gt; could not be written.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6835"/>
+        <location filename="../QScintilla/Editor.py" line="6843"/>
         <source>Start Macro Recording</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6835"/>
+        <location filename="../QScintilla/Editor.py" line="6843"/>
         <source>Macro recording is already active. Start new?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6861"/>
+        <location filename="../QScintilla/Editor.py" line="6869"/>
         <source>Macro Recording</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6861"/>
+        <location filename="../QScintilla/Editor.py" line="6869"/>
         <source>Enter name of the macro:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6991"/>
+        <location filename="../QScintilla/Editor.py" line="6999"/>
         <source>&lt;p&gt;The file &lt;b&gt;{0}&lt;/b&gt; has been changed while it was opened in eric6. Reread it?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6997"/>
+        <location filename="../QScintilla/Editor.py" line="7005"/>
         <source>&lt;br&gt;&lt;b&gt;Warning:&lt;/b&gt; You will lose your changes upon reopening it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7001"/>
+        <location filename="../QScintilla/Editor.py" line="7009"/>
         <source>File changed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7166"/>
+        <location filename="../QScintilla/Editor.py" line="7179"/>
         <source>{0} (ro)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7307"/>
+        <location filename="../QScintilla/Editor.py" line="7320"/>
         <source>Drop Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7307"/>
+        <location filename="../QScintilla/Editor.py" line="7320"/>
         <source>&lt;p&gt;&lt;b&gt;{0}&lt;/b&gt; is not a file.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7328"/>
-        <source>Resources</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="7330"/>
-        <source>Add file...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="7332"/>
-        <source>Add files...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="7334"/>
-        <source>Add aliased file...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="7337"/>
-        <source>Add localized resource...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../QScintilla/Editor.py" line="7341"/>
+        <source>Resources</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="7343"/>
+        <source>Add file...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="7345"/>
+        <source>Add files...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="7347"/>
+        <source>Add aliased file...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="7350"/>
+        <source>Add localized resource...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="7354"/>
         <source>Add resource frame</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7360"/>
+        <location filename="../QScintilla/Editor.py" line="7373"/>
         <source>Add file resource</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7376"/>
+        <location filename="../QScintilla/Editor.py" line="7389"/>
         <source>Add file resources</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7403"/>
+        <location filename="../QScintilla/Editor.py" line="7416"/>
         <source>Add aliased file resource</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7403"/>
+        <location filename="../QScintilla/Editor.py" line="7416"/>
         <source>Alias for file &lt;b&gt;{0}&lt;/b&gt;:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7469"/>
+        <location filename="../QScintilla/Editor.py" line="7482"/>
         <source>Package Diagram</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7469"/>
+        <location filename="../QScintilla/Editor.py" line="7482"/>
         <source>Include class attributes?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7491"/>
+        <location filename="../QScintilla/Editor.py" line="7504"/>
         <source>Imports Diagram</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7491"/>
+        <location filename="../QScintilla/Editor.py" line="7504"/>
         <source>Include imports from external modules?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7505"/>
+        <location filename="../QScintilla/Editor.py" line="7518"/>
         <source>Application Diagram</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7505"/>
+        <location filename="../QScintilla/Editor.py" line="7518"/>
         <source>Include module names?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7837"/>
+        <location filename="../QScintilla/Editor.py" line="7850"/>
         <source>Add to dictionary</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7839"/>
+        <location filename="../QScintilla/Editor.py" line="7852"/>
         <source>Ignore All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="8255"/>
+        <location filename="../QScintilla/Editor.py" line="8268"/>
         <source>Sort Lines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="8255"/>
+        <location filename="../QScintilla/Editor.py" line="8268"/>
         <source>The selection contains illegal data for a numerical sort.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="8344"/>
+        <location filename="../QScintilla/Editor.py" line="8357"/>
         <source>Register Mouse Click Handler</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="8344"/>
+        <location filename="../QScintilla/Editor.py" line="8357"/>
         <source>A mouse click handler for &quot;{0}&quot; was already registered by &quot;{1}&quot;. Aborting request by &quot;{2}&quot;...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11525,12 +11525,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="8465"/>
+        <location filename="../QScintilla/Editor.py" line="8478"/>
         <source>EditorConfig Properties</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="8465"/>
+        <location filename="../QScintilla/Editor.py" line="8478"/>
         <source>&lt;p&gt;The EditorConfig properties for file &lt;b&gt;{0}&lt;/b&gt; could not be loaded.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12080,37 +12080,22 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="122"/>
-        <source>Colours</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="128"/>
-        <source>Background colour:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="141"/>
-        <source>Select the background colour for calltips.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="167"/>
+        <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="213"/>
         <source>Plug-In Behavior</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="173"/>
+        <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="219"/>
         <source>Select to show QScintilla provided calltips, if the selected plug-ins fail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="176"/>
+        <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="222"/>
         <source>Qscintilla provided calltips are shown, if this option is enabled and calltips shall be provided by plug-ins (see calltips sub-page of the plug-in) and the plugin-ins don&apos;t deliver any calltips.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="179"/>
+        <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="225"/>
         <source>Show QScintilla calltips, if plug-ins fail</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12124,6 +12109,41 @@
         <source>Above Text</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="122"/>
+        <source>Colors</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="128"/>
+        <source>Background color:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="141"/>
+        <source>Select the background color for calltips.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="164"/>
+        <source>Foreground color:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="177"/>
+        <source>Select the foreground color for calltips.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="187"/>
+        <source>Highlight color:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="200"/>
+        <source>Select the highlight color for calltips.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>EditorCalltipsQScintillaPage</name>
@@ -13058,26 +13078,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="174"/>
-        <source>Select the foreground colour.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="177"/>
-        <source>Foreground Colour</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="184"/>
-        <source>Select the background colour.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="187"/>
-        <source>Background Colour</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="194"/>
         <source>Select the font.</source>
         <translation type="unfinished"></translation>
@@ -13118,16 +13118,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="273"/>
-        <source>Select the background colour for all styles</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="276"/>
-        <source>All Background Colours</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="283"/>
         <source>Select the font for all styles.</source>
         <translation type="unfinished"></translation>
@@ -13317,6 +13307,36 @@
         <source>Press to set all sub-styles to default values</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="174"/>
+        <source>Select the foreground color.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="177"/>
+        <source>Foreground Color</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="184"/>
+        <source>Select the background color.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="187"/>
+        <source>Background Color</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="273"/>
+        <source>Select the background color for all styles</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="276"/>
+        <source>All Background Colors</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>EditorKeywordsPage</name>
@@ -14151,16 +14171,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorSearchPage.ui" line="127"/>
-        <source>Marker Colour:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorSearchPage.ui" line="140"/>
-        <source>Select the colour for the search markers.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorSearchPage.ui" line="168"/>
         <source>Regular Expression Type</source>
         <translation type="unfinished"></translation>
@@ -14185,6 +14195,16 @@
         <source>QScintilla Extended  Mode (C++11)</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorSearchPage.ui" line="127"/>
+        <source>Marker Color:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorSearchPage.ui" line="140"/>
+        <source>Select the color for the search markers.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>EditorSpellCheckingPage</name>
@@ -14254,21 +14274,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorSpellCheckingPage.ui" line="215"/>
-        <source>Colours</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorSpellCheckingPage.ui" line="221"/>
-        <source>Marker Colour:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorSpellCheckingPage.ui" line="234"/>
-        <source>Select the colour for the spelling markers.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorSpellCheckingPage.ui" line="260"/>
         <source>Personal lists</source>
         <translation type="unfinished"></translation>
@@ -14349,6 +14354,21 @@
 &lt;p&gt;Enter the file extension of pure text files. The complete contents of files with these extensions will be checked.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorSpellCheckingPage.ui" line="215"/>
+        <source>Colors</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorSpellCheckingPage.ui" line="221"/>
+        <source>Marker Color:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorSpellCheckingPage.ui" line="234"/>
+        <source>Select the color for the spelling markers.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>EditorStylesPage</name>
@@ -14363,41 +14383,16 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="47"/>
-        <source>Colours</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="53"/>
-        <source>Select to set the colour of the edit area different to the default style</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="56"/>
-        <source>Override edit area colours</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="68"/>
         <source>Edit area foreground:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="81"/>
-        <source>Select the foreground colour for the edit area.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="91"/>
         <source>Edit area background:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="104"/>
-        <source>Select the background colour for the edit area.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="163"/>
         <source>Fonts</source>
         <translation type="unfinished"></translation>
@@ -14533,51 +14528,26 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="351"/>
-        <source>Select the foreground colour for the margins</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="361"/>
         <source>Margins background:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="374"/>
-        <source>Select the background colour for the margins</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="384"/>
         <source>Foldmargin background:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="397"/>
-        <source>Select the background colour for the foldmargin</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="407"/>
         <source>Foldmarkers foreground:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="420"/>
-        <source>Select the foreground colour of the foldmarkers</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="430"/>
         <source>Foldmarkers background:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="443"/>
-        <source>Select the background colour of the foldmarkers</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="457"/>
         <source>Press to select the font for the editor line numbers</source>
         <translation type="unfinished"></translation>
@@ -14598,31 +14568,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="515"/>
-        <source>Select to use custom selection colours</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="518"/>
-        <source>&lt;b&gt;Use custom selection colours&lt;/b&gt;&lt;p&gt;Select this entry in order to use custom selection colours in the editor and shell windows. The colours for the selection foreground and background are defined on the colours page.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="521"/>
-        <source>Use custom selection colours</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="528"/>
-        <source>Select, if selected text should be colourized by the lexer.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="531"/>
-        <source>Colourize selected text</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="538"/>
         <source>Select to extend selection to end of line</source>
         <translation type="unfinished"></translation>
@@ -14638,21 +14583,11 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="565"/>
-        <source>Select the foreground colour for the selection.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="575"/>
         <source>Selection background:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="588"/>
-        <source>Select the background colour for the selection.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="609"/>
         <source>Caret</source>
         <translation type="unfinished"></translation>
@@ -14668,16 +14603,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="648"/>
-        <source>Select the colour for the caret.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="761"/>
-        <source>Select the background colour for the line containing the caret.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="857"/>
         <source>Braces</source>
         <translation type="unfinished"></translation>
@@ -14698,41 +14623,21 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="886"/>
-        <source>Select the colour for highlighting matching braces.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="896"/>
         <source>Matched braces background:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="909"/>
-        <source>Select the background colour for highlighting matching braces.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="925"/>
         <source>Unmatched brace:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="932"/>
-        <source>Select the colour for  highlighting nonmatching braces.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="948"/>
         <source>Unmatched brace background:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="955"/>
-        <source>Select the background colour for  highlighting nonmatching braces.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="968"/>
         <source>End of Line</source>
         <translation type="unfinished"></translation>
@@ -14778,16 +14683,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1124"/>
-        <source>Select the colour for the edge marker.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1134"/>
-        <source>Background colour:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1147"/>
         <source>Move to set the edge column.</source>
         <translation type="unfinished"></translation>
@@ -14813,11 +14708,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1222"/>
-        <source>Change Background Colour</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1236"/>
         <source>Zoom</source>
         <translation type="unfinished"></translation>
@@ -14858,21 +14748,11 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1402"/>
-        <source>Press to select the foreground colour</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1405"/>
         <source>Foreground</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1412"/>
-        <source>Press to select the background colour</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1415"/>
         <source>Background</source>
         <translation type="unfinished"></translation>
@@ -14933,26 +14813,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1514"/>
-        <source>Unsaved changes colour:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1527"/>
-        <source>Select the colour for the change marker for unsaved changes.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1537"/>
-        <source>Saved changes colour:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1550"/>
-        <source>Select the colour for the change marker for saved changes.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1565"/>
         <source>Whitespace</source>
         <translation type="unfinished"></translation>
@@ -14983,21 +14843,11 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1636"/>
-        <source>Select the foreground colour for visible whitespace</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1646"/>
         <source>Whitespace background:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1659"/>
-        <source>Select the background colour for visible whitespace</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1674"/>
         <source>Indentation Guides</source>
         <translation type="unfinished"></translation>
@@ -15018,21 +14868,11 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1705"/>
-        <source>Select the foreground colour for indentation guides</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1715"/>
         <source>Indentation Guides background:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1728"/>
-        <source>Select the background colour for indentation guides</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1743"/>
         <source>Marker Map</source>
         <translation type="unfinished"></translation>
@@ -15043,101 +14883,51 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1782"/>
-        <source>Select the colour for error markers</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1792"/>
         <source>Warnings:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1805"/>
-        <source>Select the colour for warning markers</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1815"/>
         <source>Bookmarks:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1828"/>
-        <source>Select the colour for bookmark markers</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1838"/>
         <source>Breakpoints:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1851"/>
-        <source>Select the colour for breakpoint markers</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1861"/>
         <source>Tasks:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1874"/>
-        <source>Select the colour for task markers</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1884"/>
         <source>Changes:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1897"/>
-        <source>Select the colour for change markers</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1907"/>
         <source>Coverage:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1920"/>
-        <source>Select the colour for coverage markers</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1930"/>
         <source>Current Line:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1943"/>
-        <source>Select the colour for the current line marker</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1953"/>
         <source>Search Markers:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1966"/>
-        <source>Select the colour for the search marker</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1999"/>
         <source>Background:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="2012"/>
-        <source>Select the background colour for the marker map</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="2077"/>
         <source>Various</source>
         <translation type="unfinished"></translation>
@@ -15198,11 +14988,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="801"/>
-        <source>Use background colours</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="808"/>
         <source>Current line marker:</source>
         <translation type="unfinished"></translation>
@@ -15213,31 +14998,11 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="798"/>
-        <source>Select to indicate the debug markers using coloured line backgrounds, arrow indicators otherwise</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="821"/>
-        <source>Select the colour for the current line marker.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="844"/>
-        <source>Select the colour for the error line marker.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1976"/>
         <source>Conflict Marker Line:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1989"/>
-        <source>Select the colour for the conflict marker line marker</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1749"/>
         <source>Select to show the marker map right of the editor</source>
         <translation type="unfinished"></translation>
@@ -15384,8 +15149,263 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="47"/>
+        <source>Colors</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="53"/>
+        <source>Select to set the color of the edit area different to the default style</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="56"/>
+        <source>Override edit area colors</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="81"/>
+        <source>Select the foreground color for the edit area.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="104"/>
+        <source>Select the background color for the edit area.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="648"/>
+        <source>Select the color for the caret.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="351"/>
+        <source>Select the foreground color for the margins</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="374"/>
+        <source>Select the background color for the margins</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="397"/>
+        <source>Select the background color for the foldmargin</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="420"/>
+        <source>Select the foreground color of the foldmarkers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="443"/>
+        <source>Select the background color of the foldmarkers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="515"/>
+        <source>Select to use custom selection colors</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="518"/>
+        <source>&lt;b&gt;Use custom selection colors&lt;/b&gt;&lt;p&gt;Select this entry in order to use custom selection colors in the editor and shell windows. The colors for the selection foreground and background are defined on the colors page.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="521"/>
+        <source>Use custom selection colors</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="528"/>
+        <source>Select, if selected text should be colorized by the lexer.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="531"/>
+        <source>Colorize selected text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="565"/>
+        <source>Select the foreground color for the selection.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="588"/>
+        <source>Select the background color for the selection.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="761"/>
+        <source>Select the background color for the line containing the caret.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="798"/>
+        <source>Select to indicate the debug markers using colored line backgrounds, arrow indicators otherwise</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="801"/>
+        <source>Use background colors</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="821"/>
+        <source>Select the color for the current line marker.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="844"/>
+        <source>Select the color for the error line marker.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="886"/>
+        <source>Select the color for highlighting matching braces.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="909"/>
+        <source>Select the background color for highlighting matching braces.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="932"/>
+        <source>Select the color for  highlighting nonmatching braces.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="955"/>
+        <source>Select the background color for  highlighting nonmatching braces.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1124"/>
+        <source>Select the color for the edge marker.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1134"/>
+        <source>Background color:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1222"/>
+        <source>Change Background Color</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1402"/>
+        <source>Press to select the foreground color</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1412"/>
+        <source>Press to select the background color</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1514"/>
+        <source>Unsaved changes color:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1527"/>
+        <source>Select the color for the change marker for unsaved changes.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1537"/>
+        <source>Saved changes color:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1550"/>
+        <source>Select the color for the change marker for saved changes.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1636"/>
+        <source>Select the foreground color for visible whitespace</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1659"/>
+        <source>Select the background color for visible whitespace</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1705"/>
+        <source>Select the foreground color for indentation guides</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1728"/>
+        <source>Select the background color for indentation guides</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1763"/>
-        <source>Marker Colours</source>
+        <source>Marker Colors</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1782"/>
+        <source>Select the color for error markers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1805"/>
+        <source>Select the color for warning markers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1828"/>
+        <source>Select the color for bookmark markers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1851"/>
+        <source>Select the color for breakpoint markers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1874"/>
+        <source>Select the color for task markers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1897"/>
+        <source>Select the color for change markers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1920"/>
+        <source>Select the color for coverage markers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1943"/>
+        <source>Select the color for the current line marker</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1966"/>
+        <source>Select the color for the search marker</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1989"/>
+        <source>Select the color for the conflict marker line marker</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="2012"/>
+        <source>Select the background color for the marker map</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -16480,111 +16500,51 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="252"/>
-        <source>Enter the filename of a CSS style sheet. Leave empty to use the colours defined below.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="262"/>
-        <source>Colours</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="268"/>
-        <source>Press to select the class and function header background colour.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="271"/>
         <source>Class/Function Header Background</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="278"/>
-        <source>Press to select the class and function header foreground colour.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="281"/>
         <source>Class/Function Header Foreground</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="288"/>
-        <source>Press to select the level 2 header background colour.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="291"/>
         <source>Level 2 Header Background</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="298"/>
-        <source>Press to select the level 2 header foreground colour.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="301"/>
         <source>Level 2 Header Foreground</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="308"/>
-        <source>Press to select the level 1 header background colour.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="311"/>
         <source>Level 1 Header Background</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="318"/>
-        <source>Press to select the level 1 header foreground colour.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="321"/>
         <source>Level 1 Header Foreground</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="328"/>
-        <source>Press to select the body background colour.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="331"/>
         <source>Body Background</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="338"/>
-        <source>Press to select the body foreground colour.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="341"/>
         <source>Body Foreground</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="348"/>
-        <source>Press to select the foreground colour of links.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="351"/>
         <source>Links</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="358"/>
-        <source>This shows an example of the selected colours.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="372"/>
         <source>QtHelp</source>
         <translation type="unfinished"></translation>
@@ -16664,6 +16624,66 @@
         <source>&lt;?xml version=&quot;1.0&quot; encoding=&quot;utf-8&quot;?&gt;&lt;!DOCTYPE html PUBLIC &quot;-//W3C//DTD XHTML 1.0 Strict//EN&quot;&quot;http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd&quot;&gt;&lt;html&gt;&lt;head&gt;&lt;title&gt;&lt;/title&gt;&lt;/head&gt;&lt;body style=&quot;background-color:{BodyBgColor};color:{BodyColor}&quot;&gt;&lt;h1 style=&quot;background-color:{Level1HeaderBgColor};color:{Level1HeaderColor}&quot;&gt;Level 1 Header&lt;/h1&gt;&lt;h3 style=&quot;background-color:{Level2HeaderBgColor};color:{Level2HeaderColor}&quot;&gt;Level 2 Header&lt;/h3&gt;&lt;h2 style=&quot;background-color:{CFBgColor};color:{CFColor}&quot;&gt;Class and Function Header&lt;/h2&gt;Standard body text with &lt;a style=&quot;color:{LinkColor}&quot;&gt;some links&lt;/a&gt; embedded.&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="252"/>
+        <source>Enter the filename of a CSS style sheet. Leave empty to use the colors defined below.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="262"/>
+        <source>Colors</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="268"/>
+        <source>Press to select the class and function header background color.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="278"/>
+        <source>Press to select the class and function header foreground color.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="288"/>
+        <source>Press to select the level 2 header background color.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="298"/>
+        <source>Press to select the level 2 header foreground color.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="308"/>
+        <source>Press to select the level 1 header background color.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="318"/>
+        <source>Press to select the level 1 header foreground color.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="328"/>
+        <source>Press to select the body background color.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="338"/>
+        <source>Press to select the body foreground color.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="348"/>
+        <source>Press to select the foreground color of links.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="358"/>
+        <source>This shows an example of the selected colors.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>EricdocExecDialog</name>
@@ -17143,30 +17163,50 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="516"/>
+        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="537"/>
         <source>Export source</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="448"/>
+        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="466"/>
         <source>&lt;p&gt;The source could not be exported to &lt;b&gt;{0}&lt;/b&gt;.&lt;/p&gt;&lt;p&gt;Reason: {1}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="457"/>
+        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="475"/>
         <source>&lt;p&gt;The source could not be exported to &lt;b&gt;{0}&lt;/b&gt;.&lt;/p&gt;&lt;p&gt;Reason: No HTML code generated.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="516"/>
+        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="537"/>
         <source>&lt;p&gt;Markdown export requires the &lt;b&gt;python-markdown&lt;/b&gt; package.&lt;br/&gt;Install it with your package manager, &apos;pip install docutils&apos; or see &lt;a href=&quot;http://pythonhosted.org/Markdown/install.html&quot;&gt; installation instructions.&lt;/a&gt;&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="484"/>
+        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="502"/>
         <source>&lt;p&gt;ReStructuredText export requires the &lt;b&gt;python-docutils&lt;/b&gt; package.&lt;br/&gt;Install it with your package manager, &apos;pip install docutils&apos; or see &lt;a href=&quot;http://pypi.python.org/pypi/docutils&quot;&gt;this page.&lt;/a&gt;&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="412"/>
+        <source>Light Background Color</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="413"/>
+        <source>Dark Background Color</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="416"/>
+        <source>Markdown Export</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="416"/>
+        <source>Select color scheme:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ExporterODT</name>
@@ -20842,12 +20882,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="101"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="106"/>
         <source>Commit ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="102"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="107"/>
         <source>Author</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20857,7 +20897,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="103"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="108"/>
         <source>Committer</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20867,7 +20907,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="104"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="109"/>
         <source>Subject</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20942,7 +20982,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2098"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2100"/>
         <source>Differences</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21002,328 +21042,328 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="88"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="93"/>
         <source>&amp;Refresh</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="90"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="95"/>
         <source>Press to refresh the list of commits</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="98"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="103"/>
         <source>Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="99"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="104"/>
         <source>Filter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="105"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="110"/>
         <source>File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="122"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="128"/>
         <source>&lt;table&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Commit ID&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Date&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{1}&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Author&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{2} &amp;lt;{3}&amp;gt;&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Commit Date&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{4}&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Committer&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{5} &amp;lt;{6}&amp;gt;&lt;/td&gt;&lt;/tr&gt;{7}&lt;tr&gt;&lt;td&gt;&lt;b&gt;Subject&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{8}&lt;/td&gt;&lt;/tr&gt;{9}&lt;/table&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="134"/>
-        <source>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Parents&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="137"/>
-        <source>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Children&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="140"/>
-        <source>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Branches&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</source>
+        <source>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Parents&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="143"/>
-        <source>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Tags&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</source>
+        <source>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Children&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="146"/>
+        <source>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Branches&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="149"/>
+        <source>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Tags&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="152"/>
         <source>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Message&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="197"/>
-        <source>Added</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="198"/>
-        <source>Deleted</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="199"/>
-        <source>Modified</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="200"/>
-        <source>Copied</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="201"/>
-        <source>Renamed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="202"/>
-        <source>Type changed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="203"/>
-        <source>Unmerged</source>
+        <source>Added</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="204"/>
+        <source>Deleted</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="205"/>
+        <source>Modified</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="206"/>
+        <source>Copied</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="207"/>
+        <source>Renamed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="208"/>
+        <source>Type changed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="209"/>
+        <source>Unmerged</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="210"/>
         <source>Unknown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="240"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="246"/>
         <source>Show Commit ID Column</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="242"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="248"/>
         <source>Press to show the commit ID column</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="250"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="256"/>
         <source>Show Author Columns</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="252"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="258"/>
         <source>Press to show the author columns</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="260"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="266"/>
         <source>Show Committer Columns</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="262"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="268"/>
         <source>Press to show the committer columns</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="270"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="276"/>
         <source>Show Branches Column</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="272"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="278"/>
         <source>Press to show the branches column</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="280"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="286"/>
         <source>Show Tags Column</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="282"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="288"/>
         <source>Press to show the Tags column</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="309"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="315"/>
         <source>Copy Commits</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="311"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="317"/>
         <source>Cherry-pick the selected commits to the current branch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="316"/>
-        <source>Tag</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="318"/>
-        <source>Tag the selected commit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1792"/>
-        <source>Branch</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="322"/>
-        <source>Create a new branch at the selected commit.</source>
+        <source>Tag</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="324"/>
+        <source>Tag the selected commit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1794"/>
+        <source>Branch</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="328"/>
+        <source>Create a new branch at the selected commit.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="330"/>
         <source>Branch &amp;&amp; Switch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="326"/>
-        <source>Create a new branch at the selected commit and switch the work tree to it.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1844"/>
-        <source>Switch</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="332"/>
-        <source>Switch the working directory to the selected commit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1870"/>
-        <source>Show Short Log</source>
+        <source>Create a new branch at the selected commit and switch the work tree to it.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1846"/>
+        <source>Switch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="338"/>
+        <source>Switch the working directory to the selected commit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1872"/>
+        <source>Show Short Log</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="344"/>
         <source>Show a dialog with a log output for release notes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="341"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="347"/>
         <source>Describe</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="343"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="349"/>
         <source>Show the most recent tag reachable from a commit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="632"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="634"/>
         <source>The git process did not finish within 30s.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="635"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="637"/>
         <source>Could not start the git executable.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="638"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="640"/>
         <source>Git Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="754"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="756"/>
         <source>{0} ({1}%)</source>
         <comment>action, confidence</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="820"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="822"/>
         <source>Process Generation Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="820"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="822"/>
         <source>The process {0} could not be started. Ensure, that it is in the search path.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1265"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1267"/>
         <source>Side-by-Side Diff to Parent {0}</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1277"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1279"/>
         <source>&lt;a href=&quot;sbsdiff:{0}_{1}&quot;&gt;Side-by-Side Compare&lt;/a&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1706"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1708"/>
         <source>Copy Changesets</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1844"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1846"/>
         <source>The project should be reread. Do this now?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1870"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1872"/>
         <source>Select a branch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1823"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1825"/>
         <source>Select a default branch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1823"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1825"/>
         <source>Branch &amp; Switch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2052"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2054"/>
         <source>Find Commit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2052"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2054"/>
         <source>&apos;{0}&apos; was not found.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2112"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2114"/>
         <source>Differences to Parent {0}</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2127"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2129"/>
         <source>Diff to Parent {0}</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2153"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2155"/>
         <source>There is no difference.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2316"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2318"/>
         <source>Save Diff</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2282"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2284"/>
         <source>Patch Files (*.diff)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2299"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2301"/>
         <source>&lt;p&gt;The patch file &lt;b&gt;{0}&lt;/b&gt; already exists. Overwrite it?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2316"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2318"/>
         <source>&lt;p&gt;The patch file &lt;b&gt;{0}&lt;/b&gt; could not be saved.&lt;br&gt;Reason: {1}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25757,20 +25797,60 @@
 <context>
     <name>GraphicsPage</name>
     <message>
-        <location filename="../Preferences/ConfigurationPages/GraphicsPage.ui" line="16"/>
+        <location filename="../Preferences/ConfigurationPages/GraphicsPage.ui" line="17"/>
         <source>&lt;b&gt;Configure graphics settings&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/GraphicsPage.ui" line="38"/>
+        <location filename="../Preferences/ConfigurationPages/GraphicsPage.ui" line="43"/>
         <source>Press to select the font for the graphic items</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/GraphicsPage.ui" line="51"/>
+        <location filename="../Preferences/ConfigurationPages/GraphicsPage.ui" line="56"/>
         <source>Graphics Font</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/GraphicsPage.ui" line="37"/>
+        <source>Font</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/GraphicsPage.ui" line="72"/>
+        <source>Drawing Mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/GraphicsPage.ui" line="78"/>
+        <source>Select to determine the drawing mode automatically</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/GraphicsPage.ui" line="81"/>
+        <source>Automatic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/GraphicsPage.ui" line="91"/>
+        <source>Select to draw black shapes on a white background</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/GraphicsPage.ui" line="94"/>
+        <source>Black On White</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/GraphicsPage.ui" line="101"/>
+        <source>Select to draw white shapes on a black background</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/GraphicsPage.ui" line="104"/>
+        <source>White On Black</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>GreaseMonkeyAddScriptDialog</name>
@@ -27496,21 +27576,11 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/HexEditorPage.ui" line="142"/>
-        <source>Select the foreground colour of the address area</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/HexEditorPage.ui" line="291"/>
         <source>Background:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/HexEditorPage.ui" line="165"/>
-        <source>Select the background colour of the address area</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/HexEditorPage.ui" line="178"/>
         <source>ASCII Area</source>
         <translation type="unfinished"></translation>
@@ -27541,31 +27611,11 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/HexEditorPage.ui" line="226"/>
-        <source>Select the foreground colour for highlighted data</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/HexEditorPage.ui" line="249"/>
-        <source>Select the background colour for highlighted data</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/HexEditorPage.ui" line="262"/>
         <source>Selection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/HexEditorPage.ui" line="281"/>
-        <source>Select the foreground colour of the selection</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/HexEditorPage.ui" line="304"/>
-        <source>Select the background colour of the selection</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/HexEditorPage.ui" line="317"/>
         <source>Font</source>
         <translation type="unfinished"></translation>
@@ -27595,6 +27645,36 @@
         <source>Enter the number of recent files to remember</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/HexEditorPage.ui" line="142"/>
+        <source>Select the foreground color of the address area</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/HexEditorPage.ui" line="165"/>
+        <source>Select the background color of the address area</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/HexEditorPage.ui" line="226"/>
+        <source>Select the foreground color for highlighted data</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/HexEditorPage.ui" line="249"/>
+        <source>Select the background color for highlighted data</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/HexEditorPage.ui" line="281"/>
+        <source>Select the foreground color of the selection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/HexEditorPage.ui" line="304"/>
+        <source>Select the background color of the selection</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Hg</name>
@@ -30110,7 +30190,7 @@
 <context>
     <name>HgLogBrowserDialog</name>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="92"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="98"/>
         <source>Mercurial Log</source>
         <translation type="unfinished"></translation>
     </message>
@@ -30180,17 +30260,17 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="122"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="128"/>
         <source>Revision</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="126"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="132"/>
         <source>Phase</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="123"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="129"/>
         <source>Author</source>
         <translation type="unfinished"></translation>
     </message>
@@ -30200,7 +30280,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="124"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="130"/>
         <source>Message</source>
         <translation type="unfinished"></translation>
     </message>
@@ -30265,263 +30345,263 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="94"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="100"/>
         <source>Mercurial Log (Incoming)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="96"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="102"/>
         <source>Mercurial Log (Outgoing)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="109"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="115"/>
         <source>&amp;Refresh</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="111"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="117"/>
         <source>Press to refresh the list of changesets</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="119"/>
-        <source>Find</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="120"/>
-        <source>Filter</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="125"/>
+        <source>Find</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="126"/>
+        <source>Filter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="131"/>
         <source>File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="164"/>
-        <source>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Tags&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="170"/>
+        <source>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Tags&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="176"/>
         <source>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Bookmarks&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="182"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="188"/>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="200"/>
-        <source>Added</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="201"/>
-        <source>Deleted</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="202"/>
-        <source>Modified</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="206"/>
-        <source>Draft</source>
+        <source>Added</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="207"/>
-        <source>Public</source>
+        <source>Deleted</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="208"/>
+        <source>Modified</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="212"/>
+        <source>Draft</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="213"/>
+        <source>Public</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="214"/>
         <source>Secret</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="217"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="223"/>
         <source>Bookmarks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2000"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2005"/>
         <source>Copy Changesets</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="257"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="264"/>
         <source>Copy the selected changesets to the current branch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="266"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="273"/>
         <source>Change Phase</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="268"/>
-        <source>Change the phase of the selected revisions</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="270"/>
-        <source>&lt;b&gt;Change Phase&lt;/b&gt;
-&lt;p&gt;This changes the phase of the selected revisions. The selected revisions have to have the same current phase.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="275"/>
+        <source>Change the phase of the selected revisions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="277"/>
+        <source>&lt;b&gt;Change Phase&lt;/b&gt;
+&lt;p&gt;This changes the phase of the selected revisions. The selected revisions have to have the same current phase.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="282"/>
         <source>Tag</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="278"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="285"/>
         <source>Tag the selected revision</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2072"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2077"/>
         <source>Switch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="288"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="295"/>
         <source>Switch the working directory to the selected revision</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2205"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2210"/>
         <source>Pull Changes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="309"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="316"/>
         <source>Pull changes from a remote repository</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="311"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="318"/>
         <source>Pull Large Files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="313"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="320"/>
         <source>Pull large files for selected revisions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="322"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="329"/>
         <source>Push Selected Changes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="325"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="332"/>
         <source>Push changes of the selected changeset and its ancestors to a remote repository</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="328"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="335"/>
         <source>Push All Changes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="331"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="338"/>
         <source>Push all changes to a remote repository</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="840"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="845"/>
         <source>Mercurial Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1130"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1135"/>
         <source>{0} (large file)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2343"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2348"/>
         <source>The project should be reread. Do this now?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2485"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2490"/>
         <source>Find Commit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2485"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2490"/>
         <source>&apos;{0}&apos; was not found.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2170"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2175"/>
         <source>Fetch Changes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2251"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2256"/>
         <source>Strip Changesets</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="317"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="324"/>
         <source>Fetch changes from a remote repository</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="374"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="381"/>
         <source>Strip changesets from a repository</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="293"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="300"/>
         <source>Define Bookmark...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="296"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="303"/>
         <source>Bookmark the selected revision</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="298"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="305"/>
         <source>Move Bookmark...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="301"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="308"/>
         <source>Move bookmark to the selected revision</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2095"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2100"/>
         <source>Define Bookmark</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2095"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2100"/>
         <source>Enter bookmark name for changeset &quot;{0}&quot;:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2119"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2124"/>
         <source>Move Bookmark</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2119"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2124"/>
         <source>Select the bookmark to be moved  to changeset &quot;{0}&quot;:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2058"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2063"/>
         <source>Select bookmark to switch to (leave empty to use revision):</source>
         <translation type="unfinished"></translation>
     </message>
@@ -30536,148 +30616,148 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="167"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="173"/>
         <source>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Latest Tag&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="148"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="154"/>
         <source>&lt;table&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Revision&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Date&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{1}&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Author&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{2}&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Branch&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{3}&lt;/td&gt;&lt;/tr&gt;{4}&lt;tr&gt;&lt;td&gt;&lt;b&gt;Message&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{5}&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="158"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="164"/>
         <source>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Parents&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="161"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="167"/>
         <source>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Children&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="260"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="267"/>
         <source>Merge with Changeset</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="263"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="270"/>
         <source>Merge the working directory with the selected changeset</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="336"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="343"/>
         <source>Create Changegroup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="339"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="346"/>
         <source>Create a changegroup file containing the selected changesets</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="341"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="348"/>
         <source>&lt;b&gt;Create Changegroup&lt;/b&gt;
 &lt;p&gt;This creates a changegroup file containing the selected revisions. If no revisions are selected, all changesets will be bundled. If one revision is selected, it will be interpreted as the base revision. Otherwise the lowest revision will be used as the base revision and all other revision will be bundled. If the dialog is showing outgoing changesets, all selected changesets will be bundled.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2343"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2348"/>
         <source>Apply Changegroup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="353"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="360"/>
         <source>Apply the currently viewed changegroup file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="358"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="365"/>
         <source>Sign Revisions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="361"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="368"/>
         <source>Add a signature for the selected revisions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="363"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="370"/>
         <source>Verify Signatures</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="366"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="373"/>
         <source>Verify all signatures there may be for the selected revision</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="379"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="386"/>
         <source>Select All Entries</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="381"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="388"/>
         <source>Deselect All Entries</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1369"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1374"/>
         <source>Side-by-Side Diff to Parent {0}</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1380"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1385"/>
         <source>&lt;a href=&quot;sbsdiff:{0}_{1}&quot;&gt;Side-by-Side Compare&lt;/a&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1521"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1526"/>
         <source>Pull Selected Changes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1522"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1527"/>
         <source>Fetch Selected Changes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2529"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2534"/>
         <source>Differences</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2539"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2544"/>
         <source>Differences to Parent {0}</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2555"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2560"/>
         <source>Diff to Parent {0}{1}</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2580"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2585"/>
         <source>There is no difference.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2723"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2728"/>
         <source>Save Diff</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2690"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2695"/>
         <source>Patch Files (*.diff)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2707"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2712"/>
         <source>&lt;p&gt;The patch file &lt;b&gt;{0}&lt;/b&gt; already exists. Overwrite it?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2723"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2728"/>
         <source>&lt;p&gt;The patch file &lt;b&gt;{0}&lt;/b&gt; could not be saved.&lt;br&gt;Reason: {1}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -30687,22 +30767,22 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2528"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2533"/>
         <source>Generating differences ...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="98"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="104"/>
         <source>Mercurial Full Log</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="280"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="287"/>
         <source>Close Heads</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="283"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="290"/>
         <source>Close the selected heads</source>
         <translation type="unfinished"></translation>
     </message>
@@ -31081,7 +31161,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="833"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="835"/>
         <source>Remove from repository only</source>
         <translation type="unfinished"></translation>
     </message>
@@ -31176,7 +31256,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="833"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="835"/>
         <source>Do you really want to remove these files from the repository?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -33677,52 +33757,52 @@
 <context>
     <name>HgServeDialog</name>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py" line="47"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py" line="50"/>
         <source>Mercurial Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py" line="49"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py" line="57"/>
         <source>Start Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py" line="55"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py" line="63"/>
         <source>Stop Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py" line="61"/>
-        <source>Start Browser</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py" line="69"/>
+        <source>Start Browser</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py" line="77"/>
         <source>Enter the server port</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py" line="75"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py" line="83"/>
         <source>Select the style to use</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py" line="79"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py" line="87"/>
         <source>Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py" line="86"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py" line="94"/>
         <source>Browser</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py" line="140"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py" line="148"/>
         <source>Process Generation Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py" line="140"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py" line="148"/>
         <source>The process {0} could not be started. Ensure, that it is in the search path.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -37014,53 +37094,138 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="146"/>
+        <source>List of icon directories</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="177"/>
+        <source>Up</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="187"/>
+        <source>Down</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="217"/>
+        <source>Press to delete the selected directory from the list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="220"/>
+        <source>Delete</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="230"/>
+        <source>Press to add the entered directory to the list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="233"/>
+        <source>Add</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="258"/>
+        <source>Show</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="44"/>
-        <source>List of icon directories</source>
+        <source>Default Icons</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="52"/>
+        <source>Select to select between Breeze (dark) and Breeze (light) based on the window lightness</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="55"/>
+        <source>Automatic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="65"/>
+        <source>Select to use the Breeze vector icons for light window background</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="68"/>
+        <source>Breeze (light)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="75"/>
-        <source>Up</source>
+        <source>Select to use the Breeze vector icons for dark window background</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="78"/>
+        <source>Breeze (dark)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="85"/>
-        <source>Down</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="115"/>
-        <source>Press to delete the selected directory from the list</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="118"/>
-        <source>Delete</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="128"/>
-        <source>Press to add the entered directory to the list</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="131"/>
-        <source>Add</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="156"/>
-        <source>Show</source>
+        <source>Select to use the Oxygen pixmap icons</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="88"/>
+        <source>Oxygen</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="112"/>
+        <source>Press to show a dialog with a preview of the selected default icon set</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="140"/>
+        <source>Custom Icon Directories</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IconsPreviewDialog</name>
     <message>
-        <location filename="../Preferences/ConfigurationPages/IconsPreviewDialog.ui" line="13"/>
+        <location filename="../Preferences/ConfigurationPages/IconsPreviewDialog.ui" line="14"/>
         <source>Icons Preview</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IconsPreviewDialog.ui" line="25"/>
+        <source>Directory:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IconsPreviewDialog.ui" line="38"/>
+        <source>Select the icons directory to be shown</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IconsPreviewDialog.ui" line="74"/>
+        <source>Invert Background</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IconsPreviewDialog.ui" line="87"/>
+        <source>Refresh</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IconsPreviewDialog.ui" line="84"/>
+        <source>Select to refresh the icons display</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IconsPreviewDialog.ui" line="71"/>
+        <source>Select to invert the background color</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>IdlCompilerDefineNameDialog</name>
@@ -39183,126 +39348,61 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="102"/>
-        <source>Colours</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="108"/>
         <source>Network Messages:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="121"/>
-        <source>Select the colour for network messages</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="131"/>
         <source>Nick Names:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="144"/>
-        <source>Select the colour for nick names</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="154"/>
         <source>Server Messages:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="167"/>
-        <source>Select the colour for server messages</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="177"/>
         <source>Own Nick Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="190"/>
-        <source>Select the colour for own nick name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="200"/>
         <source>Channel Messages:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="213"/>
-        <source>Select the colour for channel messages</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="223"/>
         <source>Join Channel:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="236"/>
-        <source>Select the colour for join channel messages</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="246"/>
         <source>Error Messages:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="259"/>
-        <source>Select the colour for error messages</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="269"/>
         <source>Leave Channel:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="282"/>
-        <source>Select the colour for leave channel messages</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="292"/>
         <source>Timestamp:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="305"/>
-        <source>Select the colour for timestamps</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="315"/>
         <source>Channel Info:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="328"/>
-        <source>Select the colour for channel info messages</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="338"/>
         <source>Hyperlink:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="351"/>
-        <source>Select the colour for hyperlinks</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="364"/>
-        <source>Enable to allow coloured text in IRC messages</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="367"/>
         <source>Allow Colored Text in IRC Messages</source>
         <translation type="unfinished"></translation>
@@ -39408,21 +39508,11 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="824"/>
-        <source>Select the foreground colour for the marker</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="834"/>
         <source>Marker Background:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="847"/>
-        <source>Select the background colour for the marker</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="862"/>
         <source>Shutdown</source>
         <translation type="unfinished"></translation>
@@ -39437,6 +39527,81 @@
         <source>Confirm Shutdown When Connected</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="102"/>
+        <source>Colors</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="121"/>
+        <source>Select the color for network messages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="144"/>
+        <source>Select the color for nick names</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="167"/>
+        <source>Select the color for server messages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="190"/>
+        <source>Select the color for own nick name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="213"/>
+        <source>Select the color for channel messages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="236"/>
+        <source>Select the color for join channel messages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="259"/>
+        <source>Select the color for error messages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="282"/>
+        <source>Select the color for leave channel messages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="305"/>
+        <source>Select the color for timestamps</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="328"/>
+        <source>Select the color for channel info messages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="351"/>
+        <source>Select the color for hyperlinks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="364"/>
+        <source>Enable to allow colored text in IRC messages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="824"/>
+        <source>Select the foreground color for the marker</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="847"/>
+        <source>Select the background color for the marker</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>IrcServerEditDialog</name>
@@ -40813,257 +40978,257 @@
 <context>
     <name>LexerPygments</name>
     <message>
-        <location filename="../QScintilla/Lexers/LexerPygments.py" line="180"/>
+        <location filename="../QScintilla/Lexers/LexerPygments.py" line="196"/>
         <source>Default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/LexerPygments.py" line="181"/>
-        <source>Comment</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/LexerPygments.py" line="182"/>
-        <source>Preprocessor</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/LexerPygments.py" line="183"/>
-        <source>Keyword</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/LexerPygments.py" line="184"/>
-        <source>Pseudo Keyword</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/LexerPygments.py" line="185"/>
-        <source>Type Keyword</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/LexerPygments.py" line="186"/>
-        <source>Operator</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/LexerPygments.py" line="187"/>
-        <source>Word</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/LexerPygments.py" line="188"/>
-        <source>Builtin</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/LexerPygments.py" line="189"/>
-        <source>Function or method name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/LexerPygments.py" line="190"/>
-        <source>Class name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/LexerPygments.py" line="191"/>
-        <source>Namespace</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/LexerPygments.py" line="192"/>
-        <source>Exception</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/LexerPygments.py" line="193"/>
-        <source>Identifier</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/LexerPygments.py" line="194"/>
-        <source>Constant</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/LexerPygments.py" line="195"/>
-        <source>Label</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/LexerPygments.py" line="196"/>
-        <source>Entity</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="197"/>
-        <source>Attribute</source>
+        <source>Comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="198"/>
-        <source>Tag</source>
+        <source>Preprocessor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="199"/>
-        <source>Decorator</source>
+        <source>Keyword</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="200"/>
-        <source>String</source>
+        <source>Pseudo Keyword</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="201"/>
-        <source>Documentation string</source>
+        <source>Type Keyword</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="202"/>
-        <source>Scalar</source>
+        <source>Operator</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="203"/>
-        <source>Escape</source>
+        <source>Word</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="204"/>
-        <source>Regular expression</source>
+        <source>Builtin</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="205"/>
-        <source>Symbol</source>
+        <source>Function or method name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="206"/>
-        <source>Other string</source>
+        <source>Class name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="207"/>
-        <source>Number</source>
+        <source>Namespace</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="208"/>
-        <source>Heading</source>
+        <source>Exception</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="209"/>
-        <source>Subheading</source>
+        <source>Identifier</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="210"/>
-        <source>Deleted</source>
+        <source>Constant</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="211"/>
-        <source>Inserted</source>
+        <source>Label</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="212"/>
-        <source>Generic error</source>
+        <source>Entity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="213"/>
-        <source>Emphasized text</source>
+        <source>Attribute</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="214"/>
-        <source>Strong text</source>
+        <source>Tag</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="215"/>
-        <source>Prompt</source>
+        <source>Decorator</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="216"/>
-        <source>Output</source>
+        <source>String</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="217"/>
-        <source>Traceback</source>
+        <source>Documentation string</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="218"/>
-        <source>Error</source>
+        <source>Scalar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="219"/>
-        <source>Comment block</source>
+        <source>Escape</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="220"/>
-        <source>Property</source>
+        <source>Regular expression</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="221"/>
-        <source>Character</source>
+        <source>Symbol</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="222"/>
-        <source>Here document</source>
+        <source>Other string</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="223"/>
-        <source>Punctuation</source>
+        <source>Number</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="224"/>
-        <source>Hashbang</source>
+        <source>Heading</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="225"/>
-        <source>Reserved Keyword</source>
+        <source>Subheading</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="226"/>
-        <source>Literal</source>
+        <source>Deleted</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="227"/>
-        <source>Double quoted string</source>
+        <source>Inserted</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="228"/>
-        <source>Single quoted string</source>
+        <source>Generic error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="229"/>
-        <source>Backtick string</source>
+        <source>Emphasized text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="230"/>
+        <source>Strong text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/LexerPygments.py" line="231"/>
+        <source>Prompt</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/LexerPygments.py" line="232"/>
+        <source>Output</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/LexerPygments.py" line="233"/>
+        <source>Traceback</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/LexerPygments.py" line="234"/>
+        <source>Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/LexerPygments.py" line="235"/>
+        <source>Comment block</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/LexerPygments.py" line="236"/>
+        <source>Property</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/LexerPygments.py" line="237"/>
+        <source>Character</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/LexerPygments.py" line="238"/>
+        <source>Here document</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/LexerPygments.py" line="239"/>
+        <source>Punctuation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/LexerPygments.py" line="240"/>
+        <source>Hashbang</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/LexerPygments.py" line="241"/>
+        <source>Reserved Keyword</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/LexerPygments.py" line="242"/>
+        <source>Literal</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/LexerPygments.py" line="243"/>
+        <source>Double quoted string</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/LexerPygments.py" line="244"/>
+        <source>Single quoted string</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/LexerPygments.py" line="245"/>
+        <source>Backtick string</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/LexerPygments.py" line="246"/>
         <source>Whitespace</source>
         <translation type="unfinished"></translation>
     </message>
@@ -42128,16 +42293,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/LogViewerPage.ui" line="49"/>
-        <source>Error Colour:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/LogViewerPage.ui" line="62"/>
-        <source>Select the colour for text sent to stderr</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/LogViewerPage.ui" line="87"/>
         <source>Message Filters:</source>
         <translation type="unfinished"></translation>
@@ -42172,6 +42327,16 @@
         <source>&lt;b&gt;Message Filters for both&lt;/b&gt;&lt;p&gt;This list shows the configured message filters used to suppress messages received via stdout or stderr.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/LogViewerPage.ui" line="49"/>
+        <source>Error Color:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/LogViewerPage.ui" line="62"/>
+        <source>Select the color for text sent to stderr</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MakePropertiesDialog</name>
@@ -42957,27 +43122,27 @@
 <context>
     <name>MicroPythonDevice</name>
     <message>
-        <location filename="../MicroPython/MicroPythonDevices.py" line="207"/>
+        <location filename="../MicroPython/MicroPythonDevices.py" line="214"/>
         <source>Unsupported Device</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonDevices.py" line="217"/>
+        <location filename="../MicroPython/MicroPythonDevices.py" line="224"/>
         <source>REPL is not supported by this device.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonDevices.py" line="236"/>
+        <location filename="../MicroPython/MicroPythonDevices.py" line="243"/>
         <source>Plotter is not supported by this device.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonDevices.py" line="255"/>
+        <location filename="../MicroPython/MicroPythonDevices.py" line="262"/>
         <source>Running scripts is not supported by this device.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonDevices.py" line="275"/>
+        <location filename="../MicroPython/MicroPythonDevices.py" line="282"/>
         <source>File Manager is not supported by this device.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -43241,27 +43406,27 @@
 <context>
     <name>MicroPythonGraphWidget</name>
     <message>
-        <location filename="../MicroPython/MicroPythonGraphWidget.py" line="63"/>
+        <location filename="../MicroPython/MicroPythonGraphWidget.py" line="64"/>
         <source>Press to save the raw data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonGraphWidget.py" line="72"/>
+        <location filename="../MicroPython/MicroPythonGraphWidget.py" line="73"/>
         <source>max. X:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonGraphWidget.py" line="81"/>
+        <location filename="../MicroPython/MicroPythonGraphWidget.py" line="82"/>
         <source>Enter the maximum number of data points to be plotted.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonGraphWidget.py" line="311"/>
+        <location filename="../MicroPython/MicroPythonGraphWidget.py" line="329"/>
         <source>Save Chart Data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonGraphWidget.py" line="311"/>
+        <location filename="../MicroPython/MicroPythonGraphWidget.py" line="329"/>
         <source>&lt;p&gt;The chart data could not be saved into file &lt;b&gt;{0}&lt;/b&gt;.&lt;/p&gt;&lt;p&gt;Reason: {1}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -43329,93 +43494,168 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="169"/>
+        <source>MPY Cross Compiler</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="175"/>
+        <source>Program:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="191"/>
+        <source>Enter the path of the cross compiler executable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.py" line="67"/>
+        <source>All Files (*)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="298"/>
+        <source>Documentation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="304"/>
+        <source>MicroPython:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="311"/>
+        <source>Enter the URL for the MicroPython documentation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="318"/>
+        <source>CircuitPython:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="325"/>
+        <source>Enter the URL for the CircuitPython documentation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="332"/>
+        <source>BBC micro:bit:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="339"/>
+        <source>Enter the URL for the BBC micro:bit MicroPython documentation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="201"/>
+        <source>PyBoard</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="207"/>
+        <source>dfu-util Path:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="223"/>
+        <source>Enter the path of the dfu-util flashing executable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="233"/>
+        <source>Firmware</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="246"/>
+        <source>Enter the URL for the MicroPython firmware for PyBoard, ESP8266 and ESP32</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="260"/>
+        <source>Enter the URL for the CircuitPython firmware</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="274"/>
+        <source>Enter the URL for the BBC micro:bit Firmware</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="140"/>
-        <source>MPY Cross Compiler</source>
+        <source>Chart Pane</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="146"/>
-        <source>Program:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="162"/>
-        <source>Enter the path of the cross compiler executable</source>
+        <source>Color Theme:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="159"/>
+        <source>Select the color scheme of the chart</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/MicroPythonPage.py" line="42"/>
-        <source>All Files (*)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="255"/>
-        <source>Documentation</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="261"/>
-        <source>MicroPython:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="268"/>
-        <source>Enter the URL for the MicroPython documentation</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="275"/>
-        <source>CircuitPython:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="282"/>
-        <source>Enter the URL for the CircuitPython documentation</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="289"/>
-        <source>BBC micro:bit:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="296"/>
-        <source>Enter the URL for the BBC micro:bit MicroPython documentation</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="172"/>
-        <source>PyBoard</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="178"/>
-        <source>dfu-util Path:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="194"/>
-        <source>Enter the path of the dfu-util flashing executable</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="204"/>
-        <source>Firmware</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="217"/>
-        <source>Enter the URL for the MicroPython firmware for PyBoard, ESP8266 and ESP32</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="231"/>
-        <source>Enter the URL for the CircuitPython firmware</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="245"/>
-        <source>Enter the URL for the BBC micro:bit Firmware</source>
+        <source>Automatic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.py" line="44"/>
+        <source>Light</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.py" line="46"/>
+        <source>Dark</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.py" line="48"/>
+        <source>Blue Cerulean</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.py" line="50"/>
+        <source>Brown Sand</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.py" line="52"/>
+        <source>Blue NCS</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.py" line="54"/>
+        <source>High Contrast</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.py" line="56"/>
+        <source>Blue Icy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.py" line="58"/>
+        <source>Qt</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="346"/>
+        <source>Calliope mini:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="288"/>
+        <source>Enter the URL for the Callope mini Firmware</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="353"/>
+        <source>Enter the URL for the Calliope mini MicroPython documentation</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -43460,59 +43700,59 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="420"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="460"/>
         <source>Press to connect the selected device</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="226"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="263"/>
         <source>&lt;h3&gt;The QtSerialPort package is not available.&lt;br/&gt;MicroPython support is deactivated.&lt;/h3&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message numerus="yes">
-        <location filename="../MicroPython/MicroPythonWidget.py" line="263"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="300"/>
         <source>%n supported device(s) detected.</source>
         <translation type="unfinished">
             <numerusform></numerusform>
         </translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="269"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="306"/>
         <source>{0} at {1}</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="277"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="314"/>
         <source>No supported devices detected.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="390"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="430"/>
         <source>Clear</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="392"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="432"/>
         <source>Copy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="393"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="433"/>
         <source>Paste</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="415"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="455"/>
         <source>Press to disconnect the current device</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="436"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="476"/>
         <source>No device attached</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="436"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="476"/>
         <source>Please ensure the device is plugged into your computer and selected.
 
 It must have a version of MicroPython (or CircuitPython) flashed onto it before anything will work.
@@ -43521,217 +43761,217 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="463"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="503"/>
         <source>Start REPL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="463"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="503"/>
         <source>&lt;p&gt;The REPL cannot be started.&lt;/p&gt;&lt;p&gt;Reason: {0}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="853"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="893"/>
         <source>Serial Device Connect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="853"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="893"/>
         <source>&lt;p&gt;Cannot connect to device at serial port &lt;b&gt;{0}&lt;/b&gt;.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="898"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="938"/>
         <source>Run Script</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="881"/>
-        <source>There is no editor open. Abort...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="889"/>
-        <source>The current editor does not contain a script. Abort...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="898"/>
-        <source>&lt;p&gt;Cannot run script.&lt;/p&gt;&lt;p&gt;Reason: {0}&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="921"/>
-        <source>Open Python File</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../MicroPython/MicroPythonWidget.py" line="921"/>
+        <source>There is no editor open. Abort...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="929"/>
+        <source>The current editor does not contain a script. Abort...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="938"/>
+        <source>&lt;p&gt;Cannot run script.&lt;/p&gt;&lt;p&gt;Reason: {0}&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="961"/>
+        <source>Open Python File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="961"/>
         <source>Python3 Files (*.py);;All Files (*)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="965"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1005"/>
         <source>Start Chart</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="965"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1005"/>
         <source>&lt;p&gt;The Chart cannot be started.&lt;/p&gt;&lt;p&gt;Reason: {0}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="994"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1034"/>
         <source>Unsaved Chart Data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="994"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1034"/>
         <source>The chart contains unsaved data.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1045"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1085"/>
         <source>Start File Manager</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1045"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1085"/>
         <source>&lt;p&gt;The File Manager cannot be started.&lt;/p&gt;&lt;p&gt;Reason: {0}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1096"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1136"/>
         <source>Show Version</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1099"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1139"/>
         <source>Show Implementation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1210"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1250"/>
         <source>Synchronize Time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1107"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1147"/>
         <source>Show Device Time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1110"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1150"/>
         <source>Show Local Time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1421"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1461"/>
         <source>Compile Python File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1481"/>
+        <source>Compile Current Editor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1188"/>
+        <source>&lt;h3&gt;Device Version Information&lt;/h3&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1197"/>
+        <source>No version information available.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1199"/>
+        <source>Device Version Information</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1222"/>
+        <source>unknown</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1226"/>
+        <source>Device Implementation Information</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1226"/>
+        <source>&lt;h3&gt;Device Implementation Information&lt;/h3&gt;&lt;p&gt;This device contains &lt;b&gt;{0} {1}&lt;/b&gt;.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1250"/>
+        <source>&lt;p&gt;The time of the connected device was synchronized with the local time.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1272"/>
+        <source>&lt;h3&gt;Device Date and Time&lt;/h3&gt;&lt;table&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Date&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Time&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{1}&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1280"/>
+        <source>&lt;h3&gt;Device Date and Time&lt;/h3&gt;&lt;p&gt;{0}&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1294"/>
+        <source>Device Date and Time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1307"/>
+        <source>Local Date and Time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1307"/>
+        <source>&lt;h3&gt;Local Date and Time&lt;/h3&gt;&lt;table&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Date&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Time&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{1}&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1374"/>
+        <source>Error handling device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1374"/>
+        <source>&lt;p&gt;There was an error communicating with the connected device.&lt;/p&gt;&lt;p&gt;Method: {0}&lt;/p&gt;&lt;p&gt;Message: {1}&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1413"/>
+        <source>The MicroPython cross compiler &lt;b&gt;mpy-cross&lt;/b&gt; cannot be found. Ensure it is in the search path or configure it on the MicroPython configuration page.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1431"/>
+        <source>Python Files (*.py);;All Files (*)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../MicroPython/MicroPythonWidget.py" line="1441"/>
-        <source>Compile Current Editor</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1148"/>
-        <source>&lt;h3&gt;Device Version Information&lt;/h3&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1157"/>
-        <source>No version information available.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1159"/>
-        <source>Device Version Information</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1182"/>
-        <source>unknown</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1186"/>
-        <source>Device Implementation Information</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1186"/>
-        <source>&lt;h3&gt;Device Implementation Information&lt;/h3&gt;&lt;p&gt;This device contains &lt;b&gt;{0} {1}&lt;/b&gt;.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1210"/>
-        <source>&lt;p&gt;The time of the connected device was synchronized with the local time.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1232"/>
-        <source>&lt;h3&gt;Device Date and Time&lt;/h3&gt;&lt;table&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Date&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Time&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{1}&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1240"/>
-        <source>&lt;h3&gt;Device Date and Time&lt;/h3&gt;&lt;p&gt;{0}&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1254"/>
-        <source>Device Date and Time</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1267"/>
-        <source>Local Date and Time</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1267"/>
-        <source>&lt;h3&gt;Local Date and Time&lt;/h3&gt;&lt;table&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Date&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Time&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{1}&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1334"/>
-        <source>Error handling device</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1334"/>
-        <source>&lt;p&gt;There was an error communicating with the connected device.&lt;/p&gt;&lt;p&gt;Method: {0}&lt;/p&gt;&lt;p&gt;Message: {1}&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1373"/>
-        <source>The MicroPython cross compiler &lt;b&gt;mpy-cross&lt;/b&gt; cannot be found. Ensure it is in the search path or configure it on the MicroPython configuration page.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1391"/>
-        <source>Python Files (*.py);;All Files (*)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1401"/>
         <source>The Python file &lt;b&gt;{0}&lt;/b&gt; does not exist. Aborting...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1411"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1451"/>
         <source>&apos;mpy-cross&apos; Output</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1434"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1474"/>
         <source>The current editor does not contain a Python file. Aborting...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="175"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="211"/>
         <source>MicroPython Menu</source>
         <translation type="unfinished"></translation>
     </message>
@@ -43741,47 +43981,47 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="978"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1018"/>
         <source>&#xc2;&#xb5;Py Chart</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1058"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1098"/>
         <source>&#xc2;&#xb5;Py Files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1134"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1174"/>
         <source>Show Documentation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1138"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1178"/>
         <source>Configure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1113"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1153"/>
         <source>Show Time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1130"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1170"/>
         <source>Download Firmware</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1310"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1350"/>
         <source>Date and Time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1293"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1333"/>
         <source>&lt;table&gt;&lt;tr&gt;&lt;th&gt;&lt;/th&gt;&lt;th&gt;Local Date and Time&lt;/th&gt;&lt;th&gt;Device Date and Time&lt;/th&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Date&lt;/b&gt;&lt;/td&gt;&lt;td align=&apos;center&apos;&gt;{0}&lt;/td&gt;&lt;td align=&apos;center&apos;&gt;{2}&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Time&lt;/b&gt;&lt;/td&gt;&lt;td align=&apos;center&apos;&gt;{1}&lt;/td&gt;&lt;td align=&apos;center&apos;&gt;{3}&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1310"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1350"/>
         <source>&lt;table&gt;&lt;tr&gt;&lt;th&gt;Local Date and Time&lt;/th&gt;&lt;th&gt;Device Date and Time&lt;/th&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td align=&apos;center&apos;&gt;{0} {1}&lt;/td&gt;&lt;td align=&apos;center&apos;&gt;{2}&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -43789,85 +44029,90 @@
 <context>
     <name>MicrobitDevice</name>
     <message>
-        <location filename="../MicroPython/MicrobitDevices.py" line="67"/>
+        <location filename="../MicroPython/MicrobitDevices.py" line="74"/>
         <source>BBC micro:bit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicrobitDevices.py" line="134"/>
+        <location filename="../MicroPython/MicrobitDevices.py" line="149"/>
         <source>Workspace Directory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicrobitDevices.py" line="134"/>
-        <source>Could not find an attached BBC micro:bit.
+        <location filename="../MicroPython/MicrobitDevices.py" line="186"/>
+        <source>Save Script as &apos;main.py&apos;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicrobitDevices.py" line="188"/>
+        <source>Save the current script as &apos;main.py&apos; on the connected device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicrobitDevices.py" line="241"/>
+        <source>MicroPython Firmware Files (*.hex);;All Files (*)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicrobitDevices.py" line="286"/>
+        <source>The script is empty. Aborting.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicrobitDevices.py" line="276"/>
+        <source>The current editor does not contain a Python script. Write it anyway?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicrobitDevices.py" line="314"/>
+        <source>&lt;p&gt;The script could not be saved to the device.&lt;/p&gt;&lt;p&gt;Reason: {0}&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicrobitDevices.py" line="241"/>
+        <source>Flash MicroPython Firmware</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicrobitDevices.py" line="273"/>
+        <source>Save Script</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicrobitDevices.py" line="303"/>
+        <source>Save Script as &apos;{0}&apos;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicrobitDevices.py" line="294"/>
+        <source>Enter a file name on the device:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicrobitDevices.py" line="183"/>
+        <source>Save the current script to the selected device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicrobitDevices.py" line="77"/>
+        <source>Calliope mini</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicrobitDevices.py" line="232"/>
+        <source>Could not find an attached {0}.
 
 Please make sure the device is plugged into this computer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicrobitDevices.py" line="171"/>
-        <source>Save Script as &apos;main.py&apos;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicrobitDevices.py" line="173"/>
-        <source>Save the current script as &apos;main.py&apos; on the connected device</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicrobitDevices.py" line="177"/>
-        <source>Reset micro:bit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicrobitDevices.py" line="201"/>
-        <source>MicroPython Firmware Files (*.hex);;All Files (*)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicrobitDevices.py" line="246"/>
-        <source>The script is empty. Aborting.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicrobitDevices.py" line="236"/>
-        <source>The current editor does not contain a Python script. Write it anyway?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicrobitDevices.py" line="274"/>
-        <source>&lt;p&gt;The script could not be saved to the device.&lt;/p&gt;&lt;p&gt;Reason: {0}&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicrobitDevices.py" line="201"/>
-        <source>Flash MicroPython Firmware</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicrobitDevices.py" line="233"/>
-        <source>Save Script</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicrobitDevices.py" line="190"/>
-        <source>The BBC micro:bit is not ready for flashing. See the &lt;a href=&quot;https://microbit.org/guide/firmware/&quot;&gt;micro:bit web site&lt;/a&gt; for details.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicrobitDevices.py" line="263"/>
-        <source>Save Script as &apos;{0}&apos;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicrobitDevices.py" line="254"/>
-        <source>Enter a file name on the device:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicrobitDevices.py" line="168"/>
-        <source>Save the current script to the selected device</source>
+        <location filename="../MicroPython/MicrobitDevices.py" line="192"/>
+        <source>Reset {0}</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicrobitDevices.py" line="213"/>
+        <source>&lt;p&gt;The BBC micro:bit is not ready for flashing. Follow these instructions.&lt;/p&gt;&lt;ul&gt;&lt;li&gt;unplug USB cable and any batteries&lt;/li&gt;&lt;li&gt;keep RESET button pressed an plug USB cable back in&lt;/li&gt;&lt;li&gt;a drive called MAINTENANCE should be available&lt;/li&gt;&lt;/ul&gt;&lt;p&gt;See the &lt;a href=&quot;https://microbit.org/guide/firmware/&quot;&gt;micro:bit web site&lt;/a&gt; for details.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -47650,109 +47895,109 @@
         <translation type="unfinished"></translation>
     </message>
     <message numerus="yes">
-        <location filename="../PipInterface/PipPackagesWidget.py" line="635"/>
+        <location filename="../PipInterface/PipPackagesWidget.py" line="645"/>
         <source>%n package(s) found.</source>
         <translation type="unfinished">
             <numerusform></numerusform>
         </translation>
     </message>
     <message>
-        <location filename="../PipInterface/PipPackagesWidget.py" line="888"/>
+        <location filename="../PipInterface/PipPackagesWidget.py" line="898"/>
         <source>Search PyPI</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../PipInterface/PipPackagesWidget.py" line="673"/>
+        <location filename="../PipInterface/PipPackagesWidget.py" line="683"/>
         <source>&lt;p&gt;The package search did not return anything.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../PipInterface/PipPackagesWidget.py" line="710"/>
+        <location filename="../PipInterface/PipPackagesWidget.py" line="720"/>
         <source>&lt;p&gt;The package search failed.&lt;/p&gt;&lt;p&gt;Reason: {0}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../PipInterface/PipPackagesWidget.py" line="715"/>
+        <location filename="../PipInterface/PipPackagesWidget.py" line="725"/>
         <source>Error: {0}</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../PipInterface/PipPackagesWidget.py" line="848"/>
+        <location filename="../PipInterface/PipPackagesWidget.py" line="858"/>
         <source>Show Package Details</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../PipInterface/PipPackagesWidget.py" line="848"/>
+        <location filename="../PipInterface/PipPackagesWidget.py" line="858"/>
         <source>Select the package version:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../PipInterface/PipPackagesWidget.py" line="888"/>
+        <location filename="../PipInterface/PipPackagesWidget.py" line="898"/>
         <source>&lt;p&gt;No package details info for &lt;b&gt;{0}&lt;/b&gt; available.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../PipInterface/PipPackagesWidget.py" line="904"/>
+        <location filename="../PipInterface/PipPackagesWidget.py" line="914"/>
         <source>Install Pip</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../PipInterface/PipPackagesWidget.py" line="907"/>
-        <source>Install Pip to User-Site</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../PipInterface/PipPackagesWidget.py" line="910"/>
-        <source>Repair Pip</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../PipInterface/PipPackagesWidget.py" line="1005"/>
-        <source>Install Packages</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../PipInterface/PipPackagesWidget.py" line="917"/>
-        <source>Install Local Package</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../PipInterface/PipPackagesWidget.py" line="921"/>
-        <source>Install Requirements</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../PipInterface/PipPackagesWidget.py" line="924"/>
-        <source>Uninstall Requirements</source>
+        <source>Install Pip to User-Site</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../PipInterface/PipPackagesWidget.py" line="920"/>
+        <source>Repair Pip</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../PipInterface/PipPackagesWidget.py" line="1015"/>
+        <source>Install Packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../PipInterface/PipPackagesWidget.py" line="927"/>
+        <source>Install Local Package</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../PipInterface/PipPackagesWidget.py" line="931"/>
+        <source>Install Requirements</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../PipInterface/PipPackagesWidget.py" line="934"/>
+        <source>Uninstall Requirements</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../PipInterface/PipPackagesWidget.py" line="937"/>
         <source>Generate Requirements...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../PipInterface/PipPackagesWidget.py" line="932"/>
+        <location filename="../PipInterface/PipPackagesWidget.py" line="942"/>
         <source>Edit User Configuration...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../PipInterface/PipPackagesWidget.py" line="935"/>
+        <location filename="../PipInterface/PipPackagesWidget.py" line="945"/>
         <source>Edit Environment Configuration...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../PipInterface/PipPackagesWidget.py" line="940"/>
+        <location filename="../PipInterface/PipPackagesWidget.py" line="950"/>
         <source>Configure...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../PipInterface/PipPackagesWidget.py" line="1118"/>
+        <location filename="../PipInterface/PipPackagesWidget.py" line="1128"/>
         <source>Edit Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../PipInterface/PipPackagesWidget.py" line="1118"/>
+        <location filename="../PipInterface/PipPackagesWidget.py" line="1128"/>
         <source>No valid configuration path determined. Aborting</source>
         <translation type="unfinished"></translation>
     </message>
@@ -49015,17 +49260,17 @@
 <context>
     <name>Preferences</name>
     <message>
-        <location filename="../Preferences/__init__.py" line="1624"/>
+        <location filename="../Preferences/__init__.py" line="1640"/>
         <source>Export Preferences</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1652"/>
+        <location filename="../Preferences/__init__.py" line="1668"/>
         <source>Properties File (*.ini);;All Files (*)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1652"/>
+        <location filename="../Preferences/__init__.py" line="1668"/>
         <source>Import Preferences</source>
         <translation type="unfinished"></translation>
     </message>
@@ -49235,16 +49480,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/PrinterPage.ui" line="49"/>
-        <source>Colour Mode:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/PrinterPage.ui" line="77"/>
-        <source>Colour</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/PrinterPage.ui" line="84"/>
         <source>Gray Scale</source>
         <translation type="unfinished"></translation>
@@ -49324,6 +49559,16 @@
         <source>Enter the bottom margin in cm.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/PrinterPage.ui" line="49"/>
+        <source>Color Mode:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/PrinterPage.ui" line="77"/>
+        <source>Color</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ProgramsDialog</name>
@@ -49611,1200 +49856,1200 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="805"/>
+        <location filename="../Project/Project.py" line="817"/>
         <source>Read project file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="805"/>
+        <location filename="../Project/Project.py" line="817"/>
         <source>&lt;p&gt;The project file &lt;b&gt;{0}&lt;/b&gt; could not be read.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="908"/>
+        <location filename="../Project/Project.py" line="920"/>
         <source>Save project file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="908"/>
+        <location filename="../Project/Project.py" line="920"/>
         <source>&lt;p&gt;The project file &lt;b&gt;{0}&lt;/b&gt; could not be written.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="944"/>
+        <location filename="../Project/Project.py" line="956"/>
         <source>Read user project properties</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="944"/>
+        <location filename="../Project/Project.py" line="956"/>
         <source>&lt;p&gt;The user specific project properties file &lt;b&gt;{0}&lt;/b&gt; could not be read.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="968"/>
+        <location filename="../Project/Project.py" line="980"/>
         <source>Save user project properties</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="968"/>
+        <location filename="../Project/Project.py" line="980"/>
         <source>&lt;p&gt;The user specific project properties file &lt;b&gt;{0}&lt;/b&gt; could not be written.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1026"/>
+        <location filename="../Project/Project.py" line="1038"/>
         <source>Read project session</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../Project/Project.py" line="1263"/>
+        <source>Please save the project first.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="1038"/>
+        <source>&lt;p&gt;The project session file &lt;b&gt;{0}&lt;/b&gt; could not be read.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="1074"/>
+        <source>Save project session</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="1074"/>
+        <source>&lt;p&gt;The project session file &lt;b&gt;{0}&lt;/b&gt; could not be written.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="1103"/>
+        <source>Delete project session</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="1103"/>
+        <source>&lt;p&gt;The project session file &lt;b&gt;{0}&lt;/b&gt; could not be deleted.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="1137"/>
+        <source>Read tasks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="1137"/>
+        <source>&lt;p&gt;The tasks file &lt;b&gt;{0}&lt;/b&gt; could not be read.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="1157"/>
+        <source>Save tasks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="1157"/>
+        <source>&lt;p&gt;The tasks file &lt;b&gt;{0}&lt;/b&gt; could not be written.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="1216"/>
+        <source>Read debugger properties</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="1216"/>
+        <source>&lt;p&gt;The project debugger properties file &lt;b&gt;{0}&lt;/b&gt; could not be read.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="1251"/>
+        <source>Save debugger properties</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../Project/Project.py" line="1251"/>
-        <source>Please save the project first.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="1026"/>
-        <source>&lt;p&gt;The project session file &lt;b&gt;{0}&lt;/b&gt; could not be read.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="1062"/>
-        <source>Save project session</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="1062"/>
-        <source>&lt;p&gt;The project session file &lt;b&gt;{0}&lt;/b&gt; could not be written.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="1091"/>
-        <source>Delete project session</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="1091"/>
-        <source>&lt;p&gt;The project session file &lt;b&gt;{0}&lt;/b&gt; could not be deleted.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="1125"/>
-        <source>Read tasks</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="1125"/>
-        <source>&lt;p&gt;The tasks file &lt;b&gt;{0}&lt;/b&gt; could not be read.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="1145"/>
-        <source>Save tasks</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="1145"/>
-        <source>&lt;p&gt;The tasks file &lt;b&gt;{0}&lt;/b&gt; could not be written.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="1204"/>
-        <source>Read debugger properties</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="1204"/>
-        <source>&lt;p&gt;The project debugger properties file &lt;b&gt;{0}&lt;/b&gt; could not be read.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="1239"/>
-        <source>Save debugger properties</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="1239"/>
         <source>&lt;p&gt;The project debugger properties file &lt;b&gt;{0}&lt;/b&gt; could not be written.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1265"/>
+        <location filename="../Project/Project.py" line="1277"/>
         <source>Delete debugger properties</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1265"/>
+        <location filename="../Project/Project.py" line="1277"/>
         <source>&lt;p&gt;The project debugger properties file &lt;b&gt;{0}&lt;/b&gt; could not be deleted.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1393"/>
+        <location filename="../Project/Project.py" line="1405"/>
         <source>Add Language</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1393"/>
+        <location filename="../Project/Project.py" line="1405"/>
         <source>You have to specify a translation pattern first.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1519"/>
+        <location filename="../Project/Project.py" line="1531"/>
         <source>Delete translation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1684"/>
+        <location filename="../Project/Project.py" line="1696"/>
         <source>Add file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1748"/>
+        <location filename="../Project/Project.py" line="1760"/>
         <source>&lt;p&gt;The file &lt;b&gt;{0}&lt;/b&gt; already exists.&lt;/p&gt;&lt;p&gt;Overwrite it?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1671"/>
+        <location filename="../Project/Project.py" line="1683"/>
         <source>&lt;p&gt;The selected file &lt;b&gt;{0}&lt;/b&gt; could not be added to &lt;b&gt;{1}&lt;/b&gt;.&lt;/p&gt;&lt;p&gt;Reason: {2}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1816"/>
+        <location filename="../Project/Project.py" line="1828"/>
         <source>The target directory must not be empty.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1827"/>
+        <location filename="../Project/Project.py" line="1839"/>
         <source>Add directory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1715"/>
+        <location filename="../Project/Project.py" line="1727"/>
         <source>&lt;p&gt;The source directory doesn&apos;t contain any files belonging to the selected category.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1730"/>
+        <location filename="../Project/Project.py" line="1742"/>
         <source>&lt;p&gt;The target directory &lt;b&gt;{0}&lt;/b&gt; could not be created.&lt;/p&gt;&lt;p&gt;Reason: {1}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1827"/>
+        <location filename="../Project/Project.py" line="1839"/>
         <source>The source directory must not be empty.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1964"/>
+        <location filename="../Project/Project.py" line="1976"/>
         <source>Rename file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1988"/>
+        <location filename="../Project/Project.py" line="2000"/>
         <source>Rename File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3130"/>
+        <location filename="../Project/Project.py" line="3147"/>
         <source>&lt;p&gt;The file &lt;b&gt;{0}&lt;/b&gt; already exists. Overwrite it?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1988"/>
+        <location filename="../Project/Project.py" line="2000"/>
         <source>&lt;p&gt;The file &lt;b&gt;{0}&lt;/b&gt; could not be renamed.&lt;br /&gt;Reason: {1}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="2233"/>
+        <location filename="../Project/Project.py" line="2250"/>
         <source>Delete file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="2263"/>
+        <location filename="../Project/Project.py" line="2280"/>
         <source>Delete directory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="2358"/>
+        <location filename="../Project/Project.py" line="2375"/>
         <source>Create project directory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="2358"/>
+        <location filename="../Project/Project.py" line="2375"/>
         <source>&lt;p&gt;The project directory &lt;b&gt;{0}&lt;/b&gt; could not be created.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="2933"/>
+        <location filename="../Project/Project.py" line="2950"/>
         <source>Create project management directory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="2933"/>
+        <location filename="../Project/Project.py" line="2950"/>
         <source>&lt;p&gt;The project directory &lt;b&gt;{0}&lt;/b&gt; is not writable.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="2441"/>
+        <location filename="../Project/Project.py" line="2458"/>
         <source>Create main script</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="2441"/>
+        <location filename="../Project/Project.py" line="2458"/>
         <source>&lt;p&gt;The mainscript &lt;b&gt;{0}&lt;/b&gt; could not be created.&lt;br/&gt;Reason: {1}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="2965"/>
+        <location filename="../Project/Project.py" line="2982"/>
         <source>New Project</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="2474"/>
+        <location filename="../Project/Project.py" line="2491"/>
         <source>Add existing files to the project?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="2965"/>
+        <location filename="../Project/Project.py" line="2982"/>
         <source>Select Version Control System</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="2601"/>
+        <location filename="../Project/Project.py" line="2618"/>
         <source>Would you like to edit the VCS command options?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3831"/>
+        <location filename="../Project/Project.py" line="3866"/>
         <source>New project</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="2544"/>
+        <location filename="../Project/Project.py" line="2561"/>
         <source>Shall the project file be added to the repository?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="2580"/>
+        <location filename="../Project/Project.py" line="2597"/>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="2573"/>
+        <location filename="../Project/Project.py" line="2590"/>
         <source>Select version control system for the project</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="2684"/>
+        <location filename="../Project/Project.py" line="2701"/>
         <source>Translation Pattern</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="2684"/>
+        <location filename="../Project/Project.py" line="2701"/>
         <source>Enter the path pattern for translation files (use &apos;%language%&apos; in place of the language code):</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3845"/>
+        <location filename="../Project/Project.py" line="3880"/>
         <source>Open project</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3115"/>
+        <location filename="../Project/Project.py" line="3132"/>
         <source>Project Files (*.e4p)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3882"/>
+        <location filename="../Project/Project.py" line="3917"/>
         <source>Save project as</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3130"/>
+        <location filename="../Project/Project.py" line="3147"/>
         <source>Save File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3166"/>
+        <location filename="../Project/Project.py" line="3183"/>
         <source>Close Project</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3166"/>
+        <location filename="../Project/Project.py" line="3183"/>
         <source>The current project has unsaved changes.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3343"/>
+        <location filename="../Project/Project.py" line="3360"/>
         <source>Syntax errors detected</source>
         <translation type="unfinished"></translation>
     </message>
     <message numerus="yes">
-        <location filename="../Project/Project.py" line="3343"/>
+        <location filename="../Project/Project.py" line="3360"/>
         <source>The project contains %n file(s) with syntax errors.</source>
         <translation type="unfinished">
             <numerusform></numerusform>
         </translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3831"/>
+        <location filename="../Project/Project.py" line="3866"/>
         <source>&amp;New...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3836"/>
+        <location filename="../Project/Project.py" line="3871"/>
         <source>Generate a new project</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3837"/>
+        <location filename="../Project/Project.py" line="3872"/>
         <source>&lt;b&gt;New...&lt;/b&gt;&lt;p&gt;This opens a dialog for entering the info for a new project.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3845"/>
+        <location filename="../Project/Project.py" line="3880"/>
         <source>&amp;Open...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3850"/>
+        <location filename="../Project/Project.py" line="3885"/>
         <source>Open an existing project</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3851"/>
-        <source>&lt;b&gt;Open...&lt;/b&gt;&lt;p&gt;This opens an existing project.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="3858"/>
-        <source>Close project</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="3858"/>
-        <source>&amp;Close</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="3862"/>
-        <source>Close the current project</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="3863"/>
-        <source>&lt;b&gt;Close&lt;/b&gt;&lt;p&gt;This closes the current project.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="3870"/>
-        <source>Save project</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4062"/>
-        <source>&amp;Save</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="3874"/>
-        <source>Save the current project</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="3875"/>
-        <source>&lt;b&gt;Save&lt;/b&gt;&lt;p&gt;This saves the current project.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="3882"/>
-        <source>Save &amp;as...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Project/Project.py" line="3886"/>
-        <source>Save the current project to a new file</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="3888"/>
-        <source>&lt;b&gt;Save as&lt;/b&gt;&lt;p&gt;This saves the current project to a new file.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="3897"/>
-        <source>Add files to project</source>
+        <source>&lt;b&gt;Open...&lt;/b&gt;&lt;p&gt;This opens an existing project.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="3893"/>
+        <source>Close project</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="3893"/>
+        <source>&amp;Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../Project/Project.py" line="3897"/>
+        <source>Close the current project</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="3898"/>
+        <source>&lt;b&gt;Close&lt;/b&gt;&lt;p&gt;This closes the current project.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="3905"/>
+        <source>Save project</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4097"/>
+        <source>&amp;Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="3909"/>
+        <source>Save the current project</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="3910"/>
+        <source>&lt;b&gt;Save&lt;/b&gt;&lt;p&gt;This saves the current project.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="3917"/>
+        <source>Save &amp;as...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="3921"/>
+        <source>Save the current project to a new file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="3923"/>
+        <source>&lt;b&gt;Save as&lt;/b&gt;&lt;p&gt;This saves the current project to a new file.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="3932"/>
+        <source>Add files to project</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="3932"/>
         <source>Add &amp;files...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3902"/>
+        <location filename="../Project/Project.py" line="3937"/>
         <source>Add files to the current project</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3904"/>
+        <location filename="../Project/Project.py" line="3939"/>
         <source>&lt;b&gt;Add files...&lt;/b&gt;&lt;p&gt;This opens a dialog for adding files to the current project. The place to add is determined by the file extension.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3913"/>
+        <location filename="../Project/Project.py" line="3948"/>
         <source>Add directory to project</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3913"/>
+        <location filename="../Project/Project.py" line="3948"/>
         <source>Add directory...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3918"/>
+        <location filename="../Project/Project.py" line="3953"/>
         <source>Add a directory to the current project</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3920"/>
+        <location filename="../Project/Project.py" line="3955"/>
         <source>&lt;b&gt;Add directory...&lt;/b&gt;&lt;p&gt;This opens a dialog for adding a directory to the current project.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3928"/>
+        <location filename="../Project/Project.py" line="3963"/>
         <source>Add translation to project</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3928"/>
+        <location filename="../Project/Project.py" line="3963"/>
         <source>Add &amp;translation...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3933"/>
+        <location filename="../Project/Project.py" line="3968"/>
         <source>Add a translation to the current project</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3935"/>
+        <location filename="../Project/Project.py" line="3970"/>
         <source>&lt;b&gt;Add translation...&lt;/b&gt;&lt;p&gt;This opens a dialog for add a translation to the current project.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3943"/>
-        <source>Search new files</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="3943"/>
-        <source>Searc&amp;h new files...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="3947"/>
-        <source>Search new files in the project directory.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="3958"/>
-        <source>Search Project File</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="3958"/>
-        <source>Search Project File...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="3958"/>
-        <source>Alt+Ctrl+P</source>
-        <comment>Project|Search Project File</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="3964"/>
-        <source>Search for a file in the project list of files.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="3966"/>
-        <source>&lt;b&gt;Search Project File&lt;/b&gt;&lt;p&gt;This searches for a file in the project list of files.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="3973"/>
-        <source>Project properties</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="3973"/>
-        <source>&amp;Properties...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Project/Project.py" line="3978"/>
-        <source>Show the project properties</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="3979"/>
-        <source>&lt;b&gt;Properties...&lt;/b&gt;&lt;p&gt;This shows a dialog to edit the project properties.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="3986"/>
-        <source>User project properties</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="3986"/>
-        <source>&amp;User Properties...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="3991"/>
-        <source>Show the user specific project properties</source>
+        <source>Search new files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="3978"/>
+        <source>Searc&amp;h new files...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="3982"/>
+        <source>Search new files in the project directory.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../Project/Project.py" line="3993"/>
-        <source>&lt;b&gt;User Properties...&lt;/b&gt;&lt;p&gt;This shows a dialog to edit the user specific project properties.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4001"/>
-        <source>Filetype Associations</source>
+        <source>Search Project File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="3993"/>
+        <source>Search Project File...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="3993"/>
+        <source>Alt+Ctrl+P</source>
+        <comment>Project|Search Project File</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="3999"/>
+        <source>Search for a file in the project list of files.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../Project/Project.py" line="4001"/>
+        <source>&lt;b&gt;Search Project File&lt;/b&gt;&lt;p&gt;This searches for a file in the project list of files.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4008"/>
+        <source>Project properties</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4008"/>
+        <source>&amp;Properties...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4013"/>
+        <source>Show the project properties</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4014"/>
+        <source>&lt;b&gt;Properties...&lt;/b&gt;&lt;p&gt;This shows a dialog to edit the project properties.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4021"/>
+        <source>User project properties</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4021"/>
+        <source>&amp;User Properties...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4026"/>
+        <source>Show the user specific project properties</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4028"/>
+        <source>&lt;b&gt;User Properties...&lt;/b&gt;&lt;p&gt;This shows a dialog to edit the user specific project properties.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4036"/>
+        <source>Filetype Associations</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4036"/>
         <source>Filetype Associations...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4005"/>
+        <location filename="../Project/Project.py" line="4040"/>
         <source>Show the project filetype associations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4019"/>
-        <source>Lexer Associations</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4019"/>
-        <source>Lexer Associations...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4023"/>
-        <source>Show the project lexer associations (overriding defaults)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4025"/>
-        <source>&lt;b&gt;Lexer Associations...&lt;/b&gt;&lt;p&gt;This shows a dialog to edit the lexer associations of the project. These associations override the global lexer associations. Lexers are used to highlight the editor text.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4037"/>
-        <source>Debugger Properties</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4037"/>
-        <source>Debugger &amp;Properties...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4041"/>
-        <source>Show the debugger properties</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4042"/>
-        <source>&lt;b&gt;Debugger Properties...&lt;/b&gt;&lt;p&gt;This shows a dialog to edit project specific debugger settings.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4050"/>
-        <source>Load</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4050"/>
-        <source>&amp;Load</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Project/Project.py" line="4054"/>
+        <source>Lexer Associations</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4054"/>
+        <source>Lexer Associations...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4058"/>
+        <source>Show the project lexer associations (overriding defaults)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4060"/>
+        <source>&lt;b&gt;Lexer Associations...&lt;/b&gt;&lt;p&gt;This shows a dialog to edit the lexer associations of the project. These associations override the global lexer associations. Lexers are used to highlight the editor text.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4072"/>
+        <source>Debugger Properties</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4072"/>
+        <source>Debugger &amp;Properties...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4076"/>
+        <source>Show the debugger properties</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4077"/>
+        <source>&lt;b&gt;Debugger Properties...&lt;/b&gt;&lt;p&gt;This shows a dialog to edit project specific debugger settings.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4085"/>
+        <source>Load</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4085"/>
+        <source>&amp;Load</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4089"/>
         <source>Load the debugger properties</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4055"/>
+        <location filename="../Project/Project.py" line="4090"/>
         <source>&lt;b&gt;Load Debugger Properties&lt;/b&gt;&lt;p&gt;This loads the project specific debugger settings.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4062"/>
+        <location filename="../Project/Project.py" line="4097"/>
         <source>Save</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4066"/>
-        <source>Save the debugger properties</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4067"/>
-        <source>&lt;b&gt;Save Debugger Properties&lt;/b&gt;&lt;p&gt;This saves the project specific debugger settings.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4074"/>
-        <source>Delete</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4074"/>
-        <source>&amp;Delete</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4078"/>
-        <source>Delete the debugger properties</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4079"/>
-        <source>&lt;b&gt;Delete Debugger Properties&lt;/b&gt;&lt;p&gt;This deletes the file containing the project specific debugger settings.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4087"/>
-        <source>Reset</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4087"/>
-        <source>&amp;Reset</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4091"/>
-        <source>Reset the debugger properties</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4092"/>
-        <source>&lt;b&gt;Reset Debugger Properties&lt;/b&gt;&lt;p&gt;This resets the project specific debugger settings.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Project/Project.py" line="4101"/>
+        <source>Save the debugger properties</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4102"/>
+        <source>&lt;b&gt;Save Debugger Properties&lt;/b&gt;&lt;p&gt;This saves the project specific debugger settings.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4109"/>
+        <source>Delete</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4109"/>
+        <source>&amp;Delete</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4113"/>
+        <source>Delete the debugger properties</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4114"/>
+        <source>&lt;b&gt;Delete Debugger Properties&lt;/b&gt;&lt;p&gt;This deletes the file containing the project specific debugger settings.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4122"/>
+        <source>Reset</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4122"/>
+        <source>&amp;Reset</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4126"/>
+        <source>Reset the debugger properties</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4127"/>
+        <source>&lt;b&gt;Reset Debugger Properties&lt;/b&gt;&lt;p&gt;This resets the project specific debugger settings.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4136"/>
         <source>Load session</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4105"/>
+        <location filename="../Project/Project.py" line="4140"/>
         <source>Load the projects session file.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4106"/>
-        <source>&lt;b&gt;Load session&lt;/b&gt;&lt;p&gt;This loads the projects session file. The session consists of the following data.&lt;br&gt;- all open source files&lt;br&gt;- all breakpoint&lt;br&gt;- the commandline arguments&lt;br&gt;- the working directory&lt;br&gt;- the exception reporting flag&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4119"/>
-        <source>Save session</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4123"/>
-        <source>Save the projects session file.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4124"/>
-        <source>&lt;b&gt;Save session&lt;/b&gt;&lt;p&gt;This saves the projects session file. The session consists of the following data.&lt;br&gt;- all open source files&lt;br&gt;- all breakpoint&lt;br&gt;- the commandline arguments&lt;br&gt;- the working directory&lt;br&gt;- the exception reporting flag&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4137"/>
-        <source>Delete session</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Project/Project.py" line="4141"/>
+        <source>&lt;b&gt;Load session&lt;/b&gt;&lt;p&gt;This loads the projects session file. The session consists of the following data.&lt;br&gt;- all open source files&lt;br&gt;- all breakpoint&lt;br&gt;- the commandline arguments&lt;br&gt;- the working directory&lt;br&gt;- the exception reporting flag&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4154"/>
+        <source>Save session</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4158"/>
+        <source>Save the projects session file.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4159"/>
+        <source>&lt;b&gt;Save session&lt;/b&gt;&lt;p&gt;This saves the projects session file. The session consists of the following data.&lt;br&gt;- all open source files&lt;br&gt;- all breakpoint&lt;br&gt;- the commandline arguments&lt;br&gt;- the working directory&lt;br&gt;- the exception reporting flag&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4172"/>
+        <source>Delete session</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4176"/>
         <source>Delete the projects session file.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4142"/>
+        <location filename="../Project/Project.py" line="4177"/>
         <source>&lt;b&gt;Delete session&lt;/b&gt;&lt;p&gt;This deletes the projects session file&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4151"/>
+        <location filename="../Project/Project.py" line="4186"/>
         <source>Code Metrics</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4151"/>
+        <location filename="../Project/Project.py" line="4186"/>
         <source>&amp;Code Metrics...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4155"/>
+        <location filename="../Project/Project.py" line="4190"/>
         <source>Show some code metrics for the project.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4157"/>
+        <location filename="../Project/Project.py" line="4192"/>
         <source>&lt;b&gt;Code Metrics...&lt;/b&gt;&lt;p&gt;This shows some code metrics for all Python files in the project.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4165"/>
+        <location filename="../Project/Project.py" line="4200"/>
         <source>Python Code Coverage</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4165"/>
-        <source>Code Co&amp;verage...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4169"/>
-        <source>Show code coverage information for the project.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4171"/>
-        <source>&lt;b&gt;Code Coverage...&lt;/b&gt;&lt;p&gt;This shows the code coverage information for all Python files in the project.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="5053"/>
-        <source>Profile Data</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4179"/>
-        <source>&amp;Profile Data...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4183"/>
-        <source>Show profiling data for the project.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4185"/>
-        <source>&lt;b&gt;Profile Data...&lt;/b&gt;&lt;p&gt;This shows the profiling data for the project.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="5107"/>
-        <source>Application Diagram</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4194"/>
-        <source>&amp;Application Diagram...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4198"/>
-        <source>Show a diagram of the project.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Project/Project.py" line="4200"/>
-        <source>&lt;b&gt;Application Diagram...&lt;/b&gt;&lt;p&gt;This shows a diagram of the project.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4208"/>
-        <source>Load Diagram</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4208"/>
-        <source>&amp;Load Diagram...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4212"/>
-        <source>Load a diagram from file.</source>
+        <source>Code Co&amp;verage...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4204"/>
+        <source>Show code coverage information for the project.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4206"/>
+        <source>&lt;b&gt;Code Coverage...&lt;/b&gt;&lt;p&gt;This shows the code coverage information for all Python files in the project.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="5088"/>
+        <source>Profile Data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../Project/Project.py" line="4214"/>
+        <source>&amp;Profile Data...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4218"/>
+        <source>Show profiling data for the project.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4220"/>
+        <source>&lt;b&gt;Profile Data...&lt;/b&gt;&lt;p&gt;This shows the profiling data for the project.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="5142"/>
+        <source>Application Diagram</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4229"/>
+        <source>&amp;Application Diagram...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4233"/>
+        <source>Show a diagram of the project.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4235"/>
+        <source>&lt;b&gt;Application Diagram...&lt;/b&gt;&lt;p&gt;This shows a diagram of the project.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4243"/>
+        <source>Load Diagram</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4243"/>
+        <source>&amp;Load Diagram...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4247"/>
+        <source>Load a diagram from file.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4249"/>
         <source>&lt;b&gt;Load Diagram...&lt;/b&gt;&lt;p&gt;This loads a diagram from file.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5300"/>
+        <location filename="../Project/Project.py" line="5335"/>
         <source>Create Package List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4223"/>
+        <location filename="../Project/Project.py" line="4258"/>
         <source>Create &amp;Package List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4228"/>
+        <location filename="../Project/Project.py" line="4263"/>
         <source>Create an initial PKGLIST file for an eric6 plugin.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4230"/>
+        <location filename="../Project/Project.py" line="4265"/>
         <source>&lt;b&gt;Create Package List&lt;/b&gt;&lt;p&gt;This creates an initial list of files to include in an eric6 plugin archive. The list is created from the project file.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5574"/>
+        <location filename="../Project/Project.py" line="5609"/>
         <source>Create Plugin Archive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4325"/>
+        <location filename="../Project/Project.py" line="4360"/>
         <source>&amp;Project</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../Project/Project.py" line="4361"/>
+        <source>Open &amp;Recent Projects</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4366"/>
+        <source>&amp;Version Control</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4370"/>
+        <source>Chec&amp;k</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4372"/>
+        <source>Sho&amp;w</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4373"/>
+        <source>&amp;Diagrams</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4362"/>
+        <source>Session</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4375"/>
+        <source>Source &amp;Documentation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4363"/>
+        <source>Debugger</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4374"/>
+        <source>Pac&amp;kagers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4500"/>
+        <source>Project</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4566"/>
+        <source>&amp;Clear</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4739"/>
+        <source>Search New Files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4739"/>
+        <source>There were no new files found to be added.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4885"/>
+        <source>Version Control System</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4874"/>
+        <source>&lt;p&gt;The selected VCS &lt;b&gt;{0}&lt;/b&gt; could not be found. &lt;br/&gt;Reverting override.&lt;/p&gt;&lt;p&gt;{1}&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4885"/>
+        <source>&lt;p&gt;The selected VCS &lt;b&gt;{0}&lt;/b&gt; could not be found.&lt;br/&gt;Disabling version control.&lt;/p&gt;&lt;p&gt;{1}&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="5015"/>
+        <source>Coverage Data</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="5065"/>
+        <source>There is no main script defined for the current project. Aborting</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="5038"/>
+        <source>Code Coverage</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="5038"/>
+        <source>Please select a coverage file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="5088"/>
+        <source>Please select a profile file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="5142"/>
+        <source>Include module names?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="5286"/>
+        <source>&lt;p&gt;The file &lt;b&gt;PKGLIST&lt;/b&gt; already exists.&lt;/p&gt;&lt;p&gt;Overwrite it?&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="5335"/>
+        <source>&lt;p&gt;The file &lt;b&gt;PKGLIST&lt;/b&gt; could not be created.&lt;/p&gt;&lt;p&gt;Reason: {0}&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="5354"/>
+        <source>The project does not have a main script defined. Aborting...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="5459"/>
+        <source>&lt;p&gt;The eric6 plugin archive file &lt;b&gt;{0}&lt;/b&gt; could not be created.&lt;/p&gt;&lt;p&gt;Reason: {1}&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="5495"/>
+        <source>&lt;p&gt;The file &lt;b&gt;{0}&lt;/b&gt; could not be stored in the archive. Ignoring it.&lt;/p&gt;&lt;p&gt;Reason: {1}&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="5568"/>
+        <source>&lt;p&gt;The plugin file &lt;b&gt;{0}&lt;/b&gt; could not be read.&lt;/p&gt;&lt;p&gt;Reason: {1}&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="5609"/>
+        <source>&lt;p&gt;The plugin file &lt;b&gt;{0}&lt;/b&gt; could not be read.&lt;/p&gt; &lt;p&gt;Reason: {1}&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="5390"/>
+        <source>Create Plugin Archives</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4274"/>
+        <source>Create Plugin &amp;Archives</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4279"/>
+        <source>Create eric6 plugin archive files.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4281"/>
+        <source>&lt;b&gt;Create Plugin Archives&lt;/b&gt;&lt;p&gt;This creates eric6 plugin archive files using the list of files given in a PKGLIST* file. The archive name is built from the main script name if not designated in the package list file.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4291"/>
+        <source>Create Plugin Archives (Snapshot)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4291"/>
+        <source>Create Plugin Archives (&amp;Snapshot)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4296"/>
+        <source>Create eric6 plugin archive files (snapshot releases).</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4298"/>
+        <source>&lt;b&gt;Create Plugin Archives (Snapshot)&lt;/b&gt;&lt;p&gt;This creates eric6 plugin archive files using the list of files given in the PKGLIST* file. The archive name is built from the main script name if not designated in the package list file. The version entry of the main script is modified to reflect a snapshot release.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="5368"/>
+        <source>Select package lists:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="5386"/>
+        <source>Creating plugin archives...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="5386"/>
+        <source>Abort</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="5386"/>
+        <source>%v/%m Archives</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="5403"/>
+        <source>&lt;p&gt;The file &lt;b&gt;{0}&lt;/b&gt; could not be read.&lt;/p&gt;&lt;p&gt;Reason: {1}&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="5514"/>
+        <source>&lt;p&gt;The eric6 plugin archive files were created with some errors.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="5517"/>
+        <source>&lt;p&gt;The eric6 plugin archive files were created successfully.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="5379"/>
+        <source>&lt;p&gt;No package list files (PKGLIST*) available or selected. Aborting...&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="5431"/>
+        <source>&lt;p&gt;The file &lt;b&gt;{0}&lt;/b&gt; is not ready yet.&lt;/p&gt;&lt;p&gt;Please rework it and delete the&apos;; initial_list&apos; line of the header.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="3984"/>
+        <source>&lt;b&gt;Search new files...&lt;/b&gt;&lt;p&gt;This searches for new files (sources, *.ui, *.idl, *.proto) in the project directory and registered subdirectories.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4042"/>
+        <source>&lt;b&gt;Filetype Associations...&lt;/b&gt;&lt;p&gt;This shows a dialog to edit the file type associations of the project. These associations determine the type (source, form, interface, protocol or others) with a filename pattern. They are used when adding a file to the project and when performing a search for new files.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="1531"/>
+        <source>&lt;p&gt;The selected translation file &lt;b&gt;{0}&lt;/b&gt; could not be deleted.&lt;/p&gt;&lt;p&gt;Reason: {1}&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="2250"/>
+        <source>&lt;p&gt;The selected file &lt;b&gt;{0}&lt;/b&gt; could not be deleted.&lt;/p&gt;&lt;p&gt;Reason: {1}&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="2280"/>
+        <source>&lt;p&gt;The selected directory &lt;b&gt;{0}&lt;/b&gt; could not be deleted.&lt;/p&gt;&lt;p&gt;Reason: {1}&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="2773"/>
+        <source>Create Makefile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="2773"/>
+        <source>&lt;p&gt;The makefile &lt;b&gt;{0}&lt;/b&gt; could not be created.&lt;br/&gt;Reason: {1}&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="5795"/>
+        <source>Execute Make</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4312"/>
+        <source>&amp;Execute Make</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4316"/>
+        <source>Perform a &apos;make&apos; run.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4318"/>
+        <source>&lt;b&gt;Execute Make&lt;/b&gt;&lt;p&gt;This performs a &apos;make&apos; run to rebuild the configured target.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="5775"/>
+        <source>Test for Changes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../Project/Project.py" line="4326"/>
-        <source>Open &amp;Recent Projects</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4331"/>
-        <source>&amp;Version Control</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4335"/>
-        <source>Chec&amp;k</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4337"/>
-        <source>Sho&amp;w</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4338"/>
-        <source>&amp;Diagrams</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4327"/>
-        <source>Session</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4340"/>
-        <source>Source &amp;Documentation</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4328"/>
-        <source>Debugger</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4339"/>
-        <source>Pac&amp;kagers</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4465"/>
-        <source>Project</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4531"/>
-        <source>&amp;Clear</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4704"/>
-        <source>Search New Files</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4704"/>
-        <source>There were no new files found to be added.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4850"/>
-        <source>Version Control System</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4839"/>
-        <source>&lt;p&gt;The selected VCS &lt;b&gt;{0}&lt;/b&gt; could not be found. &lt;br/&gt;Reverting override.&lt;/p&gt;&lt;p&gt;{1}&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4850"/>
-        <source>&lt;p&gt;The selected VCS &lt;b&gt;{0}&lt;/b&gt; could not be found.&lt;br/&gt;Disabling version control.&lt;/p&gt;&lt;p&gt;{1}&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4980"/>
-        <source>Coverage Data</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="5030"/>
-        <source>There is no main script defined for the current project. Aborting</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="5003"/>
-        <source>Code Coverage</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="5003"/>
-        <source>Please select a coverage file</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="5053"/>
-        <source>Please select a profile file</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="5107"/>
-        <source>Include module names?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="5251"/>
-        <source>&lt;p&gt;The file &lt;b&gt;PKGLIST&lt;/b&gt; already exists.&lt;/p&gt;&lt;p&gt;Overwrite it?&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="5300"/>
-        <source>&lt;p&gt;The file &lt;b&gt;PKGLIST&lt;/b&gt; could not be created.&lt;/p&gt;&lt;p&gt;Reason: {0}&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="5319"/>
-        <source>The project does not have a main script defined. Aborting...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="5424"/>
-        <source>&lt;p&gt;The eric6 plugin archive file &lt;b&gt;{0}&lt;/b&gt; could not be created.&lt;/p&gt;&lt;p&gt;Reason: {1}&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="5460"/>
-        <source>&lt;p&gt;The file &lt;b&gt;{0}&lt;/b&gt; could not be stored in the archive. Ignoring it.&lt;/p&gt;&lt;p&gt;Reason: {1}&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="5533"/>
-        <source>&lt;p&gt;The plugin file &lt;b&gt;{0}&lt;/b&gt; could not be read.&lt;/p&gt;&lt;p&gt;Reason: {1}&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="5574"/>
-        <source>&lt;p&gt;The plugin file &lt;b&gt;{0}&lt;/b&gt; could not be read.&lt;/p&gt; &lt;p&gt;Reason: {1}&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="5355"/>
-        <source>Create Plugin Archives</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4239"/>
-        <source>Create Plugin &amp;Archives</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4244"/>
-        <source>Create eric6 plugin archive files.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4246"/>
-        <source>&lt;b&gt;Create Plugin Archives&lt;/b&gt;&lt;p&gt;This creates eric6 plugin archive files using the list of files given in a PKGLIST* file. The archive name is built from the main script name if not designated in the package list file.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4256"/>
-        <source>Create Plugin Archives (Snapshot)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4256"/>
-        <source>Create Plugin Archives (&amp;Snapshot)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4261"/>
-        <source>Create eric6 plugin archive files (snapshot releases).</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4263"/>
-        <source>&lt;b&gt;Create Plugin Archives (Snapshot)&lt;/b&gt;&lt;p&gt;This creates eric6 plugin archive files using the list of files given in the PKGLIST* file. The archive name is built from the main script name if not designated in the package list file. The version entry of the main script is modified to reflect a snapshot release.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="5333"/>
-        <source>Select package lists:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="5351"/>
-        <source>Creating plugin archives...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="5351"/>
-        <source>Abort</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="5351"/>
-        <source>%v/%m Archives</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="5368"/>
-        <source>&lt;p&gt;The file &lt;b&gt;{0}&lt;/b&gt; could not be read.&lt;/p&gt;&lt;p&gt;Reason: {1}&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="5479"/>
-        <source>&lt;p&gt;The eric6 plugin archive files were created with some errors.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="5482"/>
-        <source>&lt;p&gt;The eric6 plugin archive files were created successfully.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="5344"/>
-        <source>&lt;p&gt;No package list files (PKGLIST*) available or selected. Aborting...&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="5396"/>
-        <source>&lt;p&gt;The file &lt;b&gt;{0}&lt;/b&gt; is not ready yet.&lt;/p&gt;&lt;p&gt;Please rework it and delete the&apos;; initial_list&apos; line of the header.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="3949"/>
-        <source>&lt;b&gt;Search new files...&lt;/b&gt;&lt;p&gt;This searches for new files (sources, *.ui, *.idl, *.proto) in the project directory and registered subdirectories.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4007"/>
-        <source>&lt;b&gt;Filetype Associations...&lt;/b&gt;&lt;p&gt;This shows a dialog to edit the file type associations of the project. These associations determine the type (source, form, interface, protocol or others) with a filename pattern. They are used when adding a file to the project and when performing a search for new files.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="1519"/>
-        <source>&lt;p&gt;The selected translation file &lt;b&gt;{0}&lt;/b&gt; could not be deleted.&lt;/p&gt;&lt;p&gt;Reason: {1}&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="2233"/>
-        <source>&lt;p&gt;The selected file &lt;b&gt;{0}&lt;/b&gt; could not be deleted.&lt;/p&gt;&lt;p&gt;Reason: {1}&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="2263"/>
-        <source>&lt;p&gt;The selected directory &lt;b&gt;{0}&lt;/b&gt; could not be deleted.&lt;/p&gt;&lt;p&gt;Reason: {1}&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="2756"/>
-        <source>Create Makefile</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="2756"/>
-        <source>&lt;p&gt;The makefile &lt;b&gt;{0}&lt;/b&gt; could not be created.&lt;br/&gt;Reason: {1}&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="5760"/>
-        <source>Execute Make</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4277"/>
-        <source>&amp;Execute Make</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4281"/>
-        <source>Perform a &apos;make&apos; run.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4283"/>
-        <source>&lt;b&gt;Execute Make&lt;/b&gt;&lt;p&gt;This performs a &apos;make&apos; run to rebuild the configured target.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="5740"/>
-        <source>Test for Changes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4291"/>
         <source>&amp;Test for Changes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4295"/>
+        <location filename="../Project/Project.py" line="4330"/>
         <source>Question &apos;make&apos;, if a rebuild is needed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4297"/>
+        <location filename="../Project/Project.py" line="4332"/>
         <source>&lt;b&gt;Test for Changes&lt;/b&gt;&lt;p&gt;This questions &apos;make&apos;, if a rebuild of the configured target is necessary.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4342"/>
+        <location filename="../Project/Project.py" line="4377"/>
         <source>Make</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5688"/>
+        <location filename="../Project/Project.py" line="5723"/>
         <source>The make process did not start.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5733"/>
+        <location filename="../Project/Project.py" line="5768"/>
         <source>The make process crashed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5743"/>
+        <location filename="../Project/Project.py" line="5778"/>
         <source>&lt;p&gt;There are changes that require the configured make target &lt;b&gt;{0}&lt;/b&gt; to be rebuilt.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5748"/>
+        <location filename="../Project/Project.py" line="5783"/>
         <source>&lt;p&gt;There are changes that require the default make target to be rebuilt.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5760"/>
+        <location filename="../Project/Project.py" line="5795"/>
         <source>The makefile contains errors.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -50819,7 +51064,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4330"/>
+        <location filename="../Project/Project.py" line="4365"/>
         <source>Project-T&amp;ools</source>
         <translation type="unfinished"></translation>
     </message>
@@ -50923,7 +51168,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/ProjectBrowserModel.py" line="782"/>
+        <location filename="../Project/ProjectBrowserModel.py" line="798"/>
         <source>local</source>
         <translation type="unfinished"></translation>
     </message>
@@ -50936,21 +51181,11 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/ProjectBrowserPage.ui" line="37"/>
-        <source>Colours</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/ProjectBrowserPage.ui" line="43"/>
         <source>Highlighted entries (Others):</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/ProjectBrowserPage.ui" line="56"/>
-        <source>Select the colour for highlighted entries in the Others viewer.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/ProjectBrowserPage.ui" line="82"/>
         <source>Visible Project Browsers</source>
         <translation type="unfinished"></translation>
@@ -51075,6 +51310,16 @@
         <source>Protocols (protobuf) Browser</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/ProjectBrowserPage.ui" line="37"/>
+        <source>Colors</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/ProjectBrowserPage.ui" line="56"/>
+        <source>Select the color for highlighted entries in the Others viewer.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ProjectFormsBrowser</name>
@@ -60704,38 +60949,38 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="767"/>
+        <location filename="../QScintilla/Shell.py" line="771"/>
         <source>Select History</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="767"/>
+        <location filename="../QScintilla/Shell.py" line="771"/>
         <source>Select the history entry to execute (most recent shown last).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="835"/>
-        <source>Passive Debug Mode</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Shell.py" line="836"/>
-        <source>
-Not connected</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../QScintilla/Shell.py" line="839"/>
+        <source>Passive Debug Mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Shell.py" line="840"/>
+        <source>
+Not connected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Shell.py" line="843"/>
         <source>No.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="841"/>
+        <location filename="../QScintilla/Shell.py" line="845"/>
         <source>{0} on {1}, {2}</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="888"/>
+        <location filename="../QScintilla/Shell.py" line="892"/>
         <source>Exception &quot;{0}&quot;
 {1}
 File: {2}, Line: {3}
@@ -60743,52 +60988,52 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="898"/>
+        <location filename="../QScintilla/Shell.py" line="902"/>
         <source>Exception &quot;{0}&quot;
 {1}
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="923"/>
+        <location filename="../QScintilla/Shell.py" line="927"/>
         <source>Unspecified syntax error.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="925"/>
+        <location filename="../QScintilla/Shell.py" line="929"/>
         <source>Syntax error &quot;{1}&quot; in file {0} at line {2}, character {3}.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="948"/>
+        <location filename="../QScintilla/Shell.py" line="952"/>
         <source>Signal &quot;{0}&quot; generated in file {1} at line {2}.
 Function: {3}({4})</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="1030"/>
+        <location filename="../QScintilla/Shell.py" line="1034"/>
         <source>StdOut: {0}</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="1038"/>
+        <location filename="../QScintilla/Shell.py" line="1042"/>
         <source>StdErr: {0}</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="2157"/>
+        <location filename="../QScintilla/Shell.py" line="2161"/>
         <source>Drop Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="2157"/>
+        <location filename="../QScintilla/Shell.py" line="2161"/>
         <source>&lt;p&gt;&lt;b&gt;{0}&lt;/b&gt; is not a file.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="2015"/>
+        <location filename="../QScintilla/Shell.py" line="2019"/>
         <source>Project</source>
         <translation type="unfinished"></translation>
     </message>
@@ -60818,14 +61063,14 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="1835"/>
+        <location filename="../QScintilla/Shell.py" line="1839"/>
         <source>Available Virtual Environments:
 {0}
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="1876"/>
+        <location filename="../QScintilla/Shell.py" line="1880"/>
         <source>Current Virtual Environment: &apos;{0}&apos;
 </source>
         <translation type="unfinished"></translation>
@@ -68879,32 +69124,32 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/Sync/SyncCheckPage.py" line="55"/>
+        <location filename="../WebBrowser/Sync/SyncCheckPage.py" line="49"/>
         <source>FTP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/Sync/SyncCheckPage.py" line="56"/>
+        <location filename="../WebBrowser/Sync/SyncCheckPage.py" line="50"/>
         <source>Host:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/Sync/SyncCheckPage.py" line="63"/>
+        <location filename="../WebBrowser/Sync/SyncCheckPage.py" line="57"/>
         <source>Shared Directory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/Sync/SyncCheckPage.py" line="64"/>
+        <location filename="../WebBrowser/Sync/SyncCheckPage.py" line="58"/>
         <source>Directory:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/Sync/SyncCheckPage.py" line="68"/>
+        <location filename="../WebBrowser/Sync/SyncCheckPage.py" line="62"/>
         <source>No Synchronization</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/Sync/SyncCheckPage.py" line="211"/>
+        <location filename="../WebBrowser/Sync/SyncCheckPage.py" line="204"/>
         <source>&lt;font color=&quot;#FF0000&quot;&gt;&lt;b&gt;Error:&lt;/b&gt; {0}&lt;/font&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -70549,16 +70794,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/TasksPage.ui" line="105"/>
-        <source>Tasks Background Colours</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/TasksPage.ui" line="206"/>
-        <source>Select the background colour for these tasks.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/TasksPage.ui" line="219"/>
         <source>Tasks Handling</source>
         <translation type="unfinished"></translation>
@@ -70573,6 +70808,16 @@
         <source>Clear global file task when file is closed</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/TasksPage.ui" line="105"/>
+        <source>Tasks Background Colors</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/TasksPage.ui" line="206"/>
+        <source>Select the background color for these tasks.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TemplateGroup</name>
@@ -71609,27 +71854,27 @@
 <context>
     <name>Translator</name>
     <message>
-        <location filename="../Plugins/UiExtensionPlugins/Translator/Translator.py" line="52"/>
+        <location filename="../Plugins/UiExtensionPlugins/Translator/Translator.py" line="63"/>
         <source>Translator</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/UiExtensionPlugins/Translator/Translator.py" line="52"/>
+        <location filename="../Plugins/UiExtensionPlugins/Translator/Translator.py" line="63"/>
         <source>T&amp;ranslator</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/UiExtensionPlugins/Translator/Translator.py" line="52"/>
+        <location filename="../Plugins/UiExtensionPlugins/Translator/Translator.py" line="63"/>
         <source>Alt+Shift+R</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/UiExtensionPlugins/Translator/Translator.py" line="58"/>
+        <location filename="../Plugins/UiExtensionPlugins/Translator/Translator.py" line="69"/>
         <source>Switch the input focus to the Translator window.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/UiExtensionPlugins/Translator/Translator.py" line="60"/>
+        <location filename="../Plugins/UiExtensionPlugins/Translator/Translator.py" line="71"/>
         <source>&lt;b&gt;Activate Translator&lt;/b&gt;&lt;p&gt;This switches the input focus to the Translator window.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -71637,52 +71882,52 @@
 <context>
     <name>TranslatorEngines</name>
     <message>
-        <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorEngines/__init__.py" line="37"/>
+        <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorEngines/__init__.py" line="39"/>
         <source>Google V.1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorEngines/__init__.py" line="39"/>
-        <source>MyMemory</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorEngines/__init__.py" line="41"/>
-        <source>Glosbe</source>
+        <source>MyMemory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorEngines/__init__.py" line="43"/>
-        <source>PROMT</source>
+        <source>Glosbe</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorEngines/__init__.py" line="45"/>
-        <source>Yandex</source>
+        <source>PROMT</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorEngines/__init__.py" line="47"/>
-        <source>Google V.2</source>
+        <source>Yandex</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorEngines/__init__.py" line="49"/>
+        <source>Google V.2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorEngines/__init__.py" line="51"/>
         <source>Microsoft</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorEngines/__init__.py" line="57"/>
+        <source>Unknow translation service name ({0})</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorEngines/__init__.py" line="55"/>
-        <source>Unknow translation service name ({0})</source>
+        <source>IBM Watson</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorEngines/__init__.py" line="53"/>
-        <source>IBM Watson</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorEngines/__init__.py" line="51"/>
         <source>DeepL Pro</source>
         <translation type="unfinished"></translation>
     </message>
@@ -71931,12 +72176,12 @@
     </message>
     <message>
         <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorLanguagesDb.py" line="79"/>
-        <source>Chinese S</source>
+        <source>Chinese (China)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorLanguagesDb.py" line="80"/>
-        <source>Chinese T</source>
+        <source>Chinese (Taiwan)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -72116,7 +72361,7 @@
 <context>
     <name>TranslatorPlugin</name>
     <message>
-        <location filename="../Plugins/PluginTranslator.py" line="65"/>
+        <location filename="../Plugins/PluginTranslator.py" line="71"/>
         <source>Translator</source>
         <translation type="unfinished"></translation>
     </message>
@@ -74792,7 +75037,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="6329"/>
+        <location filename="../UI/UserInterface.py" line="6327"/>
         <source>Export Keyboard Shortcuts</source>
         <translation type="unfinished"></translation>
     </message>
@@ -74812,7 +75057,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="6353"/>
+        <location filename="../UI/UserInterface.py" line="6351"/>
         <source>Import Keyboard Shortcuts</source>
         <translation type="unfinished"></translation>
     </message>
@@ -75242,7 +75487,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="7326"/>
+        <location filename="../UI/UserInterface.py" line="7324"/>
         <source>&lt;/table&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -75434,157 +75679,157 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="6121"/>
+        <location filename="../UI/UserInterface.py" line="6119"/>
         <source>Open Browser</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="6121"/>
+        <location filename="../UI/UserInterface.py" line="6119"/>
         <source>Could not start a web browser</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="6353"/>
+        <location filename="../UI/UserInterface.py" line="6351"/>
         <source>Keyboard shortcut file (*.e4k)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="6523"/>
+        <location filename="../UI/UserInterface.py" line="6521"/>
         <source>Save tasks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="6523"/>
+        <location filename="../UI/UserInterface.py" line="6521"/>
         <source>&lt;p&gt;The tasks file &lt;b&gt;{0}&lt;/b&gt; could not be written.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="6552"/>
+        <location filename="../UI/UserInterface.py" line="6550"/>
         <source>Read tasks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="6552"/>
+        <location filename="../UI/UserInterface.py" line="6550"/>
         <source>&lt;p&gt;The tasks file &lt;b&gt;{0}&lt;/b&gt; could not be read.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="6648"/>
+        <location filename="../UI/UserInterface.py" line="6646"/>
         <source>Save session</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="6586"/>
+        <location filename="../UI/UserInterface.py" line="6584"/>
         <source>&lt;p&gt;The session file &lt;b&gt;{0}&lt;/b&gt; could not be written.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="6632"/>
+        <location filename="../UI/UserInterface.py" line="6630"/>
         <source>Read session</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="6632"/>
+        <location filename="../UI/UserInterface.py" line="6630"/>
         <source>&lt;p&gt;The session file &lt;b&gt;{0}&lt;/b&gt; could not be read.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="6916"/>
+        <location filename="../UI/UserInterface.py" line="6914"/>
         <source>Drop Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="6916"/>
+        <location filename="../UI/UserInterface.py" line="6914"/>
         <source>&lt;p&gt;&lt;b&gt;{0}&lt;/b&gt; is not a file.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="7101"/>
+        <location filename="../UI/UserInterface.py" line="7099"/>
         <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="7101"/>
+        <location filename="../UI/UserInterface.py" line="7099"/>
         <source>%v/%m</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="7105"/>
+        <location filename="../UI/UserInterface.py" line="7103"/>
         <source>Version Check</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="7110"/>
+        <location filename="../UI/UserInterface.py" line="7108"/>
         <source>Trying host {0}</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="7176"/>
+        <location filename="../UI/UserInterface.py" line="7174"/>
         <source>Error getting versions information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="7121"/>
+        <location filename="../UI/UserInterface.py" line="7119"/>
         <source>The versions information cannot not be downloaded because you are &lt;b&gt;offline&lt;/b&gt;. Please go online and try again.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="7169"/>
+        <location filename="../UI/UserInterface.py" line="7167"/>
         <source>The versions information could not be downloaded. Please go online and try again.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="7176"/>
+        <location filename="../UI/UserInterface.py" line="7174"/>
         <source>The versions information could not be downloaded for the last 7 days. Please go online and try again.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="7268"/>
+        <location filename="../UI/UserInterface.py" line="7266"/>
         <source>Update available</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="7268"/>
+        <location filename="../UI/UserInterface.py" line="7266"/>
         <source>The update to &lt;b&gt;{0}&lt;/b&gt; of eric6 is available at &lt;b&gt;{1}&lt;/b&gt;. Would you like to get it?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="7280"/>
+        <location filename="../UI/UserInterface.py" line="7278"/>
         <source>Eric6 is up to date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="7280"/>
+        <location filename="../UI/UserInterface.py" line="7278"/>
         <source>You are using the latest version of eric6</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="7287"/>
+        <location filename="../UI/UserInterface.py" line="7285"/>
         <source>Error during updates check</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="7287"/>
+        <location filename="../UI/UserInterface.py" line="7285"/>
         <source>Could not perform updates check.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="7311"/>
+        <location filename="../UI/UserInterface.py" line="7309"/>
         <source>&lt;h3&gt;Available versions&lt;/h3&gt;&lt;table&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="7363"/>
+        <location filename="../UI/UserInterface.py" line="7361"/>
         <source>First time usage</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="7363"/>
+        <location filename="../UI/UserInterface.py" line="7361"/>
         <source>eric6 has not been configured yet. The configuration dialog will be started.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="7382"/>
+        <location filename="../UI/UserInterface.py" line="7380"/>
         <source>Select Workspace Directory</source>
         <translation type="unfinished"></translation>
     </message>
@@ -75599,7 +75844,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="6670"/>
+        <location filename="../UI/UserInterface.py" line="6668"/>
         <source>Load session</source>
         <translation type="unfinished"></translation>
     </message>
@@ -75614,17 +75859,17 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="6670"/>
+        <location filename="../UI/UserInterface.py" line="6668"/>
         <source>eric6 Session Files (*.e5s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="6721"/>
+        <location filename="../UI/UserInterface.py" line="6719"/>
         <source>Crash Session found!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="6721"/>
+        <location filename="../UI/UserInterface.py" line="6719"/>
         <source>A session file of a crashed session was found. Shall this session be restored?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -75639,17 +75884,17 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="7256"/>
+        <location filename="../UI/UserInterface.py" line="7254"/>
         <source>Update Check</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="7256"/>
+        <location filename="../UI/UserInterface.py" line="7254"/>
         <source>You installed eric directly from the source code. There is no possibility to check for the availability of an update.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="7246"/>
+        <location filename="../UI/UserInterface.py" line="7244"/>
         <source>You are using a snapshot release of eric6. A more up-to-date stable release might be available.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -76598,68 +76843,68 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="128"/>
-        <source>Colours</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="134"/>
         <source>VCS status &quot;added&quot;:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="147"/>
-        <source>Select the background colour for entries with VCS status &quot;added&quot;.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="157"/>
         <source>VCS status &quot;conflict&quot;:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="170"/>
-        <source>Select the background colour for entries with VCS status &quot;conflict&quot;.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="193"/>
         <source>VCS status &quot;modified&quot;:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="206"/>
-        <source>Select the background colour for entries with VCS status &quot;modified&quot;.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="216"/>
         <source>VCS status &quot;replaced&quot;:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="229"/>
-        <source>Select the background colour for entries with VCS status &quot;replaced&quot;.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="239"/>
         <source>VCS status &quot;needs update&quot;:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="252"/>
-        <source>Select the background colour for entries with VCS status &quot;needs update&quot;.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="262"/>
         <source>VCS status &quot;removed&quot;:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="128"/>
+        <source>Colors</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="147"/>
+        <source>Select the background color for entries with VCS status &quot;added&quot;.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="170"/>
+        <source>Select the background color for entries with VCS status &quot;conflict&quot;.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="206"/>
+        <source>Select the background color for entries with VCS status &quot;modified&quot;.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="229"/>
+        <source>Select the background color for entries with VCS status &quot;replaced&quot;.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="252"/>
+        <source>Select the background color for entries with VCS status &quot;needs update&quot;.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="275"/>
-        <source>Select the background colour for entries with VCS status &quot;removed&quot;.</source>
+        <source>Select the background color for entries with VCS status &quot;removed&quot;.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -81594,21 +81839,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="279"/>
-        <source>Colours</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="285"/>
-        <source>Background colour of secure URLs:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="298"/>
-        <source>Select the background colour for secure URLs.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="324"/>
         <source>Images</source>
         <translation type="unfinished"></translation>
@@ -81693,6 +81923,21 @@
         <source>Show Scrollbars</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="279"/>
+        <source>Colors</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="285"/>
+        <source>Background color of secure URLs:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="298"/>
+        <source>Select the background color for secure URLs.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>WebBrowserClearPrivateDataDialog</name>
@@ -82577,12 +82822,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserPage.py" line="171"/>
+        <location filename="../WebBrowser/WebBrowserPage.py" line="172"/>
         <source>Suspicuous URL detected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserPage.py" line="171"/>
+        <location filename="../WebBrowser/WebBrowserPage.py" line="172"/>
         <source>&lt;p&gt;The URL &lt;b&gt;{0}&lt;/b&gt; was found in the Safe Browsing database.&lt;/p&gt;{1}</source>
         <translation type="unfinished"></translation>
     </message>
@@ -82872,137 +83117,137 @@
 <context>
     <name>WebBrowserTabWidget</name>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="124"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="122"/>
         <source>Show a navigation menu</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="137"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="135"/>
         <source>Show a navigation menu for closed tabs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="151"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="149"/>
         <source>Open a new web browser tab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="165"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="163"/>
         <source>New Tab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="169"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="167"/>
         <source>Move Left</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="172"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="170"/>
         <source>Move Right</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="176"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="174"/>
         <source>Duplicate Page</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="179"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="177"/>
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="182"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="180"/>
         <source>Close Others</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="211"/>
+        <source>Close All</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="186"/>
+        <source>Print Preview</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="189"/>
+        <source>Print</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="192"/>
+        <source>Print as PDF</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../WebBrowser/WebBrowserTabWidget.py" line="213"/>
-        <source>Close All</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="188"/>
-        <source>Print Preview</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="191"/>
-        <source>Print</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="194"/>
-        <source>Print as PDF</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="215"/>
         <source>Reload All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="218"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="216"/>
         <source>Bookmark All Tabs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="222"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="220"/>
         <source>Restore Closed Tab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="252"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="250"/>
         <source>Unmute Tab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="256"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="254"/>
         <source>Mute Tab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="458"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="456"/>
         <source>...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="755"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="753"/>
         <source>Print to PDF</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="705"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="703"/>
         <source>&lt;p&gt;The file &lt;b&gt;{0}&lt;/b&gt; exists already. Shall it be overwritten?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="755"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="753"/>
         <source>&lt;p&gt;The PDF could not be written to file &lt;b&gt;{0}&lt;/b&gt;.&lt;/p&gt;&lt;p&gt;&lt;b&gt;Error:&lt;/b&gt; {1}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="898"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="892"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="918"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="912"/>
         <source>Finished loading</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="920"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="914"/>
         <source>Failed to load</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="961"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="955"/>
         <source>Are you sure you want to close the window?</source>
         <translation type="unfinished"></translation>
     </message>
     <message numerus="yes">
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="961"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="955"/>
         <source>Are you sure you want to close the window?
 You have %n tab(s) open.</source>
         <translation type="unfinished">
@@ -83010,22 +83255,22 @@
         </translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="968"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="962"/>
         <source>&amp;Quit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="971"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="965"/>
         <source>C&amp;lose Current Tab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="1152"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="1146"/>
         <source>Restore All Closed Tabs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="1154"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="1148"/>
         <source>Clear List</source>
         <translation type="unfinished"></translation>
     </message>
--- a/eric6/i18n/eric6_en.ts	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/i18n/eric6_en.ts	Sat May 02 13:51:07 2020 +0200
@@ -1181,12 +1181,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Graphics/ApplicationDiagramBuilder.py" line="292"/>
+        <location filename="../Graphics/ApplicationDiagramBuilder.py" line="294"/>
         <source>Load Diagram</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Graphics/ApplicationDiagramBuilder.py" line="292"/>
+        <location filename="../Graphics/ApplicationDiagramBuilder.py" line="294"/>
         <source>&lt;p&gt;The diagram belongs to the project &lt;b&gt;{0}&lt;/b&gt;. Shall this project be opened?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2325,32 +2325,32 @@
 <context>
     <name>BrowserModel</name>
     <message>
-        <location filename="../UI/BrowserModel.py" line="62"/>
+        <location filename="../UI/BrowserModel.py" line="63"/>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/BrowserModel.py" line="654"/>
+        <location filename="../UI/BrowserModel.py" line="655"/>
         <source>Coding: {0}</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/BrowserModel.py" line="660"/>
+        <location filename="../UI/BrowserModel.py" line="661"/>
         <source>Globals</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/BrowserModel.py" line="730"/>
+        <location filename="../UI/BrowserModel.py" line="731"/>
         <source>Attributes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/BrowserModel.py" line="740"/>
+        <location filename="../UI/BrowserModel.py" line="741"/>
         <source>Class Attributes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/BrowserModel.py" line="666"/>
+        <location filename="../UI/BrowserModel.py" line="667"/>
         <source>Imports</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3006,54 +3006,54 @@
 <context>
     <name>CodeDocumentationViewer</name>
     <message>
-        <location filename="../UI/CodeDocumentationViewer.py" line="175"/>
+        <location filename="../UI/CodeDocumentationViewer.py" line="211"/>
         <source>Code Info Provider:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/CodeDocumentationViewer.py" line="188"/>
+        <location filename="../UI/CodeDocumentationViewer.py" line="224"/>
         <source>Select the code info provider</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/CodeDocumentationViewer.py" line="190"/>
+        <location filename="../UI/CodeDocumentationViewer.py" line="226"/>
         <source>&lt;disabled&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/CodeDocumentationViewer.py" line="371"/>
+        <location filename="../UI/CodeDocumentationViewer.py" line="407"/>
         <source>No documentation available</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/CodeDocumentationViewer.py" line="392"/>
+        <location filename="../UI/CodeDocumentationViewer.py" line="428"/>
         <source>No source code documentation provider has been registered. This function has been disabled.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/CodeDocumentationViewer.py" line="397"/>
+        <location filename="../UI/CodeDocumentationViewer.py" line="433"/>
         <source>This function has been disabled.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/CodeDocumentationViewerTemplate.py" line="137"/>
+        <location filename="../UI/CodeDocumentationViewerTemplate.py" line="139"/>
         <source>No further documentation available</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/CodeDocumentationViewerTemplate.py" line="58"/>
+        <location filename="../UI/CodeDocumentationViewerTemplate.py" line="60"/>
         <source>&lt;p&gt;&lt;b&gt;Definition:&lt;/b&gt; &lt;span class=&quot;def&quot;&gt;@NAME@@ARGSPEC@&lt;/span&gt;&lt;/p&gt;</source>
         <comment>Just translate &apos;Definition:&apos; and leave the rest intact.</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/CodeDocumentationViewerTemplate.py" line="68"/>
+        <location filename="../UI/CodeDocumentationViewerTemplate.py" line="70"/>
         <source>&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; @NOTE@&lt;/p&gt;</source>
         <comment>Just translate &apos;Note:&apos; and leave the rest intact.</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/CodeDocumentationViewerTemplate.py" line="63"/>
+        <location filename="../UI/CodeDocumentationViewerTemplate.py" line="65"/>
         <source>&lt;p&gt;&lt;b&gt;Type:&lt;/b&gt; @TYPE@&lt;/p&gt;</source>
         <comment>Just translate &apos;Type:&apos; and leave the rest intact.</comment>
         <translation type="unfinished"></translation>
@@ -4133,11 +4133,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.ui" line="143"/>
-        <source>Colour</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.ui" line="42"/>
         <source>Select to generate a QColorDialog.getRgba dialog</source>
         <translation type="unfinished"></translation>
@@ -4158,11 +4153,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.ui" line="155"/>
-        <source>Enter a variable name or a colour</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.ui" line="167"/>
         <source>Qt.red</source>
         <translation type="unfinished"></translation>
@@ -4318,11 +4308,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.py" line="72"/>
-        <source>&lt;p&gt;The colour &lt;b&gt;{0}&lt;/b&gt; is not valid.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.ui" line="55"/>
         <source>Result</source>
         <translation type="unfinished"></translation>
@@ -4333,11 +4318,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.ui" line="292"/>
-        <source>Colour Variable</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.ui" line="87"/>
         <source>Parent</source>
         <translation type="unfinished"></translation>
@@ -4377,6 +4357,26 @@
         <source>Enter the parent expression</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.ui" line="143"/>
+        <source>Color</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.ui" line="155"/>
+        <source>Enter a variable name or a color</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.ui" line="292"/>
+        <source>Color Variable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.py" line="72"/>
+        <source>&lt;p&gt;The color &lt;b&gt;{0}&lt;/b&gt; is not valid.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>CompareDialog</name>
@@ -6240,22 +6240,22 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/CreateDialogCodeDialog.py" line="577"/>
+        <location filename="../Project/CreateDialogCodeDialog.py" line="580"/>
         <source>Code Generation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/CreateDialogCodeDialog.py" line="437"/>
+        <location filename="../Project/CreateDialogCodeDialog.py" line="440"/>
         <source>&lt;p&gt;Could not open the code template file &quot;{0}&quot;.&lt;/p&gt;&lt;p&gt;Reason: {1}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/CreateDialogCodeDialog.py" line="475"/>
+        <location filename="../Project/CreateDialogCodeDialog.py" line="478"/>
         <source>&lt;p&gt;Could not open the source file &quot;{0}&quot;.&lt;/p&gt;&lt;p&gt;Reason: {1}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/CreateDialogCodeDialog.py" line="577"/>
+        <location filename="../Project/CreateDialogCodeDialog.py" line="580"/>
         <source>&lt;p&gt;Could not write the source file &quot;{0}&quot;.&lt;/p&gt;&lt;p&gt;Reason: {1}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7459,21 +7459,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="630"/>
-        <source>Background Colours</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="659"/>
-        <source>Select the background colour for changed items.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="695"/>
-        <source>Select the background colour for elements which are loaded for the first time.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="669"/>
         <source>Changed elements:</source>
         <translation type="unfinished"></translation>
@@ -7483,6 +7468,21 @@
         <source>First time opened elements:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="630"/>
+        <source>Background Colors</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="659"/>
+        <source>Select the background color for changed items.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="695"/>
+        <source>Select the background color for elements which are loaded for the first time.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DebuggerInterfacePython</name>
@@ -7965,110 +7965,110 @@
 <context>
     <name>DiffColoursPage</name>
     <message>
-        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="17"/>
-        <source>&lt;b&gt;Configure Diff colours&lt;/b&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="39"/>
-        <source>Select the background colour for header lines</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="42"/>
-        <source>Header Colour</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="52"/>
         <source>Header Line</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="65"/>
-        <source>Select the background colour for bad whitespace</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="68"/>
-        <source>Whitespace Colour</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="88"/>
-        <source>Select the text foreground colour</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="91"/>
-        <source>Text Colour</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="101"/>
         <source>Normal Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="114"/>
-        <source>Select the background colour for additions</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="117"/>
-        <source>Added Colour</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="127"/>
         <source>Added Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="140"/>
-        <source>Select the background colour for removed text</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="143"/>
-        <source>Removed Colour</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="153"/>
         <source>Removed Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="166"/>
-        <source>Select the background colour for replaced text</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="169"/>
-        <source>Replaced Colour</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="179"/>
         <source>Replaced Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="192"/>
-        <source>Select the background colour for context lines</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="195"/>
-        <source>Context Colour</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="205"/>
         <source>Context Line</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="17"/>
+        <source>&lt;b&gt;Configure Diff colors&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="39"/>
+        <source>Select the background color for header lines</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="42"/>
+        <source>Header Color</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="65"/>
+        <source>Select the background color for bad whitespace</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="68"/>
+        <source>Whitespace Color</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="88"/>
+        <source>Select the text foreground color</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="91"/>
+        <source>Text Color</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="114"/>
+        <source>Select the background color for additions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="117"/>
+        <source>Added Color</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="140"/>
+        <source>Select the background color for removed text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="143"/>
+        <source>Removed Color</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="166"/>
+        <source>Select the background color for replaced text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="169"/>
+        <source>Replaced Color</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="192"/>
+        <source>Select the background color for context lines</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="195"/>
+        <source>Context Color</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DiffDialog</name>
@@ -9231,7 +9231,7 @@
 <context>
     <name>E5GraphicsView</name>
     <message>
-        <location filename="../E5Graphics/E5GraphicsView.py" line="56"/>
+        <location filename="../E5Graphics/E5GraphicsView.py" line="58"/>
         <source>&lt;b&gt;Graphics View&lt;/b&gt;
 &lt;p&gt;This graphics view is used to show a diagram. 
 There are various actions available to manipulate the 
@@ -9250,7 +9250,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../E5Graphics/E5GraphicsView.py" line="377"/>
+        <location filename="../E5Graphics/E5GraphicsView.py" line="416"/>
         <source>{0}, Page {1}</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10659,7 +10659,7 @@
 <context>
     <name>Editor</name>
     <message>
-        <location filename="../QScintilla/Editor.py" line="3106"/>
+        <location filename="../QScintilla/Editor.py" line="3107"/>
         <source>Open File</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10749,7 +10749,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7834"/>
+        <location filename="../QScintilla/Editor.py" line="7847"/>
         <source>Check spelling...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10974,7 +10974,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5607"/>
+        <location filename="../QScintilla/Editor.py" line="5615"/>
         <source>Enable breakpoint</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11079,327 +11079,327 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="1955"/>
+        <location filename="../QScintilla/Editor.py" line="1956"/>
         <source>Modification of Read Only file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="1955"/>
+        <location filename="../QScintilla/Editor.py" line="1956"/>
         <source>You are attempting to change a read only file. Please save to a different file first.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="2663"/>
+        <location filename="../QScintilla/Editor.py" line="2664"/>
         <source>Printing...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="2680"/>
+        <location filename="../QScintilla/Editor.py" line="2681"/>
         <source>Printing completed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="2682"/>
+        <location filename="../QScintilla/Editor.py" line="2683"/>
         <source>Error while printing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="2685"/>
+        <location filename="../QScintilla/Editor.py" line="2686"/>
         <source>Printing aborted</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="3046"/>
+        <location filename="../QScintilla/Editor.py" line="3047"/>
         <source>File Modified</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="3046"/>
+        <location filename="../QScintilla/Editor.py" line="3047"/>
         <source>&lt;p&gt;The file &lt;b&gt;{0}&lt;/b&gt; has unsaved changes.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="3106"/>
+        <location filename="../QScintilla/Editor.py" line="3107"/>
         <source>&lt;p&gt;The file &lt;b&gt;{0}&lt;/b&gt; could not be opened.&lt;/p&gt;&lt;p&gt;Reason: {1}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="3295"/>
+        <location filename="../QScintilla/Editor.py" line="3296"/>
         <source>Save File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="3232"/>
+        <location filename="../QScintilla/Editor.py" line="3233"/>
         <source>&lt;p&gt;The file &lt;b&gt;{0}&lt;/b&gt; could not be saved.&lt;br/&gt;Reason: {1}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="3295"/>
+        <location filename="../QScintilla/Editor.py" line="3296"/>
         <source>&lt;p&gt;The file &lt;b&gt;{0}&lt;/b&gt; already exists. Overwrite it?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="4772"/>
+        <location filename="../QScintilla/Editor.py" line="4777"/>
         <source>Autocompletion</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="4772"/>
+        <location filename="../QScintilla/Editor.py" line="4777"/>
         <source>Autocompletion is not available because there is no autocompletion source set.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5610"/>
+        <location filename="../QScintilla/Editor.py" line="5618"/>
         <source>Disable breakpoint</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5985"/>
+        <location filename="../QScintilla/Editor.py" line="5993"/>
         <source>Code Coverage</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5985"/>
+        <location filename="../QScintilla/Editor.py" line="5993"/>
         <source>Please select a coverage file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6048"/>
+        <location filename="../QScintilla/Editor.py" line="6056"/>
         <source>Show Code Coverage Annotations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6041"/>
+        <location filename="../QScintilla/Editor.py" line="6049"/>
         <source>All lines have been covered.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6048"/>
+        <location filename="../QScintilla/Editor.py" line="6056"/>
         <source>There is no coverage file available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6165"/>
+        <location filename="../QScintilla/Editor.py" line="6173"/>
         <source>Profile Data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6165"/>
+        <location filename="../QScintilla/Editor.py" line="6173"/>
         <source>Please select a profile file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6327"/>
+        <location filename="../QScintilla/Editor.py" line="6335"/>
         <source>Syntax Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6327"/>
+        <location filename="../QScintilla/Editor.py" line="6335"/>
         <source>No syntax error message available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6718"/>
+        <location filename="../QScintilla/Editor.py" line="6726"/>
         <source>Macro Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6718"/>
+        <location filename="../QScintilla/Editor.py" line="6726"/>
         <source>Select a macro name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6746"/>
+        <location filename="../QScintilla/Editor.py" line="6754"/>
         <source>Load macro file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6789"/>
+        <location filename="../QScintilla/Editor.py" line="6797"/>
         <source>Macro files (*.macro)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6769"/>
+        <location filename="../QScintilla/Editor.py" line="6777"/>
         <source>Error loading macro</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6760"/>
+        <location filename="../QScintilla/Editor.py" line="6768"/>
         <source>&lt;p&gt;The macro file &lt;b&gt;{0}&lt;/b&gt; could not be read.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6769"/>
+        <location filename="../QScintilla/Editor.py" line="6777"/>
         <source>&lt;p&gt;The macro file &lt;b&gt;{0}&lt;/b&gt; is corrupt.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6789"/>
+        <location filename="../QScintilla/Editor.py" line="6797"/>
         <source>Save macro file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6806"/>
+        <location filename="../QScintilla/Editor.py" line="6814"/>
         <source>Save macro</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6806"/>
+        <location filename="../QScintilla/Editor.py" line="6814"/>
         <source>&lt;p&gt;The macro file &lt;b&gt;{0}&lt;/b&gt; already exists. Overwrite it?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6822"/>
+        <location filename="../QScintilla/Editor.py" line="6830"/>
         <source>Error saving macro</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6822"/>
+        <location filename="../QScintilla/Editor.py" line="6830"/>
         <source>&lt;p&gt;The macro file &lt;b&gt;{0}&lt;/b&gt; could not be written.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6835"/>
+        <location filename="../QScintilla/Editor.py" line="6843"/>
         <source>Start Macro Recording</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6835"/>
+        <location filename="../QScintilla/Editor.py" line="6843"/>
         <source>Macro recording is already active. Start new?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6861"/>
+        <location filename="../QScintilla/Editor.py" line="6869"/>
         <source>Macro Recording</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6861"/>
+        <location filename="../QScintilla/Editor.py" line="6869"/>
         <source>Enter name of the macro:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7001"/>
+        <location filename="../QScintilla/Editor.py" line="7009"/>
         <source>File changed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7166"/>
+        <location filename="../QScintilla/Editor.py" line="7179"/>
         <source>{0} (ro)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7307"/>
+        <location filename="../QScintilla/Editor.py" line="7320"/>
         <source>Drop Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7307"/>
+        <location filename="../QScintilla/Editor.py" line="7320"/>
         <source>&lt;p&gt;&lt;b&gt;{0}&lt;/b&gt; is not a file.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7328"/>
-        <source>Resources</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="7330"/>
-        <source>Add file...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="7332"/>
-        <source>Add files...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="7334"/>
-        <source>Add aliased file...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="7337"/>
-        <source>Add localized resource...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../QScintilla/Editor.py" line="7341"/>
+        <source>Resources</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="7343"/>
+        <source>Add file...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="7345"/>
+        <source>Add files...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="7347"/>
+        <source>Add aliased file...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="7350"/>
+        <source>Add localized resource...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="7354"/>
         <source>Add resource frame</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7360"/>
+        <location filename="../QScintilla/Editor.py" line="7373"/>
         <source>Add file resource</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7376"/>
+        <location filename="../QScintilla/Editor.py" line="7389"/>
         <source>Add file resources</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7403"/>
+        <location filename="../QScintilla/Editor.py" line="7416"/>
         <source>Add aliased file resource</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7403"/>
+        <location filename="../QScintilla/Editor.py" line="7416"/>
         <source>Alias for file &lt;b&gt;{0}&lt;/b&gt;:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7469"/>
+        <location filename="../QScintilla/Editor.py" line="7482"/>
         <source>Package Diagram</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7469"/>
+        <location filename="../QScintilla/Editor.py" line="7482"/>
         <source>Include class attributes?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7491"/>
+        <location filename="../QScintilla/Editor.py" line="7504"/>
         <source>Imports Diagram</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7491"/>
+        <location filename="../QScintilla/Editor.py" line="7504"/>
         <source>Include imports from external modules?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7505"/>
+        <location filename="../QScintilla/Editor.py" line="7518"/>
         <source>Application Diagram</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7505"/>
+        <location filename="../QScintilla/Editor.py" line="7518"/>
         <source>Include module names?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7837"/>
+        <location filename="../QScintilla/Editor.py" line="7850"/>
         <source>Add to dictionary</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7839"/>
+        <location filename="../QScintilla/Editor.py" line="7852"/>
         <source>Ignore All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6606"/>
+        <location filename="../QScintilla/Editor.py" line="6614"/>
         <source>Warning: {0}</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6613"/>
+        <location filename="../QScintilla/Editor.py" line="6621"/>
         <source>Error: {0}</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6997"/>
+        <location filename="../QScintilla/Editor.py" line="7005"/>
         <source>&lt;br&gt;&lt;b&gt;Warning:&lt;/b&gt; You will lose your changes upon reopening it.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11424,27 +11424,27 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="8255"/>
+        <location filename="../QScintilla/Editor.py" line="8268"/>
         <source>Sort Lines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="8255"/>
+        <location filename="../QScintilla/Editor.py" line="8268"/>
         <source>The selection contains illegal data for a numerical sort.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6541"/>
+        <location filename="../QScintilla/Editor.py" line="6549"/>
         <source>Warning</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6541"/>
+        <location filename="../QScintilla/Editor.py" line="6549"/>
         <source>No warning messages available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6603"/>
+        <location filename="../QScintilla/Editor.py" line="6611"/>
         <source>Style: {0}</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11469,7 +11469,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6991"/>
+        <location filename="../QScintilla/Editor.py" line="6999"/>
         <source>&lt;p&gt;The file &lt;b&gt;{0}&lt;/b&gt; has been changed while it was opened in eric6. Reread it?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11484,32 +11484,32 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="4902"/>
+        <location filename="../QScintilla/Editor.py" line="4907"/>
         <source>Auto-Completion Provider</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="4902"/>
+        <location filename="../QScintilla/Editor.py" line="4907"/>
         <source>The completion list provider &apos;{0}&apos; was already registered. Ignoring duplicate request.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5177"/>
+        <location filename="../QScintilla/Editor.py" line="5185"/>
         <source>Call-Tips Provider</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5177"/>
+        <location filename="../QScintilla/Editor.py" line="5185"/>
         <source>The call-tips provider &apos;{0}&apos; was already registered. Ignoring duplicate request.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="8344"/>
+        <location filename="../QScintilla/Editor.py" line="8357"/>
         <source>Register Mouse Click Handler</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="8344"/>
+        <location filename="../QScintilla/Editor.py" line="8357"/>
         <source>A mouse click handler for &quot;{0}&quot; was already registered by &quot;{1}&quot;. Aborting request by &quot;{2}&quot;...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11539,12 +11539,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="8465"/>
+        <location filename="../QScintilla/Editor.py" line="8478"/>
         <source>EditorConfig Properties</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="8465"/>
+        <location filename="../QScintilla/Editor.py" line="8478"/>
         <source>&lt;p&gt;The EditorConfig properties for file &lt;b&gt;{0}&lt;/b&gt; could not be loaded.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12074,22 +12074,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="122"/>
-        <source>Colours</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="128"/>
-        <source>Background colour:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="141"/>
-        <source>Select the background colour for calltips.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="167"/>
+        <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="213"/>
         <source>Plug-In Behavior</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12124,20 +12109,55 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="176"/>
+        <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="222"/>
         <source>Qscintilla provided calltips are shown, if this option is enabled and calltips shall be provided by plug-ins (see calltips sub-page of the plug-in) and the plugin-ins don&apos;t deliver any calltips.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="179"/>
+        <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="225"/>
         <source>Show QScintilla calltips, if plug-ins fail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="173"/>
+        <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="219"/>
         <source>Select to show QScintilla provided calltips, if the selected plug-ins fail</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="122"/>
+        <source>Colors</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="128"/>
+        <source>Background color:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="141"/>
+        <source>Select the background color for calltips.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="164"/>
+        <source>Foreground color:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="177"/>
+        <source>Select the foreground color for calltips.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="187"/>
+        <source>Highlight color:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="200"/>
+        <source>Select the highlight color for calltips.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>EditorCalltipsQScintillaPage</name>
@@ -13072,26 +13092,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="174"/>
-        <source>Select the foreground colour.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="177"/>
-        <source>Foreground Colour</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="184"/>
-        <source>Select the background colour.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="187"/>
-        <source>Background Colour</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="194"/>
         <source>Select the font.</source>
         <translation type="unfinished"></translation>
@@ -13117,16 +13117,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="273"/>
-        <source>Select the background colour for all styles</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="276"/>
-        <source>All Background Colours</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="283"/>
         <source>Select the font for all styles.</source>
         <translation type="unfinished"></translation>
@@ -13331,6 +13321,36 @@
         <source>Press to set all sub-styles to default values</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="174"/>
+        <source>Select the foreground color.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="177"/>
+        <source>Foreground Color</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="184"/>
+        <source>Select the background color.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="187"/>
+        <source>Background Color</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="273"/>
+        <source>Select the background color for all styles</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="276"/>
+        <source>All Background Colors</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>EditorKeywordsPage</name>
@@ -14165,16 +14185,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorSearchPage.ui" line="127"/>
-        <source>Marker Colour:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorSearchPage.ui" line="140"/>
-        <source>Select the colour for the search markers.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorSearchPage.ui" line="168"/>
         <source>Regular Expression Type</source>
         <translation type="unfinished"></translation>
@@ -14199,6 +14209,16 @@
         <source>QScintilla Extended  Mode (C++11)</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorSearchPage.ui" line="127"/>
+        <source>Marker Color:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorSearchPage.ui" line="140"/>
+        <source>Select the color for the search markers.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>EditorSpellCheckingPage</name>
@@ -14268,21 +14288,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorSpellCheckingPage.ui" line="215"/>
-        <source>Colours</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorSpellCheckingPage.ui" line="221"/>
-        <source>Marker Colour:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorSpellCheckingPage.ui" line="234"/>
-        <source>Select the colour for the spelling markers.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorSpellCheckingPage.ui" line="260"/>
         <source>Personal lists</source>
         <translation type="unfinished"></translation>
@@ -14363,6 +14368,21 @@
 &lt;p&gt;Enter the file extension of pure text files. The complete contents of files with these extensions will be checked.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorSpellCheckingPage.ui" line="215"/>
+        <source>Colors</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorSpellCheckingPage.ui" line="221"/>
+        <source>Marker Color:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorSpellCheckingPage.ui" line="234"/>
+        <source>Select the color for the spelling markers.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>EditorStylesPage</name>
@@ -14507,51 +14527,26 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="351"/>
-        <source>Select the foreground colour for the margins</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="361"/>
         <source>Margins background:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="374"/>
-        <source>Select the background colour for the margins</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="384"/>
         <source>Foldmargin background:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="397"/>
-        <source>Select the background colour for the foldmargin</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="407"/>
         <source>Foldmarkers foreground:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="420"/>
-        <source>Select the foreground colour of the foldmarkers</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="430"/>
         <source>Foldmarkers background:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="443"/>
-        <source>Select the background colour of the foldmarkers</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="457"/>
         <source>Press to select the font for the editor line numbers</source>
         <translation type="unfinished"></translation>
@@ -14572,31 +14567,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="515"/>
-        <source>Select to use custom selection colours</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="518"/>
-        <source>&lt;b&gt;Use custom selection colours&lt;/b&gt;&lt;p&gt;Select this entry in order to use custom selection colours in the editor and shell windows. The colours for the selection foreground and background are defined on the colours page.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="521"/>
-        <source>Use custom selection colours</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="528"/>
-        <source>Select, if selected text should be colourized by the lexer.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="531"/>
-        <source>Colourize selected text</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="538"/>
         <source>Select to extend selection to end of line</source>
         <translation type="unfinished"></translation>
@@ -14612,21 +14582,11 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="565"/>
-        <source>Select the foreground colour for the selection.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="575"/>
         <source>Selection background:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="588"/>
-        <source>Select the background colour for the selection.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="609"/>
         <source>Caret</source>
         <translation type="unfinished"></translation>
@@ -14642,16 +14602,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="648"/>
-        <source>Select the colour for the caret.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="761"/>
-        <source>Select the background colour for the line containing the caret.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="857"/>
         <source>Braces</source>
         <translation type="unfinished"></translation>
@@ -14672,41 +14622,21 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="886"/>
-        <source>Select the colour for highlighting matching braces.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="896"/>
         <source>Matched braces background:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="909"/>
-        <source>Select the background colour for highlighting matching braces.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="925"/>
         <source>Unmatched brace:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="932"/>
-        <source>Select the colour for  highlighting nonmatching braces.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="948"/>
         <source>Unmatched brace background:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="955"/>
-        <source>Select the background colour for  highlighting nonmatching braces.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="968"/>
         <source>End of Line</source>
         <translation type="unfinished"></translation>
@@ -14732,16 +14662,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1124"/>
-        <source>Select the colour for the edge marker.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1134"/>
-        <source>Background colour:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1147"/>
         <source>Move to set the edge column.</source>
         <translation type="unfinished"></translation>
@@ -14772,11 +14692,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1222"/>
-        <source>Change Background Colour</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1236"/>
         <source>Zoom</source>
         <translation type="unfinished"></translation>
@@ -14847,21 +14762,11 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1402"/>
-        <source>Press to select the foreground colour</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1405"/>
         <source>Foreground</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1412"/>
-        <source>Press to select the background colour</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1415"/>
         <source>Background</source>
         <translation type="unfinished"></translation>
@@ -14892,56 +14797,21 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1636"/>
-        <source>Select the foreground colour for visible whitespace</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1646"/>
         <source>Whitespace background:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1659"/>
-        <source>Select the background colour for visible whitespace</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="53"/>
-        <source>Select to set the colour of the edit area different to the default style</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="56"/>
-        <source>Override edit area colours</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="68"/>
         <source>Edit area foreground:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="81"/>
-        <source>Select the foreground colour for the edit area.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="91"/>
         <source>Edit area background:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="104"/>
-        <source>Select the background colour for the edit area.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="47"/>
-        <source>Colours</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1444"/>
         <source>Change Tracing</source>
         <translation type="unfinished"></translation>
@@ -14972,26 +14842,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1514"/>
-        <source>Unsaved changes colour:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1527"/>
-        <source>Select the colour for the change marker for unsaved changes.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1537"/>
-        <source>Saved changes colour:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1550"/>
-        <source>Select the colour for the change marker for saved changes.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1003"/>
         <source>Select the wrap mode for long lines</source>
         <translation type="unfinished"></translation>
@@ -15067,91 +14917,46 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1782"/>
-        <source>Select the colour for error markers</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1792"/>
         <source>Warnings:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1805"/>
-        <source>Select the colour for warning markers</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1815"/>
         <source>Bookmarks:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1828"/>
-        <source>Select the colour for bookmark markers</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1838"/>
         <source>Breakpoints:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1851"/>
-        <source>Select the colour for breakpoint markers</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1861"/>
         <source>Tasks:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1874"/>
-        <source>Select the colour for task markers</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1884"/>
         <source>Changes:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1897"/>
-        <source>Select the colour for change markers</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1907"/>
         <source>Coverage:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1920"/>
-        <source>Select the colour for coverage markers</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1930"/>
         <source>Current Line:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1943"/>
-        <source>Select the colour for the current line marker</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1999"/>
         <source>Background:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="2012"/>
-        <source>Select the background colour for the marker map</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1674"/>
         <source>Indentation Guides</source>
         <translation type="unfinished"></translation>
@@ -15172,31 +14977,16 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1705"/>
-        <source>Select the foreground colour for indentation guides</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1715"/>
         <source>Indentation Guides background:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1728"/>
-        <source>Select the background colour for indentation guides</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1953"/>
         <source>Search Markers:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1966"/>
-        <source>Select the colour for the search marker</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="2093"/>
         <source>Select to hide the Format Buttons bar when formatting is not supported</source>
         <translation type="unfinished"></translation>
@@ -15212,11 +15002,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="801"/>
-        <source>Use background colours</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="808"/>
         <source>Current line marker:</source>
         <translation type="unfinished"></translation>
@@ -15227,31 +15012,11 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="798"/>
-        <source>Select to indicate the debug markers using coloured line backgrounds, arrow indicators otherwise</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="821"/>
-        <source>Select the colour for the current line marker.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="844"/>
-        <source>Select the colour for the error line marker.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1976"/>
         <source>Conflict Marker Line:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1989"/>
-        <source>Select the colour for the conflict marker line marker</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1749"/>
         <source>Select to show the marker map right of the editor</source>
         <translation type="unfinished"></translation>
@@ -15398,8 +15163,263 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="47"/>
+        <source>Colors</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="53"/>
+        <source>Select to set the color of the edit area different to the default style</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="56"/>
+        <source>Override edit area colors</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="81"/>
+        <source>Select the foreground color for the edit area.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="104"/>
+        <source>Select the background color for the edit area.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="648"/>
+        <source>Select the color for the caret.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="351"/>
+        <source>Select the foreground color for the margins</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="374"/>
+        <source>Select the background color for the margins</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="397"/>
+        <source>Select the background color for the foldmargin</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="420"/>
+        <source>Select the foreground color of the foldmarkers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="443"/>
+        <source>Select the background color of the foldmarkers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="515"/>
+        <source>Select to use custom selection colors</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="518"/>
+        <source>&lt;b&gt;Use custom selection colors&lt;/b&gt;&lt;p&gt;Select this entry in order to use custom selection colors in the editor and shell windows. The colors for the selection foreground and background are defined on the colors page.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="521"/>
+        <source>Use custom selection colors</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="528"/>
+        <source>Select, if selected text should be colorized by the lexer.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="531"/>
+        <source>Colorize selected text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="565"/>
+        <source>Select the foreground color for the selection.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="588"/>
+        <source>Select the background color for the selection.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="761"/>
+        <source>Select the background color for the line containing the caret.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="798"/>
+        <source>Select to indicate the debug markers using colored line backgrounds, arrow indicators otherwise</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="801"/>
+        <source>Use background colors</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="821"/>
+        <source>Select the color for the current line marker.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="844"/>
+        <source>Select the color for the error line marker.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="886"/>
+        <source>Select the color for highlighting matching braces.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="909"/>
+        <source>Select the background color for highlighting matching braces.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="932"/>
+        <source>Select the color for  highlighting nonmatching braces.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="955"/>
+        <source>Select the background color for  highlighting nonmatching braces.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1124"/>
+        <source>Select the color for the edge marker.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1134"/>
+        <source>Background color:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1222"/>
+        <source>Change Background Color</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1402"/>
+        <source>Press to select the foreground color</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1412"/>
+        <source>Press to select the background color</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1514"/>
+        <source>Unsaved changes color:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1527"/>
+        <source>Select the color for the change marker for unsaved changes.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1537"/>
+        <source>Saved changes color:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1550"/>
+        <source>Select the color for the change marker for saved changes.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1636"/>
+        <source>Select the foreground color for visible whitespace</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1659"/>
+        <source>Select the background color for visible whitespace</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1705"/>
+        <source>Select the foreground color for indentation guides</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1728"/>
+        <source>Select the background color for indentation guides</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1763"/>
-        <source>Marker Colours</source>
+        <source>Marker Colors</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1782"/>
+        <source>Select the color for error markers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1805"/>
+        <source>Select the color for warning markers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1828"/>
+        <source>Select the color for bookmark markers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1851"/>
+        <source>Select the color for breakpoint markers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1874"/>
+        <source>Select the color for task markers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1897"/>
+        <source>Select the color for change markers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1920"/>
+        <source>Select the color for coverage markers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1943"/>
+        <source>Select the color for the current line marker</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1966"/>
+        <source>Select the color for the search marker</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1989"/>
+        <source>Select the color for the conflict marker line marker</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="2012"/>
+        <source>Select the background color for the marker map</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -16494,111 +16514,51 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="252"/>
-        <source>Enter the filename of a CSS style sheet. Leave empty to use the colours defined below.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="262"/>
-        <source>Colours</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="268"/>
-        <source>Press to select the class and function header background colour.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="271"/>
         <source>Class/Function Header Background</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="278"/>
-        <source>Press to select the class and function header foreground colour.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="281"/>
         <source>Class/Function Header Foreground</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="288"/>
-        <source>Press to select the level 2 header background colour.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="291"/>
         <source>Level 2 Header Background</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="298"/>
-        <source>Press to select the level 2 header foreground colour.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="301"/>
         <source>Level 2 Header Foreground</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="308"/>
-        <source>Press to select the level 1 header background colour.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="311"/>
         <source>Level 1 Header Background</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="318"/>
-        <source>Press to select the level 1 header foreground colour.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="321"/>
         <source>Level 1 Header Foreground</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="328"/>
-        <source>Press to select the body background colour.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="331"/>
         <source>Body Background</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="338"/>
-        <source>Press to select the body foreground colour.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="341"/>
         <source>Body Foreground</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="348"/>
-        <source>Press to select the foreground colour of links.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="351"/>
         <source>Links</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="358"/>
-        <source>This shows an example of the selected colours.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="372"/>
         <source>QtHelp</source>
         <translation type="unfinished"></translation>
@@ -16678,6 +16638,66 @@
         <source>Style sheet (*.css);;All files (*)</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="252"/>
+        <source>Enter the filename of a CSS style sheet. Leave empty to use the colors defined below.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="262"/>
+        <source>Colors</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="268"/>
+        <source>Press to select the class and function header background color.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="278"/>
+        <source>Press to select the class and function header foreground color.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="288"/>
+        <source>Press to select the level 2 header background color.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="298"/>
+        <source>Press to select the level 2 header foreground color.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="308"/>
+        <source>Press to select the level 1 header background color.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="318"/>
+        <source>Press to select the level 1 header foreground color.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="328"/>
+        <source>Press to select the body background color.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="338"/>
+        <source>Press to select the body foreground color.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="348"/>
+        <source>Press to select the foreground color of links.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="358"/>
+        <source>This shows an example of the selected colors.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>EricdocExecDialog</name>
@@ -17157,30 +17177,50 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="516"/>
+        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="537"/>
         <source>Export source</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="448"/>
+        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="466"/>
         <source>&lt;p&gt;The source could not be exported to &lt;b&gt;{0}&lt;/b&gt;.&lt;/p&gt;&lt;p&gt;Reason: {1}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="457"/>
+        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="475"/>
         <source>&lt;p&gt;The source could not be exported to &lt;b&gt;{0}&lt;/b&gt;.&lt;/p&gt;&lt;p&gt;Reason: No HTML code generated.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="516"/>
+        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="537"/>
         <source>&lt;p&gt;Markdown export requires the &lt;b&gt;python-markdown&lt;/b&gt; package.&lt;br/&gt;Install it with your package manager, &apos;pip install docutils&apos; or see &lt;a href=&quot;http://pythonhosted.org/Markdown/install.html&quot;&gt; installation instructions.&lt;/a&gt;&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="484"/>
+        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="502"/>
         <source>&lt;p&gt;ReStructuredText export requires the &lt;b&gt;python-docutils&lt;/b&gt; package.&lt;br/&gt;Install it with your package manager, &apos;pip install docutils&apos; or see &lt;a href=&quot;http://pypi.python.org/pypi/docutils&quot;&gt;this page.&lt;/a&gt;&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="412"/>
+        <source>Light Background Color</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="413"/>
+        <source>Dark Background Color</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="416"/>
+        <source>Markdown Export</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="416"/>
+        <source>Select color scheme:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ExporterODT</name>
@@ -20878,22 +20918,22 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="102"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="107"/>
         <source>Author</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="103"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="108"/>
         <source>Committer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1792"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1794"/>
         <source>Branch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="104"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="109"/>
         <source>Subject</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20963,178 +21003,178 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="88"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="93"/>
         <source>&amp;Refresh</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="90"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="95"/>
         <source>Press to refresh the list of commits</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="197"/>
-        <source>Added</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="198"/>
-        <source>Deleted</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="199"/>
-        <source>Modified</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="200"/>
-        <source>Copied</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="201"/>
-        <source>Renamed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="202"/>
-        <source>Type changed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="203"/>
+        <source>Added</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="204"/>
+        <source>Deleted</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="205"/>
+        <source>Modified</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="206"/>
+        <source>Copied</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="207"/>
+        <source>Renamed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="208"/>
+        <source>Type changed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="209"/>
         <source>Unmerged</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="250"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="256"/>
         <source>Show Author Columns</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="252"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="258"/>
         <source>Press to show the author columns</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="260"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="266"/>
         <source>Show Committer Columns</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="262"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="268"/>
         <source>Press to show the committer columns</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="309"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="315"/>
         <source>Copy Commits</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="311"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="317"/>
         <source>Cherry-pick the selected commits to the current branch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="316"/>
-        <source>Tag</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="318"/>
-        <source>Tag the selected commit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="322"/>
-        <source>Create a new branch at the selected commit.</source>
+        <source>Tag</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="324"/>
+        <source>Tag the selected commit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="328"/>
+        <source>Create a new branch at the selected commit.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="330"/>
         <source>Branch &amp;&amp; Switch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="326"/>
-        <source>Create a new branch at the selected commit and switch the work tree to it.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1844"/>
-        <source>Switch</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="332"/>
-        <source>Switch the working directory to the selected commit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1870"/>
-        <source>Show Short Log</source>
+        <source>Create a new branch at the selected commit and switch the work tree to it.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1846"/>
+        <source>Switch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="338"/>
+        <source>Switch the working directory to the selected commit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1872"/>
+        <source>Show Short Log</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="344"/>
         <source>Show a dialog with a log output for release notes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="341"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="347"/>
         <source>Describe</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="343"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="349"/>
         <source>Show the most recent tag reachable from a commit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="632"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="634"/>
         <source>The git process did not finish within 30s.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="635"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="637"/>
         <source>Could not start the git executable.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="638"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="640"/>
         <source>Git Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="754"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="756"/>
         <source>{0} ({1}%)</source>
         <comment>action, confidence</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="820"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="822"/>
         <source>Process Generation Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="820"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="822"/>
         <source>The process {0} could not be started. Ensure, that it is in the search path.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1706"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1708"/>
         <source>Copy Changesets</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1844"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1846"/>
         <source>The project should be reread. Do this now?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="204"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="210"/>
         <source>Unknown</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21144,17 +21184,17 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1870"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1872"/>
         <source>Select a branch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1823"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1825"/>
         <source>Select a default branch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1823"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1825"/>
         <source>Branch &amp; Switch</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21174,37 +21214,37 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="101"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="106"/>
         <source>Commit ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="98"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="103"/>
         <source>Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="99"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="104"/>
         <source>Filter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="140"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="146"/>
         <source>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Branches&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="143"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="149"/>
         <source>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Tags&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2052"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2054"/>
         <source>&apos;{0}&apos; was not found.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2052"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2054"/>
         <source>Find Commit</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21214,7 +21254,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="105"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="110"/>
         <source>File</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21239,7 +21279,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2098"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2100"/>
         <source>Differences</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21249,97 +21289,97 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="122"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="128"/>
         <source>&lt;table&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Commit ID&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Date&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{1}&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Author&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{2} &amp;lt;{3}&amp;gt;&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Commit Date&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{4}&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Committer&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{5} &amp;lt;{6}&amp;gt;&lt;/td&gt;&lt;/tr&gt;{7}&lt;tr&gt;&lt;td&gt;&lt;b&gt;Subject&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{8}&lt;/td&gt;&lt;/tr&gt;{9}&lt;/table&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="134"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="140"/>
         <source>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Parents&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="137"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="143"/>
         <source>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Children&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="146"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="152"/>
         <source>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Message&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1265"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1267"/>
         <source>Side-by-Side Diff to Parent {0}</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1277"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1279"/>
         <source>&lt;a href=&quot;sbsdiff:{0}_{1}&quot;&gt;Side-by-Side Compare&lt;/a&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2112"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2114"/>
         <source>Differences to Parent {0}</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2127"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2129"/>
         <source>Diff to Parent {0}</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2153"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2155"/>
         <source>There is no difference.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2316"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2318"/>
         <source>Save Diff</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2282"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2284"/>
         <source>Patch Files (*.diff)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2299"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2301"/>
         <source>&lt;p&gt;The patch file &lt;b&gt;{0}&lt;/b&gt; already exists. Overwrite it?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2316"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2318"/>
         <source>&lt;p&gt;The patch file &lt;b&gt;{0}&lt;/b&gt; could not be saved.&lt;br&gt;Reason: {1}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="240"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="246"/>
         <source>Show Commit ID Column</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="242"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="248"/>
         <source>Press to show the commit ID column</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="270"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="276"/>
         <source>Show Branches Column</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="272"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="278"/>
         <source>Press to show the branches column</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="280"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="286"/>
         <source>Show Tags Column</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="282"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="288"/>
         <source>Press to show the Tags column</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25776,20 +25816,60 @@
 <context>
     <name>GraphicsPage</name>
     <message>
-        <location filename="../Preferences/ConfigurationPages/GraphicsPage.ui" line="16"/>
+        <location filename="../Preferences/ConfigurationPages/GraphicsPage.ui" line="17"/>
         <source>&lt;b&gt;Configure graphics settings&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/GraphicsPage.ui" line="38"/>
+        <location filename="../Preferences/ConfigurationPages/GraphicsPage.ui" line="43"/>
         <source>Press to select the font for the graphic items</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/GraphicsPage.ui" line="51"/>
+        <location filename="../Preferences/ConfigurationPages/GraphicsPage.ui" line="56"/>
         <source>Graphics Font</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/GraphicsPage.ui" line="37"/>
+        <source>Font</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/GraphicsPage.ui" line="72"/>
+        <source>Drawing Mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/GraphicsPage.ui" line="78"/>
+        <source>Select to determine the drawing mode automatically</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/GraphicsPage.ui" line="81"/>
+        <source>Automatic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/GraphicsPage.ui" line="91"/>
+        <source>Select to draw black shapes on a white background</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/GraphicsPage.ui" line="94"/>
+        <source>Black On White</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/GraphicsPage.ui" line="101"/>
+        <source>Select to draw white shapes on a black background</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/GraphicsPage.ui" line="104"/>
+        <source>White On Black</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>GreaseMonkeyAddScriptDialog</name>
@@ -27517,21 +27597,11 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/HexEditorPage.ui" line="142"/>
-        <source>Select the foreground colour of the address area</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/HexEditorPage.ui" line="291"/>
         <source>Background:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/HexEditorPage.ui" line="165"/>
-        <source>Select the background colour of the address area</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/HexEditorPage.ui" line="178"/>
         <source>ASCII Area</source>
         <translation type="unfinished"></translation>
@@ -27562,31 +27632,11 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/HexEditorPage.ui" line="226"/>
-        <source>Select the foreground colour for highlighted data</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/HexEditorPage.ui" line="249"/>
-        <source>Select the background colour for highlighted data</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/HexEditorPage.ui" line="262"/>
         <source>Selection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/HexEditorPage.ui" line="281"/>
-        <source>Select the foreground colour of the selection</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/HexEditorPage.ui" line="304"/>
-        <source>Select the background colour of the selection</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/HexEditorPage.ui" line="317"/>
         <source>Font</source>
         <translation type="unfinished"></translation>
@@ -27616,6 +27666,36 @@
         <source>Enter the number of recent files to remember</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/HexEditorPage.ui" line="142"/>
+        <source>Select the foreground color of the address area</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/HexEditorPage.ui" line="165"/>
+        <source>Select the background color of the address area</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/HexEditorPage.ui" line="226"/>
+        <source>Select the foreground color for highlighted data</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/HexEditorPage.ui" line="249"/>
+        <source>Select the background color for highlighted data</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/HexEditorPage.ui" line="281"/>
+        <source>Select the foreground color of the selection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/HexEditorPage.ui" line="304"/>
+        <source>Select the background color of the selection</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Hg</name>
@@ -30131,7 +30211,7 @@
 <context>
     <name>HgLogBrowserDialog</name>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="92"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="98"/>
         <source>Mercurial Log</source>
         <translation type="unfinished"></translation>
     </message>
@@ -30171,17 +30251,17 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="122"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="128"/>
         <source>Revision</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="123"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="129"/>
         <source>Author</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="124"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="130"/>
         <source>Message</source>
         <translation type="unfinished"></translation>
     </message>
@@ -30256,83 +30336,83 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="200"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="206"/>
         <source>Added</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="201"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="207"/>
         <source>Deleted</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="202"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="208"/>
         <source>Modified</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="182"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="188"/>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="840"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="845"/>
         <source>Mercurial Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="94"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="100"/>
         <source>Mercurial Log (Incoming)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="96"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="102"/>
         <source>Mercurial Log (Outgoing)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="217"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="223"/>
         <source>Bookmarks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="111"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="117"/>
         <source>Press to refresh the list of changesets</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="109"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="115"/>
         <source>&amp;Refresh</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="126"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="132"/>
         <source>Phase</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="268"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="275"/>
         <source>Change the phase of the selected revisions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="270"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="277"/>
         <source>&lt;b&gt;Change Phase&lt;/b&gt;
 &lt;p&gt;This changes the phase of the selected revisions. The selected revisions have to have the same current phase.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="266"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="273"/>
         <source>Change Phase</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2000"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2005"/>
         <source>Copy Changesets</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2343"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2348"/>
         <source>The project should be reread. Do this now?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -30342,42 +30422,42 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="257"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="264"/>
         <source>Copy the selected changesets to the current branch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="275"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="282"/>
         <source>Tag</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="278"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="285"/>
         <source>Tag the selected revision</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2072"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2077"/>
         <source>Switch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="288"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="295"/>
         <source>Switch the working directory to the selected revision</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="311"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="318"/>
         <source>Pull Large Files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="313"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="320"/>
         <source>Pull large files for selected revisions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1130"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1135"/>
         <source>{0} (large file)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -30402,147 +30482,147 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="119"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="125"/>
         <source>Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="120"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="126"/>
         <source>Filter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="164"/>
-        <source>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Tags&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="170"/>
+        <source>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Tags&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="176"/>
         <source>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Bookmarks&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2485"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2490"/>
         <source>Find Commit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2485"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2490"/>
         <source>&apos;{0}&apos; was not found.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="125"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="131"/>
         <source>File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="206"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="212"/>
         <source>Draft</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="207"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="213"/>
         <source>Public</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="208"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="214"/>
         <source>Secret</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2205"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2210"/>
         <source>Pull Changes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="309"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="316"/>
         <source>Pull changes from a remote repository</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="322"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="329"/>
         <source>Push Selected Changes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="325"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="332"/>
         <source>Push changes of the selected changeset and its ancestors to a remote repository</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="328"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="335"/>
         <source>Push All Changes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="331"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="338"/>
         <source>Push all changes to a remote repository</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2170"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2175"/>
         <source>Fetch Changes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2251"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2256"/>
         <source>Strip Changesets</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="317"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="324"/>
         <source>Fetch changes from a remote repository</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="374"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="381"/>
         <source>Strip changesets from a repository</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="293"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="300"/>
         <source>Define Bookmark...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="296"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="303"/>
         <source>Bookmark the selected revision</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="298"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="305"/>
         <source>Move Bookmark...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="301"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="308"/>
         <source>Move bookmark to the selected revision</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2095"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2100"/>
         <source>Define Bookmark</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2095"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2100"/>
         <source>Enter bookmark name for changeset &quot;{0}&quot;:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2119"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2124"/>
         <source>Move Bookmark</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2119"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2124"/>
         <source>Select the bookmark to be moved  to changeset &quot;{0}&quot;:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2058"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2063"/>
         <source>Select bookmark to switch to (leave empty to use revision):</source>
         <translation type="unfinished"></translation>
     </message>
@@ -30557,148 +30637,148 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="167"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="173"/>
         <source>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Latest Tag&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="148"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="154"/>
         <source>&lt;table&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Revision&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Date&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{1}&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Author&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{2}&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Branch&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{3}&lt;/td&gt;&lt;/tr&gt;{4}&lt;tr&gt;&lt;td&gt;&lt;b&gt;Message&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{5}&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="158"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="164"/>
         <source>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Parents&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="161"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="167"/>
         <source>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Children&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="260"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="267"/>
         <source>Merge with Changeset</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="263"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="270"/>
         <source>Merge the working directory with the selected changeset</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="336"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="343"/>
         <source>Create Changegroup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="339"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="346"/>
         <source>Create a changegroup file containing the selected changesets</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="341"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="348"/>
         <source>&lt;b&gt;Create Changegroup&lt;/b&gt;
 &lt;p&gt;This creates a changegroup file containing the selected revisions. If no revisions are selected, all changesets will be bundled. If one revision is selected, it will be interpreted as the base revision. Otherwise the lowest revision will be used as the base revision and all other revision will be bundled. If the dialog is showing outgoing changesets, all selected changesets will be bundled.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2343"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2348"/>
         <source>Apply Changegroup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="353"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="360"/>
         <source>Apply the currently viewed changegroup file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="358"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="365"/>
         <source>Sign Revisions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="361"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="368"/>
         <source>Add a signature for the selected revisions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="363"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="370"/>
         <source>Verify Signatures</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="366"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="373"/>
         <source>Verify all signatures there may be for the selected revision</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="379"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="386"/>
         <source>Select All Entries</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="381"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="388"/>
         <source>Deselect All Entries</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1369"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1374"/>
         <source>Side-by-Side Diff to Parent {0}</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1380"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1385"/>
         <source>&lt;a href=&quot;sbsdiff:{0}_{1}&quot;&gt;Side-by-Side Compare&lt;/a&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1521"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1526"/>
         <source>Pull Selected Changes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1522"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1527"/>
         <source>Fetch Selected Changes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2529"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2534"/>
         <source>Differences</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2539"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2544"/>
         <source>Differences to Parent {0}</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2555"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2560"/>
         <source>Diff to Parent {0}{1}</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2580"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2585"/>
         <source>There is no difference.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2723"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2728"/>
         <source>Save Diff</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2690"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2695"/>
         <source>Patch Files (*.diff)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2707"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2712"/>
         <source>&lt;p&gt;The patch file &lt;b&gt;{0}&lt;/b&gt; already exists. Overwrite it?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2723"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2728"/>
         <source>&lt;p&gt;The patch file &lt;b&gt;{0}&lt;/b&gt; could not be saved.&lt;br&gt;Reason: {1}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -30708,22 +30788,22 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2528"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2533"/>
         <source>Generating differences ...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="98"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="104"/>
         <source>Mercurial Full Log</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="280"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="287"/>
         <source>Close Heads</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="283"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="290"/>
         <source>Close the selected heads</source>
         <translation type="unfinished"></translation>
     </message>
@@ -31097,7 +31177,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="833"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="835"/>
         <source>Remove from repository only</source>
         <translation type="unfinished"></translation>
     </message>
@@ -31142,7 +31222,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="833"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="835"/>
         <source>Do you really want to remove these files from the repository?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -33698,52 +33778,52 @@
 <context>
     <name>HgServeDialog</name>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py" line="47"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py" line="50"/>
         <source>Mercurial Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py" line="49"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py" line="57"/>
         <source>Start Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py" line="55"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py" line="63"/>
         <source>Stop Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py" line="61"/>
-        <source>Start Browser</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py" line="69"/>
+        <source>Start Browser</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py" line="77"/>
         <source>Enter the server port</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py" line="75"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py" line="83"/>
         <source>Select the style to use</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py" line="79"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py" line="87"/>
         <source>Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py" line="86"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py" line="94"/>
         <source>Browser</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py" line="140"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py" line="148"/>
         <source>Process Generation Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py" line="140"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py" line="148"/>
         <source>The process {0} could not be started. Ensure, that it is in the search path.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -37046,53 +37126,138 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="115"/>
+        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="217"/>
         <source>Press to delete the selected directory from the list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="118"/>
+        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="220"/>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="128"/>
+        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="230"/>
         <source>Press to add the entered directory to the list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="131"/>
+        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="233"/>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="156"/>
+        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="258"/>
         <source>Show</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="177"/>
+        <source>Up</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="187"/>
+        <source>Down</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="146"/>
+        <source>List of icon directories</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="44"/>
+        <source>Default Icons</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="52"/>
+        <source>Select to select between Breeze (dark) and Breeze (light) based on the window lightness</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="55"/>
+        <source>Automatic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="65"/>
+        <source>Select to use the Breeze vector icons for light window background</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="68"/>
+        <source>Breeze (light)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="75"/>
-        <source>Up</source>
+        <source>Select to use the Breeze vector icons for dark window background</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="78"/>
+        <source>Breeze (dark)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="85"/>
-        <source>Down</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="44"/>
-        <source>List of icon directories</source>
+        <source>Select to use the Oxygen pixmap icons</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="88"/>
+        <source>Oxygen</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="112"/>
+        <source>Press to show a dialog with a preview of the selected default icon set</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="140"/>
+        <source>Custom Icon Directories</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IconsPreviewDialog</name>
     <message>
-        <location filename="../Preferences/ConfigurationPages/IconsPreviewDialog.ui" line="13"/>
+        <location filename="../Preferences/ConfigurationPages/IconsPreviewDialog.ui" line="14"/>
         <source>Icons Preview</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IconsPreviewDialog.ui" line="25"/>
+        <source>Directory:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IconsPreviewDialog.ui" line="38"/>
+        <source>Select the icons directory to be shown</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IconsPreviewDialog.ui" line="74"/>
+        <source>Invert Background</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IconsPreviewDialog.ui" line="87"/>
+        <source>Refresh</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IconsPreviewDialog.ui" line="84"/>
+        <source>Select to refresh the icons display</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IconsPreviewDialog.ui" line="71"/>
+        <source>Select to invert the background color</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>IdlCompilerDefineNameDialog</name>
@@ -39222,126 +39387,61 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="102"/>
-        <source>Colours</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="108"/>
         <source>Network Messages:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="121"/>
-        <source>Select the colour for network messages</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="131"/>
         <source>Nick Names:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="144"/>
-        <source>Select the colour for nick names</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="154"/>
         <source>Server Messages:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="167"/>
-        <source>Select the colour for server messages</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="177"/>
         <source>Own Nick Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="190"/>
-        <source>Select the colour for own nick name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="200"/>
         <source>Channel Messages:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="213"/>
-        <source>Select the colour for channel messages</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="223"/>
         <source>Join Channel:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="236"/>
-        <source>Select the colour for join channel messages</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="246"/>
         <source>Error Messages:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="259"/>
-        <source>Select the colour for error messages</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="269"/>
         <source>Leave Channel:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="282"/>
-        <source>Select the colour for leave channel messages</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="292"/>
         <source>Timestamp:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="305"/>
-        <source>Select the colour for timestamps</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="315"/>
         <source>Channel Info:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="328"/>
-        <source>Select the colour for channel info messages</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="338"/>
         <source>Hyperlink:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="351"/>
-        <source>Select the colour for hyperlinks</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="364"/>
-        <source>Enable to allow coloured text in IRC messages</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="367"/>
         <source>Allow Colored Text in IRC Messages</source>
         <translation type="unfinished"></translation>
@@ -39447,21 +39547,11 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="824"/>
-        <source>Select the foreground colour for the marker</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="834"/>
         <source>Marker Background:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="847"/>
-        <source>Select the background colour for the marker</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="862"/>
         <source>Shutdown</source>
         <translation type="unfinished"></translation>
@@ -39476,6 +39566,81 @@
         <source>Confirm Shutdown When Connected</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="102"/>
+        <source>Colors</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="121"/>
+        <source>Select the color for network messages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="144"/>
+        <source>Select the color for nick names</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="167"/>
+        <source>Select the color for server messages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="190"/>
+        <source>Select the color for own nick name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="213"/>
+        <source>Select the color for channel messages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="236"/>
+        <source>Select the color for join channel messages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="259"/>
+        <source>Select the color for error messages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="282"/>
+        <source>Select the color for leave channel messages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="305"/>
+        <source>Select the color for timestamps</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="328"/>
+        <source>Select the color for channel info messages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="351"/>
+        <source>Select the color for hyperlinks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="364"/>
+        <source>Enable to allow colored text in IRC messages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="824"/>
+        <source>Select the foreground color for the marker</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="847"/>
+        <source>Select the background color for the marker</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>IrcServerEditDialog</name>
@@ -40852,257 +41017,257 @@
 <context>
     <name>LexerPygments</name>
     <message>
-        <location filename="../QScintilla/Lexers/LexerPygments.py" line="180"/>
+        <location filename="../QScintilla/Lexers/LexerPygments.py" line="196"/>
         <source>Default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/LexerPygments.py" line="181"/>
-        <source>Comment</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/LexerPygments.py" line="182"/>
-        <source>Preprocessor</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/LexerPygments.py" line="183"/>
-        <source>Keyword</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/LexerPygments.py" line="184"/>
-        <source>Pseudo Keyword</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/LexerPygments.py" line="185"/>
-        <source>Type Keyword</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/LexerPygments.py" line="186"/>
-        <source>Operator</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/LexerPygments.py" line="187"/>
-        <source>Word</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/LexerPygments.py" line="188"/>
-        <source>Builtin</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/LexerPygments.py" line="189"/>
-        <source>Function or method name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/LexerPygments.py" line="190"/>
-        <source>Class name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/LexerPygments.py" line="191"/>
-        <source>Namespace</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/LexerPygments.py" line="192"/>
-        <source>Exception</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/LexerPygments.py" line="193"/>
-        <source>Identifier</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/LexerPygments.py" line="194"/>
-        <source>Constant</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/LexerPygments.py" line="195"/>
-        <source>Label</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/LexerPygments.py" line="196"/>
-        <source>Entity</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="197"/>
-        <source>Attribute</source>
+        <source>Comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="198"/>
-        <source>Tag</source>
+        <source>Preprocessor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="199"/>
-        <source>Decorator</source>
+        <source>Keyword</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="200"/>
-        <source>String</source>
+        <source>Pseudo Keyword</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="201"/>
-        <source>Documentation string</source>
+        <source>Type Keyword</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="202"/>
-        <source>Scalar</source>
+        <source>Operator</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="203"/>
-        <source>Escape</source>
+        <source>Word</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="204"/>
-        <source>Regular expression</source>
+        <source>Builtin</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="205"/>
-        <source>Symbol</source>
+        <source>Function or method name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="206"/>
-        <source>Other string</source>
+        <source>Class name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="207"/>
-        <source>Number</source>
+        <source>Namespace</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="208"/>
-        <source>Heading</source>
+        <source>Exception</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="209"/>
-        <source>Subheading</source>
+        <source>Identifier</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="210"/>
-        <source>Deleted</source>
+        <source>Constant</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="211"/>
-        <source>Inserted</source>
+        <source>Label</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="212"/>
-        <source>Generic error</source>
+        <source>Entity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="213"/>
-        <source>Emphasized text</source>
+        <source>Attribute</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="214"/>
-        <source>Strong text</source>
+        <source>Tag</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="215"/>
-        <source>Prompt</source>
+        <source>Decorator</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="216"/>
-        <source>Output</source>
+        <source>String</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="217"/>
-        <source>Traceback</source>
+        <source>Documentation string</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="218"/>
-        <source>Error</source>
+        <source>Scalar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="219"/>
-        <source>Comment block</source>
+        <source>Escape</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="220"/>
-        <source>Property</source>
+        <source>Regular expression</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="221"/>
-        <source>Character</source>
+        <source>Symbol</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="222"/>
-        <source>Here document</source>
+        <source>Other string</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="223"/>
-        <source>Punctuation</source>
+        <source>Number</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="224"/>
-        <source>Hashbang</source>
+        <source>Heading</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="225"/>
-        <source>Reserved Keyword</source>
+        <source>Subheading</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="226"/>
-        <source>Literal</source>
+        <source>Deleted</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="227"/>
-        <source>Double quoted string</source>
+        <source>Inserted</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="228"/>
-        <source>Single quoted string</source>
+        <source>Generic error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="229"/>
-        <source>Backtick string</source>
+        <source>Emphasized text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="230"/>
+        <source>Strong text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/LexerPygments.py" line="231"/>
+        <source>Prompt</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/LexerPygments.py" line="232"/>
+        <source>Output</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/LexerPygments.py" line="233"/>
+        <source>Traceback</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/LexerPygments.py" line="234"/>
+        <source>Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/LexerPygments.py" line="235"/>
+        <source>Comment block</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/LexerPygments.py" line="236"/>
+        <source>Property</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/LexerPygments.py" line="237"/>
+        <source>Character</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/LexerPygments.py" line="238"/>
+        <source>Here document</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/LexerPygments.py" line="239"/>
+        <source>Punctuation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/LexerPygments.py" line="240"/>
+        <source>Hashbang</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/LexerPygments.py" line="241"/>
+        <source>Reserved Keyword</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/LexerPygments.py" line="242"/>
+        <source>Literal</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/LexerPygments.py" line="243"/>
+        <source>Double quoted string</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/LexerPygments.py" line="244"/>
+        <source>Single quoted string</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/LexerPygments.py" line="245"/>
+        <source>Backtick string</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/LexerPygments.py" line="246"/>
         <source>Whitespace</source>
         <translation type="unfinished"></translation>
     </message>
@@ -42167,16 +42332,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/LogViewerPage.ui" line="49"/>
-        <source>Error Colour:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/LogViewerPage.ui" line="62"/>
-        <source>Select the colour for text sent to stderr</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/LogViewerPage.ui" line="87"/>
         <source>Message Filters:</source>
         <translation type="unfinished"></translation>
@@ -42211,6 +42366,16 @@
         <source>&lt;b&gt;Message Filters for both&lt;/b&gt;&lt;p&gt;This list shows the configured message filters used to suppress messages received via stdout or stderr.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/LogViewerPage.ui" line="49"/>
+        <source>Error Color:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/LogViewerPage.ui" line="62"/>
+        <source>Select the color for text sent to stderr</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MakePropertiesDialog</name>
@@ -42996,27 +43161,27 @@
 <context>
     <name>MicroPythonDevice</name>
     <message>
-        <location filename="../MicroPython/MicroPythonDevices.py" line="207"/>
+        <location filename="../MicroPython/MicroPythonDevices.py" line="214"/>
         <source>Unsupported Device</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonDevices.py" line="217"/>
+        <location filename="../MicroPython/MicroPythonDevices.py" line="224"/>
         <source>REPL is not supported by this device.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonDevices.py" line="236"/>
+        <location filename="../MicroPython/MicroPythonDevices.py" line="243"/>
         <source>Plotter is not supported by this device.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonDevices.py" line="255"/>
+        <location filename="../MicroPython/MicroPythonDevices.py" line="262"/>
         <source>Running scripts is not supported by this device.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonDevices.py" line="275"/>
+        <location filename="../MicroPython/MicroPythonDevices.py" line="282"/>
         <source>File Manager is not supported by this device.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -43280,27 +43445,27 @@
 <context>
     <name>MicroPythonGraphWidget</name>
     <message>
-        <location filename="../MicroPython/MicroPythonGraphWidget.py" line="63"/>
+        <location filename="../MicroPython/MicroPythonGraphWidget.py" line="64"/>
         <source>Press to save the raw data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonGraphWidget.py" line="72"/>
+        <location filename="../MicroPython/MicroPythonGraphWidget.py" line="73"/>
         <source>max. X:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonGraphWidget.py" line="81"/>
+        <location filename="../MicroPython/MicroPythonGraphWidget.py" line="82"/>
         <source>Enter the maximum number of data points to be plotted.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonGraphWidget.py" line="311"/>
+        <location filename="../MicroPython/MicroPythonGraphWidget.py" line="329"/>
         <source>Save Chart Data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonGraphWidget.py" line="311"/>
+        <location filename="../MicroPython/MicroPythonGraphWidget.py" line="329"/>
         <source>&lt;p&gt;The chart data could not be saved into file &lt;b&gt;{0}&lt;/b&gt;.&lt;/p&gt;&lt;p&gt;Reason: {1}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -43368,93 +43533,168 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="169"/>
+        <source>MPY Cross Compiler</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="175"/>
+        <source>Program:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="191"/>
+        <source>Enter the path of the cross compiler executable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.py" line="67"/>
+        <source>All Files (*)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="298"/>
+        <source>Documentation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="304"/>
+        <source>MicroPython:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="311"/>
+        <source>Enter the URL for the MicroPython documentation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="318"/>
+        <source>CircuitPython:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="325"/>
+        <source>Enter the URL for the CircuitPython documentation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="332"/>
+        <source>BBC micro:bit:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="339"/>
+        <source>Enter the URL for the BBC micro:bit MicroPython documentation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="201"/>
+        <source>PyBoard</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="207"/>
+        <source>dfu-util Path:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="223"/>
+        <source>Enter the path of the dfu-util flashing executable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="233"/>
+        <source>Firmware</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="246"/>
+        <source>Enter the URL for the MicroPython firmware for PyBoard, ESP8266 and ESP32</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="260"/>
+        <source>Enter the URL for the CircuitPython firmware</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="274"/>
+        <source>Enter the URL for the BBC micro:bit Firmware</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="140"/>
-        <source>MPY Cross Compiler</source>
+        <source>Chart Pane</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="146"/>
-        <source>Program:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="162"/>
-        <source>Enter the path of the cross compiler executable</source>
+        <source>Color Theme:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="159"/>
+        <source>Select the color scheme of the chart</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/MicroPythonPage.py" line="42"/>
-        <source>All Files (*)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="255"/>
-        <source>Documentation</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="261"/>
-        <source>MicroPython:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="268"/>
-        <source>Enter the URL for the MicroPython documentation</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="275"/>
-        <source>CircuitPython:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="282"/>
-        <source>Enter the URL for the CircuitPython documentation</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="289"/>
-        <source>BBC micro:bit:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="296"/>
-        <source>Enter the URL for the BBC micro:bit MicroPython documentation</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="172"/>
-        <source>PyBoard</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="178"/>
-        <source>dfu-util Path:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="194"/>
-        <source>Enter the path of the dfu-util flashing executable</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="204"/>
-        <source>Firmware</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="217"/>
-        <source>Enter the URL for the MicroPython firmware for PyBoard, ESP8266 and ESP32</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="231"/>
-        <source>Enter the URL for the CircuitPython firmware</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="245"/>
-        <source>Enter the URL for the BBC micro:bit Firmware</source>
+        <source>Automatic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.py" line="44"/>
+        <source>Light</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.py" line="46"/>
+        <source>Dark</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.py" line="48"/>
+        <source>Blue Cerulean</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.py" line="50"/>
+        <source>Brown Sand</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.py" line="52"/>
+        <source>Blue NCS</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.py" line="54"/>
+        <source>High Contrast</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.py" line="56"/>
+        <source>Blue Icy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.py" line="58"/>
+        <source>Qt</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="346"/>
+        <source>Calliope mini:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="288"/>
+        <source>Enter the URL for the Callope mini Firmware</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="353"/>
+        <source>Enter the URL for the Calliope mini MicroPython documentation</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -43499,17 +43739,17 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="420"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="460"/>
         <source>Press to connect the selected device</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="226"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="263"/>
         <source>&lt;h3&gt;The QtSerialPort package is not available.&lt;br/&gt;MicroPython support is deactivated.&lt;/h3&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message numerus="yes">
-        <location filename="../MicroPython/MicroPythonWidget.py" line="263"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="300"/>
         <source>%n supported device(s) detected.</source>
         <translation>
             <numerusform>%n supported device detected.</numerusform>
@@ -43517,42 +43757,42 @@
         </translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="269"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="306"/>
         <source>{0} at {1}</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="277"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="314"/>
         <source>No supported devices detected.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="390"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="430"/>
         <source>Clear</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="392"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="432"/>
         <source>Copy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="393"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="433"/>
         <source>Paste</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="415"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="455"/>
         <source>Press to disconnect the current device</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="436"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="476"/>
         <source>No device attached</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="436"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="476"/>
         <source>Please ensure the device is plugged into your computer and selected.
 
 It must have a version of MicroPython (or CircuitPython) flashed onto it before anything will work.
@@ -43561,217 +43801,217 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="463"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="503"/>
         <source>Start REPL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="463"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="503"/>
         <source>&lt;p&gt;The REPL cannot be started.&lt;/p&gt;&lt;p&gt;Reason: {0}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="853"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="893"/>
         <source>Serial Device Connect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="853"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="893"/>
         <source>&lt;p&gt;Cannot connect to device at serial port &lt;b&gt;{0}&lt;/b&gt;.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="898"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="938"/>
         <source>Run Script</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="881"/>
-        <source>There is no editor open. Abort...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="889"/>
-        <source>The current editor does not contain a script. Abort...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="898"/>
-        <source>&lt;p&gt;Cannot run script.&lt;/p&gt;&lt;p&gt;Reason: {0}&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="921"/>
-        <source>Open Python File</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../MicroPython/MicroPythonWidget.py" line="921"/>
+        <source>There is no editor open. Abort...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="929"/>
+        <source>The current editor does not contain a script. Abort...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="938"/>
+        <source>&lt;p&gt;Cannot run script.&lt;/p&gt;&lt;p&gt;Reason: {0}&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="961"/>
+        <source>Open Python File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="961"/>
         <source>Python3 Files (*.py);;All Files (*)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="965"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1005"/>
         <source>Start Chart</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="965"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1005"/>
         <source>&lt;p&gt;The Chart cannot be started.&lt;/p&gt;&lt;p&gt;Reason: {0}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="994"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1034"/>
         <source>Unsaved Chart Data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="994"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1034"/>
         <source>The chart contains unsaved data.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1045"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1085"/>
         <source>Start File Manager</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1045"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1085"/>
         <source>&lt;p&gt;The File Manager cannot be started.&lt;/p&gt;&lt;p&gt;Reason: {0}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1096"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1136"/>
         <source>Show Version</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1099"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1139"/>
         <source>Show Implementation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1210"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1250"/>
         <source>Synchronize Time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1107"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1147"/>
         <source>Show Device Time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1110"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1150"/>
         <source>Show Local Time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1421"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1461"/>
         <source>Compile Python File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1481"/>
+        <source>Compile Current Editor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1188"/>
+        <source>&lt;h3&gt;Device Version Information&lt;/h3&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1197"/>
+        <source>No version information available.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1199"/>
+        <source>Device Version Information</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1222"/>
+        <source>unknown</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1226"/>
+        <source>Device Implementation Information</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1226"/>
+        <source>&lt;h3&gt;Device Implementation Information&lt;/h3&gt;&lt;p&gt;This device contains &lt;b&gt;{0} {1}&lt;/b&gt;.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1250"/>
+        <source>&lt;p&gt;The time of the connected device was synchronized with the local time.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1272"/>
+        <source>&lt;h3&gt;Device Date and Time&lt;/h3&gt;&lt;table&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Date&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Time&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{1}&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1280"/>
+        <source>&lt;h3&gt;Device Date and Time&lt;/h3&gt;&lt;p&gt;{0}&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1294"/>
+        <source>Device Date and Time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1307"/>
+        <source>Local Date and Time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1307"/>
+        <source>&lt;h3&gt;Local Date and Time&lt;/h3&gt;&lt;table&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Date&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Time&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{1}&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1374"/>
+        <source>Error handling device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1374"/>
+        <source>&lt;p&gt;There was an error communicating with the connected device.&lt;/p&gt;&lt;p&gt;Method: {0}&lt;/p&gt;&lt;p&gt;Message: {1}&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1413"/>
+        <source>The MicroPython cross compiler &lt;b&gt;mpy-cross&lt;/b&gt; cannot be found. Ensure it is in the search path or configure it on the MicroPython configuration page.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1431"/>
+        <source>Python Files (*.py);;All Files (*)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../MicroPython/MicroPythonWidget.py" line="1441"/>
-        <source>Compile Current Editor</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1148"/>
-        <source>&lt;h3&gt;Device Version Information&lt;/h3&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1157"/>
-        <source>No version information available.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1159"/>
-        <source>Device Version Information</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1182"/>
-        <source>unknown</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1186"/>
-        <source>Device Implementation Information</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1186"/>
-        <source>&lt;h3&gt;Device Implementation Information&lt;/h3&gt;&lt;p&gt;This device contains &lt;b&gt;{0} {1}&lt;/b&gt;.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1210"/>
-        <source>&lt;p&gt;The time of the connected device was synchronized with the local time.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1232"/>
-        <source>&lt;h3&gt;Device Date and Time&lt;/h3&gt;&lt;table&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Date&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Time&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{1}&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1240"/>
-        <source>&lt;h3&gt;Device Date and Time&lt;/h3&gt;&lt;p&gt;{0}&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1254"/>
-        <source>Device Date and Time</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1267"/>
-        <source>Local Date and Time</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1267"/>
-        <source>&lt;h3&gt;Local Date and Time&lt;/h3&gt;&lt;table&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Date&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Time&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{1}&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1334"/>
-        <source>Error handling device</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1334"/>
-        <source>&lt;p&gt;There was an error communicating with the connected device.&lt;/p&gt;&lt;p&gt;Method: {0}&lt;/p&gt;&lt;p&gt;Message: {1}&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1373"/>
-        <source>The MicroPython cross compiler &lt;b&gt;mpy-cross&lt;/b&gt; cannot be found. Ensure it is in the search path or configure it on the MicroPython configuration page.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1391"/>
-        <source>Python Files (*.py);;All Files (*)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1401"/>
         <source>The Python file &lt;b&gt;{0}&lt;/b&gt; does not exist. Aborting...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1411"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1451"/>
         <source>&apos;mpy-cross&apos; Output</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1434"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1474"/>
         <source>The current editor does not contain a Python file. Aborting...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="175"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="211"/>
         <source>MicroPython Menu</source>
         <translation type="unfinished"></translation>
     </message>
@@ -43781,47 +44021,47 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="978"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1018"/>
         <source>&#xc2;&#xb5;Py Chart</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1058"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1098"/>
         <source>&#xc2;&#xb5;Py Files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1134"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1174"/>
         <source>Show Documentation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1138"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1178"/>
         <source>Configure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1113"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1153"/>
         <source>Show Time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1130"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1170"/>
         <source>Download Firmware</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1310"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1350"/>
         <source>Date and Time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1293"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1333"/>
         <source>&lt;table&gt;&lt;tr&gt;&lt;th&gt;&lt;/th&gt;&lt;th&gt;Local Date and Time&lt;/th&gt;&lt;th&gt;Device Date and Time&lt;/th&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Date&lt;/b&gt;&lt;/td&gt;&lt;td align=&apos;center&apos;&gt;{0}&lt;/td&gt;&lt;td align=&apos;center&apos;&gt;{2}&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Time&lt;/b&gt;&lt;/td&gt;&lt;td align=&apos;center&apos;&gt;{1}&lt;/td&gt;&lt;td align=&apos;center&apos;&gt;{3}&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1310"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1350"/>
         <source>&lt;table&gt;&lt;tr&gt;&lt;th&gt;Local Date and Time&lt;/th&gt;&lt;th&gt;Device Date and Time&lt;/th&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td align=&apos;center&apos;&gt;{0} {1}&lt;/td&gt;&lt;td align=&apos;center&apos;&gt;{2}&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -43829,85 +44069,90 @@
 <context>
     <name>MicrobitDevice</name>
     <message>
-        <location filename="../MicroPython/MicrobitDevices.py" line="67"/>
+        <location filename="../MicroPython/MicrobitDevices.py" line="74"/>
         <source>BBC micro:bit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicrobitDevices.py" line="134"/>
+        <location filename="../MicroPython/MicrobitDevices.py" line="149"/>
         <source>Workspace Directory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicrobitDevices.py" line="134"/>
-        <source>Could not find an attached BBC micro:bit.
+        <location filename="../MicroPython/MicrobitDevices.py" line="186"/>
+        <source>Save Script as &apos;main.py&apos;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicrobitDevices.py" line="188"/>
+        <source>Save the current script as &apos;main.py&apos; on the connected device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicrobitDevices.py" line="241"/>
+        <source>MicroPython Firmware Files (*.hex);;All Files (*)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicrobitDevices.py" line="286"/>
+        <source>The script is empty. Aborting.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicrobitDevices.py" line="276"/>
+        <source>The current editor does not contain a Python script. Write it anyway?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicrobitDevices.py" line="314"/>
+        <source>&lt;p&gt;The script could not be saved to the device.&lt;/p&gt;&lt;p&gt;Reason: {0}&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicrobitDevices.py" line="241"/>
+        <source>Flash MicroPython Firmware</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicrobitDevices.py" line="273"/>
+        <source>Save Script</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicrobitDevices.py" line="303"/>
+        <source>Save Script as &apos;{0}&apos;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicrobitDevices.py" line="294"/>
+        <source>Enter a file name on the device:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicrobitDevices.py" line="183"/>
+        <source>Save the current script to the selected device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicrobitDevices.py" line="77"/>
+        <source>Calliope mini</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicrobitDevices.py" line="232"/>
+        <source>Could not find an attached {0}.
 
 Please make sure the device is plugged into this computer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicrobitDevices.py" line="171"/>
-        <source>Save Script as &apos;main.py&apos;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicrobitDevices.py" line="173"/>
-        <source>Save the current script as &apos;main.py&apos; on the connected device</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicrobitDevices.py" line="177"/>
-        <source>Reset micro:bit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicrobitDevices.py" line="201"/>
-        <source>MicroPython Firmware Files (*.hex);;All Files (*)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicrobitDevices.py" line="246"/>
-        <source>The script is empty. Aborting.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicrobitDevices.py" line="236"/>
-        <source>The current editor does not contain a Python script. Write it anyway?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicrobitDevices.py" line="274"/>
-        <source>&lt;p&gt;The script could not be saved to the device.&lt;/p&gt;&lt;p&gt;Reason: {0}&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicrobitDevices.py" line="201"/>
-        <source>Flash MicroPython Firmware</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicrobitDevices.py" line="233"/>
-        <source>Save Script</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicrobitDevices.py" line="190"/>
-        <source>The BBC micro:bit is not ready for flashing. See the &lt;a href=&quot;https://microbit.org/guide/firmware/&quot;&gt;micro:bit web site&lt;/a&gt; for details.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicrobitDevices.py" line="263"/>
-        <source>Save Script as &apos;{0}&apos;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicrobitDevices.py" line="254"/>
-        <source>Enter a file name on the device:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicrobitDevices.py" line="168"/>
-        <source>Save the current script to the selected device</source>
+        <location filename="../MicroPython/MicrobitDevices.py" line="192"/>
+        <source>Reset {0}</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicrobitDevices.py" line="213"/>
+        <source>&lt;p&gt;The BBC micro:bit is not ready for flashing. Follow these instructions.&lt;/p&gt;&lt;ul&gt;&lt;li&gt;unplug USB cable and any batteries&lt;/li&gt;&lt;li&gt;keep RESET button pressed an plug USB cable back in&lt;/li&gt;&lt;li&gt;a drive called MAINTENANCE should be available&lt;/li&gt;&lt;/ul&gt;&lt;p&gt;See the &lt;a href=&quot;https://microbit.org/guide/firmware/&quot;&gt;micro:bit web site&lt;/a&gt; for details.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -47690,7 +47935,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message numerus="yes">
-        <location filename="../PipInterface/PipPackagesWidget.py" line="635"/>
+        <location filename="../PipInterface/PipPackagesWidget.py" line="645"/>
         <source>%n package(s) found.</source>
         <translation>
             <numerusform>%n package found.</numerusform>
@@ -47698,102 +47943,102 @@
         </translation>
     </message>
     <message>
-        <location filename="../PipInterface/PipPackagesWidget.py" line="888"/>
+        <location filename="../PipInterface/PipPackagesWidget.py" line="898"/>
         <source>Search PyPI</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../PipInterface/PipPackagesWidget.py" line="673"/>
+        <location filename="../PipInterface/PipPackagesWidget.py" line="683"/>
         <source>&lt;p&gt;The package search did not return anything.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../PipInterface/PipPackagesWidget.py" line="710"/>
+        <location filename="../PipInterface/PipPackagesWidget.py" line="720"/>
         <source>&lt;p&gt;The package search failed.&lt;/p&gt;&lt;p&gt;Reason: {0}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../PipInterface/PipPackagesWidget.py" line="715"/>
+        <location filename="../PipInterface/PipPackagesWidget.py" line="725"/>
         <source>Error: {0}</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../PipInterface/PipPackagesWidget.py" line="848"/>
+        <location filename="../PipInterface/PipPackagesWidget.py" line="858"/>
         <source>Show Package Details</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../PipInterface/PipPackagesWidget.py" line="848"/>
+        <location filename="../PipInterface/PipPackagesWidget.py" line="858"/>
         <source>Select the package version:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../PipInterface/PipPackagesWidget.py" line="888"/>
+        <location filename="../PipInterface/PipPackagesWidget.py" line="898"/>
         <source>&lt;p&gt;No package details info for &lt;b&gt;{0}&lt;/b&gt; available.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../PipInterface/PipPackagesWidget.py" line="904"/>
+        <location filename="../PipInterface/PipPackagesWidget.py" line="914"/>
         <source>Install Pip</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../PipInterface/PipPackagesWidget.py" line="907"/>
-        <source>Install Pip to User-Site</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../PipInterface/PipPackagesWidget.py" line="910"/>
-        <source>Repair Pip</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../PipInterface/PipPackagesWidget.py" line="1005"/>
-        <source>Install Packages</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../PipInterface/PipPackagesWidget.py" line="917"/>
-        <source>Install Local Package</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../PipInterface/PipPackagesWidget.py" line="921"/>
-        <source>Install Requirements</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../PipInterface/PipPackagesWidget.py" line="924"/>
-        <source>Uninstall Requirements</source>
+        <source>Install Pip to User-Site</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../PipInterface/PipPackagesWidget.py" line="920"/>
+        <source>Repair Pip</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../PipInterface/PipPackagesWidget.py" line="1015"/>
+        <source>Install Packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../PipInterface/PipPackagesWidget.py" line="927"/>
+        <source>Install Local Package</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../PipInterface/PipPackagesWidget.py" line="931"/>
+        <source>Install Requirements</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../PipInterface/PipPackagesWidget.py" line="934"/>
+        <source>Uninstall Requirements</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../PipInterface/PipPackagesWidget.py" line="937"/>
         <source>Generate Requirements...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../PipInterface/PipPackagesWidget.py" line="932"/>
+        <location filename="../PipInterface/PipPackagesWidget.py" line="942"/>
         <source>Edit User Configuration...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../PipInterface/PipPackagesWidget.py" line="935"/>
+        <location filename="../PipInterface/PipPackagesWidget.py" line="945"/>
         <source>Edit Environment Configuration...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../PipInterface/PipPackagesWidget.py" line="940"/>
+        <location filename="../PipInterface/PipPackagesWidget.py" line="950"/>
         <source>Configure...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../PipInterface/PipPackagesWidget.py" line="1118"/>
+        <location filename="../PipInterface/PipPackagesWidget.py" line="1128"/>
         <source>Edit Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../PipInterface/PipPackagesWidget.py" line="1118"/>
+        <location filename="../PipInterface/PipPackagesWidget.py" line="1128"/>
         <source>No valid configuration path determined. Aborting</source>
         <translation type="unfinished"></translation>
     </message>
@@ -49056,17 +49301,17 @@
 <context>
     <name>Preferences</name>
     <message>
-        <location filename="../Preferences/__init__.py" line="1624"/>
+        <location filename="../Preferences/__init__.py" line="1640"/>
         <source>Export Preferences</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1652"/>
+        <location filename="../Preferences/__init__.py" line="1668"/>
         <source>Import Preferences</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1652"/>
+        <location filename="../Preferences/__init__.py" line="1668"/>
         <source>Properties File (*.ini);;All Files (*)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -49271,11 +49516,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/PrinterPage.ui" line="77"/>
-        <source>Colour</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/PrinterPage.ui" line="84"/>
         <source>Gray Scale</source>
         <translation type="unfinished"></translation>
@@ -49311,11 +49551,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/PrinterPage.ui" line="49"/>
-        <source>Colour Mode:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/PrinterPage.ui" line="94"/>
         <source>Page Order:</source>
         <translation type="unfinished"></translation>
@@ -49365,6 +49600,16 @@
         <source> DPI</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/PrinterPage.ui" line="49"/>
+        <source>Color Mode:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/PrinterPage.ui" line="77"/>
+        <source>Color</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ProgramsDialog</name>
@@ -49617,312 +49862,312 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="805"/>
+        <location filename="../Project/Project.py" line="817"/>
         <source>Read project file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="805"/>
+        <location filename="../Project/Project.py" line="817"/>
         <source>&lt;p&gt;The project file &lt;b&gt;{0}&lt;/b&gt; could not be read.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="908"/>
+        <location filename="../Project/Project.py" line="920"/>
         <source>Save project file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="908"/>
+        <location filename="../Project/Project.py" line="920"/>
         <source>&lt;p&gt;The project file &lt;b&gt;{0}&lt;/b&gt; could not be written.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="944"/>
+        <location filename="../Project/Project.py" line="956"/>
         <source>Read user project properties</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="944"/>
+        <location filename="../Project/Project.py" line="956"/>
         <source>&lt;p&gt;The user specific project properties file &lt;b&gt;{0}&lt;/b&gt; could not be read.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="968"/>
+        <location filename="../Project/Project.py" line="980"/>
         <source>Save user project properties</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="968"/>
+        <location filename="../Project/Project.py" line="980"/>
         <source>&lt;p&gt;The user specific project properties file &lt;b&gt;{0}&lt;/b&gt; could not be written.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1026"/>
+        <location filename="../Project/Project.py" line="1038"/>
         <source>Read project session</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../Project/Project.py" line="1263"/>
+        <source>Please save the project first.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="1038"/>
+        <source>&lt;p&gt;The project session file &lt;b&gt;{0}&lt;/b&gt; could not be read.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="1074"/>
+        <source>Save project session</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="1074"/>
+        <source>&lt;p&gt;The project session file &lt;b&gt;{0}&lt;/b&gt; could not be written.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="1103"/>
+        <source>Delete project session</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="1103"/>
+        <source>&lt;p&gt;The project session file &lt;b&gt;{0}&lt;/b&gt; could not be deleted.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="1137"/>
+        <source>Read tasks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="1137"/>
+        <source>&lt;p&gt;The tasks file &lt;b&gt;{0}&lt;/b&gt; could not be read.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="1157"/>
+        <source>Save tasks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="1157"/>
+        <source>&lt;p&gt;The tasks file &lt;b&gt;{0}&lt;/b&gt; could not be written.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="1216"/>
+        <source>Read debugger properties</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="1216"/>
+        <source>&lt;p&gt;The project debugger properties file &lt;b&gt;{0}&lt;/b&gt; could not be read.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="1251"/>
+        <source>Save debugger properties</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../Project/Project.py" line="1251"/>
-        <source>Please save the project first.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="1026"/>
-        <source>&lt;p&gt;The project session file &lt;b&gt;{0}&lt;/b&gt; could not be read.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="1062"/>
-        <source>Save project session</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="1062"/>
-        <source>&lt;p&gt;The project session file &lt;b&gt;{0}&lt;/b&gt; could not be written.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="1091"/>
-        <source>Delete project session</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="1091"/>
-        <source>&lt;p&gt;The project session file &lt;b&gt;{0}&lt;/b&gt; could not be deleted.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="1125"/>
-        <source>Read tasks</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="1125"/>
-        <source>&lt;p&gt;The tasks file &lt;b&gt;{0}&lt;/b&gt; could not be read.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="1145"/>
-        <source>Save tasks</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="1145"/>
-        <source>&lt;p&gt;The tasks file &lt;b&gt;{0}&lt;/b&gt; could not be written.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="1204"/>
-        <source>Read debugger properties</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="1204"/>
-        <source>&lt;p&gt;The project debugger properties file &lt;b&gt;{0}&lt;/b&gt; could not be read.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="1239"/>
-        <source>Save debugger properties</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="1239"/>
         <source>&lt;p&gt;The project debugger properties file &lt;b&gt;{0}&lt;/b&gt; could not be written.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1265"/>
+        <location filename="../Project/Project.py" line="1277"/>
         <source>Delete debugger properties</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1265"/>
+        <location filename="../Project/Project.py" line="1277"/>
         <source>&lt;p&gt;The project debugger properties file &lt;b&gt;{0}&lt;/b&gt; could not be deleted.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1393"/>
+        <location filename="../Project/Project.py" line="1405"/>
         <source>Add Language</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1393"/>
+        <location filename="../Project/Project.py" line="1405"/>
         <source>You have to specify a translation pattern first.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1519"/>
+        <location filename="../Project/Project.py" line="1531"/>
         <source>Delete translation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1684"/>
+        <location filename="../Project/Project.py" line="1696"/>
         <source>Add file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1748"/>
+        <location filename="../Project/Project.py" line="1760"/>
         <source>&lt;p&gt;The file &lt;b&gt;{0}&lt;/b&gt; already exists.&lt;/p&gt;&lt;p&gt;Overwrite it?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1671"/>
+        <location filename="../Project/Project.py" line="1683"/>
         <source>&lt;p&gt;The selected file &lt;b&gt;{0}&lt;/b&gt; could not be added to &lt;b&gt;{1}&lt;/b&gt;.&lt;/p&gt;&lt;p&gt;Reason: {2}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1816"/>
+        <location filename="../Project/Project.py" line="1828"/>
         <source>The target directory must not be empty.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1827"/>
+        <location filename="../Project/Project.py" line="1839"/>
         <source>Add directory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1715"/>
+        <location filename="../Project/Project.py" line="1727"/>
         <source>&lt;p&gt;The source directory doesn&apos;t contain any files belonging to the selected category.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1730"/>
+        <location filename="../Project/Project.py" line="1742"/>
         <source>&lt;p&gt;The target directory &lt;b&gt;{0}&lt;/b&gt; could not be created.&lt;/p&gt;&lt;p&gt;Reason: {1}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1827"/>
+        <location filename="../Project/Project.py" line="1839"/>
         <source>The source directory must not be empty.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1964"/>
+        <location filename="../Project/Project.py" line="1976"/>
         <source>Rename file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1988"/>
+        <location filename="../Project/Project.py" line="2000"/>
         <source>Rename File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3130"/>
+        <location filename="../Project/Project.py" line="3147"/>
         <source>&lt;p&gt;The file &lt;b&gt;{0}&lt;/b&gt; already exists. Overwrite it?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1988"/>
+        <location filename="../Project/Project.py" line="2000"/>
         <source>&lt;p&gt;The file &lt;b&gt;{0}&lt;/b&gt; could not be renamed.&lt;br /&gt;Reason: {1}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="2233"/>
+        <location filename="../Project/Project.py" line="2250"/>
         <source>Delete file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="2263"/>
+        <location filename="../Project/Project.py" line="2280"/>
         <source>Delete directory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="2358"/>
+        <location filename="../Project/Project.py" line="2375"/>
         <source>Create project directory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="2358"/>
+        <location filename="../Project/Project.py" line="2375"/>
         <source>&lt;p&gt;The project directory &lt;b&gt;{0}&lt;/b&gt; could not be created.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="2965"/>
+        <location filename="../Project/Project.py" line="2982"/>
         <source>New Project</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="2474"/>
+        <location filename="../Project/Project.py" line="2491"/>
         <source>Add existing files to the project?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="2965"/>
+        <location filename="../Project/Project.py" line="2982"/>
         <source>Select Version Control System</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="2601"/>
+        <location filename="../Project/Project.py" line="2618"/>
         <source>Would you like to edit the VCS command options?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3831"/>
+        <location filename="../Project/Project.py" line="3866"/>
         <source>New project</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="2544"/>
+        <location filename="../Project/Project.py" line="2561"/>
         <source>Shall the project file be added to the repository?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="2580"/>
+        <location filename="../Project/Project.py" line="2597"/>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="2573"/>
+        <location filename="../Project/Project.py" line="2590"/>
         <source>Select version control system for the project</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="2684"/>
+        <location filename="../Project/Project.py" line="2701"/>
         <source>Translation Pattern</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="2684"/>
+        <location filename="../Project/Project.py" line="2701"/>
         <source>Enter the path pattern for translation files (use &apos;%language%&apos; in place of the language code):</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3845"/>
+        <location filename="../Project/Project.py" line="3880"/>
         <source>Open project</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3115"/>
+        <location filename="../Project/Project.py" line="3132"/>
         <source>Project Files (*.e4p)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3882"/>
+        <location filename="../Project/Project.py" line="3917"/>
         <source>Save project as</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3130"/>
+        <location filename="../Project/Project.py" line="3147"/>
         <source>Save File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3166"/>
+        <location filename="../Project/Project.py" line="3183"/>
         <source>Close Project</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3166"/>
+        <location filename="../Project/Project.py" line="3183"/>
         <source>The current project has unsaved changes.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3343"/>
+        <location filename="../Project/Project.py" line="3360"/>
         <source>Syntax errors detected</source>
         <translation type="unfinished"></translation>
     </message>
     <message numerus="yes">
-        <location filename="../Project/Project.py" line="3343"/>
+        <location filename="../Project/Project.py" line="3360"/>
         <source>The project contains %n file(s) with syntax errors.</source>
         <translation>
             <numerusform>The project contains one file with syntax errors.</numerusform>
@@ -49930,607 +50175,607 @@
         </translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3831"/>
+        <location filename="../Project/Project.py" line="3866"/>
         <source>&amp;New...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3836"/>
+        <location filename="../Project/Project.py" line="3871"/>
         <source>Generate a new project</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3837"/>
+        <location filename="../Project/Project.py" line="3872"/>
         <source>&lt;b&gt;New...&lt;/b&gt;&lt;p&gt;This opens a dialog for entering the info for a new project.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3845"/>
+        <location filename="../Project/Project.py" line="3880"/>
         <source>&amp;Open...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3850"/>
+        <location filename="../Project/Project.py" line="3885"/>
         <source>Open an existing project</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3851"/>
-        <source>&lt;b&gt;Open...&lt;/b&gt;&lt;p&gt;This opens an existing project.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="3858"/>
-        <source>Close project</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="3858"/>
-        <source>&amp;Close</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="3862"/>
-        <source>Close the current project</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="3863"/>
-        <source>&lt;b&gt;Close&lt;/b&gt;&lt;p&gt;This closes the current project.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="3870"/>
-        <source>Save project</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4062"/>
-        <source>&amp;Save</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="3874"/>
-        <source>Save the current project</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="3875"/>
-        <source>&lt;b&gt;Save&lt;/b&gt;&lt;p&gt;This saves the current project.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="3882"/>
-        <source>Save &amp;as...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Project/Project.py" line="3886"/>
-        <source>Save the current project to a new file</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="3888"/>
-        <source>&lt;b&gt;Save as&lt;/b&gt;&lt;p&gt;This saves the current project to a new file.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="3897"/>
-        <source>Add files to project</source>
+        <source>&lt;b&gt;Open...&lt;/b&gt;&lt;p&gt;This opens an existing project.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="3893"/>
+        <source>Close project</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="3893"/>
+        <source>&amp;Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../Project/Project.py" line="3897"/>
+        <source>Close the current project</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="3898"/>
+        <source>&lt;b&gt;Close&lt;/b&gt;&lt;p&gt;This closes the current project.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="3905"/>
+        <source>Save project</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4097"/>
+        <source>&amp;Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="3909"/>
+        <source>Save the current project</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="3910"/>
+        <source>&lt;b&gt;Save&lt;/b&gt;&lt;p&gt;This saves the current project.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="3917"/>
+        <source>Save &amp;as...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="3921"/>
+        <source>Save the current project to a new file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="3923"/>
+        <source>&lt;b&gt;Save as&lt;/b&gt;&lt;p&gt;This saves the current project to a new file.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="3932"/>
+        <source>Add files to project</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="3932"/>
         <source>Add &amp;files...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3902"/>
+        <location filename="../Project/Project.py" line="3937"/>
         <source>Add files to the current project</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3904"/>
+        <location filename="../Project/Project.py" line="3939"/>
         <source>&lt;b&gt;Add files...&lt;/b&gt;&lt;p&gt;This opens a dialog for adding files to the current project. The place to add is determined by the file extension.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3913"/>
+        <location filename="../Project/Project.py" line="3948"/>
         <source>Add directory to project</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3913"/>
+        <location filename="../Project/Project.py" line="3948"/>
         <source>Add directory...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3918"/>
+        <location filename="../Project/Project.py" line="3953"/>
         <source>Add a directory to the current project</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3920"/>
+        <location filename="../Project/Project.py" line="3955"/>
         <source>&lt;b&gt;Add directory...&lt;/b&gt;&lt;p&gt;This opens a dialog for adding a directory to the current project.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3928"/>
+        <location filename="../Project/Project.py" line="3963"/>
         <source>Add translation to project</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3928"/>
+        <location filename="../Project/Project.py" line="3963"/>
         <source>Add &amp;translation...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3933"/>
+        <location filename="../Project/Project.py" line="3968"/>
         <source>Add a translation to the current project</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3935"/>
+        <location filename="../Project/Project.py" line="3970"/>
         <source>&lt;b&gt;Add translation...&lt;/b&gt;&lt;p&gt;This opens a dialog for add a translation to the current project.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3943"/>
-        <source>Search new files</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="3943"/>
-        <source>Searc&amp;h new files...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="3947"/>
-        <source>Search new files in the project directory.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="3973"/>
-        <source>Project properties</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="3973"/>
-        <source>&amp;Properties...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Project/Project.py" line="3978"/>
+        <source>Search new files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="3978"/>
+        <source>Searc&amp;h new files...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="3982"/>
+        <source>Search new files in the project directory.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4008"/>
+        <source>Project properties</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4008"/>
+        <source>&amp;Properties...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4013"/>
         <source>Show the project properties</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3979"/>
+        <location filename="../Project/Project.py" line="4014"/>
         <source>&lt;b&gt;Properties...&lt;/b&gt;&lt;p&gt;This shows a dialog to edit the project properties.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3986"/>
+        <location filename="../Project/Project.py" line="4021"/>
         <source>User project properties</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3986"/>
+        <location filename="../Project/Project.py" line="4021"/>
         <source>&amp;User Properties...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3991"/>
+        <location filename="../Project/Project.py" line="4026"/>
         <source>Show the user specific project properties</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3993"/>
+        <location filename="../Project/Project.py" line="4028"/>
         <source>&lt;b&gt;User Properties...&lt;/b&gt;&lt;p&gt;This shows a dialog to edit the user specific project properties.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4001"/>
+        <location filename="../Project/Project.py" line="4036"/>
         <source>Filetype Associations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4001"/>
+        <location filename="../Project/Project.py" line="4036"/>
         <source>Filetype Associations...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4005"/>
+        <location filename="../Project/Project.py" line="4040"/>
         <source>Show the project filetype associations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4019"/>
+        <location filename="../Project/Project.py" line="4054"/>
         <source>Lexer Associations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4019"/>
-        <source>Lexer Associations...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4023"/>
-        <source>Show the project lexer associations (overriding defaults)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4025"/>
-        <source>&lt;b&gt;Lexer Associations...&lt;/b&gt;&lt;p&gt;This shows a dialog to edit the lexer associations of the project. These associations override the global lexer associations. Lexers are used to highlight the editor text.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4037"/>
-        <source>Debugger Properties</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4037"/>
-        <source>Debugger &amp;Properties...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4041"/>
-        <source>Show the debugger properties</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4042"/>
-        <source>&lt;b&gt;Debugger Properties...&lt;/b&gt;&lt;p&gt;This shows a dialog to edit project specific debugger settings.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4050"/>
-        <source>Load</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4050"/>
-        <source>&amp;Load</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Project/Project.py" line="4054"/>
+        <source>Lexer Associations...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4058"/>
+        <source>Show the project lexer associations (overriding defaults)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4060"/>
+        <source>&lt;b&gt;Lexer Associations...&lt;/b&gt;&lt;p&gt;This shows a dialog to edit the lexer associations of the project. These associations override the global lexer associations. Lexers are used to highlight the editor text.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4072"/>
+        <source>Debugger Properties</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4072"/>
+        <source>Debugger &amp;Properties...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4076"/>
+        <source>Show the debugger properties</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4077"/>
+        <source>&lt;b&gt;Debugger Properties...&lt;/b&gt;&lt;p&gt;This shows a dialog to edit project specific debugger settings.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4085"/>
+        <source>Load</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4085"/>
+        <source>&amp;Load</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4089"/>
         <source>Load the debugger properties</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4055"/>
+        <location filename="../Project/Project.py" line="4090"/>
         <source>&lt;b&gt;Load Debugger Properties&lt;/b&gt;&lt;p&gt;This loads the project specific debugger settings.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4062"/>
+        <location filename="../Project/Project.py" line="4097"/>
         <source>Save</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4066"/>
-        <source>Save the debugger properties</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4067"/>
-        <source>&lt;b&gt;Save Debugger Properties&lt;/b&gt;&lt;p&gt;This saves the project specific debugger settings.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4074"/>
-        <source>Delete</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4074"/>
-        <source>&amp;Delete</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4078"/>
-        <source>Delete the debugger properties</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4079"/>
-        <source>&lt;b&gt;Delete Debugger Properties&lt;/b&gt;&lt;p&gt;This deletes the file containing the project specific debugger settings.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4087"/>
-        <source>Reset</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4087"/>
-        <source>&amp;Reset</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4091"/>
-        <source>Reset the debugger properties</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4092"/>
-        <source>&lt;b&gt;Reset Debugger Properties&lt;/b&gt;&lt;p&gt;This resets the project specific debugger settings.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Project/Project.py" line="4101"/>
+        <source>Save the debugger properties</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4102"/>
+        <source>&lt;b&gt;Save Debugger Properties&lt;/b&gt;&lt;p&gt;This saves the project specific debugger settings.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4109"/>
+        <source>Delete</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4109"/>
+        <source>&amp;Delete</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4113"/>
+        <source>Delete the debugger properties</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4114"/>
+        <source>&lt;b&gt;Delete Debugger Properties&lt;/b&gt;&lt;p&gt;This deletes the file containing the project specific debugger settings.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4122"/>
+        <source>Reset</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4122"/>
+        <source>&amp;Reset</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4126"/>
+        <source>Reset the debugger properties</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4127"/>
+        <source>&lt;b&gt;Reset Debugger Properties&lt;/b&gt;&lt;p&gt;This resets the project specific debugger settings.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4136"/>
         <source>Load session</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4105"/>
+        <location filename="../Project/Project.py" line="4140"/>
         <source>Load the projects session file.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4106"/>
-        <source>&lt;b&gt;Load session&lt;/b&gt;&lt;p&gt;This loads the projects session file. The session consists of the following data.&lt;br&gt;- all open source files&lt;br&gt;- all breakpoint&lt;br&gt;- the commandline arguments&lt;br&gt;- the working directory&lt;br&gt;- the exception reporting flag&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4119"/>
-        <source>Save session</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4123"/>
-        <source>Save the projects session file.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4124"/>
-        <source>&lt;b&gt;Save session&lt;/b&gt;&lt;p&gt;This saves the projects session file. The session consists of the following data.&lt;br&gt;- all open source files&lt;br&gt;- all breakpoint&lt;br&gt;- the commandline arguments&lt;br&gt;- the working directory&lt;br&gt;- the exception reporting flag&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4137"/>
-        <source>Delete session</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Project/Project.py" line="4141"/>
+        <source>&lt;b&gt;Load session&lt;/b&gt;&lt;p&gt;This loads the projects session file. The session consists of the following data.&lt;br&gt;- all open source files&lt;br&gt;- all breakpoint&lt;br&gt;- the commandline arguments&lt;br&gt;- the working directory&lt;br&gt;- the exception reporting flag&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4154"/>
+        <source>Save session</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4158"/>
+        <source>Save the projects session file.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4159"/>
+        <source>&lt;b&gt;Save session&lt;/b&gt;&lt;p&gt;This saves the projects session file. The session consists of the following data.&lt;br&gt;- all open source files&lt;br&gt;- all breakpoint&lt;br&gt;- the commandline arguments&lt;br&gt;- the working directory&lt;br&gt;- the exception reporting flag&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4172"/>
+        <source>Delete session</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4176"/>
         <source>Delete the projects session file.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4142"/>
+        <location filename="../Project/Project.py" line="4177"/>
         <source>&lt;b&gt;Delete session&lt;/b&gt;&lt;p&gt;This deletes the projects session file&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4151"/>
+        <location filename="../Project/Project.py" line="4186"/>
         <source>Code Metrics</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4151"/>
+        <location filename="../Project/Project.py" line="4186"/>
         <source>&amp;Code Metrics...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4155"/>
+        <location filename="../Project/Project.py" line="4190"/>
         <source>Show some code metrics for the project.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4157"/>
+        <location filename="../Project/Project.py" line="4192"/>
         <source>&lt;b&gt;Code Metrics...&lt;/b&gt;&lt;p&gt;This shows some code metrics for all Python files in the project.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4165"/>
+        <location filename="../Project/Project.py" line="4200"/>
         <source>Python Code Coverage</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4165"/>
-        <source>Code Co&amp;verage...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4169"/>
-        <source>Show code coverage information for the project.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4171"/>
-        <source>&lt;b&gt;Code Coverage...&lt;/b&gt;&lt;p&gt;This shows the code coverage information for all Python files in the project.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="5053"/>
-        <source>Profile Data</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4179"/>
-        <source>&amp;Profile Data...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4183"/>
-        <source>Show profiling data for the project.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4185"/>
-        <source>&lt;b&gt;Profile Data...&lt;/b&gt;&lt;p&gt;This shows the profiling data for the project.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="5107"/>
-        <source>Application Diagram</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4194"/>
-        <source>&amp;Application Diagram...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4198"/>
-        <source>Show a diagram of the project.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Project/Project.py" line="4200"/>
+        <source>Code Co&amp;verage...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4204"/>
+        <source>Show code coverage information for the project.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4206"/>
+        <source>&lt;b&gt;Code Coverage...&lt;/b&gt;&lt;p&gt;This shows the code coverage information for all Python files in the project.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="5088"/>
+        <source>Profile Data</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4214"/>
+        <source>&amp;Profile Data...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4218"/>
+        <source>Show profiling data for the project.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4220"/>
+        <source>&lt;b&gt;Profile Data...&lt;/b&gt;&lt;p&gt;This shows the profiling data for the project.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="5142"/>
+        <source>Application Diagram</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4229"/>
+        <source>&amp;Application Diagram...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4233"/>
+        <source>Show a diagram of the project.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4235"/>
         <source>&lt;b&gt;Application Diagram...&lt;/b&gt;&lt;p&gt;This shows a diagram of the project.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5300"/>
+        <location filename="../Project/Project.py" line="5335"/>
         <source>Create Package List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4223"/>
+        <location filename="../Project/Project.py" line="4258"/>
         <source>Create &amp;Package List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5574"/>
+        <location filename="../Project/Project.py" line="5609"/>
         <source>Create Plugin Archive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4325"/>
+        <location filename="../Project/Project.py" line="4360"/>
         <source>&amp;Project</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4326"/>
+        <location filename="../Project/Project.py" line="4361"/>
         <source>Open &amp;Recent Projects</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4331"/>
+        <location filename="../Project/Project.py" line="4366"/>
         <source>&amp;Version Control</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4335"/>
+        <location filename="../Project/Project.py" line="4370"/>
         <source>Chec&amp;k</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4337"/>
+        <location filename="../Project/Project.py" line="4372"/>
         <source>Sho&amp;w</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4338"/>
+        <location filename="../Project/Project.py" line="4373"/>
         <source>&amp;Diagrams</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4327"/>
+        <location filename="../Project/Project.py" line="4362"/>
         <source>Session</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4340"/>
+        <location filename="../Project/Project.py" line="4375"/>
         <source>Source &amp;Documentation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4328"/>
+        <location filename="../Project/Project.py" line="4363"/>
         <source>Debugger</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4339"/>
+        <location filename="../Project/Project.py" line="4374"/>
         <source>Pac&amp;kagers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4465"/>
+        <location filename="../Project/Project.py" line="4500"/>
         <source>Project</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4531"/>
+        <location filename="../Project/Project.py" line="4566"/>
         <source>&amp;Clear</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4704"/>
+        <location filename="../Project/Project.py" line="4739"/>
         <source>Search New Files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4704"/>
+        <location filename="../Project/Project.py" line="4739"/>
         <source>There were no new files found to be added.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4850"/>
+        <location filename="../Project/Project.py" line="4885"/>
         <source>Version Control System</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4850"/>
+        <location filename="../Project/Project.py" line="4885"/>
         <source>&lt;p&gt;The selected VCS &lt;b&gt;{0}&lt;/b&gt; could not be found.&lt;br/&gt;Disabling version control.&lt;/p&gt;&lt;p&gt;{1}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4980"/>
+        <location filename="../Project/Project.py" line="5015"/>
         <source>Coverage Data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5030"/>
+        <location filename="../Project/Project.py" line="5065"/>
         <source>There is no main script defined for the current project. Aborting</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5003"/>
+        <location filename="../Project/Project.py" line="5038"/>
         <source>Code Coverage</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5003"/>
+        <location filename="../Project/Project.py" line="5038"/>
         <source>Please select a coverage file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5053"/>
+        <location filename="../Project/Project.py" line="5088"/>
         <source>Please select a profile file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5107"/>
+        <location filename="../Project/Project.py" line="5142"/>
         <source>Include module names?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5251"/>
+        <location filename="../Project/Project.py" line="5286"/>
         <source>&lt;p&gt;The file &lt;b&gt;PKGLIST&lt;/b&gt; already exists.&lt;/p&gt;&lt;p&gt;Overwrite it?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5300"/>
+        <location filename="../Project/Project.py" line="5335"/>
         <source>&lt;p&gt;The file &lt;b&gt;PKGLIST&lt;/b&gt; could not be created.&lt;/p&gt;&lt;p&gt;Reason: {0}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5319"/>
+        <location filename="../Project/Project.py" line="5354"/>
         <source>The project does not have a main script defined. Aborting...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5460"/>
+        <location filename="../Project/Project.py" line="5495"/>
         <source>&lt;p&gt;The file &lt;b&gt;{0}&lt;/b&gt; could not be stored in the archive. Ignoring it.&lt;/p&gt;&lt;p&gt;Reason: {1}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5533"/>
+        <location filename="../Project/Project.py" line="5568"/>
         <source>&lt;p&gt;The plugin file &lt;b&gt;{0}&lt;/b&gt; could not be read.&lt;/p&gt;&lt;p&gt;Reason: {1}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -50540,32 +50785,32 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="2441"/>
+        <location filename="../Project/Project.py" line="2458"/>
         <source>Create main script</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="2441"/>
+        <location filename="../Project/Project.py" line="2458"/>
         <source>&lt;p&gt;The mainscript &lt;b&gt;{0}&lt;/b&gt; could not be created.&lt;br/&gt;Reason: {1}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4208"/>
+        <location filename="../Project/Project.py" line="4243"/>
         <source>Load Diagram</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4208"/>
+        <location filename="../Project/Project.py" line="4243"/>
         <source>&amp;Load Diagram...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4212"/>
+        <location filename="../Project/Project.py" line="4247"/>
         <source>Load a diagram from file.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4214"/>
+        <location filename="../Project/Project.py" line="4249"/>
         <source>&lt;b&gt;Load Diagram...&lt;/b&gt;&lt;p&gt;This loads a diagram from file.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -50595,27 +50840,27 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4839"/>
+        <location filename="../Project/Project.py" line="4874"/>
         <source>&lt;p&gt;The selected VCS &lt;b&gt;{0}&lt;/b&gt; could not be found. &lt;br/&gt;Reverting override.&lt;/p&gt;&lt;p&gt;{1}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5574"/>
+        <location filename="../Project/Project.py" line="5609"/>
         <source>&lt;p&gt;The plugin file &lt;b&gt;{0}&lt;/b&gt; could not be read.&lt;/p&gt; &lt;p&gt;Reason: {1}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4228"/>
+        <location filename="../Project/Project.py" line="4263"/>
         <source>Create an initial PKGLIST file for an eric6 plugin.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4230"/>
+        <location filename="../Project/Project.py" line="4265"/>
         <source>&lt;b&gt;Create Package List&lt;/b&gt;&lt;p&gt;This creates an initial list of files to include in an eric6 plugin archive. The list is created from the project file.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5424"/>
+        <location filename="../Project/Project.py" line="5459"/>
         <source>&lt;p&gt;The eric6 plugin archive file &lt;b&gt;{0}&lt;/b&gt; could not be created.&lt;/p&gt;&lt;p&gt;Reason: {1}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -50625,228 +50870,228 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="2933"/>
+        <location filename="../Project/Project.py" line="2950"/>
         <source>Create project management directory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="2933"/>
+        <location filename="../Project/Project.py" line="2950"/>
         <source>&lt;p&gt;The project directory &lt;b&gt;{0}&lt;/b&gt; is not writable.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3958"/>
+        <location filename="../Project/Project.py" line="3993"/>
         <source>Alt+Ctrl+P</source>
         <comment>Project|Search Project File</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3964"/>
+        <location filename="../Project/Project.py" line="3999"/>
         <source>Search for a file in the project list of files.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3966"/>
+        <location filename="../Project/Project.py" line="4001"/>
         <source>&lt;b&gt;Search Project File&lt;/b&gt;&lt;p&gt;This searches for a file in the project list of files.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3958"/>
+        <location filename="../Project/Project.py" line="3993"/>
         <source>Search Project File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3958"/>
+        <location filename="../Project/Project.py" line="3993"/>
         <source>Search Project File...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5355"/>
+        <location filename="../Project/Project.py" line="5390"/>
         <source>Create Plugin Archives</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4239"/>
+        <location filename="../Project/Project.py" line="4274"/>
         <source>Create Plugin &amp;Archives</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4244"/>
+        <location filename="../Project/Project.py" line="4279"/>
         <source>Create eric6 plugin archive files.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4246"/>
+        <location filename="../Project/Project.py" line="4281"/>
         <source>&lt;b&gt;Create Plugin Archives&lt;/b&gt;&lt;p&gt;This creates eric6 plugin archive files using the list of files given in a PKGLIST* file. The archive name is built from the main script name if not designated in the package list file.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4256"/>
+        <location filename="../Project/Project.py" line="4291"/>
         <source>Create Plugin Archives (Snapshot)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4256"/>
+        <location filename="../Project/Project.py" line="4291"/>
         <source>Create Plugin Archives (&amp;Snapshot)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4261"/>
+        <location filename="../Project/Project.py" line="4296"/>
         <source>Create eric6 plugin archive files (snapshot releases).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4263"/>
+        <location filename="../Project/Project.py" line="4298"/>
         <source>&lt;b&gt;Create Plugin Archives (Snapshot)&lt;/b&gt;&lt;p&gt;This creates eric6 plugin archive files using the list of files given in the PKGLIST* file. The archive name is built from the main script name if not designated in the package list file. The version entry of the main script is modified to reflect a snapshot release.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5333"/>
-        <source>Select package lists:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="5351"/>
-        <source>Creating plugin archives...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="5351"/>
-        <source>Abort</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="5351"/>
-        <source>%v/%m Archives</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Project/Project.py" line="5368"/>
+        <source>Select package lists:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="5386"/>
+        <source>Creating plugin archives...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="5386"/>
+        <source>Abort</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="5386"/>
+        <source>%v/%m Archives</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="5403"/>
         <source>&lt;p&gt;The file &lt;b&gt;{0}&lt;/b&gt; could not be read.&lt;/p&gt;&lt;p&gt;Reason: {1}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5479"/>
+        <location filename="../Project/Project.py" line="5514"/>
         <source>&lt;p&gt;The eric6 plugin archive files were created with some errors.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5482"/>
+        <location filename="../Project/Project.py" line="5517"/>
         <source>&lt;p&gt;The eric6 plugin archive files were created successfully.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5344"/>
+        <location filename="../Project/Project.py" line="5379"/>
         <source>&lt;p&gt;No package list files (PKGLIST*) available or selected. Aborting...&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5396"/>
+        <location filename="../Project/Project.py" line="5431"/>
         <source>&lt;p&gt;The file &lt;b&gt;{0}&lt;/b&gt; is not ready yet.&lt;/p&gt;&lt;p&gt;Please rework it and delete the&apos;; initial_list&apos; line of the header.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3949"/>
+        <location filename="../Project/Project.py" line="3984"/>
         <source>&lt;b&gt;Search new files...&lt;/b&gt;&lt;p&gt;This searches for new files (sources, *.ui, *.idl, *.proto) in the project directory and registered subdirectories.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4007"/>
+        <location filename="../Project/Project.py" line="4042"/>
         <source>&lt;b&gt;Filetype Associations...&lt;/b&gt;&lt;p&gt;This shows a dialog to edit the file type associations of the project. These associations determine the type (source, form, interface, protocol or others) with a filename pattern. They are used when adding a file to the project and when performing a search for new files.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1519"/>
+        <location filename="../Project/Project.py" line="1531"/>
         <source>&lt;p&gt;The selected translation file &lt;b&gt;{0}&lt;/b&gt; could not be deleted.&lt;/p&gt;&lt;p&gt;Reason: {1}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="2233"/>
+        <location filename="../Project/Project.py" line="2250"/>
         <source>&lt;p&gt;The selected file &lt;b&gt;{0}&lt;/b&gt; could not be deleted.&lt;/p&gt;&lt;p&gt;Reason: {1}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="2263"/>
+        <location filename="../Project/Project.py" line="2280"/>
         <source>&lt;p&gt;The selected directory &lt;b&gt;{0}&lt;/b&gt; could not be deleted.&lt;/p&gt;&lt;p&gt;Reason: {1}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="2756"/>
+        <location filename="../Project/Project.py" line="2773"/>
         <source>Create Makefile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="2756"/>
+        <location filename="../Project/Project.py" line="2773"/>
         <source>&lt;p&gt;The makefile &lt;b&gt;{0}&lt;/b&gt; could not be created.&lt;br/&gt;Reason: {1}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5760"/>
+        <location filename="../Project/Project.py" line="5795"/>
         <source>Execute Make</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4277"/>
+        <location filename="../Project/Project.py" line="4312"/>
         <source>&amp;Execute Make</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4281"/>
+        <location filename="../Project/Project.py" line="4316"/>
         <source>Perform a &apos;make&apos; run.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4283"/>
+        <location filename="../Project/Project.py" line="4318"/>
         <source>&lt;b&gt;Execute Make&lt;/b&gt;&lt;p&gt;This performs a &apos;make&apos; run to rebuild the configured target.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5740"/>
+        <location filename="../Project/Project.py" line="5775"/>
         <source>Test for Changes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4291"/>
+        <location filename="../Project/Project.py" line="4326"/>
         <source>&amp;Test for Changes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4295"/>
+        <location filename="../Project/Project.py" line="4330"/>
         <source>Question &apos;make&apos;, if a rebuild is needed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4297"/>
+        <location filename="../Project/Project.py" line="4332"/>
         <source>&lt;b&gt;Test for Changes&lt;/b&gt;&lt;p&gt;This questions &apos;make&apos;, if a rebuild of the configured target is necessary.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4342"/>
+        <location filename="../Project/Project.py" line="4377"/>
         <source>Make</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5688"/>
+        <location filename="../Project/Project.py" line="5723"/>
         <source>The make process did not start.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5733"/>
+        <location filename="../Project/Project.py" line="5768"/>
         <source>The make process crashed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5743"/>
+        <location filename="../Project/Project.py" line="5778"/>
         <source>&lt;p&gt;There are changes that require the configured make target &lt;b&gt;{0}&lt;/b&gt; to be rebuilt.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5748"/>
+        <location filename="../Project/Project.py" line="5783"/>
         <source>&lt;p&gt;There are changes that require the default make target to be rebuilt.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5760"/>
+        <location filename="../Project/Project.py" line="5795"/>
         <source>The makefile contains errors.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -50861,7 +51106,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4330"/>
+        <location filename="../Project/Project.py" line="4365"/>
         <source>Project-T&amp;ools</source>
         <translation type="unfinished"></translation>
     </message>
@@ -50965,7 +51210,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/ProjectBrowserModel.py" line="782"/>
+        <location filename="../Project/ProjectBrowserModel.py" line="798"/>
         <source>local</source>
         <translation type="unfinished"></translation>
     </message>
@@ -50978,21 +51223,11 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/ProjectBrowserPage.ui" line="37"/>
-        <source>Colours</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/ProjectBrowserPage.ui" line="43"/>
         <source>Highlighted entries (Others):</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/ProjectBrowserPage.ui" line="56"/>
-        <source>Select the colour for highlighted entries in the Others viewer.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/ProjectBrowserPage.ui" line="82"/>
         <source>Visible Project Browsers</source>
         <translation type="unfinished"></translation>
@@ -51117,6 +51352,16 @@
         <source>Protocols (protobuf) Browser</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/ProjectBrowserPage.ui" line="37"/>
+        <source>Colors</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/ProjectBrowserPage.ui" line="56"/>
+        <source>Select the color for highlighted entries in the Others viewer.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ProjectFormsBrowser</name>
@@ -60742,53 +60987,53 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="767"/>
+        <location filename="../QScintilla/Shell.py" line="771"/>
         <source>Select History</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="767"/>
+        <location filename="../QScintilla/Shell.py" line="771"/>
         <source>Select the history entry to execute (most recent shown last).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="835"/>
-        <source>Passive Debug Mode</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Shell.py" line="836"/>
-        <source>
-Not connected</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../QScintilla/Shell.py" line="839"/>
+        <source>Passive Debug Mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Shell.py" line="840"/>
+        <source>
+Not connected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Shell.py" line="843"/>
         <source>No.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="841"/>
+        <location filename="../QScintilla/Shell.py" line="845"/>
         <source>{0} on {1}, {2}</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="1030"/>
+        <location filename="../QScintilla/Shell.py" line="1034"/>
         <source>StdOut: {0}</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="1038"/>
+        <location filename="../QScintilla/Shell.py" line="1042"/>
         <source>StdErr: {0}</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="2157"/>
+        <location filename="../QScintilla/Shell.py" line="2161"/>
         <source>Drop Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="2157"/>
+        <location filename="../QScintilla/Shell.py" line="2161"/>
         <source>&lt;p&gt;&lt;b&gt;{0}&lt;/b&gt; is not a file.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -60798,7 +61043,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="888"/>
+        <location filename="../QScintilla/Shell.py" line="892"/>
         <source>Exception &quot;{0}&quot;
 {1}
 File: {2}, Line: {3}
@@ -60806,32 +61051,32 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="923"/>
+        <location filename="../QScintilla/Shell.py" line="927"/>
         <source>Unspecified syntax error.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="898"/>
+        <location filename="../QScintilla/Shell.py" line="902"/>
         <source>Exception &quot;{0}&quot;
 {1}
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="925"/>
+        <location filename="../QScintilla/Shell.py" line="929"/>
         <source>Syntax error &quot;{1}&quot; in file {0} at line {2}, character {3}.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="948"/>
+        <location filename="../QScintilla/Shell.py" line="952"/>
         <source>Signal &quot;{0}&quot; generated in file {1} at line {2}.
 Function: {3}({4})</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="2015"/>
+        <location filename="../QScintilla/Shell.py" line="2019"/>
         <source>Project</source>
         <translation type="unfinished"></translation>
     </message>
@@ -60861,14 +61106,14 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="1835"/>
+        <location filename="../QScintilla/Shell.py" line="1839"/>
         <source>Available Virtual Environments:
 {0}
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="1876"/>
+        <location filename="../QScintilla/Shell.py" line="1880"/>
         <source>Current Virtual Environment: &apos;{0}&apos;
 </source>
         <translation type="unfinished"></translation>
@@ -68893,7 +69138,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/Sync/SyncCheckPage.py" line="56"/>
+        <location filename="../WebBrowser/Sync/SyncCheckPage.py" line="50"/>
         <source>Host:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -68923,22 +69168,22 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/Sync/SyncCheckPage.py" line="55"/>
+        <location filename="../WebBrowser/Sync/SyncCheckPage.py" line="49"/>
         <source>FTP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/Sync/SyncCheckPage.py" line="68"/>
+        <location filename="../WebBrowser/Sync/SyncCheckPage.py" line="62"/>
         <source>No Synchronization</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/Sync/SyncCheckPage.py" line="211"/>
+        <location filename="../WebBrowser/Sync/SyncCheckPage.py" line="204"/>
         <source>&lt;font color=&quot;#FF0000&quot;&gt;&lt;b&gt;Error:&lt;/b&gt; {0}&lt;/font&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/Sync/SyncCheckPage.py" line="63"/>
+        <location filename="../WebBrowser/Sync/SyncCheckPage.py" line="57"/>
         <source>Shared Directory</source>
         <translation type="unfinished"></translation>
     </message>
@@ -68948,7 +69193,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/Sync/SyncCheckPage.py" line="64"/>
+        <location filename="../WebBrowser/Sync/SyncCheckPage.py" line="58"/>
         <source>Directory:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -70609,12 +70854,12 @@
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/TasksPage.ui" line="105"/>
-        <source>Tasks Background Colours</source>
+        <source>Tasks Background Colors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/TasksPage.ui" line="206"/>
-        <source>Select the background colour for these tasks.</source>
+        <source>Select the background color for these tasks.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -71653,27 +71898,27 @@
 <context>
     <name>Translator</name>
     <message>
-        <location filename="../Plugins/UiExtensionPlugins/Translator/Translator.py" line="52"/>
+        <location filename="../Plugins/UiExtensionPlugins/Translator/Translator.py" line="63"/>
         <source>Translator</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/UiExtensionPlugins/Translator/Translator.py" line="52"/>
+        <location filename="../Plugins/UiExtensionPlugins/Translator/Translator.py" line="63"/>
         <source>T&amp;ranslator</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/UiExtensionPlugins/Translator/Translator.py" line="52"/>
+        <location filename="../Plugins/UiExtensionPlugins/Translator/Translator.py" line="63"/>
         <source>Alt+Shift+R</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/UiExtensionPlugins/Translator/Translator.py" line="58"/>
+        <location filename="../Plugins/UiExtensionPlugins/Translator/Translator.py" line="69"/>
         <source>Switch the input focus to the Translator window.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/UiExtensionPlugins/Translator/Translator.py" line="60"/>
+        <location filename="../Plugins/UiExtensionPlugins/Translator/Translator.py" line="71"/>
         <source>&lt;b&gt;Activate Translator&lt;/b&gt;&lt;p&gt;This switches the input focus to the Translator window.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -71681,52 +71926,52 @@
 <context>
     <name>TranslatorEngines</name>
     <message>
-        <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorEngines/__init__.py" line="37"/>
+        <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorEngines/__init__.py" line="39"/>
         <source>Google V.1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorEngines/__init__.py" line="39"/>
-        <source>MyMemory</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorEngines/__init__.py" line="41"/>
-        <source>Glosbe</source>
+        <source>MyMemory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorEngines/__init__.py" line="43"/>
-        <source>PROMT</source>
+        <source>Glosbe</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorEngines/__init__.py" line="45"/>
-        <source>Yandex</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorEngines/__init__.py" line="55"/>
-        <source>Unknow translation service name ({0})</source>
+        <source>PROMT</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorEngines/__init__.py" line="47"/>
-        <source>Google V.2</source>
+        <source>Yandex</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorEngines/__init__.py" line="57"/>
+        <source>Unknow translation service name ({0})</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorEngines/__init__.py" line="49"/>
+        <source>Google V.2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorEngines/__init__.py" line="51"/>
         <source>Microsoft</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorEngines/__init__.py" line="55"/>
+        <source>IBM Watson</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorEngines/__init__.py" line="53"/>
-        <source>IBM Watson</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorEngines/__init__.py" line="51"/>
         <source>DeepL Pro</source>
         <translation type="unfinished"></translation>
     </message>
@@ -71954,16 +72199,6 @@
         <translation>Vietnamese</translation>
     </message>
     <message>
-        <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorLanguagesDb.py" line="79"/>
-        <source>Chinese S</source>
-        <translation>Chinese S</translation>
-    </message>
-    <message>
-        <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorLanguagesDb.py" line="80"/>
-        <source>Chinese T</source>
-        <translation>Chinese T</translation>
-    </message>
-    <message>
         <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorLanguagesDb.py" line="31"/>
         <source>Afrikaans</source>
         <translation>Afrikaans</translation>
@@ -71983,6 +72218,16 @@
         <source>Hebrew (iw)</source>
         <translation>Hebrew (iw)</translation>
     </message>
+    <message>
+        <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorLanguagesDb.py" line="79"/>
+        <source>Chinese (China)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorLanguagesDb.py" line="80"/>
+        <source>Chinese (Taiwan)</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TranslatorPage</name>
@@ -72160,7 +72405,7 @@
 <context>
     <name>TranslatorPlugin</name>
     <message>
-        <location filename="../Plugins/PluginTranslator.py" line="65"/>
+        <location filename="../Plugins/PluginTranslator.py" line="71"/>
         <source>Translator</source>
         <translation type="unfinished"></translation>
     </message>
@@ -74377,7 +74622,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="6329"/>
+        <location filename="../UI/UserInterface.py" line="6327"/>
         <source>Export Keyboard Shortcuts</source>
         <translation type="unfinished"></translation>
     </message>
@@ -74397,7 +74642,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="6353"/>
+        <location filename="../UI/UserInterface.py" line="6351"/>
         <source>Import Keyboard Shortcuts</source>
         <translation type="unfinished"></translation>
     </message>
@@ -74692,7 +74937,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="7326"/>
+        <location filename="../UI/UserInterface.py" line="7324"/>
         <source>&lt;/table&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -74859,92 +75104,92 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="6353"/>
+        <location filename="../UI/UserInterface.py" line="6351"/>
         <source>Keyboard shortcut file (*.e4k)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="6523"/>
+        <location filename="../UI/UserInterface.py" line="6521"/>
         <source>Save tasks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="6523"/>
+        <location filename="../UI/UserInterface.py" line="6521"/>
         <source>&lt;p&gt;The tasks file &lt;b&gt;{0}&lt;/b&gt; could not be written.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="6552"/>
+        <location filename="../UI/UserInterface.py" line="6550"/>
         <source>Read tasks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="6552"/>
+        <location filename="../UI/UserInterface.py" line="6550"/>
         <source>&lt;p&gt;The tasks file &lt;b&gt;{0}&lt;/b&gt; could not be read.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="6648"/>
+        <location filename="../UI/UserInterface.py" line="6646"/>
         <source>Save session</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="6586"/>
+        <location filename="../UI/UserInterface.py" line="6584"/>
         <source>&lt;p&gt;The session file &lt;b&gt;{0}&lt;/b&gt; could not be written.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="6632"/>
+        <location filename="../UI/UserInterface.py" line="6630"/>
         <source>Read session</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="6632"/>
+        <location filename="../UI/UserInterface.py" line="6630"/>
         <source>&lt;p&gt;The session file &lt;b&gt;{0}&lt;/b&gt; could not be read.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="6916"/>
+        <location filename="../UI/UserInterface.py" line="6914"/>
         <source>Drop Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="6916"/>
+        <location filename="../UI/UserInterface.py" line="6914"/>
         <source>&lt;p&gt;&lt;b&gt;{0}&lt;/b&gt; is not a file.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="7101"/>
+        <location filename="../UI/UserInterface.py" line="7099"/>
         <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="7110"/>
+        <location filename="../UI/UserInterface.py" line="7108"/>
         <source>Trying host {0}</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="7268"/>
+        <location filename="../UI/UserInterface.py" line="7266"/>
         <source>Update available</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="7287"/>
+        <location filename="../UI/UserInterface.py" line="7285"/>
         <source>Error during updates check</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="7287"/>
+        <location filename="../UI/UserInterface.py" line="7285"/>
         <source>Could not perform updates check.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="7311"/>
+        <location filename="../UI/UserInterface.py" line="7309"/>
         <source>&lt;h3&gt;Available versions&lt;/h3&gt;&lt;table&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="7363"/>
+        <location filename="../UI/UserInterface.py" line="7361"/>
         <source>First time usage</source>
         <translation type="unfinished"></translation>
     </message>
@@ -74984,27 +75229,27 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="7176"/>
+        <location filename="../UI/UserInterface.py" line="7174"/>
         <source>Error getting versions information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="7169"/>
+        <location filename="../UI/UserInterface.py" line="7167"/>
         <source>The versions information could not be downloaded. Please go online and try again.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="6121"/>
+        <location filename="../UI/UserInterface.py" line="6119"/>
         <source>Open Browser</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="6121"/>
+        <location filename="../UI/UserInterface.py" line="6119"/>
         <source>Could not start a web browser</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="7176"/>
+        <location filename="../UI/UserInterface.py" line="7174"/>
         <source>The versions information could not be downloaded for the last 7 days. Please go online and try again.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -75095,7 +75340,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="7382"/>
+        <location filename="../UI/UserInterface.py" line="7380"/>
         <source>Select Workspace Directory</source>
         <translation type="unfinished"></translation>
     </message>
@@ -75470,7 +75715,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="7101"/>
+        <location filename="../UI/UserInterface.py" line="7099"/>
         <source>%v/%m</source>
         <translation type="unfinished"></translation>
     </message>
@@ -75490,7 +75735,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="7105"/>
+        <location filename="../UI/UserInterface.py" line="7103"/>
         <source>Version Check</source>
         <translation type="unfinished"></translation>
     </message>
@@ -75565,22 +75810,22 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="7268"/>
+        <location filename="../UI/UserInterface.py" line="7266"/>
         <source>The update to &lt;b&gt;{0}&lt;/b&gt; of eric6 is available at &lt;b&gt;{1}&lt;/b&gt;. Would you like to get it?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="7280"/>
+        <location filename="../UI/UserInterface.py" line="7278"/>
         <source>Eric6 is up to date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="7280"/>
+        <location filename="../UI/UserInterface.py" line="7278"/>
         <source>You are using the latest version of eric6</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="7363"/>
+        <location filename="../UI/UserInterface.py" line="7361"/>
         <source>eric6 has not been configured yet. The configuration dialog will be started.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -75600,7 +75845,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="7121"/>
+        <location filename="../UI/UserInterface.py" line="7119"/>
         <source>The versions information cannot not be downloaded because you are &lt;b&gt;offline&lt;/b&gt;. Please go online and try again.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -75645,7 +75890,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="6670"/>
+        <location filename="../UI/UserInterface.py" line="6668"/>
         <source>Load session</source>
         <translation type="unfinished"></translation>
     </message>
@@ -75660,17 +75905,17 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="6670"/>
+        <location filename="../UI/UserInterface.py" line="6668"/>
         <source>eric6 Session Files (*.e5s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="6721"/>
+        <location filename="../UI/UserInterface.py" line="6719"/>
         <source>Crash Session found!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="6721"/>
+        <location filename="../UI/UserInterface.py" line="6719"/>
         <source>A session file of a crashed session was found. Shall this session be restored?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -75685,17 +75930,17 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="7256"/>
+        <location filename="../UI/UserInterface.py" line="7254"/>
         <source>Update Check</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="7256"/>
+        <location filename="../UI/UserInterface.py" line="7254"/>
         <source>You installed eric directly from the source code. There is no possibility to check for the availability of an update.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="7246"/>
+        <location filename="../UI/UserInterface.py" line="7244"/>
         <source>You are using a snapshot release of eric6. A more up-to-date stable release might be available.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -76644,68 +76889,68 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="128"/>
-        <source>Colours</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="134"/>
         <source>VCS status &quot;added&quot;:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="147"/>
-        <source>Select the background colour for entries with VCS status &quot;added&quot;.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="157"/>
         <source>VCS status &quot;conflict&quot;:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="170"/>
-        <source>Select the background colour for entries with VCS status &quot;conflict&quot;.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="193"/>
         <source>VCS status &quot;modified&quot;:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="206"/>
-        <source>Select the background colour for entries with VCS status &quot;modified&quot;.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="216"/>
         <source>VCS status &quot;replaced&quot;:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="229"/>
-        <source>Select the background colour for entries with VCS status &quot;replaced&quot;.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="239"/>
         <source>VCS status &quot;needs update&quot;:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="252"/>
-        <source>Select the background colour for entries with VCS status &quot;needs update&quot;.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="262"/>
         <source>VCS status &quot;removed&quot;:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="128"/>
+        <source>Colors</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="147"/>
+        <source>Select the background color for entries with VCS status &quot;added&quot;.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="170"/>
+        <source>Select the background color for entries with VCS status &quot;conflict&quot;.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="206"/>
+        <source>Select the background color for entries with VCS status &quot;modified&quot;.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="229"/>
+        <source>Select the background color for entries with VCS status &quot;replaced&quot;.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="252"/>
+        <source>Select the background color for entries with VCS status &quot;needs update&quot;.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="275"/>
-        <source>Select the background colour for entries with VCS status &quot;removed&quot;.</source>
+        <source>Select the background color for entries with VCS status &quot;removed&quot;.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -81630,21 +81875,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="279"/>
-        <source>Colours</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="285"/>
-        <source>Background colour of secure URLs:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="298"/>
-        <source>Select the background colour for secure URLs.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="324"/>
         <source>Images</source>
         <translation type="unfinished"></translation>
@@ -81739,6 +81969,21 @@
         <source>Show Scrollbars</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="279"/>
+        <source>Colors</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="285"/>
+        <source>Background color of secure URLs:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="298"/>
+        <source>Select the background color for secure URLs.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>WebBrowserClearPrivateDataDialog</name>
@@ -82623,12 +82868,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserPage.py" line="171"/>
+        <location filename="../WebBrowser/WebBrowserPage.py" line="172"/>
         <source>Suspicuous URL detected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserPage.py" line="171"/>
+        <location filename="../WebBrowser/WebBrowserPage.py" line="172"/>
         <source>&lt;p&gt;The URL &lt;b&gt;{0}&lt;/b&gt; was found in the Safe Browsing database.&lt;/p&gt;{1}</source>
         <translation type="unfinished"></translation>
     </message>
@@ -82918,112 +83163,112 @@
 <context>
     <name>WebBrowserTabWidget</name>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="124"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="122"/>
         <source>Show a navigation menu</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="137"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="135"/>
         <source>Show a navigation menu for closed tabs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="151"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="149"/>
         <source>Open a new web browser tab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="165"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="163"/>
         <source>New Tab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="169"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="167"/>
         <source>Move Left</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="172"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="170"/>
         <source>Move Right</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="176"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="174"/>
         <source>Duplicate Page</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="179"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="177"/>
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="182"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="180"/>
         <source>Close Others</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="211"/>
+        <source>Close All</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="186"/>
+        <source>Print Preview</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="189"/>
+        <source>Print</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="192"/>
+        <source>Print as PDF</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../WebBrowser/WebBrowserTabWidget.py" line="213"/>
-        <source>Close All</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="188"/>
-        <source>Print Preview</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="191"/>
-        <source>Print</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="194"/>
-        <source>Print as PDF</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="215"/>
         <source>Reload All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="218"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="216"/>
         <source>Bookmark All Tabs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="222"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="220"/>
         <source>Restore Closed Tab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="458"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="456"/>
         <source>...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="898"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="892"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="918"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="912"/>
         <source>Finished loading</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="920"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="914"/>
         <source>Failed to load</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="961"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="955"/>
         <source>Are you sure you want to close the window?</source>
         <translation type="unfinished"></translation>
     </message>
     <message numerus="yes">
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="961"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="955"/>
         <source>Are you sure you want to close the window?
 You have %n tab(s) open.</source>
         <translation>
@@ -83034,47 +83279,47 @@
         </translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="968"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="962"/>
         <source>&amp;Quit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="971"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="965"/>
         <source>C&amp;lose Current Tab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="1152"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="1146"/>
         <source>Restore All Closed Tabs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="1154"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="1148"/>
         <source>Clear List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="252"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="250"/>
         <source>Unmute Tab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="256"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="254"/>
         <source>Mute Tab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="755"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="753"/>
         <source>Print to PDF</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="705"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="703"/>
         <source>&lt;p&gt;The file &lt;b&gt;{0}&lt;/b&gt; exists already. Shall it be overwritten?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="755"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="753"/>
         <source>&lt;p&gt;The PDF could not be written to file &lt;b&gt;{0}&lt;/b&gt;.&lt;/p&gt;&lt;p&gt;&lt;b&gt;Error:&lt;/b&gt; {1}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
Binary file eric6/i18n/eric6_es.qm has changed
--- a/eric6/i18n/eric6_es.ts	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/i18n/eric6_es.ts	Sat May 02 13:51:07 2020 +0200
@@ -1194,12 +1194,12 @@
         <translation>&lt;&lt;Otros&gt;&gt;</translation>
     </message>
     <message>
-        <location filename="../Graphics/ApplicationDiagramBuilder.py" line="292"/>
+        <location filename="../Graphics/ApplicationDiagramBuilder.py" line="294"/>
         <source>Load Diagram</source>
         <translation>Cargar Diagrama</translation>
     </message>
     <message>
-        <location filename="../Graphics/ApplicationDiagramBuilder.py" line="292"/>
+        <location filename="../Graphics/ApplicationDiagramBuilder.py" line="294"/>
         <source>&lt;p&gt;The diagram belongs to the project &lt;b&gt;{0}&lt;/b&gt;. Shall this project be opened?&lt;/p&gt;</source>
         <translation>&lt;p&gt;El diagrama pertenece al proyecto &lt;b&gt;{0}&lt;/b&gt;. ¿Abrir proyecto?&lt;/p&gt;</translation>
     </message>
@@ -2344,32 +2344,32 @@
 <context>
     <name>BrowserModel</name>
     <message>
-        <location filename="../UI/BrowserModel.py" line="62"/>
+        <location filename="../UI/BrowserModel.py" line="63"/>
         <source>Name</source>
         <translation>Nombre</translation>
     </message>
     <message>
-        <location filename="../UI/BrowserModel.py" line="730"/>
+        <location filename="../UI/BrowserModel.py" line="731"/>
         <source>Attributes</source>
         <translation>Atributos</translation>
     </message>
     <message>
-        <location filename="../UI/BrowserModel.py" line="660"/>
+        <location filename="../UI/BrowserModel.py" line="661"/>
         <source>Globals</source>
         <translation>Globales</translation>
     </message>
     <message>
-        <location filename="../UI/BrowserModel.py" line="654"/>
+        <location filename="../UI/BrowserModel.py" line="655"/>
         <source>Coding: {0}</source>
         <translation>Codificación: {0}</translation>
     </message>
     <message>
-        <location filename="../UI/BrowserModel.py" line="740"/>
+        <location filename="../UI/BrowserModel.py" line="741"/>
         <source>Class Attributes</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../UI/BrowserModel.py" line="666"/>
+        <location filename="../UI/BrowserModel.py" line="667"/>
         <source>Imports</source>
         <translation>Imports</translation>
     </message>
@@ -3036,54 +3036,54 @@
 <context>
     <name>CodeDocumentationViewer</name>
     <message>
-        <location filename="../UI/CodeDocumentationViewer.py" line="175"/>
+        <location filename="../UI/CodeDocumentationViewer.py" line="211"/>
         <source>Code Info Provider:</source>
         <translation>Proveedor de Info del Código:</translation>
     </message>
     <message>
-        <location filename="../UI/CodeDocumentationViewer.py" line="188"/>
+        <location filename="../UI/CodeDocumentationViewer.py" line="224"/>
         <source>Select the code info provider</source>
         <translation>Seleccionar el proveedor de info del código</translation>
     </message>
     <message>
-        <location filename="../UI/CodeDocumentationViewer.py" line="190"/>
+        <location filename="../UI/CodeDocumentationViewer.py" line="226"/>
         <source>&lt;disabled&gt;</source>
         <translation>&lt;deshabilitado&gt;</translation>
     </message>
     <message>
-        <location filename="../UI/CodeDocumentationViewer.py" line="371"/>
+        <location filename="../UI/CodeDocumentationViewer.py" line="407"/>
         <source>No documentation available</source>
         <translation>No hay documentación disponible</translation>
     </message>
     <message>
-        <location filename="../UI/CodeDocumentationViewer.py" line="392"/>
+        <location filename="../UI/CodeDocumentationViewer.py" line="428"/>
         <source>No source code documentation provider has been registered. This function has been disabled.</source>
         <translation>No hay registrado ningún proveedor de documentación de código. Esta función se ha deshabilitado.</translation>
     </message>
     <message>
-        <location filename="../UI/CodeDocumentationViewer.py" line="397"/>
+        <location filename="../UI/CodeDocumentationViewer.py" line="433"/>
         <source>This function has been disabled.</source>
         <translation>Esta función se ha deshabilitado.</translation>
     </message>
     <message>
-        <location filename="../UI/CodeDocumentationViewerTemplate.py" line="137"/>
+        <location filename="../UI/CodeDocumentationViewerTemplate.py" line="139"/>
         <source>No further documentation available</source>
         <translation>No hay más documentación disponible</translation>
     </message>
     <message>
-        <location filename="../UI/CodeDocumentationViewerTemplate.py" line="58"/>
+        <location filename="../UI/CodeDocumentationViewerTemplate.py" line="60"/>
         <source>&lt;p&gt;&lt;b&gt;Definition:&lt;/b&gt; &lt;span class=&quot;def&quot;&gt;@NAME@@ARGSPEC@&lt;/span&gt;&lt;/p&gt;</source>
         <comment>Just translate &apos;Definition:&apos; and leave the rest intact.</comment>
         <translation>&lt;p&gt;&lt;b&gt;Definición:&lt;/b&gt; &lt;span class=&quot;def&quot;&gt;@NAME@@ARGSPEC@&lt;/span&gt;&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../UI/CodeDocumentationViewerTemplate.py" line="68"/>
+        <location filename="../UI/CodeDocumentationViewerTemplate.py" line="70"/>
         <source>&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; @NOTE@&lt;/p&gt;</source>
         <comment>Just translate &apos;Note:&apos; and leave the rest intact.</comment>
         <translation>&lt;p&gt;&lt;b&gt;Nota:&lt;/b&gt; @NOTE@&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../UI/CodeDocumentationViewerTemplate.py" line="63"/>
+        <location filename="../UI/CodeDocumentationViewerTemplate.py" line="65"/>
         <source>&lt;p&gt;&lt;b&gt;Type:&lt;/b&gt; @TYPE@&lt;/p&gt;</source>
         <comment>Just translate &apos;Type:&apos; and leave the rest intact.</comment>
         <translation>&lt;p&gt;&lt;b&gt;Tipo:&lt;/b&gt; @TYPE@&lt;/p&gt;</translation>
@@ -4170,11 +4170,6 @@
         <translation>Seleccione para generar un diálogo del tipo QColorDialog.getColor</translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.ui" line="143"/>
-        <source>Colour</source>
-        <translation>Color</translation>
-    </message>
-    <message>
         <location filename="../Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.ui" line="42"/>
         <source>Select to generate a QColorDialog.getRgba dialog</source>
         <translation>Seleccione para generar un diálogo de tipo QColorDialog.getRgba</translation>
@@ -4185,11 +4180,6 @@
         <translation>RGBA</translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.ui" line="155"/>
-        <source>Enter a variable name or a colour</source>
-        <translation>Introduzca un nombre de variable o un color</translation>
-    </message>
-    <message>
         <location filename="../Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.ui" line="167"/>
         <source>Qt.red</source>
         <translation>Qt.red</translation>
@@ -4355,11 +4345,6 @@
         <translation>Introduzca el título del diálogo</translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.py" line="72"/>
-        <source>&lt;p&gt;The colour &lt;b&gt;{0}&lt;/b&gt; is not valid.&lt;/p&gt;</source>
-        <translation>&lt;p&gt;El color &lt;b&gt;{0}&lt;/b&gt;no es válido.&lt;/p&gt;</translation>
-    </message>
-    <message>
         <location filename="../Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.ui" line="55"/>
         <source>Result</source>
         <translation>Resultado</translation>
@@ -4370,11 +4355,6 @@
         <translation>Introduzca el nombre para la variable.de resultado</translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.ui" line="292"/>
-        <source>Colour Variable</source>
-        <translation>Variable para Color</translation>
-    </message>
-    <message>
         <location filename="../Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.ui" line="87"/>
         <source>Parent</source>
         <translation>Padre</translation>
@@ -4414,6 +4394,26 @@
         <source>Enter the parent expression</source>
         <translation>Introducir la expresión padre</translation>
     </message>
+    <message>
+        <location filename="../Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.ui" line="143"/>
+        <source>Color</source>
+        <translation>Color</translation>
+    </message>
+    <message>
+        <location filename="../Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.ui" line="155"/>
+        <source>Enter a variable name or a color</source>
+        <translation>Introduzca un nombre de variable o un color</translation>
+    </message>
+    <message>
+        <location filename="../Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.ui" line="292"/>
+        <source>Color Variable</source>
+        <translation>Variable para Color</translation>
+    </message>
+    <message>
+        <location filename="../Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.py" line="72"/>
+        <source>&lt;p&gt;The color &lt;b&gt;{0}&lt;/b&gt; is not valid.&lt;/p&gt;</source>
+        <translation>&lt;p&gt;El color &lt;b&gt;{0}&lt;/b&gt;no es válido.&lt;/p&gt;</translation>
+    </message>
 </context>
 <context>
     <name>CompareDialog</name>
@@ -6270,7 +6270,7 @@
         <translation>error de uic</translation>
     </message>
     <message>
-        <location filename="../Project/CreateDialogCodeDialog.py" line="577"/>
+        <location filename="../Project/CreateDialogCodeDialog.py" line="580"/>
         <source>Code Generation</source>
         <translation>Generación de Código</translation>
     </message>
@@ -6290,17 +6290,17 @@
         <translation>&lt;p&gt;Ha ocurrido un error al cargar el formulario &lt;b&gt;{0}&lt;/b&gt;.&lt;/p&gt;&lt;p&gt;{1}&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/CreateDialogCodeDialog.py" line="437"/>
+        <location filename="../Project/CreateDialogCodeDialog.py" line="440"/>
         <source>&lt;p&gt;Could not open the code template file &quot;{0}&quot;.&lt;/p&gt;&lt;p&gt;Reason: {1}&lt;/p&gt;</source>
         <translation>&lt;p&gt;No se ha podido cargar el archivo con la plantilla de código &quot;{0}&quot;.&lt;/p&gt;&lt;p&gt;Razón: {1}&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/CreateDialogCodeDialog.py" line="475"/>
+        <location filename="../Project/CreateDialogCodeDialog.py" line="478"/>
         <source>&lt;p&gt;Could not open the source file &quot;{0}&quot;.&lt;/p&gt;&lt;p&gt;Reason: {1}&lt;/p&gt;</source>
         <translation>&lt;p&gt;No se ha podido abrir el archivo de codigo fuente &quot;{0}&quot;.&lt;/p&gt;&lt;p&gt;Razón: {1}&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/CreateDialogCodeDialog.py" line="577"/>
+        <location filename="../Project/CreateDialogCodeDialog.py" line="580"/>
         <source>&lt;p&gt;Could not write the source file &quot;{0}&quot;.&lt;/p&gt;&lt;p&gt;Reason: {1}&lt;/p&gt;</source>
         <translation>&lt;p&gt;No se ha podido escribir en el archivo de codigo fuente &quot;{0}&quot;.&lt;/p&gt;&lt;p&gt;Razón: {1}&lt;/p&gt;</translation>
     </message>
@@ -7522,21 +7522,6 @@
         <translation>Seleccionar si el depurador debe ser ejecutado remotamente</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="630"/>
-        <source>Background Colours</source>
-        <translation>Colores de Fondo</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="659"/>
-        <source>Select the background colour for changed items.</source>
-        <translation>Seleccionar el color de fondo para elementos que han cambiado.</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="695"/>
-        <source>Select the background colour for elements which are loaded for the first time.</source>
-        <translation>Seleccionar el color de fondo para elementos que se cargan por primera vez.</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="669"/>
         <source>Changed elements:</source>
         <translation>Elementos cambiados:</translation>
@@ -7546,6 +7531,21 @@
         <source>First time opened elements:</source>
         <translation>Elementos abiertos por primera vez:</translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="630"/>
+        <source>Background Colors</source>
+        <translation>Colores de Fondo</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="659"/>
+        <source>Select the background color for changed items.</source>
+        <translation>Seleccionar el color de fondo para elementos que han cambiado.</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="695"/>
+        <source>Select the background color for elements which are loaded for the first time.</source>
+        <translation>Seleccionar el color de fondo para elementos que se cargan por primera vez.</translation>
+    </message>
 </context>
 <context>
     <name>DebuggerInterfacePython</name>
@@ -8033,110 +8033,110 @@
 <context>
     <name>DiffColoursPage</name>
     <message>
-        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="17"/>
-        <source>&lt;b&gt;Configure Diff colours&lt;/b&gt;</source>
-        <translation>&lt;b&gt;Configurar colores de Diff&lt;/b&gt;</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="39"/>
-        <source>Select the background colour for header lines</source>
-        <translation>Seleccionar el color de fondo para líneas de cabecera</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="42"/>
-        <source>Header Colour</source>
-        <translation>Color de Cabecera</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="52"/>
         <source>Header Line</source>
         <translation>Línea de Cabecera</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="65"/>
-        <source>Select the background colour for bad whitespace</source>
-        <translation>Seleccionar el color de fondo para espacio en blanco erróneo</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="68"/>
-        <source>Whitespace Colour</source>
-        <translation>Color de Espacio en Blanco</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="88"/>
-        <source>Select the text foreground colour</source>
-        <translation>Seleccionar el color en primer plano para el texto</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="91"/>
-        <source>Text Colour</source>
-        <translation>Color de Texto</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="101"/>
         <source>Normal Text</source>
         <translation>Texto Normal</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="114"/>
-        <source>Select the background colour for additions</source>
-        <translation>Seleccionar el color de fondo para adiciones</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="117"/>
-        <source>Added Colour</source>
-        <translation>Color Añadido</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="127"/>
         <source>Added Text</source>
         <translation>Texto Añadido</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="140"/>
-        <source>Select the background colour for removed text</source>
-        <translation>Seleccionar el color de fondo para texto eliminado</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="143"/>
-        <source>Removed Colour</source>
-        <translation>Color Eliminado</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="153"/>
         <source>Removed Text</source>
         <translation>Texto Eliminado</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="166"/>
-        <source>Select the background colour for replaced text</source>
-        <translation>Seleccionar el color de fondo para texto reemplazado</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="169"/>
-        <source>Replaced Colour</source>
-        <translation>Color Reemplazado</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="179"/>
         <source>Replaced Text</source>
         <translation>Texto Reemplazado</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="192"/>
-        <source>Select the background colour for context lines</source>
-        <translation>Seleccionar el color de fondo para líneas de contexto</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="195"/>
-        <source>Context Colour</source>
-        <translation>Color de Contexto</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="205"/>
         <source>Context Line</source>
         <translation>Línea de Contexto</translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="17"/>
+        <source>&lt;b&gt;Configure Diff colors&lt;/b&gt;</source>
+        <translation>&lt;b&gt;Configurar colores de Diff&lt;/b&gt;</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="39"/>
+        <source>Select the background color for header lines</source>
+        <translation>Seleccionar el color de fondo para líneas de cabecera</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="42"/>
+        <source>Header Color</source>
+        <translation>Color de Cabecera</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="65"/>
+        <source>Select the background color for bad whitespace</source>
+        <translation>Seleccionar el color de fondo para espacio en blanco erróneo</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="68"/>
+        <source>Whitespace Color</source>
+        <translation>Color de Espacio en Blanco</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="88"/>
+        <source>Select the text foreground color</source>
+        <translation>Seleccionar el color en primer plano para el texto</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="91"/>
+        <source>Text Color</source>
+        <translation>Color de Texto</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="114"/>
+        <source>Select the background color for additions</source>
+        <translation>Seleccionar el color de fondo para adiciones</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="117"/>
+        <source>Added Color</source>
+        <translation>Color Añadido</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="140"/>
+        <source>Select the background color for removed text</source>
+        <translation>Seleccionar el color de fondo para texto eliminado</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="143"/>
+        <source>Removed Color</source>
+        <translation>Color Eliminado</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="166"/>
+        <source>Select the background color for replaced text</source>
+        <translation>Seleccionar el color de fondo para texto reemplazado</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="169"/>
+        <source>Replaced Color</source>
+        <translation>Color Reemplazado</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="192"/>
+        <source>Select the background color for context lines</source>
+        <translation>Seleccionar el color de fondo para líneas de contexto</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="195"/>
+        <source>Context Color</source>
+        <translation>Color de Contexto</translation>
+    </message>
 </context>
 <context>
     <name>DiffDialog</name>
@@ -9302,7 +9302,7 @@
 <context>
     <name>E5GraphicsView</name>
     <message>
-        <location filename="../E5Graphics/E5GraphicsView.py" line="56"/>
+        <location filename="../E5Graphics/E5GraphicsView.py" line="58"/>
         <source>&lt;b&gt;Graphics View&lt;/b&gt;
 &lt;p&gt;This graphics view is used to show a diagram. 
 There are various actions available to manipulate the 
@@ -9334,7 +9334,7 @@
 </translation>
     </message>
     <message>
-        <location filename="../E5Graphics/E5GraphicsView.py" line="377"/>
+        <location filename="../E5Graphics/E5GraphicsView.py" line="416"/>
         <source>{0}, Page {1}</source>
         <translation>{0}, Página {1}</translation>
     </message>
@@ -10747,7 +10747,7 @@
 <context>
     <name>Editor</name>
     <message>
-        <location filename="../QScintilla/Editor.py" line="3106"/>
+        <location filename="../QScintilla/Editor.py" line="3107"/>
         <source>Open File</source>
         <translation>Abrir archivo</translation>
     </message>
@@ -11002,7 +11002,7 @@
         <translation>Editar punto de interrupción...</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5607"/>
+        <location filename="../QScintilla/Editor.py" line="5615"/>
         <source>Enable breakpoint</source>
         <translation>Activar punto de interrupción</translation>
     </message>
@@ -11052,247 +11052,247 @@
         <translation>No se ha proporcionado un formato de exportación. Abortando...</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="1955"/>
+        <location filename="../QScintilla/Editor.py" line="1956"/>
         <source>Modification of Read Only file</source>
         <translation>Modificación de un archivo de solo lectura</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="1955"/>
+        <location filename="../QScintilla/Editor.py" line="1956"/>
         <source>You are attempting to change a read only file. Please save to a different file first.</source>
         <translation>Usted está intentando modificar un archivo solo lectura. Por favor guarde en otro archivo primero.</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="2663"/>
+        <location filename="../QScintilla/Editor.py" line="2664"/>
         <source>Printing...</source>
         <translation>Imprimiendo...</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="2680"/>
+        <location filename="../QScintilla/Editor.py" line="2681"/>
         <source>Printing completed</source>
         <translation>Impresión completa</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="2682"/>
+        <location filename="../QScintilla/Editor.py" line="2683"/>
         <source>Error while printing</source>
         <translation>Error al imprimir</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="2685"/>
+        <location filename="../QScintilla/Editor.py" line="2686"/>
         <source>Printing aborted</source>
         <translation>Impresión cancelada</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="3046"/>
+        <location filename="../QScintilla/Editor.py" line="3047"/>
         <source>File Modified</source>
         <translation>Archivo modificado</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="3295"/>
+        <location filename="../QScintilla/Editor.py" line="3296"/>
         <source>Save File</source>
         <translation>Guardar archivo</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="4772"/>
+        <location filename="../QScintilla/Editor.py" line="4777"/>
         <source>Autocompletion</source>
         <translation>Autocompletar</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="4772"/>
+        <location filename="../QScintilla/Editor.py" line="4777"/>
         <source>Autocompletion is not available because there is no autocompletion source set.</source>
         <translation>Autocompletar no está disponible porque no hay origen de datos para autocompletar.</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5610"/>
+        <location filename="../QScintilla/Editor.py" line="5618"/>
         <source>Disable breakpoint</source>
         <translation>Deshabilitar punto de interrupción</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5985"/>
+        <location filename="../QScintilla/Editor.py" line="5993"/>
         <source>Code Coverage</source>
         <translation>Cobertura de codigo</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5985"/>
+        <location filename="../QScintilla/Editor.py" line="5993"/>
         <source>Please select a coverage file</source>
         <translation>Por favor seleccione un archivo de cobertura</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6048"/>
+        <location filename="../QScintilla/Editor.py" line="6056"/>
         <source>Show Code Coverage Annotations</source>
         <translation>Mostrar Anotaciones de Cobertura de Código</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6041"/>
+        <location filename="../QScintilla/Editor.py" line="6049"/>
         <source>All lines have been covered.</source>
         <translation>Todas las líneas han sido cubiertas.</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6048"/>
+        <location filename="../QScintilla/Editor.py" line="6056"/>
         <source>There is no coverage file available.</source>
         <translation>No hay archivo de cobertura disponible.</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6165"/>
+        <location filename="../QScintilla/Editor.py" line="6173"/>
         <source>Profile Data</source>
         <translation>Datos de profiling</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6165"/>
+        <location filename="../QScintilla/Editor.py" line="6173"/>
         <source>Please select a profile file</source>
         <translation>Por favor seleccione un archivo de profiling</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6327"/>
+        <location filename="../QScintilla/Editor.py" line="6335"/>
         <source>Syntax Error</source>
         <translation>Error de sintaxis</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6327"/>
+        <location filename="../QScintilla/Editor.py" line="6335"/>
         <source>No syntax error message available.</source>
         <translation>No hay mensajes de error de sintaxis disponibles.</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6718"/>
+        <location filename="../QScintilla/Editor.py" line="6726"/>
         <source>Macro Name</source>
         <translation>Nombre de macro</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6718"/>
+        <location filename="../QScintilla/Editor.py" line="6726"/>
         <source>Select a macro name:</source>
         <translation>Seleccione un nombre de macro:</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6746"/>
+        <location filename="../QScintilla/Editor.py" line="6754"/>
         <source>Load macro file</source>
         <translation>Cargar archivo de macro</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6789"/>
+        <location filename="../QScintilla/Editor.py" line="6797"/>
         <source>Macro files (*.macro)</source>
         <translation>Archivos de Macro  (*.macro)</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6769"/>
+        <location filename="../QScintilla/Editor.py" line="6777"/>
         <source>Error loading macro</source>
         <translation>Error al cargar macro</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6789"/>
+        <location filename="../QScintilla/Editor.py" line="6797"/>
         <source>Save macro file</source>
         <translation>Guardar archivo de macro</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6806"/>
+        <location filename="../QScintilla/Editor.py" line="6814"/>
         <source>Save macro</source>
         <translation>Guardar macro</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6822"/>
+        <location filename="../QScintilla/Editor.py" line="6830"/>
         <source>Error saving macro</source>
         <translation>Error al guardar macro</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6835"/>
+        <location filename="../QScintilla/Editor.py" line="6843"/>
         <source>Start Macro Recording</source>
         <translation>Comenzar grabación de macro</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6835"/>
+        <location filename="../QScintilla/Editor.py" line="6843"/>
         <source>Macro recording is already active. Start new?</source>
         <translation>Grabación de macro ya está activada. ¿Comenzar una nueva?</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6861"/>
+        <location filename="../QScintilla/Editor.py" line="6869"/>
         <source>Macro Recording</source>
         <translation>Grabando macro</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6861"/>
+        <location filename="../QScintilla/Editor.py" line="6869"/>
         <source>Enter name of the macro:</source>
         <translation>Introduzca el nombre de la macro:</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7001"/>
+        <location filename="../QScintilla/Editor.py" line="7009"/>
         <source>File changed</source>
         <translation>Archivo modificado</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7307"/>
+        <location filename="../QScintilla/Editor.py" line="7320"/>
         <source>Drop Error</source>
         <translation>Error al soltar</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7328"/>
-        <source>Resources</source>
-        <translation>Recursos</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="7330"/>
-        <source>Add file...</source>
-        <translation>Añadir archivo...</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="7332"/>
-        <source>Add files...</source>
-        <translation>Añadir archivos...</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="7334"/>
-        <source>Add aliased file...</source>
-        <translation>Añadir archivo con un alias...</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="7337"/>
-        <source>Add localized resource...</source>
-        <translation>Añadir recursos localizados...</translation>
-    </message>
-    <message>
         <location filename="../QScintilla/Editor.py" line="7341"/>
+        <source>Resources</source>
+        <translation>Recursos</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="7343"/>
+        <source>Add file...</source>
+        <translation>Añadir archivo...</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="7345"/>
+        <source>Add files...</source>
+        <translation>Añadir archivos...</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="7347"/>
+        <source>Add aliased file...</source>
+        <translation>Añadir archivo con un alias...</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="7350"/>
+        <source>Add localized resource...</source>
+        <translation>Añadir recursos localizados...</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="7354"/>
         <source>Add resource frame</source>
         <translation>Añadir ventana de recursos</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7360"/>
+        <location filename="../QScintilla/Editor.py" line="7373"/>
         <source>Add file resource</source>
         <translation>Añadir archivo de recursos</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7376"/>
+        <location filename="../QScintilla/Editor.py" line="7389"/>
         <source>Add file resources</source>
         <translation>Añadir archivo de recursos</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7403"/>
+        <location filename="../QScintilla/Editor.py" line="7416"/>
         <source>Add aliased file resource</source>
         <translation>Añadir archivo de recursos con un alias</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7469"/>
+        <location filename="../QScintilla/Editor.py" line="7482"/>
         <source>Package Diagram</source>
         <translation>Digrama de paquetes</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7469"/>
+        <location filename="../QScintilla/Editor.py" line="7482"/>
         <source>Include class attributes?</source>
         <translation>¿Incluir atributos de clase?</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7491"/>
+        <location filename="../QScintilla/Editor.py" line="7504"/>
         <source>Imports Diagram</source>
         <translation>Diagrama de imports</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7491"/>
+        <location filename="../QScintilla/Editor.py" line="7504"/>
         <source>Include imports from external modules?</source>
         <translation>¿Incluir los imports de módulos externos?</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7505"/>
+        <location filename="../QScintilla/Editor.py" line="7518"/>
         <source>Application Diagram</source>
         <translation>Diagrama de aplicación</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7505"/>
+        <location filename="../QScintilla/Editor.py" line="7518"/>
         <source>Include module names?</source>
         <translation>¿Incluir nombres de módulos?</translation>
     </message>
@@ -11362,7 +11362,7 @@
         <translation>Seleccionar el Analizador Léxico de Pygments.</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7834"/>
+        <location filename="../QScintilla/Editor.py" line="7847"/>
         <source>Check spelling...</source>
         <translation>Corrección ortográfica...</translation>
     </message>
@@ -11372,12 +11372,12 @@
         <translation>Corrección ortográfica de la selección...</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7837"/>
+        <location filename="../QScintilla/Editor.py" line="7850"/>
         <source>Add to dictionary</source>
         <translation>Añadir al diccionario</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7839"/>
+        <location filename="../QScintilla/Editor.py" line="7852"/>
         <source>Ignore All</source>
         <translation>Ignorar Todo</translation>
     </message>
@@ -11402,47 +11402,47 @@
         <translation>Alternativas ({0})</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="3046"/>
+        <location filename="../QScintilla/Editor.py" line="3047"/>
         <source>&lt;p&gt;The file &lt;b&gt;{0}&lt;/b&gt; has unsaved changes.&lt;/p&gt;</source>
         <translation>&lt;p&gt;El archivo &lt;b&gt;{0}&lt;/b&gt; tiene cambios sin guardar.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="3106"/>
+        <location filename="../QScintilla/Editor.py" line="3107"/>
         <source>&lt;p&gt;The file &lt;b&gt;{0}&lt;/b&gt; could not be opened.&lt;/p&gt;&lt;p&gt;Reason: {1}&lt;/p&gt;</source>
         <translation>&lt;p&gt;El archivo&lt;b&gt;{0}&lt;/b&gt; no puede ser abierto.&lt;br /&gt;Causa: {1}&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="3232"/>
+        <location filename="../QScintilla/Editor.py" line="3233"/>
         <source>&lt;p&gt;The file &lt;b&gt;{0}&lt;/b&gt; could not be saved.&lt;br/&gt;Reason: {1}&lt;/p&gt;</source>
         <translation>&lt;p&gt;El archivo &lt;b&gt;{0}&lt;/b&gt; no puede ser guardado.&lt;br&gt;Causa: {1}&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6760"/>
+        <location filename="../QScintilla/Editor.py" line="6768"/>
         <source>&lt;p&gt;The macro file &lt;b&gt;{0}&lt;/b&gt; could not be read.&lt;/p&gt;</source>
         <translation>&lt;p&gt;El archivo de macro &lt;b&gt;{0}&lt;/b&gt; no se puede leer.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6769"/>
+        <location filename="../QScintilla/Editor.py" line="6777"/>
         <source>&lt;p&gt;The macro file &lt;b&gt;{0}&lt;/b&gt; is corrupt.&lt;/p&gt;</source>
         <translation>&lt;p&gt;El archivo de macro &lt;b&gt;{0}&lt;/b&gt; está dañado&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6822"/>
+        <location filename="../QScintilla/Editor.py" line="6830"/>
         <source>&lt;p&gt;The macro file &lt;b&gt;{0}&lt;/b&gt; could not be written.&lt;/p&gt;</source>
         <translation>&lt;p&gt;El archivo de macro  &lt;b&gt;{0}&lt;/b&gt; no se puede escribir.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7166"/>
+        <location filename="../QScintilla/Editor.py" line="7179"/>
         <source>{0} (ro)</source>
         <translation>{0} (ro)</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7307"/>
+        <location filename="../QScintilla/Editor.py" line="7320"/>
         <source>&lt;p&gt;&lt;b&gt;{0}&lt;/b&gt; is not a file.&lt;/p&gt;</source>
         <translation>&lt;p&gt;&lt;b&gt;{0}&lt;/b&gt; no es un archivo.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7403"/>
+        <location filename="../QScintilla/Editor.py" line="7416"/>
         <source>Alias for file &lt;b&gt;{0}&lt;/b&gt;:</source>
         <translation>Alias para el archivo &lt;b&gt;{0}&lt;/b&gt;:</translation>
     </message>
@@ -11467,27 +11467,27 @@
         <translation>Limpiar advertencias</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="3295"/>
+        <location filename="../QScintilla/Editor.py" line="3296"/>
         <source>&lt;p&gt;The file &lt;b&gt;{0}&lt;/b&gt; already exists. Overwrite it?&lt;/p&gt;</source>
         <translation>&lt;p&gt;El archivo &lt;b&gt;{0}&lt;/b&gt; ya existe. ¿Desea sobreescribirlo?&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6806"/>
+        <location filename="../QScintilla/Editor.py" line="6814"/>
         <source>&lt;p&gt;The macro file &lt;b&gt;{0}&lt;/b&gt; already exists. Overwrite it?&lt;/p&gt;</source>
         <translation>&lt;p&gt;El archivo de macro &lt;b&gt;{0}&lt;/b&gt; ya existe. ¿Desea sobreescribirlo?&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6606"/>
+        <location filename="../QScintilla/Editor.py" line="6614"/>
         <source>Warning: {0}</source>
         <translation>Advertencia: {0}</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6613"/>
+        <location filename="../QScintilla/Editor.py" line="6621"/>
         <source>Error: {0}</source>
         <translation>Error: {0}</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6997"/>
+        <location filename="../QScintilla/Editor.py" line="7005"/>
         <source>&lt;br&gt;&lt;b&gt;Warning:&lt;/b&gt; You will lose your changes upon reopening it.</source>
         <translation>&lt;br&gt;&lt;b&gt;Advertencia:&lt;/b&gt; Perderá los cambios si lo reabre.</translation>
     </message>
@@ -11512,27 +11512,27 @@
         <translation>Cambio anterior</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="8255"/>
+        <location filename="../QScintilla/Editor.py" line="8268"/>
         <source>Sort Lines</source>
         <translation>Ordenar Líneas</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="8255"/>
+        <location filename="../QScintilla/Editor.py" line="8268"/>
         <source>The selection contains illegal data for a numerical sort.</source>
         <translation>La selección contiene datos ilegales para una ordenación numérica.</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6541"/>
+        <location filename="../QScintilla/Editor.py" line="6549"/>
         <source>Warning</source>
         <translation>Advertencia</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6541"/>
+        <location filename="../QScintilla/Editor.py" line="6549"/>
         <source>No warning messages available.</source>
         <translation>No hay mensajes de advertencia disponibles.</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6603"/>
+        <location filename="../QScintilla/Editor.py" line="6611"/>
         <source>Style: {0}</source>
         <translation>Estilo: {0}</translation>
     </message>
@@ -11557,7 +11557,7 @@
         <translation>Reabrir Con Codificación</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6991"/>
+        <location filename="../QScintilla/Editor.py" line="6999"/>
         <source>&lt;p&gt;The file &lt;b&gt;{0}&lt;/b&gt; has been changed while it was opened in eric6. Reread it?&lt;/p&gt;</source>
         <translation>&lt;p&gt;El archivo &lt;b&gt;{0}&lt;/b&gt; ha cambiado mientras estaba abierto en eric6. ¿Desea volver a cargarlo?&lt;/p&gt;</translation>
     </message>
@@ -11572,32 +11572,32 @@
         <translation>Completo</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="4902"/>
+        <location filename="../QScintilla/Editor.py" line="4907"/>
         <source>Auto-Completion Provider</source>
         <translation>Proveedor de Autocompletado</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="4902"/>
+        <location filename="../QScintilla/Editor.py" line="4907"/>
         <source>The completion list provider &apos;{0}&apos; was already registered. Ignoring duplicate request.</source>
         <translation>El proveedor de lista de completado&apos;{0}&apos; ya está registrado. Se ignora la solicitud duplicada.</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5177"/>
+        <location filename="../QScintilla/Editor.py" line="5185"/>
         <source>Call-Tips Provider</source>
         <translation>Proveedor de Call-Tips</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5177"/>
+        <location filename="../QScintilla/Editor.py" line="5185"/>
         <source>The call-tips provider &apos;{0}&apos; was already registered. Ignoring duplicate request.</source>
         <translation>El proveedor de call-tips&apos;{0}&apos; ya está registrado. Se ignora la solicitud duplicada.</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="8344"/>
+        <location filename="../QScintilla/Editor.py" line="8357"/>
         <source>Register Mouse Click Handler</source>
         <translation>Registrar Manejador de Clicks de Ratón</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="8344"/>
+        <location filename="../QScintilla/Editor.py" line="8357"/>
         <source>A mouse click handler for &quot;{0}&quot; was already registered by &quot;{1}&quot;. Aborting request by &quot;{2}&quot;...</source>
         <translation>Un manejador de clicks de ratón para &quot;{0}&quot; ya está registrado por &quot;{1}&quot;. Abortando solicitud por &quot;{2}&quot;...</translation>
     </message>
@@ -11627,12 +11627,12 @@
         <translation>Ejecutar Selección en Consola</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="8465"/>
+        <location filename="../QScintilla/Editor.py" line="8478"/>
         <source>EditorConfig Properties</source>
         <translation>Propiedades de EditorConfig</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="8465"/>
+        <location filename="../QScintilla/Editor.py" line="8478"/>
         <source>&lt;p&gt;The EditorConfig properties for file &lt;b&gt;{0}&lt;/b&gt; could not be loaded.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Las propiedades de EditorConfig para el archivo &lt;b&gt;{0}&lt;/b&gt; no se ha podido cargar.&lt;/p&gt;</translation>
     </message>
@@ -12152,21 +12152,6 @@
         <translation>Seleccionar para habilitar consejos de llamada</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="122"/>
-        <source>Colours</source>
-        <translation>Colores</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="128"/>
-        <source>Background colour:</source>
-        <translation>Color de fondo:</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="141"/>
-        <source>Select the background colour for calltips.</source>
-        <translation>Seleccione el color de fondo para consejos de llamada.</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="74"/>
         <source>Move to set the maximum number of calltips shown (0 = all available)</source>
         <translation>Mover para establecer el número máximo de consejos de llamada que se muestran (0 = todos los disponibles)</translation>
@@ -12177,22 +12162,22 @@
         <translation>Muestra el máximo numero de consejos de llamada que se mostrarán</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="167"/>
+        <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="213"/>
         <source>Plug-In Behavior</source>
         <translation>Comportamiento del Plug-in</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="173"/>
+        <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="219"/>
         <source>Select to show QScintilla provided calltips, if the selected plug-ins fail</source>
         <translation>Seleccionar para mostrar calltips proporcionados por QScintilla si los plugins seleccionados no proporcionan ninguno</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="176"/>
+        <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="222"/>
         <source>Qscintilla provided calltips are shown, if this option is enabled and calltips shall be provided by plug-ins (see calltips sub-page of the plug-in) and the plugin-ins don&apos;t deliver any calltips.</source>
         <translation>Se muestran los calltips proporcionados por Qscintilla si esta opción está habilitada, y además se han configurado plug-ins para proporcionar calltips (ver subpágina de calltips del plug-in), pero los plug-ins no generan ningún calltip.</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="179"/>
+        <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="225"/>
         <source>Show QScintilla calltips, if plug-ins fail</source>
         <translation>Mostrar calltips de QScintilla si los plugins no muestran ninguno</translation>
     </message>
@@ -12226,6 +12211,41 @@
         <source>Automatic Calltips Enabled</source>
         <translation>Calltips Automáticos Habilitados</translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="122"/>
+        <source>Colors</source>
+        <translation>Colores</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="128"/>
+        <source>Background color:</source>
+        <translation>Colores de fondo:</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="141"/>
+        <source>Select the background color for calltips.</source>
+        <translation>Seleccionar el color de fondo para consejos de llamada.</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="164"/>
+        <source>Foreground color:</source>
+        <translation>Color de Primer Plano:</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="177"/>
+        <source>Select the foreground color for calltips.</source>
+        <translation>Seleccionar el color de primer plano para los consejos de llamada.</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="187"/>
+        <source>Highlight color:</source>
+        <translation>Color de resaltado:</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="200"/>
+        <source>Select the highlight color for calltips.</source>
+        <translation>Seleccionar el color de resaltado para los consejos de llamada.</translation>
+    </message>
 </context>
 <context>
     <name>EditorCalltipsQScintillaPage</name>
@@ -13182,31 +13202,11 @@
         <translation>Todas las Fuentes</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="273"/>
-        <source>Select the background colour for all styles</source>
-        <translation>Selecciona el color de fondo para todos los estilos</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="276"/>
-        <source>All Background Colours</source>
-        <translation>Todos los colores de fondo</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="325"/>
         <source>Sample Text</source>
         <translation>Texto de Ejemplo</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="184"/>
-        <source>Select the background colour.</source>
-        <translation>Selecciona el Color de Fondo.</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="187"/>
-        <source>Background Colour</source>
-        <translation>Color de Fondo</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="194"/>
         <source>Select the font.</source>
         <translation>Selección de Fuente.</translation>
@@ -13217,16 +13217,6 @@
         <translation>Fuente</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="174"/>
-        <source>Select the foreground colour.</source>
-        <translation>Selección del Color de Fuente.</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="177"/>
-        <source>Foreground Colour</source>
-        <translation>Color de Fuente</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="293"/>
         <source>Select the eol fill for all styles</source>
         <translation>Selecciona llenado hasta final de línea para todos los estilos</translation>
@@ -13421,6 +13411,36 @@
         <source>Press to set all sub-styles to default values</source>
         <translation>Pulsar para establecer todos los subestilos a sus valores por defecto</translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="174"/>
+        <source>Select the foreground color.</source>
+        <translation>Seleccionar el color de primer plano.</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="177"/>
+        <source>Foreground Color</source>
+        <translation>Color de Primer Plano</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="184"/>
+        <source>Select the background color.</source>
+        <translation>Selecciona el color de fondo.</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="187"/>
+        <source>Background Color</source>
+        <translation>Color de Fondo</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="273"/>
+        <source>Select the background color for all styles</source>
+        <translation>Selecciona el color de fondo para todos los estilos</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="276"/>
+        <source>All Background Colors</source>
+        <translation>Todos los Colores de Fondo</translation>
+    </message>
 </context>
 <context>
     <name>EditorKeywordsPage</name>
@@ -14210,16 +14230,6 @@
         <translation>Marcadores de Búsqueda</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorSearchPage.ui" line="127"/>
-        <source>Marker Colour:</source>
-        <translation>Color del Marcador:</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorSearchPage.ui" line="140"/>
-        <source>Select the colour for the search markers.</source>
-        <translation>Seleccionar el color para la marca de color para búsqueda.</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorSearchPage.ui" line="53"/>
         <source>Select, whether search markers shall be shown for a standard search</source>
         <translation>Seleccionar si los marcadores de búsqueda deben mostrarse para la búsqueda estándar</translation>
@@ -14289,6 +14299,16 @@
         <source>QScintilla Extended  Mode (C++11)</source>
         <translation>Modo Extendido QScintilla (C++11)</translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorSearchPage.ui" line="127"/>
+        <source>Marker Color:</source>
+        <translation>Color del Marcador:</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorSearchPage.ui" line="140"/>
+        <source>Select the color for the search markers.</source>
+        <translation>Seleccionar el color para los marcadores de búsqueda.</translation>
+    </message>
 </context>
 <context>
     <name>EditorSpellCheckingPage</name>
@@ -14328,16 +14348,6 @@
         <translation>Seleccionar el lenguaje por defecto</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorSpellCheckingPage.ui" line="221"/>
-        <source>Marker Colour:</source>
-        <translation>Color del Marcador:</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorSpellCheckingPage.ui" line="234"/>
-        <source>Select the colour for the spelling markers.</source>
-        <translation>Seleccionar el color para los marcadores de corrección ortográfica.</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorSpellCheckingPage.ui" line="17"/>
         <source>&lt;b&gt;Configure editor spell checking options&lt;/b&gt;</source>
         <translation>&lt;b&gt;Configurar opciones de corrección ortografica del editor&lt;/b&gt;</translation>
@@ -14363,11 +14373,6 @@
         <translation>Comprobar solamente cadenas</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorSpellCheckingPage.ui" line="215"/>
-        <source>Colours</source>
-        <translation>Colores</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorSpellCheckingPage.ui" line="260"/>
         <source>Personal lists</source>
         <translation>Listas personales</translation>
@@ -14454,6 +14459,21 @@
         <translation>&lt;b&gt;Archivos de Texto&lt;/b&gt;
 &lt;p&gt;Introducir las extensiones de archivo para archivos de texto plano. Se comprobará el contenido completo de archivos con estas extensiones.&lt;/p&gt;</translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorSpellCheckingPage.ui" line="215"/>
+        <source>Colors</source>
+        <translation>Colores</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorSpellCheckingPage.ui" line="221"/>
+        <source>Marker Color:</source>
+        <translation>Color del Marcador:</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorSpellCheckingPage.ui" line="234"/>
+        <source>Select the color for the spelling markers.</source>
+        <translation>Seleccionar el color para los marcadores de corrección ortográfica.</translation>
+    </message>
 </context>
 <context>
     <name>EditorStylesPage</name>
@@ -14613,31 +14633,6 @@
         <translation>Selección</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="515"/>
-        <source>Select to use custom selection colours</source>
-        <translation>Seleccione para usar colores personalizados para la selección</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="518"/>
-        <source>&lt;b&gt;Use custom selection colours&lt;/b&gt;&lt;p&gt;Select this entry in order to use custom selection colours in the editor and shell windows. The colours for the selection foreground and background are defined on the colours page.&lt;/p&gt;</source>
-        <translation>&lt;b&gt;Usar colores personalizados para la selección&lt;/b&gt;&lt;p&gt;Seleccione esta entrada para utilizar colores personalizados de selección en las ventanas de edición y shell. Los colores para el primer plano y para el fondo se definen en la página de colores&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="521"/>
-        <source>Use custom selection colours</source>
-        <translation>Usar colores personalizados para la selección</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="528"/>
-        <source>Select, if selected text should be colourized by the lexer.</source>
-        <translation>Seleccione si el texto seleccionado debe ser coloreado por el analizador léxico.</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="531"/>
-        <source>Colourize selected text</source>
-        <translation>Colorizar texto seleccionado</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="538"/>
         <source>Select to extend selection to end of line</source>
         <translation>Seleccionar para extender la selección hasta el final de la línea</translation>
@@ -14653,21 +14648,11 @@
         <translation>Primer plano de la selección:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="565"/>
-        <source>Select the foreground colour for the selection.</source>
-        <translation>Seleccionar el color de primer plano para la selección.</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="575"/>
         <source>Selection background:</source>
         <translation>Color de fondo de la selección:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="588"/>
-        <source>Select the background colour for the selection.</source>
-        <translation>Seleccione el color de fondo para la selección.</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="609"/>
         <source>Caret</source>
         <translation>Punto de inserción de texto</translation>
@@ -14683,16 +14668,6 @@
         <translation>Línea de Cursor visible</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="648"/>
-        <source>Select the colour for the caret.</source>
-        <translation>Seleccionar el color para el punto de inserción de texto.</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="761"/>
-        <source>Select the background colour for the line containing the caret.</source>
-        <translation>Seleccionar el color de fondo para la línea que contiene el punto de inserción de texto.</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="857"/>
         <source>Braces</source>
         <translation>Llaves ( &apos;{&apos; y &apos;}&apos; )</translation>
@@ -14713,41 +14688,21 @@
         <translation>Llaves coincidentes:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="886"/>
-        <source>Select the colour for highlighting matching braces.</source>
-        <translation>Seleccione el color de resaltado de llaves coincidentes.</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="896"/>
         <source>Matched braces background:</source>
         <translation>Fondo de llaves coincidentes:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="909"/>
-        <source>Select the background colour for highlighting matching braces.</source>
-        <translation>Seleccione el color de fondo para resaltar llaves coincidentes.</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="925"/>
         <source>Unmatched brace:</source>
         <translation>Llave sin coincidencia:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="932"/>
-        <source>Select the colour for  highlighting nonmatching braces.</source>
-        <translation>Seleccione el color de resaltado de llaves sin coincidencia.</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="948"/>
         <source>Unmatched brace background:</source>
         <translation>Fondo de llaves sin coincidencia:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="955"/>
-        <source>Select the background colour for  highlighting nonmatching braces.</source>
-        <translation>Seleccione el color de fondo para resaltar llaves sin coincidencia.</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="968"/>
         <source>End of Line</source>
         <translation>Final de Línea</translation>
@@ -14773,16 +14728,6 @@
         <translation>Modo del Borde</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1124"/>
-        <source>Select the colour for the edge marker.</source>
-        <translation>Seleccionar el color para el marcador del borde.</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1134"/>
-        <source>Background colour:</source>
-        <translation>Color de fondo:</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1147"/>
         <source>Move to set the edge column.</source>
         <translation>Mover para establecer la columna del borde.</translation>
@@ -14813,11 +14758,6 @@
         <translation>Dibujar línea</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1222"/>
-        <source>Change Background Colour</source>
-        <translation>Cambiar color de fondo</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="2077"/>
         <source>Various</source>
         <translation>Varios</translation>
@@ -14848,31 +14788,16 @@
         <translation>Color de primer plano para márgenes:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="351"/>
-        <source>Select the foreground colour for the margins</source>
-        <translation>Seleccionar el color de primer plano para los márgenes</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="361"/>
         <source>Margins background:</source>
         <translation>Color de fondo para los márgenes:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="374"/>
-        <source>Select the background colour for the margins</source>
-        <translation>Seleccione el color de fondo para los márgenes</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="384"/>
         <source>Foldmargin background:</source>
         <translation>Color de fondo para los pliegues de los márgenes:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="397"/>
-        <source>Select the background colour for the foldmargin</source>
-        <translation>Seleccione el color de fondo para los pliegues de los márgenes</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1236"/>
         <source>Zoom</source>
         <translation>Zoom</translation>
@@ -14908,21 +14833,11 @@
         <translation>Color de primer plano para marcadores de plegado:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="420"/>
-        <source>Select the foreground colour of the foldmarkers</source>
-        <translation>Seleccionar el color de primer plano para los marcadores de plegado</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="430"/>
         <source>Foldmarkers background:</source>
         <translation>Color de fondo para marcadores de plegado:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="443"/>
-        <source>Select the background colour of the foldmarkers</source>
-        <translation>Seleccionar el color de fondo para los marcadores de plegado</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="37"/>
         <source>&lt;b&gt;Note:&lt;/b&gt; Fonts and colors of the syntax highlighters have to be configured on the syntax highlighter styles page.</source>
         <translation>&lt;b&gt;Nota:&lt;/b&gt; Las fuentes y colores de los resaltadores de sintaxis deben ser configurados en la página de estilos de resaltado de sintaxis.</translation>
@@ -14948,21 +14863,11 @@
         <translation>Advertencias</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1402"/>
-        <source>Press to select the foreground colour</source>
-        <translation>Pulse para seleccionar el color de primer plano</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1405"/>
         <source>Foreground</source>
         <translation>Primer plano</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1412"/>
-        <source>Press to select the background colour</source>
-        <translation>Pulse para seleccionar el color de fondo</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1415"/>
         <source>Background</source>
         <translation>Fondo</translation>
@@ -14993,56 +14898,21 @@
         <translation>Color de primer plano para espacios en blanco:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1636"/>
-        <source>Select the foreground colour for visible whitespace</source>
-        <translation>Seleccionar el color de primer plano para espacios en blanco visibles</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1646"/>
         <source>Whitespace background:</source>
         <translation>Color de fondo para espacios en blanco:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1659"/>
-        <source>Select the background colour for visible whitespace</source>
-        <translation>Seleccionar el color de fondo para espacios en blanco visibles</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="53"/>
-        <source>Select to set the colour of the edit area different to the default style</source>
-        <translation>Seleccionar para establecer el color del área de edición distinto del estilo por defecto</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="56"/>
-        <source>Override edit area colours</source>
-        <translation>Sobreescribir colores del área de edición</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="68"/>
         <source>Edit area foreground:</source>
         <translation>Color de primer plano para el área de edición:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="81"/>
-        <source>Select the foreground colour for the edit area.</source>
-        <translation>Seleccionar el color de primer plano para el área de edición.</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="91"/>
         <source>Edit area background:</source>
         <translation>Color de fondo para el área de edición:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="104"/>
-        <source>Select the background colour for the edit area.</source>
-        <translation>Seleccionar el color de fondo para el área de edición.</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="47"/>
-        <source>Colours</source>
-        <translation>Colores</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1444"/>
         <source>Change Tracing</source>
         <translation>Trazado de Cambios</translation>
@@ -15073,26 +14943,6 @@
         <translation> ms</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1514"/>
-        <source>Unsaved changes colour:</source>
-        <translation>Color para cambios no guardados:</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1527"/>
-        <source>Select the colour for the change marker for unsaved changes.</source>
-        <translation>Seleccionar el color para el marcador de cambios para cambios sin guardar.</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1537"/>
-        <source>Saved changes colour:</source>
-        <translation>Color para cambios guardados:</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1550"/>
-        <source>Select the colour for the change marker for saved changes.</source>
-        <translation>Seleccionar el color para el marcador de cambios para cambios guardados.</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1003"/>
         <source>Select the wrap mode for long lines</source>
         <translation>Seleccionar el modo de ajuste de línea para líneas largas</translation>
@@ -15168,91 +15018,46 @@
         <translation>Errores:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1782"/>
-        <source>Select the colour for error markers</source>
-        <translation>Seleccionar el color para la marca de color para errores</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1792"/>
         <source>Warnings:</source>
         <translation>Advertencias:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1805"/>
-        <source>Select the colour for warning markers</source>
-        <translation>Seleccionar el color para la marca de color para advertencias</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1815"/>
         <source>Bookmarks:</source>
         <translation>Marcadores:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1828"/>
-        <source>Select the colour for bookmark markers</source>
-        <translation>Seleccionar el color para la marca de color para marcadores</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1838"/>
         <source>Breakpoints:</source>
         <translation>Puntos de interrupción (Breakpoints):</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1851"/>
-        <source>Select the colour for breakpoint markers</source>
-        <translation>Seleccionar el color para la marca de color para breakpoints</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1861"/>
         <source>Tasks:</source>
         <translation>Tareas:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1874"/>
-        <source>Select the colour for task markers</source>
-        <translation>Seleccionar el color para la marca de color para tareas</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1884"/>
         <source>Changes:</source>
         <translation>Cambios:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1897"/>
-        <source>Select the colour for change markers</source>
-        <translation>Seleccionar el color para la marca de color para cambios</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1907"/>
         <source>Coverage:</source>
         <translation>Cobertura:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1920"/>
-        <source>Select the colour for coverage markers</source>
-        <translation>Seleccionar el color para la marca de color para cobertura</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1930"/>
         <source>Current Line:</source>
         <translation>Línea Actual:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1943"/>
-        <source>Select the colour for the current line marker</source>
-        <translation>Seleccionar el color para la marca de color de línea actual</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1999"/>
         <source>Background:</source>
         <translation>Fondo:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="2012"/>
-        <source>Select the background colour for the marker map</source>
-        <translation>Seleccionar el color de fondo para el mapa de marcas de color</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1674"/>
         <source>Indentation Guides</source>
         <translation>Guías de Indentación</translation>
@@ -15273,31 +15078,16 @@
         <translation>Primer plano para Guías de Indentación:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1705"/>
-        <source>Select the foreground colour for indentation guides</source>
-        <translation>Seleccionar el color de primer plano para guías de indentación</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1715"/>
         <source>Indentation Guides background:</source>
         <translation>Fondo para Guías de Indentación:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1728"/>
-        <source>Select the background colour for indentation guides</source>
-        <translation>Seleccionar el color de fondo para guías de indentación</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1953"/>
         <source>Search Markers:</source>
         <translation>Marcadores de Búsqueda:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1966"/>
-        <source>Select the colour for the search marker</source>
-        <translation>Seleccionar el color para el marcador de búsqueda</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="2093"/>
         <source>Select to hide the Format Buttons bar when formatting is not supported</source>
         <translation>Seleccionar para ocultar la barra de Botones de Formato cuando formatear no está soportado</translation>
@@ -15313,11 +15103,6 @@
         <translation>Marcadores de Línea en Depuración</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="801"/>
-        <source>Use background colours</source>
-        <translation>Utilizar colores de fondo</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="808"/>
         <source>Current line marker:</source>
         <translation>Marcador de línea actual:</translation>
@@ -15328,31 +15113,11 @@
         <translation>Marcador de línea de error:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="798"/>
-        <source>Select to indicate the debug markers using coloured line backgrounds, arrow indicators otherwise</source>
-        <translation>Seleccionar para indicar los marcadores de depuración utilizando fondos de línea coloreados; si no, indicador de flechas</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="821"/>
-        <source>Select the colour for the current line marker.</source>
-        <translation>Seleccionar color para el marcador de línea actual.</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="844"/>
-        <source>Select the colour for the error line marker.</source>
-        <translation>Seleccionar color para el marcador de línea con error.</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1976"/>
         <source>Conflict Marker Line:</source>
         <translation>Marcador de Línea de Conflicto:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1989"/>
-        <source>Select the colour for the conflict marker line marker</source>
-        <translation>Seleccionar el color para el marcador el marcador de línea de conflicto</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1749"/>
         <source>Select to show the marker map right of the editor</source>
         <translation>Seleccionar para mostrar el mapa de marcadores a la derecha del editor</translation>
@@ -15472,7 +15237,7 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1054"/>
         <source> characters</source>
-        <translation>caracteres</translation>
+        <translation> caracteres</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.py" line="73"/>
@@ -15500,10 +15265,265 @@
         <translation>Resaltado:</translation>
     </message>
     <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="47"/>
+        <source>Colors</source>
+        <translation>Colores</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="53"/>
+        <source>Select to set the color of the edit area different to the default style</source>
+        <translation>Seleccionar para establecer el color del área de edición distinto del estilo por defecto</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="56"/>
+        <source>Override edit area colors</source>
+        <translation>Sobreescribir colores del área de edición</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="81"/>
+        <source>Select the foreground color for the edit area.</source>
+        <translation>Seleccionar el color de primer plano para el área de edición.</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="104"/>
+        <source>Select the background color for the edit area.</source>
+        <translation>Seleccionar el color de fondo para el área de edición.</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="648"/>
+        <source>Select the color for the caret.</source>
+        <translation>Seleccionar el color para el punto de inserción de texto.</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="351"/>
+        <source>Select the foreground color for the margins</source>
+        <translation>Seleccionar el color de primer plano para los márgenes</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="374"/>
+        <source>Select the background color for the margins</source>
+        <translation>Seleccione el color de fondo para los márgenes</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="397"/>
+        <source>Select the background color for the foldmargin</source>
+        <translation>Seleccionar el color de fondo para los pliegues de los márgenes</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="420"/>
+        <source>Select the foreground color of the foldmarkers</source>
+        <translation>Seleccionar el color de primer plano para los marcadores de plegado</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="443"/>
+        <source>Select the background color of the foldmarkers</source>
+        <translation>Seleccionar el color de fondo para los marcadores de plegado</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="515"/>
+        <source>Select to use custom selection colors</source>
+        <translation>Seleccione para usar colores personalizados para la selección</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="518"/>
+        <source>&lt;b&gt;Use custom selection colors&lt;/b&gt;&lt;p&gt;Select this entry in order to use custom selection colors in the editor and shell windows. The colors for the selection foreground and background are defined on the colors page.&lt;/p&gt;</source>
+        <translation>&lt;b&gt;Usar colores personalizados para la selección&lt;/b&gt;&lt;p&gt;Seleccione esta entrada para utilizar colores personalizados de selección en las ventanas de edición y shell. Los colores para el primer plano y para el fondo se definen en la página de colores&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="521"/>
+        <source>Use custom selection colors</source>
+        <translation>Usar colores personalizados para la selección</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="528"/>
+        <source>Select, if selected text should be colorized by the lexer.</source>
+        <translation>Seleccione si el texto seleccionado debe ser coloreado por el analizador léxico.</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="531"/>
+        <source>Colorize selected text</source>
+        <translation>Colorizar texto seleccionado</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="565"/>
+        <source>Select the foreground color for the selection.</source>
+        <translation>Seleccionar el color de primer plano para la selección.</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="588"/>
+        <source>Select the background color for the selection.</source>
+        <translation>Seleccione el color de fondo para la selección.</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="761"/>
+        <source>Select the background color for the line containing the caret.</source>
+        <translation>Seleccionar el color de fondo para la línea que contiene el punto de inserción de texto.</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="798"/>
+        <source>Select to indicate the debug markers using colored line backgrounds, arrow indicators otherwise</source>
+        <translation>Seleccionar para indicar los marcadores de depuración utilizando fondos de línea coloreados; si no, indicador de flechas</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="801"/>
+        <source>Use background colors</source>
+        <translation>Utilizar colores de fondo</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="821"/>
+        <source>Select the color for the current line marker.</source>
+        <translation>Seleccionar el color para la marca de línea actual.</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="844"/>
+        <source>Select the color for the error line marker.</source>
+        <translation>Seleccionar color para el marcador de línea con error.</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="886"/>
+        <source>Select the color for highlighting matching braces.</source>
+        <translation>Seleccionar el color de resaltado de llaves coincidentes.</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="909"/>
+        <source>Select the background color for highlighting matching braces.</source>
+        <translation>Seleccionar el color de fondo para resaltar llaves coincidentes.</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="932"/>
+        <source>Select the color for  highlighting nonmatching braces.</source>
+        <translation>Seleccione el color de resaltado de llaves sin coincidencia.</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="955"/>
+        <source>Select the background color for  highlighting nonmatching braces.</source>
+        <translation>Seleccione el color de fondo para resaltar llaves sin coincidencia.</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1124"/>
+        <source>Select the color for the edge marker.</source>
+        <translation>Seleccionar el color para el marcador del borde.</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1134"/>
+        <source>Background color:</source>
+        <translation>Color de fondo:</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1222"/>
+        <source>Change Background Color</source>
+        <translation>Cambiar Color de Fondo</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1402"/>
+        <source>Press to select the foreground color</source>
+        <translation>Pulsar para seleccionar el color de primer plano</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1412"/>
+        <source>Press to select the background color</source>
+        <translation>Pulsar para seleccionar el color de fondo</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1514"/>
+        <source>Unsaved changes color:</source>
+        <translation>Color para cambios no guardados:</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1527"/>
+        <source>Select the color for the change marker for unsaved changes.</source>
+        <translation>Seleccionar el color para el marcador de cambios para cambios sin guardar.</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1537"/>
+        <source>Saved changes color:</source>
+        <translation>Color para cambios guardados:</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1550"/>
+        <source>Select the color for the change marker for saved changes.</source>
+        <translation>Seleccionar el color para el marcador de cambios para cambios guardados.</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1636"/>
+        <source>Select the foreground color for visible whitespace</source>
+        <translation>Seleccionar el color de primer plano para espacios en blanco visibles</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1659"/>
+        <source>Select the background color for visible whitespace</source>
+        <translation>Seleccionar el color de fondo para espacios en blanco visibles</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1705"/>
+        <source>Select the foreground color for indentation guides</source>
+        <translation>Seleccionar el color de primer plano para guías de indentación</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1728"/>
+        <source>Select the background color for indentation guides</source>
+        <translation>Seleccionar el color de fondo para guías de indentación</translation>
+    </message>
+    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1763"/>
-        <source>Marker Colours</source>
+        <source>Marker Colors</source>
         <translation>Colores de Marcador</translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1782"/>
+        <source>Select the color for error markers</source>
+        <translation>Seleccionar el color para la marcas de errores</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1805"/>
+        <source>Select the color for warning markers</source>
+        <translation>Seleccionar el color para las marcas de advertencias</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1828"/>
+        <source>Select the color for bookmark markers</source>
+        <translation>Seleccionar el color para la marca de marcadores</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1851"/>
+        <source>Select the color for breakpoint markers</source>
+        <translation>Seleccionar el color para la marca de breakpoints</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1874"/>
+        <source>Select the color for task markers</source>
+        <translation>Seleccionar el color para la marcas de tareas</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1897"/>
+        <source>Select the color for change markers</source>
+        <translation>Seleccionar el color para la marca de cambios</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1920"/>
+        <source>Select the color for coverage markers</source>
+        <translation>Seleccionar el color para la marca de cobertura</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1943"/>
+        <source>Select the color for the current line marker</source>
+        <translation>Seleccionar el color para la marca de línea actual</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1966"/>
+        <source>Select the color for the search marker</source>
+        <translation>Seleccionar el color para el marcador de búsqueda</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1989"/>
+        <source>Select the color for the conflict marker line marker</source>
+        <translation>Seleccionar el color para el marcador de línea de conflicto</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="2012"/>
+        <source>Select the background color for the marker map</source>
+        <translation>Seleccionar el color de fondo para el mapa de marcas</translation>
+    </message>
 </context>
 <context>
     <name>EditorSyntaxPage</name>
@@ -16599,111 +16619,51 @@
         <translation>Hoja de Estilo</translation>
     </message>
     <message>
-        <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="252"/>
-        <source>Enter the filename of a CSS style sheet. Leave empty to use the colours defined below.</source>
-        <translation>Introduzca el nombre de una hoja de estilos CSS. Deje en blanco para utilizar los colores definidos debajo.</translation>
-    </message>
-    <message>
-        <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="262"/>
-        <source>Colours</source>
-        <translation>Colores</translation>
-    </message>
-    <message>
-        <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="268"/>
-        <source>Press to select the class and function header background colour.</source>
-        <translation>Pulse para seleccionar el color de fondo de la clase y del encabezamiento de función.</translation>
-    </message>
-    <message>
         <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="271"/>
         <source>Class/Function Header Background</source>
         <translation>Color de fondo para Clase/Encabezamiento de Función</translation>
     </message>
     <message>
-        <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="278"/>
-        <source>Press to select the class and function header foreground colour.</source>
-        <translation>Pulse para seleccionar el color de primer plano de la clase y del encabezamiento de función.</translation>
-    </message>
-    <message>
         <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="281"/>
         <source>Class/Function Header Foreground</source>
         <translation>Color de primer plano para Clase/Encabezamiento de Función</translation>
     </message>
     <message>
-        <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="288"/>
-        <source>Press to select the level 2 header background colour.</source>
-        <translation>Pulse para seleccionar el color de fondo del encabezamiento de nivel 2.</translation>
-    </message>
-    <message>
         <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="291"/>
         <source>Level 2 Header Background</source>
         <translation>Color de fondo de la Encabezamiento de nivel 2</translation>
     </message>
     <message>
-        <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="298"/>
-        <source>Press to select the level 2 header foreground colour.</source>
-        <translation>Pulse para seleccionar el color de primer plano del encabezamiento de nivel 2.</translation>
-    </message>
-    <message>
         <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="301"/>
         <source>Level 2 Header Foreground</source>
         <translation>Color de primer plano del Encabezamiento de nivel 2</translation>
     </message>
     <message>
-        <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="308"/>
-        <source>Press to select the level 1 header background colour.</source>
-        <translation>Pulse para seleccionar el color de fondo del encabezamiento de nivel 1.</translation>
-    </message>
-    <message>
         <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="311"/>
         <source>Level 1 Header Background</source>
         <translation>Color de fondo del Encabezamiento de nivel 1</translation>
     </message>
     <message>
-        <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="318"/>
-        <source>Press to select the level 1 header foreground colour.</source>
-        <translation>Pulse para seleccionar el color de primer plano del encabezamiento de nivel 1.</translation>
-    </message>
-    <message>
         <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="321"/>
         <source>Level 1 Header Foreground</source>
         <translation>Color de primer plano del Encabezamiento de nivel 1</translation>
     </message>
     <message>
-        <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="328"/>
-        <source>Press to select the body background colour.</source>
-        <translation>Pulse para seleccionar el color de fondo del cuerpo.</translation>
-    </message>
-    <message>
         <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="331"/>
         <source>Body Background</source>
         <translation>Color de Fondo del Cuerpo</translation>
     </message>
     <message>
-        <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="338"/>
-        <source>Press to select the body foreground colour.</source>
-        <translation>Pulse para seleccionar el color de primer plano del cuerpo.</translation>
-    </message>
-    <message>
         <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="341"/>
         <source>Body Foreground</source>
         <translation>Color de primer plano del Cuerpo</translation>
     </message>
     <message>
-        <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="348"/>
-        <source>Press to select the foreground colour of links.</source>
-        <translation>Pulse para seleccionar el color de primer plano de los enlaces .</translation>
-    </message>
-    <message>
         <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="351"/>
         <source>Links</source>
         <translation>Enlaces</translation>
     </message>
     <message>
-        <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="358"/>
-        <source>This shows an example of the selected colours.</source>
-        <translation>Esto es una muestra de los colores seleccionados.</translation>
-    </message>
-    <message>
         <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py" line="53"/>
         <source>Style sheet (*.css);;All files (*)</source>
         <translation>Hojas de estilos (*.css);; Todos los archivos (*)</translation>
@@ -16783,6 +16743,66 @@
         <source>&lt;?xml version=&quot;1.0&quot; encoding=&quot;utf-8&quot;?&gt;&lt;!DOCTYPE html PUBLIC &quot;-//W3C//DTD XHTML 1.0 Strict//EN&quot;&quot;http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd&quot;&gt;&lt;html&gt;&lt;head&gt;&lt;title&gt;&lt;/title&gt;&lt;/head&gt;&lt;body style=&quot;background-color:{BodyBgColor};color:{BodyColor}&quot;&gt;&lt;h1 style=&quot;background-color:{Level1HeaderBgColor};color:{Level1HeaderColor}&quot;&gt;Level 1 Header&lt;/h1&gt;&lt;h3 style=&quot;background-color:{Level2HeaderBgColor};color:{Level2HeaderColor}&quot;&gt;Level 2 Header&lt;/h3&gt;&lt;h2 style=&quot;background-color:{CFBgColor};color:{CFColor}&quot;&gt;Class and Function Header&lt;/h2&gt;Standard body text with &lt;a style=&quot;color:{LinkColor}&quot;&gt;some links&lt;/a&gt; embedded.&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;?xml version=&quot;1.0&quot; encoding=&quot;utf-8&quot;?&gt;&lt;!DOCTYPE html PUBLIC &quot;-//W3C//DTD XHTML 1.0 Strict//EN&quot;&quot;http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd&quot;&gt;&lt;html&gt;&lt;head&gt;&lt;title&gt;&lt;/title&gt;&lt;/head&gt;&lt;body style=&quot;background-color:{BodyBgColor};color:{BodyColor}&quot;&gt;&lt;h1 style=&quot;background-color:{Level1HeaderBgColor};color:{Level1HeaderColor}&quot;&gt;Encabezado de Nivel 1&lt;/h1&gt;&lt;h3 style=&quot;background-color:{Level2HeaderBgColor};color:{Level2HeaderColor}&quot;&gt;Encabezado de Nivel 2&lt;/h3&gt;&lt;h2 style=&quot;background-color:{CFBgColor};color:{CFColor}&quot;&gt;Clase y Encabezado de Función&lt;/h2&gt;Texto estándar del cuerpo con &lt;a style=&quot;color:{LinkColor}&quot;&gt;algunos enlaces&lt;/a&gt; embebidos.&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
+    <message>
+        <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="252"/>
+        <source>Enter the filename of a CSS style sheet. Leave empty to use the colors defined below.</source>
+        <translation>Introducir el nombre de una hoja de estilos CSS. Dejar en blanco para utilizar los colores definidos debajo.</translation>
+    </message>
+    <message>
+        <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="262"/>
+        <source>Colors</source>
+        <translation>Colores</translation>
+    </message>
+    <message>
+        <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="268"/>
+        <source>Press to select the class and function header background color.</source>
+        <translation>Pulsar para seleccionar el color de fondo de la clase y del encabezamiento de función.</translation>
+    </message>
+    <message>
+        <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="278"/>
+        <source>Press to select the class and function header foreground color.</source>
+        <translation>Pulsar para seleccionar el color de primer plano de la clase y del encabezamiento de función.</translation>
+    </message>
+    <message>
+        <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="288"/>
+        <source>Press to select the level 2 header background color.</source>
+        <translation>Pulsar para seleccionar el color de fondo del encabezamiento de nivel 2.</translation>
+    </message>
+    <message>
+        <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="298"/>
+        <source>Press to select the level 2 header foreground color.</source>
+        <translation>Pulsar para seleccionar el color de primer plano del encabezamiento de nivel 2.</translation>
+    </message>
+    <message>
+        <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="308"/>
+        <source>Press to select the level 1 header background color.</source>
+        <translation>Pulsar para seleccionar el color de fondo del encabezamiento de nivel 1.</translation>
+    </message>
+    <message>
+        <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="318"/>
+        <source>Press to select the level 1 header foreground color.</source>
+        <translation>Pulsar para seleccionar el color de primer plano del encabezamiento de nivel 1.</translation>
+    </message>
+    <message>
+        <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="328"/>
+        <source>Press to select the body background color.</source>
+        <translation>Pulsar para seleccionar el color de fondo del cuerpo.</translation>
+    </message>
+    <message>
+        <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="338"/>
+        <source>Press to select the body foreground color.</source>
+        <translation>Pulsar para seleccionar el color de primer plano del cuerpo.</translation>
+    </message>
+    <message>
+        <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="348"/>
+        <source>Press to select the foreground color of links.</source>
+        <translation>Pulsar para seleccionar el color de primer plano de los enlaces .</translation>
+    </message>
+    <message>
+        <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="358"/>
+        <source>This shows an example of the selected colors.</source>
+        <translation>Esto es una muestra de los colores seleccionados.</translation>
+    </message>
 </context>
 <context>
     <name>EricdocExecDialog</name>
@@ -17268,30 +17288,50 @@
         <translation>Archivos HTML (*.html)</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="516"/>
+        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="537"/>
         <source>Export source</source>
         <translation>Exportar código fuente</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="448"/>
+        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="466"/>
         <source>&lt;p&gt;The source could not be exported to &lt;b&gt;{0}&lt;/b&gt;.&lt;/p&gt;&lt;p&gt;Reason: {1}&lt;/p&gt;</source>
         <translation>&lt;p&gt;El código fuente no se ha podido exportar a &lt;b&gt;{0}&lt;/b&gt;.&lt;/p&gt;&lt;p&gt;Razón: {1}&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="457"/>
+        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="475"/>
         <source>&lt;p&gt;The source could not be exported to &lt;b&gt;{0}&lt;/b&gt;.&lt;/p&gt;&lt;p&gt;Reason: No HTML code generated.&lt;/p&gt;</source>
         <translation>&lt;p&gt;La fuente no se ha podido exportar a &lt;b&gt;{0}&lt;/b&gt;.&lt;/p&gt;&lt;p&gt;Razón: No se ha generado código HTML.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="516"/>
+        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="537"/>
         <source>&lt;p&gt;Markdown export requires the &lt;b&gt;python-markdown&lt;/b&gt; package.&lt;br/&gt;Install it with your package manager, &apos;pip install docutils&apos; or see &lt;a href=&quot;http://pythonhosted.org/Markdown/install.html&quot;&gt; installation instructions.&lt;/a&gt;&lt;/p&gt;</source>
         <translation>&lt;p&gt;Exportar como Markdown requieres el package &lt;b&gt;python-markdown&lt;/b&gt;.&lt;br/&gt;Se puede instalar con el gestor de paquetes, con &apos;pip install docutils&apos; o véanse las instrucciones de instalación en &lt;a href=&quot;http://pythonhosted.org/Markdown/install.html&quot;&gt;.&lt;/a&gt;&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="484"/>
+        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="502"/>
         <source>&lt;p&gt;ReStructuredText export requires the &lt;b&gt;python-docutils&lt;/b&gt; package.&lt;br/&gt;Install it with your package manager, &apos;pip install docutils&apos; or see &lt;a href=&quot;http://pypi.python.org/pypi/docutils&quot;&gt;this page.&lt;/a&gt;&lt;/p&gt;</source>
         <translation>&lt;p&gt;Exportar como ReStructuredText requiere el package &lt;b&gt;python-docutils&lt;/b&gt; .&lt;br/&gt;Se puede instalar con el gestor de paquetes, con &apos;pip install docutils&apos; o ver &lt;a href=&quot;http://pypi.python.org/pypi/docutils&quot;&gt;esta página .&lt;/a&gt;&lt;/p&gt;</translation>
     </message>
+    <message>
+        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="412"/>
+        <source>Light Background Color</source>
+        <translation>Color de Fondo Pálido</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="413"/>
+        <source>Dark Background Color</source>
+        <translation>Color de Fondo Oscuro</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="416"/>
+        <source>Markdown Export</source>
+        <translation>Exportar Markdown</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="416"/>
+        <source>Select color scheme:</source>
+        <translation>Seleccionar esquema de color:</translation>
+    </message>
 </context>
 <context>
     <name>ExporterODT</name>
@@ -21017,7 +21057,7 @@
         <translation>Autor de commit</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1796"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1794"/>
         <source>Branch</source>
         <translation>Branch</translation>
     </message>
@@ -21102,168 +21142,168 @@
         <translation>Pulsar para actualizar la lista de commits</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="205"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="203"/>
         <source>Added</source>
         <translation>Añadido</translation>
     </message>
     <message>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="204"/>
+        <source>Deleted</source>
+        <translation>Borrado</translation>
+    </message>
+    <message>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="205"/>
+        <source>Modified</source>
+        <translation>Modificado</translation>
+    </message>
+    <message>
         <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="206"/>
-        <source>Deleted</source>
-        <translation>Borrado</translation>
+        <source>Copied</source>
+        <translation>Copiado</translation>
     </message>
     <message>
         <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="207"/>
-        <source>Modified</source>
-        <translation>Modificado</translation>
+        <source>Renamed</source>
+        <translation>Renombrado</translation>
     </message>
     <message>
         <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="208"/>
-        <source>Copied</source>
-        <translation>Copiado</translation>
+        <source>Type changed</source>
+        <translation>Tipo cambiado</translation>
     </message>
     <message>
         <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="209"/>
-        <source>Renamed</source>
-        <translation>Renombrado</translation>
+        <source>Unmerged</source>
+        <translation>Merge Deshecho</translation>
     </message>
     <message>
         <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="210"/>
-        <source>Type changed</source>
-        <translation>Tipo cambiado</translation>
-    </message>
-    <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="211"/>
-        <source>Unmerged</source>
-        <translation>Merge Deshecho</translation>
-    </message>
-    <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="212"/>
         <source>Unknown</source>
         <translation>Desconocido</translation>
     </message>
     <message>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="256"/>
+        <source>Show Author Columns</source>
+        <translation>Mostrar Columnas de Autor</translation>
+    </message>
+    <message>
         <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="258"/>
-        <source>Show Author Columns</source>
-        <translation>Mostrar Columnas de Autor</translation>
-    </message>
-    <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="260"/>
         <source>Press to show the author columns</source>
         <translation>Pulsar para mostrar las columnas de autor</translation>
     </message>
     <message>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="266"/>
+        <source>Show Committer Columns</source>
+        <translation>Mostrar Columnas de Autor del Commit</translation>
+    </message>
+    <message>
         <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="268"/>
-        <source>Show Committer Columns</source>
-        <translation>Mostrar Columnas de Autor del Commit</translation>
-    </message>
-    <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="270"/>
         <source>Press to show the committer columns</source>
         <translation>Pulsar para mostrar las columnas de autor del commit</translation>
     </message>
     <message>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="315"/>
+        <source>Copy Commits</source>
+        <translation>Copiar Commits</translation>
+    </message>
+    <message>
         <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="317"/>
-        <source>Copy Commits</source>
-        <translation>Copiar Commits</translation>
-    </message>
-    <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="319"/>
         <source>Cherry-pick the selected commits to the current branch</source>
         <translation>Hacer cherry-pick de los commits seleccionados a la branch actual</translation>
     </message>
     <message>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="322"/>
+        <source>Tag</source>
+        <translation>Tag</translation>
+    </message>
+    <message>
         <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="324"/>
-        <source>Tag</source>
-        <translation>Tag</translation>
-    </message>
-    <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="326"/>
         <source>Tag the selected commit</source>
         <translation>Hacer Tag del commit seleccionado</translation>
     </message>
     <message>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="328"/>
+        <source>Create a new branch at the selected commit.</source>
+        <translation>Crear una nueva branch desde el commit seleccionado.</translation>
+    </message>
+    <message>
         <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="330"/>
-        <source>Create a new branch at the selected commit.</source>
-        <translation>Crear una nueva branch desde el commit seleccionado.</translation>
+        <source>Branch &amp;&amp; Switch</source>
+        <translation>Branch &amp;&amp; Switch</translation>
     </message>
     <message>
         <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="332"/>
-        <source>Branch &amp;&amp; Switch</source>
-        <translation>Branch &amp;&amp; Switch</translation>
-    </message>
-    <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="334"/>
         <source>Create a new branch at the selected commit and switch the work tree to it.</source>
         <translation>Crear una nueva branch desde el commit seleccionado y cambiar el árbol de trabajo a ella.</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1848"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1846"/>
         <source>Switch</source>
         <translation>Hacer switch</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="340"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="338"/>
         <source>Switch the working directory to the selected commit</source>
         <translation>Cambiar el directorio de trabajo al commit seleccionado</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1874"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1872"/>
         <source>Show Short Log</source>
         <translation>Mostrar Shortlog</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="346"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="344"/>
         <source>Show a dialog with a log output for release notes</source>
         <translation>Mostrar un diálogo con una salida de log para release notes</translation>
     </message>
     <message>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="347"/>
+        <source>Describe</source>
+        <translation>Describir</translation>
+    </message>
+    <message>
         <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="349"/>
-        <source>Describe</source>
-        <translation>Describir</translation>
-    </message>
-    <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="351"/>
         <source>Show the most recent tag reachable from a commit</source>
         <translation>Mostrar la tag más reciente alcanzable desde un commit</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="636"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="634"/>
         <source>The git process did not finish within 30s.</source>
         <translation>El proceso git no terminó en un plazo de 30s.</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="639"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="637"/>
         <source>Could not start the git executable.</source>
         <translation>No se ha podido iniciar el ejecutable de git.</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="642"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="640"/>
         <source>Git Error</source>
         <translation>Error de Git</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="758"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="756"/>
         <source>{0} ({1}%)</source>
         <comment>action, confidence</comment>
         <translation>{0} ({1}%)</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="824"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="822"/>
         <source>Process Generation Error</source>
         <translation>Error de Generación de Proceso</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="824"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="822"/>
         <source>The process {0} could not be started. Ensure, that it is in the search path.</source>
         <translation>El proceso {0} no se ha podido ejecutar. Verifique que está en la ruta de búsqueda (search path).</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1710"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1708"/>
         <source>Copy Changesets</source>
         <translation>Copiar Changesets</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1848"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1846"/>
         <source>The project should be reread. Do this now?</source>
         <translation>El proyecto debería ser cargado de nuevo. ¿Desea hacerlo ahora?</translation>
     </message>
@@ -21273,17 +21313,17 @@
         <translation>Branches</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1874"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1872"/>
         <source>Select a branch</source>
         <translation>Seleccionar una branch</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1827"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1825"/>
         <source>Select a default branch</source>
         <translation>Seleccionar la branch por defecto</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1827"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1825"/>
         <source>Branch &amp; Switch</source>
         <translation>Branch &amp; Switch</translation>
     </message>
@@ -21318,22 +21358,22 @@
         <translation>Filtrar</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="148"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="146"/>
         <source>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Branches&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</source>
         <translation>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Branches&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="151"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="149"/>
         <source>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Tags&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</source>
         <translation>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Tags&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2056"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2054"/>
         <source>&apos;{0}&apos; was not found.</source>
         <translation>No se ha encontrado &apos;{0}&apos;.</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2056"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2054"/>
         <source>Find Commit</source>
         <translation>Buscar Commit</translation>
     </message>
@@ -21368,7 +21408,7 @@
         <translation>Eliminaciones</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2102"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2100"/>
         <source>Differences</source>
         <translation>Diferencias</translation>
     </message>
@@ -21378,97 +21418,97 @@
         <translation>&lt;a href=&quot;save:me&quot;&gt;Guardar&lt;/a&gt;</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="130"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="128"/>
         <source>&lt;table&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Commit ID&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Date&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{1}&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Author&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{2} &amp;lt;{3}&amp;gt;&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Commit Date&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{4}&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Committer&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{5} &amp;lt;{6}&amp;gt;&lt;/td&gt;&lt;/tr&gt;{7}&lt;tr&gt;&lt;td&gt;&lt;b&gt;Subject&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{8}&lt;/td&gt;&lt;/tr&gt;{9}&lt;/table&gt;</source>
         <translation>&lt;table&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;ID de Commit&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Fecha&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{1}&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Autor&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{2} &amp;lt;{3}&amp;gt;&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Fecha de Commit&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{4}&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Committer&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{5} &amp;lt;{6}&amp;gt;&lt;/td&gt;&lt;/tr&gt;{7}&lt;tr&gt;&lt;td&gt;&lt;b&gt;Asunto&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{8}&lt;/td&gt;&lt;/tr&gt;{9}&lt;/table&gt;</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="142"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="140"/>
         <source>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Parents&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</source>
         <translation>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Padres&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="145"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="143"/>
         <source>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Children&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</source>
         <translation>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Hijos&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="154"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="152"/>
         <source>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Message&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</source>
         <translation>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Mensaje&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1269"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1267"/>
         <source>Side-by-Side Diff to Parent {0}</source>
         <translation>Diferencias lado a lado con Parent {0}</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1281"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1279"/>
         <source>&lt;a href=&quot;sbsdiff:{0}_{1}&quot;&gt;Side-by-Side Compare&lt;/a&gt;</source>
         <translation>&lt;a href=&quot;sbsdiff:{0}_{1}&quot;&gt;Comparación lado a lado&lt;/a&gt;</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2116"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2114"/>
         <source>Differences to Parent {0}</source>
         <translation>Diferencias con Parent {0}</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2131"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2129"/>
         <source>Diff to Parent {0}</source>
         <translation>Diff con Parent {0}</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2157"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2155"/>
         <source>There is no difference.</source>
         <translation>No hay ninguna diferencia.</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2320"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2318"/>
         <source>Save Diff</source>
         <translation>Guardar Diff</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2286"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2284"/>
         <source>Patch Files (*.diff)</source>
         <translation>Archivos de Parche (*.diff)</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2303"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2301"/>
         <source>&lt;p&gt;The patch file &lt;b&gt;{0}&lt;/b&gt; already exists. Overwrite it?&lt;/p&gt;</source>
         <translation>&lt;p&gt;El archivo de parche &lt;b&gt;{0}&lt;/b&gt; ya existe. ¿Desea sobreescribirlo?&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2320"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2318"/>
         <source>&lt;p&gt;The patch file &lt;b&gt;{0}&lt;/b&gt; could not be saved.&lt;br&gt;Reason: {1}&lt;/p&gt;</source>
         <translation>&lt;p&gt;El archivo de parche &lt;b&gt;{0}&lt;/b&gt; no puede ser guardado.&lt;br /&gt;Causa: {1}&lt;/p&gt;</translation>
     </message>
     <message>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="246"/>
+        <source>Show Commit ID Column</source>
+        <translation>Mostrar columna de Commit ID</translation>
+    </message>
+    <message>
         <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="248"/>
-        <source>Show Commit ID Column</source>
-        <translation>Mostrar columna de Commit ID</translation>
-    </message>
-    <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="250"/>
         <source>Press to show the commit ID column</source>
         <translation>Pulsar para mostrar la columna de ID de commit</translation>
     </message>
     <message>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="276"/>
+        <source>Show Branches Column</source>
+        <translation>Mostrar Columna de Branches</translation>
+    </message>
+    <message>
         <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="278"/>
-        <source>Show Branches Column</source>
-        <translation>Mostrar Columna de Branches</translation>
-    </message>
-    <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="280"/>
         <source>Press to show the branches column</source>
         <translation>Pulsar para mostrar la columna de branches</translation>
     </message>
     <message>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="286"/>
+        <source>Show Tags Column</source>
+        <translation>Mostrar Columna de Tags</translation>
+    </message>
+    <message>
         <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="288"/>
-        <source>Show Tags Column</source>
-        <translation>Mostrar Columna de Tags</translation>
-    </message>
-    <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="290"/>
         <source>Press to show the Tags column</source>
         <translation>Pulsar para mostrar la columna de autor</translation>
     </message>
@@ -25921,20 +25961,60 @@
 <context>
     <name>GraphicsPage</name>
     <message>
-        <location filename="../Preferences/ConfigurationPages/GraphicsPage.ui" line="16"/>
+        <location filename="../Preferences/ConfigurationPages/GraphicsPage.ui" line="17"/>
         <source>&lt;b&gt;Configure graphics settings&lt;/b&gt;</source>
         <translation>&lt;b&gt;Configurar parámetros gráficos&lt;/b&gt;</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/GraphicsPage.ui" line="38"/>
+        <location filename="../Preferences/ConfigurationPages/GraphicsPage.ui" line="43"/>
         <source>Press to select the font for the graphic items</source>
         <translation>Pulse para seleccionar la fuente para la los elementos graficos</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/GraphicsPage.ui" line="51"/>
+        <location filename="../Preferences/ConfigurationPages/GraphicsPage.ui" line="56"/>
         <source>Graphics Font</source>
         <translation>Fuente para Gráficos</translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/GraphicsPage.ui" line="37"/>
+        <source>Font</source>
+        <translation>Fuente</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/GraphicsPage.ui" line="72"/>
+        <source>Drawing Mode</source>
+        <translation>Modo de Dibujado</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/GraphicsPage.ui" line="78"/>
+        <source>Select to determine the drawing mode automatically</source>
+        <translation>Seleccionar para determinar automáticamente el modo de dibujado</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/GraphicsPage.ui" line="81"/>
+        <source>Automatic</source>
+        <translation>Automático</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/GraphicsPage.ui" line="91"/>
+        <source>Select to draw black shapes on a white background</source>
+        <translation>Seleccionar para dibujar formas negras sobre fondo blanco</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/GraphicsPage.ui" line="94"/>
+        <source>Black On White</source>
+        <translation>Negro Sobre Blanco</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/GraphicsPage.ui" line="101"/>
+        <source>Select to draw white shapes on a black background</source>
+        <translation>Seleccionar para dibujar formas blancas sobre fondo negro</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/GraphicsPage.ui" line="104"/>
+        <source>White On Black</source>
+        <translation>Blanco Sobre Negro</translation>
+    </message>
 </context>
 <context>
     <name>GreaseMonkeyAddScriptDialog</name>
@@ -27664,21 +27744,11 @@
         <translation>Primer plano:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/HexEditorPage.ui" line="142"/>
-        <source>Select the foreground colour of the address area</source>
-        <translation>Seleccionar el color de primer plano para el área de direcciones</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/HexEditorPage.ui" line="291"/>
         <source>Background:</source>
         <translation>Fondo:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/HexEditorPage.ui" line="165"/>
-        <source>Select the background colour of the address area</source>
-        <translation>Seleccionar el color de fondo para el área de direcciones</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/HexEditorPage.ui" line="178"/>
         <source>ASCII Area</source>
         <translation>Área ASCII</translation>
@@ -27709,31 +27779,11 @@
         <translation>Resaltar Datos Modificados</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/HexEditorPage.ui" line="226"/>
-        <source>Select the foreground colour for highlighted data</source>
-        <translation>Seleccionar el color de primer plano para los datos resaltados</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/HexEditorPage.ui" line="249"/>
-        <source>Select the background colour for highlighted data</source>
-        <translation>Seleccionar el color de fondo para los datos resaltados</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/HexEditorPage.ui" line="262"/>
         <source>Selection</source>
         <translation>Selección</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/HexEditorPage.ui" line="281"/>
-        <source>Select the foreground colour of the selection</source>
-        <translation>Seleccionar el color de primer plano de la selección</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/HexEditorPage.ui" line="304"/>
-        <source>Select the background colour of the selection</source>
-        <translation>Seleccionar el color de fondo de la selección</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/HexEditorPage.ui" line="317"/>
         <source>Font</source>
         <translation>Fuente</translation>
@@ -27763,6 +27813,36 @@
         <source>Enter the number of recent files to remember</source>
         <translation>Introducir el número de archivos recientes a recordar</translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/HexEditorPage.ui" line="142"/>
+        <source>Select the foreground color of the address area</source>
+        <translation>Seleccionar el color de primer plano para el área de dirección</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/HexEditorPage.ui" line="165"/>
+        <source>Select the background color of the address area</source>
+        <translation>Seleccionar el color de fondo para el área de dirección</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/HexEditorPage.ui" line="226"/>
+        <source>Select the foreground color for highlighted data</source>
+        <translation>Seleccionar el color de primer plano para los datos resaltados</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/HexEditorPage.ui" line="249"/>
+        <source>Select the background color for highlighted data</source>
+        <translation>Seleccionar el color de fondo para los datos resaltados</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/HexEditorPage.ui" line="281"/>
+        <source>Select the foreground color of the selection</source>
+        <translation>Seleccionar el color de primer plano de la selección</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/HexEditorPage.ui" line="304"/>
+        <source>Select the background color of the selection</source>
+        <translation>Seleccionar el color de fondo de la selección</translation>
+    </message>
 </context>
 <context>
     <name>Hg</name>
@@ -30427,7 +30507,7 @@
         <translation>Tags</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="847"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="845"/>
         <source>Mercurial Error</source>
         <translation>Error de Mercurial</translation>
     </message>
@@ -30482,29 +30562,29 @@
         <translation>Fase</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="277"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="275"/>
         <source>Change the phase of the selected revisions</source>
         <translation>Cambiar la fase de las revisiones seleccionadas</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="279"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="277"/>
         <source>&lt;b&gt;Change Phase&lt;/b&gt;
 &lt;p&gt;This changes the phase of the selected revisions. The selected revisions have to have the same current phase.&lt;/p&gt;</source>
         <translation>&lt;b&gt;Cambiar Fase&lt;/b&gt;
 &lt;p&gt;Cambia la fase de las revisiones seleccionadas. Las revisiones seleccionadas deben tener la misma fase actual.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="275"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="273"/>
         <source>Change Phase</source>
         <translation>Cambiar Fase</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2007"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2005"/>
         <source>Copy Changesets</source>
         <translation>Copiar Changesets</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2350"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2348"/>
         <source>The project should be reread. Do this now?</source>
         <translation>El proyecto debería ser cargado de nuevo. ¿Desea hacerlo ahora?</translation>
     </message>
@@ -30514,42 +30594,42 @@
         <translation>Seleccionar acción del menú</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="266"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="264"/>
         <source>Copy the selected changesets to the current branch</source>
         <translation>Pulsar para copiar los changesets seleccionados a la branch actual</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="284"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="282"/>
         <source>Tag</source>
         <translation>Aplicar Tag</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="287"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="285"/>
         <source>Tag the selected revision</source>
         <translation>Aplicar Tag a la revisión seleccionada</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2079"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2077"/>
         <source>Switch</source>
         <translation>Hacer switch</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="297"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="295"/>
         <source>Switch the working directory to the selected revision</source>
         <translation>Hacer switch del directorio de trabajo a la revisión seleccionada</translation>
     </message>
     <message>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="318"/>
+        <source>Pull Large Files</source>
+        <translation>Hacer pull de archivos grandes</translation>
+    </message>
+    <message>
         <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="320"/>
-        <source>Pull Large Files</source>
-        <translation>Hacer pull de archivos grandes</translation>
-    </message>
-    <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="322"/>
         <source>Pull large files for selected revisions</source>
         <translation>Hacer pull de archivos grandes para revisiones seleccionadas</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1137"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1135"/>
         <source>{0} (large file)</source>
         <translation>{0} (archivo grande)</translation>
     </message>
@@ -30594,12 +30674,12 @@
         <translation>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Marcadores&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2492"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2490"/>
         <source>Find Commit</source>
         <translation>Buscar Commit</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2492"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2490"/>
         <source>&apos;{0}&apos; was not found.</source>
         <translation>&apos;{0}&apos; no se ha encontrado.</translation>
     </message>
@@ -30624,97 +30704,97 @@
         <translation>Secreto</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2212"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2210"/>
         <source>Pull Changes</source>
         <translation>Hacer Pull de Cambios</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="318"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="316"/>
         <source>Pull changes from a remote repository</source>
         <translation>Hacer pull de cambios desde un repositorio remoto</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="331"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="329"/>
         <source>Push Selected Changes</source>
         <translation>Hacer Pull de Cambios Seleccionados</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="334"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="332"/>
         <source>Push changes of the selected changeset and its ancestors to a remote repository</source>
         <translation>Hacer push de cambios del changeset seleccionado y sus ancestores a un repositorio remoto</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="337"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="335"/>
         <source>Push All Changes</source>
         <translation>Hacer Push de Todos los Cambios</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="340"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="338"/>
         <source>Push all changes to a remote repository</source>
         <translation>Hacer push de todos los cambios a un repositorio remoto</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2177"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2175"/>
         <source>Fetch Changes</source>
         <translation>Fetch (recuperación) de cambios</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2258"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2256"/>
         <source>Strip Changesets</source>
         <translation>Hacer strip de Changesets</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="326"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="324"/>
         <source>Fetch changes from a remote repository</source>
         <translation>Fetch (recuperación) de cambios desde un repositorio remoto</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="383"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="381"/>
         <source>Strip changesets from a repository</source>
         <translation>Hacer strip de changesets desde un repositorio remoto</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="302"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="300"/>
         <source>Define Bookmark...</source>
         <translation>Definir marcador...</translation>
     </message>
     <message>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="303"/>
+        <source>Bookmark the selected revision</source>
+        <translation>Establecer marcador para la revisión seleccionada</translation>
+    </message>
+    <message>
         <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="305"/>
-        <source>Bookmark the selected revision</source>
-        <translation>Establecer marcador para la revisión seleccionada</translation>
-    </message>
-    <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="307"/>
         <source>Move Bookmark...</source>
         <translation>Mover Marcador...</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="310"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="308"/>
         <source>Move bookmark to the selected revision</source>
         <translation>Mover marcador a la revisión seleccionada</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2102"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2100"/>
         <source>Define Bookmark</source>
         <translation>Definir Marcador</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2102"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2100"/>
         <source>Enter bookmark name for changeset &quot;{0}&quot;:</source>
         <translation>Introducir nombre de marcador para el changeset &quot;{0}&quot;:</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2126"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2124"/>
         <source>Move Bookmark</source>
         <translation>Mover Marcador</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2126"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2124"/>
         <source>Select the bookmark to be moved  to changeset &quot;{0}&quot;:</source>
         <translation>Seleccionar el marcador a mover al changeset &quot;{0}&quot;:</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2065"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2063"/>
         <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>
@@ -30749,129 +30829,129 @@
         <translation>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Hijos&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="269"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="267"/>
         <source>Merge with Changeset</source>
         <translation>Hacer merge con Chageset</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="272"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="270"/>
         <source>Merge the working directory with the selected changeset</source>
         <translation>Hacer merge del directorio de trabajo con el changeset seleccionado</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="345"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="343"/>
         <source>Create Changegroup</source>
         <translation>Crear Changegroup</translation>
     </message>
     <message>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="346"/>
+        <source>Create a changegroup file containing the selected changesets</source>
+        <translation>Crear un archivo de changegroup conteniendo los changesets seleccionados</translation>
+    </message>
+    <message>
         <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="348"/>
-        <source>Create a changegroup file containing the selected changesets</source>
-        <translation>Crear un archivo de changegroup conteniendo los changesets seleccionados</translation>
-    </message>
-    <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="350"/>
         <source>&lt;b&gt;Create Changegroup&lt;/b&gt;
 &lt;p&gt;This creates a changegroup file containing the selected revisions. If no revisions are selected, all changesets will be bundled. If one revision is selected, it will be interpreted as the base revision. Otherwise the lowest revision will be used as the base revision and all other revision will be bundled. If the dialog is showing outgoing changesets, all selected changesets will be bundled.&lt;/p&gt;</source>
         <translation>&lt;b&gt;Crear Changegroup&lt;/b&gt;
 &lt;p&gt;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.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2350"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2348"/>
         <source>Apply Changegroup</source>
         <translation>Aplicar Changegroup</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="362"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="360"/>
         <source>Apply the currently viewed changegroup file</source>
         <translation>Aplicar el archivo de changegroup mostrado actualmente</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="367"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="365"/>
         <source>Sign Revisions</source>
         <translation>Firmar Revisiones</translation>
     </message>
     <message>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="368"/>
+        <source>Add a signature for the selected revisions</source>
+        <translation>Añadir una firma para las revisiones seleccionadas</translation>
+    </message>
+    <message>
         <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="370"/>
-        <source>Add a signature for the selected revisions</source>
-        <translation>Añadir una firma para las revisiones seleccionadas</translation>
-    </message>
-    <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="372"/>
         <source>Verify Signatures</source>
         <translation>Verificar Firmas</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="375"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="373"/>
         <source>Verify all signatures there may be for the selected revision</source>
         <translation>Verificar todas las firmas que puede haber para la revisión seleccionada</translation>
     </message>
     <message>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="386"/>
+        <source>Select All Entries</source>
+        <translation>Seleccionar Todas las Entradas</translation>
+    </message>
+    <message>
         <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="388"/>
-        <source>Select All Entries</source>
-        <translation>Seleccionar Todas las Entradas</translation>
-    </message>
-    <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="390"/>
         <source>Deselect All Entries</source>
         <translation>Quitar Selección de Todas las Entradas</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1376"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1374"/>
         <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="1387"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1385"/>
         <source>&lt;a href=&quot;sbsdiff:{0}_{1}&quot;&gt;Side-by-Side Compare&lt;/a&gt;</source>
         <translation>&lt;a href=&quot;sbsdiff:{0}_{1}&quot;&gt;Comparar lado a lado&lt;/a&gt;</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1528"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1526"/>
         <source>Pull Selected Changes</source>
         <translation>Hacer Pull de Cambios Seleccionados</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1529"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1527"/>
         <source>Fetch Selected Changes</source>
         <translation>Hacer Fetch de Cambios Seleccionados</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2536"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2534"/>
         <source>Differences</source>
         <translation>Diferencias</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2546"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2544"/>
         <source>Differences to Parent {0}</source>
         <translation>Diferencias con el Parent {0}</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2562"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2560"/>
         <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="2587"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2585"/>
         <source>There is no difference.</source>
         <translation>No hay ninguna diferencia.</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2730"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2728"/>
         <source>Save Diff</source>
         <translation>Guardar Diff</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2697"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2695"/>
         <source>Patch Files (*.diff)</source>
         <translation>Archivos de Parche (*.diff)</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2714"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2712"/>
         <source>&lt;p&gt;The patch file &lt;b&gt;{0}&lt;/b&gt; already exists. Overwrite it?&lt;/p&gt;</source>
         <translation>&lt;p&gt;El archivo de parche &lt;b&gt;{0}&lt;/b&gt; ya existe. ¿Desea sobreescribirlo?&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2730"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2728"/>
         <source>&lt;p&gt;The patch file &lt;b&gt;{0}&lt;/b&gt; could not be saved.&lt;br&gt;Reason: {1}&lt;/p&gt;</source>
         <translation>&lt;p&gt;El archivo de parche &lt;b&gt;{0}&lt;/b&gt; no puede ser guardado.&lt;br /&gt;Causa: {1}&lt;/p&gt;</translation>
     </message>
@@ -30881,7 +30961,7 @@
         <translation>&lt;a href=&quot;save:me&quot;&gt;Guardar&lt;/a&gt;</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2535"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2533"/>
         <source>Generating differences ...</source>
         <translation>Generando diferencias ...</translation>
     </message>
@@ -30891,12 +30971,12 @@
         <translation>Registro completo de Mercurial</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="289"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="287"/>
         <source>Close Heads</source>
         <translation>Cerrar Heads</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="292"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="290"/>
         <source>Close the selected heads</source>
         <translation>Cerrar las heads seleccionadas</translation>
     </message>
@@ -31316,12 +31396,12 @@
         <translation>Revertir cambios</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="833"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="835"/>
         <source>Remove from repository only</source>
         <translation>Eliminar solamente del repositorio</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="833"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="835"/>
         <source>Do you really want to remove these files from the repository?</source>
         <translation>¿Realmente quiere eliminar estos archivos del repositorio?</translation>
     </message>
@@ -33879,52 +33959,52 @@
 <context>
     <name>HgServeDialog</name>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py" line="49"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py" line="57"/>
         <source>Start Server</source>
         <translation>Iniciar servidor</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py" line="55"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py" line="63"/>
         <source>Stop Server</source>
         <translation>Detener servidor</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py" line="61"/>
-        <source>Start Browser</source>
-        <translation>Iniciar servidor</translation>
-    </message>
-    <message>
         <location filename="../Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py" line="69"/>
+        <source>Start Browser</source>
+        <translation>Iniciar servidor</translation>
+    </message>
+    <message>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py" line="77"/>
         <source>Enter the server port</source>
         <translation>Introducir el puerto del servidor</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py" line="75"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py" line="83"/>
         <source>Select the style to use</source>
         <translation>Seleccionar el estilo a utilizar</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py" line="79"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py" line="87"/>
         <source>Server</source>
         <translation>Servidor</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py" line="86"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py" line="94"/>
         <source>Browser</source>
         <translation>Navegador</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py" line="140"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py" line="148"/>
         <source>Process Generation Error</source>
         <translation>Error de Generación de Proceso</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py" line="140"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py" line="148"/>
         <source>The process {0} could not be started. Ensure, that it is in the search path.</source>
         <translation>El proceso {0} no se ha podido ejecutar. Verifique que está en la ruta de búsqueda (search path).</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py" line="47"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py" line="50"/>
         <source>Mercurial Server</source>
         <translation>Servidor de Mercurial</translation>
     </message>
@@ -37236,53 +37316,138 @@
         <translation>&lt;font color=&quot;#FF0000&quot;&gt;&lt;b&gt;Nota:&lt;/b&gt; Estas opciones de configuración se activarán la siguiente vez que se ejecute la aplicacion.&lt;/font&gt;</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="115"/>
+        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="217"/>
         <source>Press to delete the selected directory from the list</source>
         <translation>Pulse para borrar el directorio seleccionado de la lista</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="118"/>
+        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="220"/>
         <source>Delete</source>
         <translation>Borrar</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="128"/>
+        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="230"/>
         <source>Press to add the entered directory to the list</source>
         <translation>Pulse para añadir el directorio introducido a la lista</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="131"/>
+        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="233"/>
         <source>Add</source>
         <translation>Añadir</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="156"/>
+        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="258"/>
         <source>Show</source>
         <translation>Mostrar</translation>
     </message>
     <message>
+        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="177"/>
+        <source>Up</source>
+        <translation>Arriba</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="187"/>
+        <source>Down</source>
+        <translation>Abajo</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="146"/>
+        <source>List of icon directories</source>
+        <translation>Lista de directorios de iconos</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="44"/>
+        <source>Default Icons</source>
+        <translation>Iconos por Defecto</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="52"/>
+        <source>Select to select between Breeze (dark) and Breeze (light) based on the window lightness</source>
+        <translation>Seleccionar para seleccionar entre Breeze (oscuro) y Breeze (claro) basado en la claridad de la ventana</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="55"/>
+        <source>Automatic</source>
+        <translation>Automático</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="65"/>
+        <source>Select to use the Breeze vector icons for light window background</source>
+        <translation>Seleccionar para usar iconos vectoriales Breeze para color de fondo de ventana claro</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="68"/>
+        <source>Breeze (light)</source>
+        <translation>Breeze (claro)</translation>
+    </message>
+    <message>
         <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="75"/>
-        <source>Up</source>
-        <translation>Arriba</translation>
+        <source>Select to use the Breeze vector icons for dark window background</source>
+        <translation>Seleccionar para usar iconos vectoriales Breeze para color de fondo de ventana oscuro</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="78"/>
+        <source>Breeze (dark)</source>
+        <translation>Breeze (oscuro)</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="85"/>
-        <source>Down</source>
-        <translation>Abajo</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="44"/>
-        <source>List of icon directories</source>
-        <translation>Lista de directorios de iconos</translation>
+        <source>Select to use the Oxygen pixmap icons</source>
+        <translation>Seleccionar para usar iconos pixmap de Oxygen</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="88"/>
+        <source>Oxygen</source>
+        <translation>Oxygen</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="112"/>
+        <source>Press to show a dialog with a preview of the selected default icon set</source>
+        <translation>Pulsar para seleccionar un diálogo con una vista preliminar del conjunto de iconos seleccionado por defecto</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="140"/>
+        <source>Custom Icon Directories</source>
+        <translation>Directorios de Iconos Personalizados</translation>
     </message>
 </context>
 <context>
     <name>IconsPreviewDialog</name>
     <message>
-        <location filename="../Preferences/ConfigurationPages/IconsPreviewDialog.ui" line="13"/>
+        <location filename="../Preferences/ConfigurationPages/IconsPreviewDialog.ui" line="14"/>
         <source>Icons Preview</source>
         <translation>Vista previa de Iconos</translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IconsPreviewDialog.ui" line="25"/>
+        <source>Directory:</source>
+        <translation>Directorio:</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IconsPreviewDialog.ui" line="38"/>
+        <source>Select the icons directory to be shown</source>
+        <translation>Seleccionar el directorio de iconos a mostrar</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IconsPreviewDialog.ui" line="74"/>
+        <source>Invert Background</source>
+        <translation>Invertir Fondo</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IconsPreviewDialog.ui" line="87"/>
+        <source>Refresh</source>
+        <translation>Actualizar</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IconsPreviewDialog.ui" line="84"/>
+        <source>Select to refresh the icons display</source>
+        <translation>Seleccioar para actualizar la vista de iconos</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IconsPreviewDialog.ui" line="71"/>
+        <source>Select to invert the background color</source>
+        <translation>Pulsar para invertir el color de fondo</translation>
+    </message>
 </context>
 <context>
     <name>IdlCompilerDefineNameDialog</name>
@@ -39412,126 +39577,61 @@
         <translation>Mostrar Fecha</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="102"/>
-        <source>Colours</source>
-        <translation>Colores</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="108"/>
         <source>Network Messages:</source>
         <translation>Mensajes de Red:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="121"/>
-        <source>Select the colour for network messages</source>
-        <translation>Seleccionar el color para mensajes de red</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="131"/>
         <source>Nick Names:</source>
         <translation>Sobrenombres (Nick Names):</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="144"/>
-        <source>Select the colour for nick names</source>
-        <translation>Seleccionar el color para los sobrenombres</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="154"/>
         <source>Server Messages:</source>
         <translation>Mensajes del Servidor:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="167"/>
-        <source>Select the colour for server messages</source>
-        <translation>Seleccionar el color para mensajes del servidor</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="177"/>
         <source>Own Nick Name:</source>
         <translation>Sombrenombre Propio:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="190"/>
-        <source>Select the colour for own nick name</source>
-        <translation>Seleccionar el color para el sobrenombre propio</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="200"/>
         <source>Channel Messages:</source>
         <translation>Mensajes del Canal:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="213"/>
-        <source>Select the colour for channel messages</source>
-        <translation>Seleccionar el color para mensajes del canal</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="223"/>
         <source>Join Channel:</source>
         <translation>Unirse al Canal:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="236"/>
-        <source>Select the colour for join channel messages</source>
-        <translation>Seleccionar el color para mensajes de unión al canal</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="246"/>
         <source>Error Messages:</source>
         <translation>Mensajes de Error:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="259"/>
-        <source>Select the colour for error messages</source>
-        <translation>Seleccionar el color para mensajes de error</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="269"/>
         <source>Leave Channel:</source>
         <translation>Abandonar Canal:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="282"/>
-        <source>Select the colour for leave channel messages</source>
-        <translation>Seleccionar el color para mensajes de abandonar el canal</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="292"/>
         <source>Timestamp:</source>
         <translation>Indicador de Tiempo:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="305"/>
-        <source>Select the colour for timestamps</source>
-        <translation>Seleccionar el color para los indicadores de tiempo</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="315"/>
         <source>Channel Info:</source>
         <translation>Info del Canal:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="328"/>
-        <source>Select the colour for channel info messages</source>
-        <translation>Seleccionar el color para mensajes de info del canal</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="338"/>
         <source>Hyperlink:</source>
         <translation>Hiperenlace:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="351"/>
-        <source>Select the colour for hyperlinks</source>
-        <translation>Seleccionar el color para hiperenlaces</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="364"/>
-        <source>Enable to allow coloured text in IRC messages</source>
-        <translation>Habilitar para permitir texto coloreado en mensajes IRC</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="367"/>
         <source>Allow Colored Text in IRC Messages</source>
         <translation>Permitir texto coloreado en mensajes IRC</translation>
@@ -39637,21 +39737,11 @@
         <translation>Color de Primer Plano para el Marcador:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="824"/>
-        <source>Select the foreground colour for the marker</source>
-        <translation>Seleccionar el color de primer plano para el marcador</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="834"/>
         <source>Marker Background:</source>
         <translation>Color Fondo para el Marcador:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="847"/>
-        <source>Select the background colour for the marker</source>
-        <translation>Seleccionar el color de fondo para el marcador</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="862"/>
         <source>Shutdown</source>
         <translation>Apagar</translation>
@@ -39666,6 +39756,81 @@
         <source>Confirm Shutdown When Connected</source>
         <translation>Confirmar Apagado mientras Conectado</translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="102"/>
+        <source>Colors</source>
+        <translation>Colores</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="121"/>
+        <source>Select the color for network messages</source>
+        <translation>Seleccionar el color para mensajes de red</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="144"/>
+        <source>Select the color for nick names</source>
+        <translation>Seleccionar el color para los sobrenombres</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="167"/>
+        <source>Select the color for server messages</source>
+        <translation>Seleccionar el color para mensajes del servidor</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="190"/>
+        <source>Select the color for own nick name</source>
+        <translation>Seleccionar el color para el sobrenombre propio</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="213"/>
+        <source>Select the color for channel messages</source>
+        <translation>Seleccionar el color para mensajes del canal</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="236"/>
+        <source>Select the color for join channel messages</source>
+        <translation>Seleccionar el color para mensajes de unión al canal</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="259"/>
+        <source>Select the color for error messages</source>
+        <translation>Seleccionar el color para mensajes de error</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="282"/>
+        <source>Select the color for leave channel messages</source>
+        <translation>Seleccionar el color para mensajes de abandonar el canal</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="305"/>
+        <source>Select the color for timestamps</source>
+        <translation>Seleccionar el color para los indicadores de tiempo</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="328"/>
+        <source>Select the color for channel info messages</source>
+        <translation>Seleccionar el color para mensajes de info del canal</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="351"/>
+        <source>Select the color for hyperlinks</source>
+        <translation>Seleccionar el color para hiperenlaces</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="364"/>
+        <source>Enable to allow colored text in IRC messages</source>
+        <translation>Habilitar para permitir texto coloreado en mensajes IRC</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="824"/>
+        <source>Select the foreground color for the marker</source>
+        <translation>Seleccionar el color de primer plano para el marcador</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="847"/>
+        <source>Select the background color for the marker</source>
+        <translation>Seleccionar el color de fondo para el marcador</translation>
+    </message>
 </context>
 <context>
     <name>IrcServerEditDialog</name>
@@ -41042,257 +41207,257 @@
 <context>
     <name>LexerPygments</name>
     <message>
-        <location filename="../QScintilla/Lexers/LexerPygments.py" line="180"/>
+        <location filename="../QScintilla/Lexers/LexerPygments.py" line="196"/>
         <source>Default</source>
         <translation>Por defecto</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/LexerPygments.py" line="181"/>
-        <source>Comment</source>
-        <translation>Comentario</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/LexerPygments.py" line="182"/>
-        <source>Preprocessor</source>
-        <translation>Preprocesador</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/LexerPygments.py" line="183"/>
-        <source>Keyword</source>
-        <translation>Palabra clave</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/LexerPygments.py" line="184"/>
-        <source>Pseudo Keyword</source>
-        <translation>Pseudo Palabra Clave</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/LexerPygments.py" line="185"/>
-        <source>Type Keyword</source>
-        <translation>Introduzca Palabra Clave</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/LexerPygments.py" line="186"/>
-        <source>Operator</source>
-        <translation>Operador</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/LexerPygments.py" line="187"/>
-        <source>Word</source>
-        <translation>Palabra</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/LexerPygments.py" line="188"/>
-        <source>Builtin</source>
-        <translation>De serie</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/LexerPygments.py" line="189"/>
-        <source>Function or method name</source>
-        <translation>Nombre de método o función</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/LexerPygments.py" line="190"/>
-        <source>Class name</source>
-        <translation>Nombre de clase</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/LexerPygments.py" line="191"/>
-        <source>Namespace</source>
-        <translation>Espacio de nombres</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/LexerPygments.py" line="192"/>
-        <source>Exception</source>
-        <translation>Excepción</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/LexerPygments.py" line="193"/>
-        <source>Identifier</source>
-        <translation>Identificador</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/LexerPygments.py" line="194"/>
-        <source>Constant</source>
-        <translation>Constante</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/LexerPygments.py" line="195"/>
-        <source>Label</source>
-        <translation>Etiqueta</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/LexerPygments.py" line="196"/>
-        <source>Entity</source>
-        <translation>Entidad</translation>
-    </message>
-    <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="197"/>
-        <source>Attribute</source>
-        <translation>Atributo</translation>
+        <source>Comment</source>
+        <translation>Comentario</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="198"/>
-        <source>Tag</source>
-        <translation>Marca</translation>
+        <source>Preprocessor</source>
+        <translation>Preprocesador</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="199"/>
-        <source>Decorator</source>
-        <translation>Decorador</translation>
+        <source>Keyword</source>
+        <translation>Palabra clave</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="200"/>
-        <source>String</source>
-        <translation>Cadena</translation>
+        <source>Pseudo Keyword</source>
+        <translation>Pseudo Palabra Clave</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="201"/>
-        <source>Documentation string</source>
-        <translation>Cadena de documentación</translation>
+        <source>Type Keyword</source>
+        <translation>Introduzca Palabra Clave</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="202"/>
-        <source>Scalar</source>
-        <translation>Escalar</translation>
+        <source>Operator</source>
+        <translation>Operador</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="203"/>
-        <source>Escape</source>
-        <translation>Escape</translation>
+        <source>Word</source>
+        <translation>Palabra</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="204"/>
-        <source>Regular expression</source>
-        <translation>Expresión regular</translation>
+        <source>Builtin</source>
+        <translation>De serie</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="205"/>
-        <source>Symbol</source>
-        <translation>Símbolo</translation>
+        <source>Function or method name</source>
+        <translation>Nombre de método o función</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="206"/>
-        <source>Other string</source>
-        <translation>Otra cadena</translation>
+        <source>Class name</source>
+        <translation>Nombre de clase</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="207"/>
-        <source>Number</source>
-        <translation>Número</translation>
+        <source>Namespace</source>
+        <translation>Espacio de nombres</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="208"/>
-        <source>Heading</source>
-        <translation>Encabezado</translation>
+        <source>Exception</source>
+        <translation>Excepción</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="209"/>
-        <source>Subheading</source>
-        <translation>Subencabezado</translation>
+        <source>Identifier</source>
+        <translation>Identificador</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="210"/>
-        <source>Deleted</source>
-        <translation>Borrado</translation>
+        <source>Constant</source>
+        <translation>Constante</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="211"/>
-        <source>Inserted</source>
-        <translation>Insertado</translation>
+        <source>Label</source>
+        <translation>Etiqueta</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="212"/>
-        <source>Generic error</source>
-        <translation>Error genérico</translation>
+        <source>Entity</source>
+        <translation>Entidad</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="213"/>
-        <source>Emphasized text</source>
-        <translation>Texto enfatizado</translation>
+        <source>Attribute</source>
+        <translation>Atributo</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="214"/>
-        <source>Strong text</source>
-        <translation>Texto cursiva</translation>
+        <source>Tag</source>
+        <translation>Marca</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="215"/>
-        <source>Prompt</source>
-        <translation>Prompt</translation>
+        <source>Decorator</source>
+        <translation>Decorador</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="216"/>
-        <source>Output</source>
-        <translation>Salida</translation>
+        <source>String</source>
+        <translation>Cadena</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="217"/>
-        <source>Traceback</source>
-        <translation>Trazado</translation>
+        <source>Documentation string</source>
+        <translation>Cadena de documentación</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="218"/>
-        <source>Error</source>
-        <translation>Error</translation>
+        <source>Scalar</source>
+        <translation>Escalar</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="219"/>
-        <source>Comment block</source>
-        <translation>Bloque de comentario</translation>
+        <source>Escape</source>
+        <translation>Escape</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="220"/>
-        <source>Property</source>
-        <translation>Propiedad</translation>
+        <source>Regular expression</source>
+        <translation>Expresión regular</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="221"/>
-        <source>Character</source>
-        <translation>Carácter</translation>
+        <source>Symbol</source>
+        <translation>Símbolo</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="222"/>
-        <source>Here document</source>
-        <translation>Here document</translation>
+        <source>Other string</source>
+        <translation>Otra cadena</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="223"/>
-        <source>Punctuation</source>
-        <translation>Puntuación</translation>
+        <source>Number</source>
+        <translation>Número</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="224"/>
-        <source>Hashbang</source>
-        <translation>Hashbang</translation>
+        <source>Heading</source>
+        <translation>Encabezado</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="225"/>
-        <source>Reserved Keyword</source>
-        <translation>Palabra Reservada</translation>
+        <source>Subheading</source>
+        <translation>Subencabezado</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="226"/>
-        <source>Literal</source>
-        <translation>Literal</translation>
+        <source>Deleted</source>
+        <translation>Borrado</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="227"/>
-        <source>Double quoted string</source>
-        <translation>Cadena de doble comilla</translation>
+        <source>Inserted</source>
+        <translation>Insertado</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="228"/>
-        <source>Single quoted string</source>
-        <translation>Cadena de comilla simple</translation>
+        <source>Generic error</source>
+        <translation>Error genérico</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="229"/>
-        <source>Backtick string</source>
-        <translation>Cadena con comillas hacia atrás</translation>
+        <source>Emphasized text</source>
+        <translation>Texto enfatizado</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="230"/>
+        <source>Strong text</source>
+        <translation>Texto cursiva</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/LexerPygments.py" line="231"/>
+        <source>Prompt</source>
+        <translation>Prompt</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/LexerPygments.py" line="232"/>
+        <source>Output</source>
+        <translation>Salida</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/LexerPygments.py" line="233"/>
+        <source>Traceback</source>
+        <translation>Trazado</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/LexerPygments.py" line="234"/>
+        <source>Error</source>
+        <translation>Error</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/LexerPygments.py" line="235"/>
+        <source>Comment block</source>
+        <translation>Bloque de comentario</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/LexerPygments.py" line="236"/>
+        <source>Property</source>
+        <translation>Propiedad</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/LexerPygments.py" line="237"/>
+        <source>Character</source>
+        <translation>Carácter</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/LexerPygments.py" line="238"/>
+        <source>Here document</source>
+        <translation>Here document</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/LexerPygments.py" line="239"/>
+        <source>Punctuation</source>
+        <translation>Puntuación</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/LexerPygments.py" line="240"/>
+        <source>Hashbang</source>
+        <translation>Hashbang</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/LexerPygments.py" line="241"/>
+        <source>Reserved Keyword</source>
+        <translation>Palabra Reservada</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/LexerPygments.py" line="242"/>
+        <source>Literal</source>
+        <translation>Literal</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/LexerPygments.py" line="243"/>
+        <source>Double quoted string</source>
+        <translation>Cadena de doble comilla</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/LexerPygments.py" line="244"/>
+        <source>Single quoted string</source>
+        <translation>Cadena de comilla simple</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/LexerPygments.py" line="245"/>
+        <source>Backtick string</source>
+        <translation>Cadena con comillas hacia atrás</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/LexerPygments.py" line="246"/>
         <source>Whitespace</source>
         <translation>Espacio en blanco</translation>
     </message>
@@ -42357,16 +42522,6 @@
         <translation>Mostrar con el siguiente output</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/LogViewerPage.ui" line="49"/>
-        <source>Error Colour:</source>
-        <translation>Color de Error:</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/LogViewerPage.ui" line="62"/>
-        <source>Select the colour for text sent to stderr</source>
-        <translation>Seleccionar el color para el texto enviado a stderr</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/LogViewerPage.ui" line="87"/>
         <source>Message Filters:</source>
         <translation>Filtros de Mensaje:</translation>
@@ -42401,6 +42556,16 @@
         <source>&lt;b&gt;Message Filters for both&lt;/b&gt;&lt;p&gt;This list shows the configured message filters used to suppress messages received via stdout or stderr.&lt;/p&gt;</source>
         <translation>&lt;b&gt;Filtros de Mensajes para ambos&lt;/b&gt;&lt;p&gt;Esta lista muestra los filtros de mensaje configurados que se usan para suprimir mensajes recibidos vía stdout o stderr.&lt;/p&gt;</translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/LogViewerPage.ui" line="49"/>
+        <source>Error Color:</source>
+        <translation>Color de Error:</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/LogViewerPage.ui" line="62"/>
+        <source>Select the color for text sent to stderr</source>
+        <translation>Seleccionar el color para el texto enviado a stderr</translation>
+    </message>
 </context>
 <context>
     <name>MakePropertiesDialog</name>
@@ -43188,27 +43353,27 @@
 <context>
     <name>MicroPythonDevice</name>
     <message>
-        <location filename="../MicroPython/MicroPythonDevices.py" line="207"/>
+        <location filename="../MicroPython/MicroPythonDevices.py" line="214"/>
         <source>Unsupported Device</source>
         <translation>Dispositivo no soportado</translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonDevices.py" line="217"/>
+        <location filename="../MicroPython/MicroPythonDevices.py" line="224"/>
         <source>REPL is not supported by this device.</source>
         <translation>REPL no soportado por este dispositivo.</translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonDevices.py" line="236"/>
+        <location filename="../MicroPython/MicroPythonDevices.py" line="243"/>
         <source>Plotter is not supported by this device.</source>
         <translation>Plotter no soportado por este dispositivo.</translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonDevices.py" line="255"/>
+        <location filename="../MicroPython/MicroPythonDevices.py" line="262"/>
         <source>Running scripts is not supported by this device.</source>
         <translation>La ejecución de scripts no está soportada por este dispositivo.</translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonDevices.py" line="275"/>
+        <location filename="../MicroPython/MicroPythonDevices.py" line="282"/>
         <source>File Manager is not supported by this device.</source>
         <translation>El Gestor de Archovos no está soportado por este dispositivo.</translation>
     </message>
@@ -43472,27 +43637,27 @@
 <context>
     <name>MicroPythonGraphWidget</name>
     <message>
-        <location filename="../MicroPython/MicroPythonGraphWidget.py" line="63"/>
+        <location filename="../MicroPython/MicroPythonGraphWidget.py" line="64"/>
         <source>Press to save the raw data</source>
         <translation>Pulsar para guardar datos en bruto</translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonGraphWidget.py" line="72"/>
+        <location filename="../MicroPython/MicroPythonGraphWidget.py" line="73"/>
         <source>max. X:</source>
         <translation>max. X:</translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonGraphWidget.py" line="81"/>
+        <location filename="../MicroPython/MicroPythonGraphWidget.py" line="82"/>
         <source>Enter the maximum number of data points to be plotted.</source>
         <translation>Introducir el número máximo de puntos de datos a plotear.</translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonGraphWidget.py" line="311"/>
+        <location filename="../MicroPython/MicroPythonGraphWidget.py" line="329"/>
         <source>Save Chart Data</source>
         <translation>Guardar Datos de Gráfica</translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonGraphWidget.py" line="311"/>
+        <location filename="../MicroPython/MicroPythonGraphWidget.py" line="329"/>
         <source>&lt;p&gt;The chart data could not be saved into file &lt;b&gt;{0}&lt;/b&gt;.&lt;/p&gt;&lt;p&gt;Reason: {1}&lt;/p&gt;</source>
         <translation>&lt;p&gt;Los datos de gráfica no se han podido guardar en el archivo &lt;b&gt;{0}&lt;/b&gt;.&lt;/p&gt;&lt;p&gt;Razón: {1}&lt;/p&gt;</translation>
     </message>
@@ -43560,94 +43725,169 @@
         <translation>Partir líneas largas</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="140"/>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="169"/>
         <source>MPY Cross Compiler</source>
         <translation>Compilador Multiplataforma MPY</translation>
     </message>
     <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="175"/>
+        <source>Program:</source>
+        <translation>Programa:</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="191"/>
+        <source>Enter the path of the cross compiler executable</source>
+        <translation>Introducir la ruta del ejecutable del compilador multiplataforma</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.py" line="67"/>
+        <source>All Files (*)</source>
+        <translation>Todos los archivos (*)</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="298"/>
+        <source>Documentation</source>
+        <translation>Documentación</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="304"/>
+        <source>MicroPython:</source>
+        <translation>MicroPython:</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="311"/>
+        <source>Enter the URL for the MicroPython documentation</source>
+        <translation>Introducir la URL para la documentación de MicroPython</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="318"/>
+        <source>CircuitPython:</source>
+        <translation>CircuitPython:</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="325"/>
+        <source>Enter the URL for the CircuitPython documentation</source>
+        <translation>Introducir la URL para la documentación de CircuitPython</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="332"/>
+        <source>BBC micro:bit:</source>
+        <translation>BBC micro:bit:</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="339"/>
+        <source>Enter the URL for the BBC micro:bit MicroPython documentation</source>
+        <translation>Intrroducir la URL para la documentación BBC micro:bit MicroPython</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="201"/>
+        <source>PyBoard</source>
+        <translation>PyBoard</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="207"/>
+        <source>dfu-util Path:</source>
+        <translation>dfu-util Path:</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="223"/>
+        <source>Enter the path of the dfu-util flashing executable</source>
+        <translation>Introducir la ruta del ejecutable para la utilidad de flasheo dfu</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="233"/>
+        <source>Firmware</source>
+        <translation>Firmware</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="246"/>
+        <source>Enter the URL for the MicroPython firmware for PyBoard, ESP8266 and ESP32</source>
+        <translation>Introducir la URL para el firmware de MicroPython firmware para PyBoard, ESP8266 y ESP32</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="260"/>
+        <source>Enter the URL for the CircuitPython firmware</source>
+        <translation>Introducir la ruta del archivo de firmware CircuitPython</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="274"/>
+        <source>Enter the URL for the BBC micro:bit Firmware</source>
+        <translation>Introducir la ruta del archivo de firmware BBC micro:bit</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="140"/>
+        <source>Chart Pane</source>
+        <translation>Panel de Gráficos</translation>
+    </message>
+    <message>
         <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="146"/>
-        <source>Program:</source>
-        <translation>Programa:</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="162"/>
-        <source>Enter the path of the cross compiler executable</source>
-        <translation>Introducir la ruta del ejecutable del compilador multiplataforma</translation>
+        <source>Color Theme:</source>
+        <translation>Tema de Color:</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="159"/>
+        <source>Select the color scheme of the chart</source>
+        <translation>Seleccionar el esquema de color para el gráfico</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/MicroPythonPage.py" line="42"/>
-        <source>All Files (*)</source>
-        <translation>Todos los archivos (*)</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="255"/>
-        <source>Documentation</source>
-        <translation>Documentación</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="261"/>
-        <source>MicroPython:</source>
-        <translation>MicroPython:</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="268"/>
-        <source>Enter the URL for the MicroPython documentation</source>
-        <translation>Introducir la URL para la documentación de MicroPython</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="275"/>
-        <source>CircuitPython:</source>
-        <translation>CircuitPython:</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="282"/>
-        <source>Enter the URL for the CircuitPython documentation</source>
-        <translation>Introducir la URL para la documentación de CircuitPython</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="289"/>
-        <source>BBC micro:bit:</source>
-        <translation>BBC micro:bit:</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="296"/>
-        <source>Enter the URL for the BBC micro:bit MicroPython documentation</source>
-        <translation>Intrroducir la URL para la documentación BBC micro:bit MicroPython</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="172"/>
-        <source>PyBoard</source>
-        <translation>PyBoard</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="178"/>
-        <source>dfu-util Path:</source>
-        <translation>dfu-util Path:</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="194"/>
-        <source>Enter the path of the dfu-util flashing executable</source>
-        <translation>Introducir la ruta del ejecutable para la utilidad de flasheo dfu</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="204"/>
-        <source>Firmware</source>
-        <translation>Firmware</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="217"/>
-        <source>Enter the URL for the MicroPython firmware for PyBoard, ESP8266 and ESP32</source>
-        <translation>Introducir la URL para el firmware de MicroPython firmware para PyBoard, ESP8266 y ESP32</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="231"/>
-        <source>Enter the URL for the CircuitPython firmware</source>
-        <translation>Introducir la ruta del archivo de firmware CircuitPython</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="245"/>
-        <source>Enter the URL for the BBC micro:bit Firmware</source>
-        <translation>Introducir la ruta del archivo de firmware BBC micro:bit</translation>
+        <source>Automatic</source>
+        <translation>Automático</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.py" line="44"/>
+        <source>Light</source>
+        <translation>Claro</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.py" line="46"/>
+        <source>Dark</source>
+        <translation>Oscuro</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.py" line="48"/>
+        <source>Blue Cerulean</source>
+        <translation>Azul Cerúleo</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.py" line="50"/>
+        <source>Brown Sand</source>
+        <translation>Marrón Arena</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.py" line="52"/>
+        <source>Blue NCS</source>
+        <translation>Azul NCS</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.py" line="54"/>
+        <source>High Contrast</source>
+        <translation>Contraste Alto</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.py" line="56"/>
+        <source>Blue Icy</source>
+        <translation>Azul hielo</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.py" line="58"/>
+        <source>Qt</source>
+        <translation>Qt</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="346"/>
+        <source>Calliope mini:</source>
+        <translation>Calliope mini:</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="288"/>
+        <source>Enter the URL for the Callope mini Firmware</source>
+        <translation>Introducir la ruta del archivo de mini-Firmware Calliope</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="353"/>
+        <source>Enter the URL for the Calliope mini MicroPython documentation</source>
+        <translation>Introducir la URL para la documentación de mini-MicroPython Calliope</translation>
     </message>
 </context>
 <context>
@@ -43691,17 +43931,17 @@
         <translation>Pulsar para abrir una ventana de gráfica para mostrar datos recibidos desde el dispositivo seleccionado</translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="420"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="460"/>
         <source>Press to connect the selected device</source>
         <translation>Pulsar para conectar el dispositivo seleccionado</translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="226"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="263"/>
         <source>&lt;h3&gt;The QtSerialPort package is not available.&lt;br/&gt;MicroPython support is deactivated.&lt;/h3&gt;</source>
         <translation>&lt;h3&gt;El package QtSerialPort no está disponible.&lt;br/&gt;Soporte para MicroPython desactivado.&lt;/h3&gt;</translation>
     </message>
     <message numerus="yes">
-        <location filename="../MicroPython/MicroPythonWidget.py" line="263"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="300"/>
         <source>%n supported device(s) detected.</source>
         <translation>
             <numerusform>%n dispositivo soportado detectado.</numerusform>
@@ -43709,42 +43949,42 @@
         </translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="269"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="306"/>
         <source>{0} at {1}</source>
         <translation>{0} en {1}</translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="277"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="314"/>
         <source>No supported devices detected.</source>
         <translation>No se han detectado dispositivos soportados.</translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="390"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="430"/>
         <source>Clear</source>
         <translation>Limpiar</translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="392"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="432"/>
         <source>Copy</source>
         <translation>Copiar</translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="393"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="433"/>
         <source>Paste</source>
         <translation>Pegar</translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="415"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="455"/>
         <source>Press to disconnect the current device</source>
         <translation>Pulsar para desconectar el dispositivo seleccionado</translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="436"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="476"/>
         <source>No device attached</source>
         <translation>No hay dispositivo conectado</translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="436"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="476"/>
         <source>Please ensure the device is plugged into your computer and selected.
 
 It must have a version of MicroPython (or CircuitPython) flashed onto it before anything will work.
@@ -43757,217 +43997,217 @@
 Finalmente, pulsar el botón de reset del dispositivo y esperar unos pocos segundos antes de intentar de nuevo.</translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="463"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="503"/>
         <source>Start REPL</source>
         <translation>Iniciar REPL</translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="463"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="503"/>
         <source>&lt;p&gt;The REPL cannot be started.&lt;/p&gt;&lt;p&gt;Reason: {0}&lt;/p&gt;</source>
         <translation>&lt;p&gt;El REPL no se puede iniciar.&lt;/p&gt;&lt;p&gt;Razón: {0}&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="853"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="893"/>
         <source>Serial Device Connect</source>
         <translation>Conexión de Dispositivo en Serie</translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="853"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="893"/>
         <source>&lt;p&gt;Cannot connect to device at serial port &lt;b&gt;{0}&lt;/b&gt;.&lt;/p&gt;</source>
         <translation>&lt;p&gt;No se puede conectar el dispositovo en el puerto de serie &lt;b&gt;{0}&lt;/b&gt;.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="898"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="938"/>
         <source>Run Script</source>
         <translation>Ejecutar Script</translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="881"/>
-        <source>There is no editor open. Abort...</source>
-        <translation>No hay editor abierto. Abortando...</translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="889"/>
-        <source>The current editor does not contain a script. Abort...</source>
-        <translation>El editor actual no contiene un script. Abortando...</translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="898"/>
-        <source>&lt;p&gt;Cannot run script.&lt;/p&gt;&lt;p&gt;Reason: {0}&lt;/p&gt;</source>
-        <translation>&lt;p&gt;No se puede ejecutar el script.&lt;/p&gt;&lt;p&gt;Razón: {0}&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="921"/>
-        <source>Open Python File</source>
-        <translation>Abrir Archivo de Python</translation>
-    </message>
-    <message>
         <location filename="../MicroPython/MicroPythonWidget.py" line="921"/>
+        <source>There is no editor open. Abort...</source>
+        <translation>No hay editor abierto. Abortando...</translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="929"/>
+        <source>The current editor does not contain a script. Abort...</source>
+        <translation>El editor actual no contiene un script. Abortando...</translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="938"/>
+        <source>&lt;p&gt;Cannot run script.&lt;/p&gt;&lt;p&gt;Reason: {0}&lt;/p&gt;</source>
+        <translation>&lt;p&gt;No se puede ejecutar el script.&lt;/p&gt;&lt;p&gt;Razón: {0}&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="961"/>
+        <source>Open Python File</source>
+        <translation>Abrir Archivo de Python</translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="961"/>
         <source>Python3 Files (*.py);;All Files (*)</source>
         <translation>Archivos de Python3 (*.py);;Todos los Archivos (*)</translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="965"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1005"/>
         <source>Start Chart</source>
         <translation>Iniciar Gráfica</translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="965"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1005"/>
         <source>&lt;p&gt;The Chart cannot be started.&lt;/p&gt;&lt;p&gt;Reason: {0}&lt;/p&gt;</source>
         <translation>&lt;p&gt;No se puede iniciar la gráfica.&lt;/p&gt;&lt;p&gt;Razón: {0}&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="994"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1034"/>
         <source>Unsaved Chart Data</source>
         <translation>Datos de Gráfica sin Guardar</translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="994"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1034"/>
         <source>The chart contains unsaved data.</source>
         <translation>La gráfica contiene datos sin guardar.</translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1045"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1085"/>
         <source>Start File Manager</source>
         <translation>Comenzar Gestor de Archivos</translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1045"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1085"/>
         <source>&lt;p&gt;The File Manager cannot be started.&lt;/p&gt;&lt;p&gt;Reason: {0}&lt;/p&gt;</source>
         <translation>&lt;p&gt;El Gestor de Archivos no se puede iniciar.&lt;/p&gt;&lt;p&gt;Razón: {0}&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1096"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1136"/>
         <source>Show Version</source>
         <translation>Mostrar Versión</translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1099"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1139"/>
         <source>Show Implementation</source>
         <translation>Mostrar Implementación</translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1210"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1250"/>
         <source>Synchronize Time</source>
         <translation>Sincronizar Hora</translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1107"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1147"/>
         <source>Show Device Time</source>
         <translation>Mostrar Hora del Dispositivo</translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1110"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1150"/>
         <source>Show Local Time</source>
         <translation>Mostrar Hora Local</translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1421"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1461"/>
         <source>Compile Python File</source>
         <translation>Compilar Archivo de Python</translation>
     </message>
     <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1481"/>
+        <source>Compile Current Editor</source>
+        <translation>Compilar Editor Actual</translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1188"/>
+        <source>&lt;h3&gt;Device Version Information&lt;/h3&gt;</source>
+        <translation>&lt;h3&gt;Información de Versión de Dispositivo&lt;/h3&gt;</translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1197"/>
+        <source>No version information available.</source>
+        <translation>No hay información de versión disponible.</translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1199"/>
+        <source>Device Version Information</source>
+        <translation>Información de Versión de Dispositivo</translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1222"/>
+        <source>unknown</source>
+        <translation>desconocido</translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1226"/>
+        <source>Device Implementation Information</source>
+        <translation>Información de Implementación de Dispositivo</translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1226"/>
+        <source>&lt;h3&gt;Device Implementation Information&lt;/h3&gt;&lt;p&gt;This device contains &lt;b&gt;{0} {1}&lt;/b&gt;.&lt;/p&gt;</source>
+        <translation>&lt;h3&gt;Información de Implementación de Dispositivo &lt;/h3&gt;&lt;p&gt;Este dispositivo contiene &lt;b&gt;{0} {1}&lt;/b&gt;.&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1250"/>
+        <source>&lt;p&gt;The time of the connected device was synchronized with the local time.&lt;/p&gt;</source>
+        <translation>&lt;p&gt;La hora del dispositivo conectado está sincronizada con la hora local.&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1272"/>
+        <source>&lt;h3&gt;Device Date and Time&lt;/h3&gt;&lt;table&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Date&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Time&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{1}&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;</source>
+        <translation>&lt;h3&gt;Fecha y Hora del Dispositivo&lt;/h3&gt;&lt;table&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Fecha&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Hora&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{1}&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;</translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1280"/>
+        <source>&lt;h3&gt;Device Date and Time&lt;/h3&gt;&lt;p&gt;{0}&lt;/p&gt;</source>
+        <translation>&lt;h3&gt;Fecha y Hora del Dispositivo&lt;/h3&gt;&lt;p&gt;{0}&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1294"/>
+        <source>Device Date and Time</source>
+        <translation>Fecha y Hora del Dispositivo</translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1307"/>
+        <source>Local Date and Time</source>
+        <translation>Fecha y Hora Local</translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1307"/>
+        <source>&lt;h3&gt;Local Date and Time&lt;/h3&gt;&lt;table&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Date&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Time&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{1}&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;</source>
+        <translation>&lt;h3&gt;Fecha y Hora del Local&lt;/h3&gt;&lt;table&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Fecha&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Hora&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{1}&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;</translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1374"/>
+        <source>Error handling device</source>
+        <translation>Error de gestión del dispositivo</translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1374"/>
+        <source>&lt;p&gt;There was an error communicating with the connected device.&lt;/p&gt;&lt;p&gt;Method: {0}&lt;/p&gt;&lt;p&gt;Message: {1}&lt;/p&gt;</source>
+        <translation>&lt;p&gt;Ha ocurrido un error al comunicar con el dispositivo conectado.&lt;/p&gt;&lt;p&gt;Método: {0}&lt;/p&gt;&lt;p&gt;Mensaje: {1}&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1413"/>
+        <source>The MicroPython cross compiler &lt;b&gt;mpy-cross&lt;/b&gt; cannot be found. Ensure it is in the search path or configure it on the MicroPython configuration page.</source>
+        <translation>El compilador multiplataforma de MicroPython &lt;b&gt;mpy-cross&lt;/b&gt; no se encuentra. Asegúrese de que está en la ruta de búsqueda o configurarlo en la página de configuración de MicroPython.</translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1431"/>
+        <source>Python Files (*.py);;All Files (*)</source>
+        <translation>Archivos Python (*.py);;Todos los Archivos (*)</translation>
+    </message>
+    <message>
         <location filename="../MicroPython/MicroPythonWidget.py" line="1441"/>
-        <source>Compile Current Editor</source>
-        <translation>Compilar Editor Actual</translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1148"/>
-        <source>&lt;h3&gt;Device Version Information&lt;/h3&gt;</source>
-        <translation>&lt;h3&gt;Información de Versión de Dispositivo&lt;/h3&gt;</translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1157"/>
-        <source>No version information available.</source>
-        <translation>No hay información de versión disponible.</translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1159"/>
-        <source>Device Version Information</source>
-        <translation>Información de Versión de Dispositivo</translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1182"/>
-        <source>unknown</source>
-        <translation>desconocido</translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1186"/>
-        <source>Device Implementation Information</source>
-        <translation>Información de Implementación de Dispositivo</translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1186"/>
-        <source>&lt;h3&gt;Device Implementation Information&lt;/h3&gt;&lt;p&gt;This device contains &lt;b&gt;{0} {1}&lt;/b&gt;.&lt;/p&gt;</source>
-        <translation>&lt;h3&gt;Información de Implementación de Dispositivo &lt;/h3&gt;&lt;p&gt;Este dispositivo contiene &lt;b&gt;{0} {1}&lt;/b&gt;.&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1210"/>
-        <source>&lt;p&gt;The time of the connected device was synchronized with the local time.&lt;/p&gt;</source>
-        <translation>&lt;p&gt;La hora del dispositivo conectado está sincronizada con la hora local.&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1232"/>
-        <source>&lt;h3&gt;Device Date and Time&lt;/h3&gt;&lt;table&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Date&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Time&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{1}&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;</source>
-        <translation>&lt;h3&gt;Fecha y Hora del Dispositivo&lt;/h3&gt;&lt;table&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Fecha&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Hora&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{1}&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;</translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1240"/>
-        <source>&lt;h3&gt;Device Date and Time&lt;/h3&gt;&lt;p&gt;{0}&lt;/p&gt;</source>
-        <translation>&lt;h3&gt;Fecha y Hora del Dispositivo&lt;/h3&gt;&lt;p&gt;{0}&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1254"/>
-        <source>Device Date and Time</source>
-        <translation>Fecha y Hora del Dispositivo</translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1267"/>
-        <source>Local Date and Time</source>
-        <translation>Fecha y Hora Local</translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1267"/>
-        <source>&lt;h3&gt;Local Date and Time&lt;/h3&gt;&lt;table&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Date&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Time&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{1}&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;</source>
-        <translation>&lt;h3&gt;Fecha y Hora del Local&lt;/h3&gt;&lt;table&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Fecha&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Hora&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{1}&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;</translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1334"/>
-        <source>Error handling device</source>
-        <translation>Error de gestión del dispositivo</translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1334"/>
-        <source>&lt;p&gt;There was an error communicating with the connected device.&lt;/p&gt;&lt;p&gt;Method: {0}&lt;/p&gt;&lt;p&gt;Message: {1}&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Ha ocurrido un error al comunicar con el dispositivo conectado.&lt;/p&gt;&lt;p&gt;Método: {0}&lt;/p&gt;&lt;p&gt;Mensaje: {1}&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1373"/>
-        <source>The MicroPython cross compiler &lt;b&gt;mpy-cross&lt;/b&gt; cannot be found. Ensure it is in the search path or configure it on the MicroPython configuration page.</source>
-        <translation>El compilador multiplataforma de MicroPython &lt;b&gt;mpy-cross&lt;/b&gt; no se encuentra. Asegúrese de que está en la ruta de búsqueda o configurarlo en la página de configuración de MicroPython.</translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1391"/>
-        <source>Python Files (*.py);;All Files (*)</source>
-        <translation>Archivos Python (*.py);;Todos los Archivos (*)</translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1401"/>
         <source>The Python file &lt;b&gt;{0}&lt;/b&gt; does not exist. Aborting...</source>
         <translation>El archivo de Python &lt;b&gt;{0}&lt;/b&gt; no existe. Abortando...</translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1411"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1451"/>
         <source>&apos;mpy-cross&apos; Output</source>
         <translation>Salida de &apos;mpy-cross&apos;</translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1434"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1474"/>
         <source>The current editor does not contain a Python file. Aborting...</source>
         <translation>El editor actual no contiene un archivo de Python. Abortando...</translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="175"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="211"/>
         <source>MicroPython Menu</source>
         <translation>Menú de MicroPython</translation>
     </message>
@@ -43977,47 +44217,47 @@
         <translation>Pulsar para abrir un gestor de archivos en el dispositivo seleccionado</translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="978"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1018"/>
         <source>&#xc2;&#xb5;Py Chart</source>
         <translation>Gráfica µPy</translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1058"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1098"/>
         <source>&#xc2;&#xb5;Py Files</source>
         <translation>Archivos µPy</translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1134"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1174"/>
         <source>Show Documentation</source>
         <translation>Mostrar Documentación</translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1138"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1178"/>
         <source>Configure</source>
         <translation>Configurar</translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1113"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1153"/>
         <source>Show Time</source>
         <translation>Mostrar Tiempo</translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1130"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1170"/>
         <source>Download Firmware</source>
         <translation>Descargar Firmware</translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1310"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1350"/>
         <source>Date and Time</source>
         <translation>Fecha y Hora</translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1293"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1333"/>
         <source>&lt;table&gt;&lt;tr&gt;&lt;th&gt;&lt;/th&gt;&lt;th&gt;Local Date and Time&lt;/th&gt;&lt;th&gt;Device Date and Time&lt;/th&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Date&lt;/b&gt;&lt;/td&gt;&lt;td align=&apos;center&apos;&gt;{0}&lt;/td&gt;&lt;td align=&apos;center&apos;&gt;{2}&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Time&lt;/b&gt;&lt;/td&gt;&lt;td align=&apos;center&apos;&gt;{1}&lt;/td&gt;&lt;td align=&apos;center&apos;&gt;{3}&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;</source>
         <translation>&lt;table&gt;&lt;tr&gt;&lt;th&gt;&lt;/th&gt;&lt;th&gt;Fecha y Hora Local&lt;/th&gt;&lt;th&gt;Fecha y Hora del Dispositivo&lt;/th&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Fecha&lt;/b&gt;&lt;/td&gt;&lt;td align=&apos;center&apos;&gt;{0}&lt;/td&gt;&lt;td align=&apos;center&apos;&gt;{2}&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Hora&lt;/b&gt;&lt;/td&gt;&lt;td align=&apos;center&apos;&gt;{1}&lt;/td&gt;&lt;td align=&apos;center&apos;&gt;{3}&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;</translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1310"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1350"/>
         <source>&lt;table&gt;&lt;tr&gt;&lt;th&gt;Local Date and Time&lt;/th&gt;&lt;th&gt;Device Date and Time&lt;/th&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td align=&apos;center&apos;&gt;{0} {1}&lt;/td&gt;&lt;td align=&apos;center&apos;&gt;{2}&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;</source>
         <translation>&lt;table&gt;&lt;tr&gt;&lt;th&gt;Fecha y Hora Local&lt;/th&gt;&lt;th&gt;Fecha y Hora del Dispositivo&lt;/th&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td align=&apos;center&apos;&gt;{0} {1}&lt;/td&gt;&lt;td align=&apos;center&apos;&gt;{2}&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;</translation>
     </message>
@@ -44025,89 +44265,94 @@
 <context>
     <name>MicrobitDevice</name>
     <message>
-        <location filename="../MicroPython/MicrobitDevices.py" line="67"/>
+        <location filename="../MicroPython/MicrobitDevices.py" line="74"/>
         <source>BBC micro:bit</source>
         <translation>BBC micro:bit</translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicrobitDevices.py" line="134"/>
+        <location filename="../MicroPython/MicrobitDevices.py" line="149"/>
         <source>Workspace Directory</source>
         <translation>Directorio del espacio de trabajo</translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicrobitDevices.py" line="134"/>
-        <source>Could not find an attached BBC micro:bit.
-
-Please make sure the device is plugged into this computer.</source>
-        <translation>No se ha podido encontrar un BBC micro:bit conectado.
-
-Por favor, asegúrese de que el dispositivo está conectado a este ordenador.</translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicrobitDevices.py" line="171"/>
+        <location filename="../MicroPython/MicrobitDevices.py" line="186"/>
         <source>Save Script as &apos;main.py&apos;</source>
         <translation>Guardar Script como &apos;main.py&apos;</translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicrobitDevices.py" line="173"/>
+        <location filename="../MicroPython/MicrobitDevices.py" line="188"/>
         <source>Save the current script as &apos;main.py&apos; on the connected device</source>
         <translation>Guardar el script actual como &apos;main.py&apos; en el dispositivo conectado</translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicrobitDevices.py" line="177"/>
-        <source>Reset micro:bit</source>
-        <translation>Restablecer micro:bit</translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicrobitDevices.py" line="201"/>
+        <location filename="../MicroPython/MicrobitDevices.py" line="241"/>
         <source>MicroPython Firmware Files (*.hex);;All Files (*)</source>
         <translation>Archivos de Firmware MicroPython (*.hex);;Todos los Archivos (*)</translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicrobitDevices.py" line="246"/>
+        <location filename="../MicroPython/MicrobitDevices.py" line="286"/>
         <source>The script is empty. Aborting.</source>
         <translation>Script vacío. Abortando.</translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicrobitDevices.py" line="236"/>
+        <location filename="../MicroPython/MicrobitDevices.py" line="276"/>
         <source>The current editor does not contain a Python script. Write it anyway?</source>
         <translation>El editor actual no contiene un script Python. ¿Escribir de todos modos?</translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicrobitDevices.py" line="274"/>
+        <location filename="../MicroPython/MicrobitDevices.py" line="314"/>
         <source>&lt;p&gt;The script could not be saved to the device.&lt;/p&gt;&lt;p&gt;Reason: {0}&lt;/p&gt;</source>
         <translation>&lt;p&gt;El script no se ha podido guardar al dispositivo.&lt;/p&gt;&lt;p&gt;Razón: {0}&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicrobitDevices.py" line="201"/>
+        <location filename="../MicroPython/MicrobitDevices.py" line="241"/>
         <source>Flash MicroPython Firmware</source>
         <translation>Flash MicroPython Firmware</translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicrobitDevices.py" line="233"/>
+        <location filename="../MicroPython/MicrobitDevices.py" line="273"/>
         <source>Save Script</source>
         <translation>Guardar Script</translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicrobitDevices.py" line="190"/>
-        <source>The BBC micro:bit is not ready for flashing. See the &lt;a href=&quot;https://microbit.org/guide/firmware/&quot;&gt;micro:bit web site&lt;/a&gt; for details.</source>
-        <translation>El BBC micro:bit no está listo para flashing. Ver en el &lt;a href=&quot;https://microbit.org/guide/firmware/&quot;&gt;sitio web de micro:bit&lt;/a&gt; más detalles.</translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicrobitDevices.py" line="263"/>
+        <location filename="../MicroPython/MicrobitDevices.py" line="303"/>
         <source>Save Script as &apos;{0}&apos;</source>
         <translation>Guardar Script como &apos;{0}&apos;</translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicrobitDevices.py" line="254"/>
+        <location filename="../MicroPython/MicrobitDevices.py" line="294"/>
         <source>Enter a file name on the device:</source>
         <translation>Introducir un nombre de archivo para el dispositivo:</translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicrobitDevices.py" line="168"/>
+        <location filename="../MicroPython/MicrobitDevices.py" line="183"/>
         <source>Save the current script to the selected device</source>
         <translation>Guardar el script actual en el dispositivo seleccionado</translation>
     </message>
+    <message>
+        <location filename="../MicroPython/MicrobitDevices.py" line="77"/>
+        <source>Calliope mini</source>
+        <translation>Calliope mini</translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicrobitDevices.py" line="232"/>
+        <source>Could not find an attached {0}.
+
+Please make sure the device is plugged into this computer.</source>
+        <translation>No se ha podido encontrar un adjunto {0}.
+
+Asegurarse por favor que el dispositivo está conectado al ordenador.</translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicrobitDevices.py" line="192"/>
+        <source>Reset {0}</source>
+        <translation>Restablecer {0}</translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicrobitDevices.py" line="213"/>
+        <source>&lt;p&gt;The BBC micro:bit is not ready for flashing. Follow these instructions.&lt;/p&gt;&lt;ul&gt;&lt;li&gt;unplug USB cable and any batteries&lt;/li&gt;&lt;li&gt;keep RESET button pressed an plug USB cable back in&lt;/li&gt;&lt;li&gt;a drive called MAINTENANCE should be available&lt;/li&gt;&lt;/ul&gt;&lt;p&gt;See the &lt;a href=&quot;https://microbit.org/guide/firmware/&quot;&gt;micro:bit web site&lt;/a&gt; for details.&lt;/p&gt;</source>
+        <translation>&lt;p&gt;El micro:bit BBC no está listo para flashing. Seguir estas instrucciones.&lt;/p&gt;&lt;ul&gt;&lt;li&gt;desconectar cable USB y batería&lt;/li&gt;&lt;li&gt;mantener el botón RESET apretado y conectar el cable USB de nuevo&lt;/li&gt;&lt;li&gt;debería haber disponible un volumen llamado MANTENIMIENTO&lt;/li&gt;&lt;/ul&gt;&lt;p&gt;Ver el website de &lt;a href=&quot;https://microbit.org/guide/firmware/&quot;&gt;micro:bit&lt;/a&gt; para más detalles.&lt;/p&gt;</translation>
+    </message>
 </context>
 <context>
     <name>MicrosoftEngine</name>
@@ -49267,17 +49512,17 @@
 <context>
     <name>Preferences</name>
     <message>
-        <location filename="../Preferences/__init__.py" line="1624"/>
+        <location filename="../Preferences/__init__.py" line="1640"/>
         <source>Export Preferences</source>
         <translation>Exportar Preferencias</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1652"/>
+        <location filename="../Preferences/__init__.py" line="1668"/>
         <source>Import Preferences</source>
         <translation>Importar Preferencias</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1652"/>
+        <location filename="../Preferences/__init__.py" line="1668"/>
         <source>Properties File (*.ini);;All Files (*)</source>
         <translation>Archivo de Propiedades (*.ini);;Todos los archivos (*)</translation>
     </message>
@@ -49482,11 +49727,6 @@
         <translation>&lt;b&gt;Configurar opciones de impresión&lt;/b&gt;</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/PrinterPage.ui" line="77"/>
-        <source>Colour</source>
-        <translation>Color</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/PrinterPage.ui" line="84"/>
         <source>Gray Scale</source>
         <translation>Escala de grises</translation>
@@ -49522,11 +49762,6 @@
         <translation>Pulse para seleccionar la fuente para los encabezamientos de página</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/PrinterPage.ui" line="49"/>
-        <source>Colour Mode:</source>
-        <translation>Modo de Color:</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/PrinterPage.ui" line="94"/>
         <source>Page Order:</source>
         <translation>Orden de las Páginas:</translation>
@@ -49576,6 +49811,16 @@
         <source> DPI</source>
         <translation> DPI</translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/PrinterPage.ui" line="49"/>
+        <source>Color Mode:</source>
+        <translation>Modo de Color:</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/PrinterPage.ui" line="77"/>
+        <source>Color</source>
+        <translation>Color</translation>
+    </message>
 </context>
 <context>
     <name>ProgramsDialog</name>
@@ -49808,207 +50053,207 @@
         <translation>Otro</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="805"/>
+        <location filename="../Project/Project.py" line="817"/>
         <source>Read project file</source>
         <translation>Leer archivo de proyecto</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="908"/>
+        <location filename="../Project/Project.py" line="920"/>
         <source>Save project file</source>
         <translation>Guardar proyecto</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="944"/>
+        <location filename="../Project/Project.py" line="956"/>
         <source>Read user project properties</source>
         <translation>Leer las propiedades de proyecto del usuario</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="968"/>
+        <location filename="../Project/Project.py" line="980"/>
         <source>Save user project properties</source>
         <translation>Guardar propiedades de proyecto del usuario</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1026"/>
+        <location filename="../Project/Project.py" line="1038"/>
         <source>Read project session</source>
         <translation>Leer sesion de proyecto</translation>
     </message>
     <message>
+        <location filename="../Project/Project.py" line="1263"/>
+        <source>Please save the project first.</source>
+        <translation>Por favor guarde primero el proyecto.</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="1074"/>
+        <source>Save project session</source>
+        <translation>Guardar sesion de proyecto</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="1103"/>
+        <source>Delete project session</source>
+        <translation>Borrar sesion de proyecto</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="1137"/>
+        <source>Read tasks</source>
+        <translation>Leer tareas</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="1157"/>
+        <source>Save tasks</source>
+        <translation>Guardar Tareas</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="1216"/>
+        <source>Read debugger properties</source>
+        <translation>Leer propiedades del depurador</translation>
+    </message>
+    <message>
         <location filename="../Project/Project.py" line="1251"/>
-        <source>Please save the project first.</source>
-        <translation>Por favor guarde primero el proyecto.</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="1062"/>
-        <source>Save project session</source>
-        <translation>Guardar sesion de proyecto</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="1091"/>
-        <source>Delete project session</source>
-        <translation>Borrar sesion de proyecto</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="1125"/>
-        <source>Read tasks</source>
-        <translation>Leer tareas</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="1145"/>
-        <source>Save tasks</source>
-        <translation>Guardar Tareas</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="1204"/>
-        <source>Read debugger properties</source>
-        <translation>Leer propiedades del depurador</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="1239"/>
         <source>Save debugger properties</source>
         <translation>Guardar propiedades del depurador</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1265"/>
+        <location filename="../Project/Project.py" line="1277"/>
         <source>Delete debugger properties</source>
         <translation>Borrar propiedades del depurador</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1393"/>
+        <location filename="../Project/Project.py" line="1405"/>
         <source>Add Language</source>
         <translation>Añadir lenguaje</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1519"/>
+        <location filename="../Project/Project.py" line="1531"/>
         <source>Delete translation</source>
         <translation>Borrar traducción</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1684"/>
+        <location filename="../Project/Project.py" line="1696"/>
         <source>Add file</source>
         <translation>Agregar archivo</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1816"/>
+        <location filename="../Project/Project.py" line="1828"/>
         <source>The target directory must not be empty.</source>
         <translation>El directorio de destino no puede estar vacío.</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1827"/>
+        <location filename="../Project/Project.py" line="1839"/>
         <source>Add directory</source>
         <translation>Añadir directorio</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1715"/>
+        <location filename="../Project/Project.py" line="1727"/>
         <source>&lt;p&gt;The source directory doesn&apos;t contain any files belonging to the selected category.&lt;/p&gt;</source>
         <translation>&lt;p&gt;El directorio de origen no contiene archivos que pertenezcan a la categoría seleccionada.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1827"/>
+        <location filename="../Project/Project.py" line="1839"/>
         <source>The source directory must not be empty.</source>
         <translation>El directorio de origen no puede estar vacío.</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1964"/>
+        <location filename="../Project/Project.py" line="1976"/>
         <source>Rename file</source>
         <translation>Renombrar archivo</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1988"/>
+        <location filename="../Project/Project.py" line="2000"/>
         <source>Rename File</source>
         <translation>Renombrar Archivo</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="2233"/>
+        <location filename="../Project/Project.py" line="2250"/>
         <source>Delete file</source>
         <translation>Borrar archivo</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="2263"/>
+        <location filename="../Project/Project.py" line="2280"/>
         <source>Delete directory</source>
         <translation>Borrar directorio</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="2358"/>
+        <location filename="../Project/Project.py" line="2375"/>
         <source>Create project directory</source>
         <translation>Crear directorio de proyecto</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="2965"/>
+        <location filename="../Project/Project.py" line="2982"/>
         <source>New Project</source>
         <translation>Proyecto nuevo</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="2474"/>
+        <location filename="../Project/Project.py" line="2491"/>
         <source>Add existing files to the project?</source>
         <translation>¿Agregar archivos existentes al proyecto?</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="2965"/>
+        <location filename="../Project/Project.py" line="2982"/>
         <source>Select Version Control System</source>
         <translation>Seleccion el Sistema de control de versiones (VCS)</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="2601"/>
+        <location filename="../Project/Project.py" line="2618"/>
         <source>Would you like to edit the VCS command options?</source>
         <translation>¿Le gustaría editar las opciones de comando para VCS?</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3831"/>
+        <location filename="../Project/Project.py" line="3866"/>
         <source>New project</source>
         <translation>Proyecto nuevo</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="2544"/>
+        <location filename="../Project/Project.py" line="2561"/>
         <source>Shall the project file be added to the repository?</source>
         <translation>¿Debe añadirse el archivo de proyecto al repositorio?</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="2580"/>
+        <location filename="../Project/Project.py" line="2597"/>
         <source>None</source>
         <translation>Ninguno</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="2573"/>
+        <location filename="../Project/Project.py" line="2590"/>
         <source>Select version control system for the project</source>
         <translation>Seleccione el sistema de control de versiones para el proyecto</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3845"/>
+        <location filename="../Project/Project.py" line="3880"/>
         <source>Open project</source>
         <translation>Abrir proyecto</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3115"/>
+        <location filename="../Project/Project.py" line="3132"/>
         <source>Project Files (*.e4p)</source>
         <translation>Archivos de proyecto (*.e4p)</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3882"/>
+        <location filename="../Project/Project.py" line="3917"/>
         <source>Save project as</source>
         <translation>Guardar proyecto como</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3130"/>
+        <location filename="../Project/Project.py" line="3147"/>
         <source>Save File</source>
         <translation>Guardar archivo</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3166"/>
+        <location filename="../Project/Project.py" line="3183"/>
         <source>Close Project</source>
         <translation>Cerrar Proyecto</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3166"/>
+        <location filename="../Project/Project.py" line="3183"/>
         <source>The current project has unsaved changes.</source>
         <translation>El proyecto actual tiene cambios sin guardar.</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3343"/>
+        <location filename="../Project/Project.py" line="3360"/>
         <source>Syntax errors detected</source>
         <translation>Se detectaron errores de sintaxis</translation>
     </message>
     <message numerus="yes">
-        <location filename="../Project/Project.py" line="3343"/>
+        <location filename="../Project/Project.py" line="3360"/>
         <source>The project contains %n file(s) with syntax errors.</source>
         <translation>
             <numerusform>El archivo contiene %n archivo(s) con errores de sintaxis.</numerusform>
@@ -50016,567 +50261,567 @@
         </translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3831"/>
+        <location filename="../Project/Project.py" line="3866"/>
         <source>&amp;New...</source>
         <translation>&amp;Nuevo...</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3836"/>
+        <location filename="../Project/Project.py" line="3871"/>
         <source>Generate a new project</source>
         <translation>Generar un nuevo proyecto</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3837"/>
+        <location filename="../Project/Project.py" line="3872"/>
         <source>&lt;b&gt;New...&lt;/b&gt;&lt;p&gt;This opens a dialog for entering the info for a new project.&lt;/p&gt;</source>
         <translation>&lt;b&gt;Nuevo...&lt;/b&gt;&lt;p&gt;Abre un diálogo para introducir la información para un nuevo proyecto.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3845"/>
+        <location filename="../Project/Project.py" line="3880"/>
         <source>&amp;Open...</source>
         <translation>&amp;Abrir...</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3850"/>
+        <location filename="../Project/Project.py" line="3885"/>
         <source>Open an existing project</source>
         <translation>Abrir un proyecto existente</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3851"/>
-        <source>&lt;b&gt;Open...&lt;/b&gt;&lt;p&gt;This opens an existing project.&lt;/p&gt;</source>
-        <translation>&lt;b&gt;Abrir...&lt;/b&gt;&lt;p&gt;Abre un proyecto existente..&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="3858"/>
-        <source>Close project</source>
-        <translation>Cerrar proyecto</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="3858"/>
-        <source>&amp;Close</source>
-        <translation>&amp;Cerrar</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="3862"/>
-        <source>Close the current project</source>
-        <translation>Cierra el proyecto actual</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="3863"/>
-        <source>&lt;b&gt;Close&lt;/b&gt;&lt;p&gt;This closes the current project.&lt;/p&gt;</source>
-        <translation>&lt;b&gt;Cerrar&lt;/b&gt;&lt;p&gt;Cierra el proyecto actualt.&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="3870"/>
-        <source>Save project</source>
-        <translation>Guardar proyecto</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4062"/>
-        <source>&amp;Save</source>
-        <translation>&amp;Guardar</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="3874"/>
-        <source>Save the current project</source>
-        <translation>Guarda el proyecto actual</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="3875"/>
-        <source>&lt;b&gt;Save&lt;/b&gt;&lt;p&gt;This saves the current project.&lt;/p&gt;</source>
-        <translation>&lt;b&gt;Guardar&lt;/b&gt;&lt;p&gt;Guarda el proyecto actual.&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="3882"/>
-        <source>Save &amp;as...</source>
-        <translation>Guardar co&amp;mo...</translation>
-    </message>
-    <message>
         <location filename="../Project/Project.py" line="3886"/>
-        <source>Save the current project to a new file</source>
-        <translation>Guardar el proyecto actual en un nuevo archivo</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="3888"/>
-        <source>&lt;b&gt;Save as&lt;/b&gt;&lt;p&gt;This saves the current project to a new file.&lt;/p&gt;</source>
-        <translation>&lt;b&gt;Guardar como&lt;/b&gt;&lt;p&gt;Guarda el proyecto en otro archivo.&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="3897"/>
-        <source>Add files to project</source>
-        <translation>Agregar archivos al proyecto</translation>
+        <source>&lt;b&gt;Open...&lt;/b&gt;&lt;p&gt;This opens an existing project.&lt;/p&gt;</source>
+        <translation>&lt;b&gt;Abrir...&lt;/b&gt;&lt;p&gt;Abre un proyecto existente..&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="3893"/>
+        <source>Close project</source>
+        <translation>Cerrar proyecto</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="3893"/>
+        <source>&amp;Close</source>
+        <translation>&amp;Cerrar</translation>
     </message>
     <message>
         <location filename="../Project/Project.py" line="3897"/>
+        <source>Close the current project</source>
+        <translation>Cierra el proyecto actual</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="3898"/>
+        <source>&lt;b&gt;Close&lt;/b&gt;&lt;p&gt;This closes the current project.&lt;/p&gt;</source>
+        <translation>&lt;b&gt;Cerrar&lt;/b&gt;&lt;p&gt;Cierra el proyecto actualt.&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="3905"/>
+        <source>Save project</source>
+        <translation>Guardar proyecto</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4097"/>
+        <source>&amp;Save</source>
+        <translation>&amp;Guardar</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="3909"/>
+        <source>Save the current project</source>
+        <translation>Guarda el proyecto actual</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="3910"/>
+        <source>&lt;b&gt;Save&lt;/b&gt;&lt;p&gt;This saves the current project.&lt;/p&gt;</source>
+        <translation>&lt;b&gt;Guardar&lt;/b&gt;&lt;p&gt;Guarda el proyecto actual.&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="3917"/>
+        <source>Save &amp;as...</source>
+        <translation>Guardar co&amp;mo...</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="3921"/>
+        <source>Save the current project to a new file</source>
+        <translation>Guardar el proyecto actual en un nuevo archivo</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="3923"/>
+        <source>&lt;b&gt;Save as&lt;/b&gt;&lt;p&gt;This saves the current project to a new file.&lt;/p&gt;</source>
+        <translation>&lt;b&gt;Guardar como&lt;/b&gt;&lt;p&gt;Guarda el proyecto en otro archivo.&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="3932"/>
+        <source>Add files to project</source>
+        <translation>Agregar archivos al proyecto</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="3932"/>
         <source>Add &amp;files...</source>
         <translation>&amp;Agregar archivos...</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3902"/>
+        <location filename="../Project/Project.py" line="3937"/>
         <source>Add files to the current project</source>
         <translation>Añadir archivos al proyecto actual</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3904"/>
+        <location filename="../Project/Project.py" line="3939"/>
         <source>&lt;b&gt;Add files...&lt;/b&gt;&lt;p&gt;This opens a dialog for adding files to the current project. The place to add is determined by the file extension.&lt;/p&gt;</source>
         <translation>&lt;b&gt;Añadir archivos...&lt;/b&gt;&lt;p&gt;Abre un diálogo para añadir archivos al proyecto actual. El lugar donde se van a añadir es determinado por la extensión del nombre de archivo.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3913"/>
+        <location filename="../Project/Project.py" line="3948"/>
         <source>Add directory to project</source>
         <translation>Agregar directorio al proyecto</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3913"/>
+        <location filename="../Project/Project.py" line="3948"/>
         <source>Add directory...</source>
         <translation>Agregar directorio...</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3918"/>
+        <location filename="../Project/Project.py" line="3953"/>
         <source>Add a directory to the current project</source>
         <translation>Agregar directorio al proyecto actual</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3920"/>
+        <location filename="../Project/Project.py" line="3955"/>
         <source>&lt;b&gt;Add directory...&lt;/b&gt;&lt;p&gt;This opens a dialog for adding a directory to the current project.&lt;/p&gt;</source>
         <translation>&lt;b&gt;Añadir directorio...&lt;/b&gt;&lt;p&gt;Abre un diálogo para añadir un directorio al proyecto actual.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3928"/>
+        <location filename="../Project/Project.py" line="3963"/>
         <source>Add translation to project</source>
         <translation>Añadir traducción al proyecto</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3928"/>
+        <location filename="../Project/Project.py" line="3963"/>
         <source>Add &amp;translation...</source>
         <translation>Añadir &amp;Traducción...</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3933"/>
+        <location filename="../Project/Project.py" line="3968"/>
         <source>Add a translation to the current project</source>
         <translation>Añadir una traducción al proyecto actual</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3935"/>
+        <location filename="../Project/Project.py" line="3970"/>
         <source>&lt;b&gt;Add translation...&lt;/b&gt;&lt;p&gt;This opens a dialog for add a translation to the current project.&lt;/p&gt;</source>
         <translation>&lt;b&gt;Añadir traducción...&lt;/b&gt;&lt;p&gt;Abre un diálogo para añadir una traducción al proyecto actual.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3943"/>
+        <location filename="../Project/Project.py" line="3978"/>
         <source>Search new files</source>
         <translation>Buscar archivos nuevos</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3943"/>
-        <source>Searc&amp;h new files...</source>
-        <translation>Bus&amp;car archivos nuevos...</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="3947"/>
-        <source>Search new files in the project directory.</source>
-        <translation>Bucar nuevos archivos en el directorio de proyecto.</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="3973"/>
-        <source>Project properties</source>
-        <translation>Propiedades del proyecto</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="3973"/>
-        <source>&amp;Properties...</source>
-        <translation>&amp;Propiedades...</translation>
-    </message>
-    <message>
         <location filename="../Project/Project.py" line="3978"/>
+        <source>Searc&amp;h new files...</source>
+        <translation>Bus&amp;car archivos nuevos...</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="3982"/>
+        <source>Search new files in the project directory.</source>
+        <translation>Bucar nuevos archivos en el directorio de proyecto.</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4008"/>
+        <source>Project properties</source>
+        <translation>Propiedades del proyecto</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4008"/>
+        <source>&amp;Properties...</source>
+        <translation>&amp;Propiedades...</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4013"/>
         <source>Show the project properties</source>
         <translation>Ver las propiedades del proyecto</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3979"/>
+        <location filename="../Project/Project.py" line="4014"/>
         <source>&lt;b&gt;Properties...&lt;/b&gt;&lt;p&gt;This shows a dialog to edit the project properties.&lt;/p&gt;</source>
         <translation>&lt;b&gt;Propiedades...&lt;/b&gt;&lt;p&gt;Muestra un diálogo para editar las propiedades del proyecto.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3986"/>
+        <location filename="../Project/Project.py" line="4021"/>
         <source>User project properties</source>
         <translation>Propiedades del usuario del proyecto</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3986"/>
+        <location filename="../Project/Project.py" line="4021"/>
         <source>&amp;User Properties...</source>
         <translation>Propiedades del &amp;Usuario...</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3991"/>
+        <location filename="../Project/Project.py" line="4026"/>
         <source>Show the user specific project properties</source>
         <translation>Muestra propiedades del proyecto específicas del usuario</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3993"/>
+        <location filename="../Project/Project.py" line="4028"/>
         <source>&lt;b&gt;User Properties...&lt;/b&gt;&lt;p&gt;This shows a dialog to edit the user specific project properties.&lt;/p&gt;</source>
         <translation>&lt;b&gt;Propiedades del Usuario...&lt;/b&gt;&lt;p&gt;Abre un diálogo par editar las propiedades del proyecto específicas del usuario.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4001"/>
+        <location filename="../Project/Project.py" line="4036"/>
         <source>Filetype Associations</source>
         <translation>Asociación de tipos de archivo</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4001"/>
+        <location filename="../Project/Project.py" line="4036"/>
         <source>Filetype Associations...</source>
         <translation>Asociación de tipos de archivo...</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4005"/>
+        <location filename="../Project/Project.py" line="4040"/>
         <source>Show the project filetype associations</source>
         <translation>Ver las asociaciones del proyecto</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4037"/>
+        <location filename="../Project/Project.py" line="4072"/>
         <source>Debugger Properties</source>
         <translation>Propiedades del depurador</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4037"/>
+        <location filename="../Project/Project.py" line="4072"/>
         <source>Debugger &amp;Properties...</source>
         <translation>&amp;Propiedades del depurador...</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4041"/>
+        <location filename="../Project/Project.py" line="4076"/>
         <source>Show the debugger properties</source>
         <translation>Muestra las propiedades del depurador</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4042"/>
+        <location filename="../Project/Project.py" line="4077"/>
         <source>&lt;b&gt;Debugger Properties...&lt;/b&gt;&lt;p&gt;This shows a dialog to edit project specific debugger settings.&lt;/p&gt;</source>
         <translation>&lt;b&gt;Propiedades del Depurador...&lt;/b&gt;&lt;p&gt;Abre un diálogo par editar las propiedades del depurador específicas del proyecto.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4050"/>
+        <location filename="../Project/Project.py" line="4085"/>
         <source>Load</source>
         <translation>Cargar</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4050"/>
+        <location filename="../Project/Project.py" line="4085"/>
         <source>&amp;Load</source>
         <translation>&amp;Cargar</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4054"/>
+        <location filename="../Project/Project.py" line="4089"/>
         <source>Load the debugger properties</source>
         <translation>Cargar las propiedades del depurador</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4055"/>
+        <location filename="../Project/Project.py" line="4090"/>
         <source>&lt;b&gt;Load Debugger Properties&lt;/b&gt;&lt;p&gt;This loads the project specific debugger settings.&lt;/p&gt;</source>
         <translation>&lt;b&gt;Cargar Propiedades del Depurador&lt;/b&gt;&lt;p&gt;Carga las opciones de configuración del depurador específicas del proyecto.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4062"/>
+        <location filename="../Project/Project.py" line="4097"/>
         <source>Save</source>
         <translation>Guardar</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4066"/>
-        <source>Save the debugger properties</source>
-        <translation>Guardar propiedades del depurador</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4067"/>
-        <source>&lt;b&gt;Save Debugger Properties&lt;/b&gt;&lt;p&gt;This saves the project specific debugger settings.&lt;/p&gt;</source>
-        <translation>&lt;b&gt;Guardar Propiedades del Depurador&lt;/b&gt;&lt;p&gt;Guarda las opciones de configuración del depurador específicas del proyecto.&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4074"/>
-        <source>Delete</source>
-        <translation>Borrar</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4074"/>
-        <source>&amp;Delete</source>
-        <translation>&amp;Borrar</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4078"/>
-        <source>Delete the debugger properties</source>
-        <translation>Borrar las propiedades del depurador</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4079"/>
-        <source>&lt;b&gt;Delete Debugger Properties&lt;/b&gt;&lt;p&gt;This deletes the file containing the project specific debugger settings.&lt;/p&gt;</source>
-        <translation>&lt;b&gt;Borrar Propiedades del Depurador&lt;/b&gt;&lt;p&gt;Borra el archivo que contiene las opciones de configuración del depurador específicas del proyecto.&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4087"/>
-        <source>Reset</source>
-        <translation>Reiniciar</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4087"/>
-        <source>&amp;Reset</source>
-        <translation>&amp;Reiniciar</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4091"/>
-        <source>Reset the debugger properties</source>
-        <translation>Restablecer las propiedades del depurador</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4092"/>
-        <source>&lt;b&gt;Reset Debugger Properties&lt;/b&gt;&lt;p&gt;This resets the project specific debugger settings.&lt;/p&gt;</source>
-        <translation>&lt;b&gt;Restablecer Propiedades del Depurador&lt;/b&gt;&lt;p&gt;Restablece las opciones de configuración del depurador específicas del proyecto.&lt;/p&gt;</translation>
-    </message>
-    <message>
         <location filename="../Project/Project.py" line="4101"/>
+        <source>Save the debugger properties</source>
+        <translation>Guardar propiedades del depurador</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4102"/>
+        <source>&lt;b&gt;Save Debugger Properties&lt;/b&gt;&lt;p&gt;This saves the project specific debugger settings.&lt;/p&gt;</source>
+        <translation>&lt;b&gt;Guardar Propiedades del Depurador&lt;/b&gt;&lt;p&gt;Guarda las opciones de configuración del depurador específicas del proyecto.&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4109"/>
+        <source>Delete</source>
+        <translation>Borrar</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4109"/>
+        <source>&amp;Delete</source>
+        <translation>&amp;Borrar</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4113"/>
+        <source>Delete the debugger properties</source>
+        <translation>Borrar las propiedades del depurador</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4114"/>
+        <source>&lt;b&gt;Delete Debugger Properties&lt;/b&gt;&lt;p&gt;This deletes the file containing the project specific debugger settings.&lt;/p&gt;</source>
+        <translation>&lt;b&gt;Borrar Propiedades del Depurador&lt;/b&gt;&lt;p&gt;Borra el archivo que contiene las opciones de configuración del depurador específicas del proyecto.&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4122"/>
+        <source>Reset</source>
+        <translation>Reiniciar</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4122"/>
+        <source>&amp;Reset</source>
+        <translation>&amp;Reiniciar</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4126"/>
+        <source>Reset the debugger properties</source>
+        <translation>Restablecer las propiedades del depurador</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4127"/>
+        <source>&lt;b&gt;Reset Debugger Properties&lt;/b&gt;&lt;p&gt;This resets the project specific debugger settings.&lt;/p&gt;</source>
+        <translation>&lt;b&gt;Restablecer Propiedades del Depurador&lt;/b&gt;&lt;p&gt;Restablece las opciones de configuración del depurador específicas del proyecto.&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4136"/>
         <source>Load session</source>
         <translation>Cargar sesión</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4105"/>
+        <location filename="../Project/Project.py" line="4140"/>
         <source>Load the projects session file.</source>
         <translation>Cargar archivo de sesión de proyectos.</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4106"/>
-        <source>&lt;b&gt;Load session&lt;/b&gt;&lt;p&gt;This loads the projects session file. The session consists of the following data.&lt;br&gt;- all open source files&lt;br&gt;- all breakpoint&lt;br&gt;- the commandline arguments&lt;br&gt;- the working directory&lt;br&gt;- the exception reporting flag&lt;/p&gt;</source>
-        <translation>&lt;b&gt;Cargar sesión&lt;/b&gt;&lt;p&gt;Carga el archivo de sesión de proyecto. La sesión consiste en los datos siguientes.&lt;br&gt;- todos los archivos de fuentes abiertos&lt;br&gt;- todos los puntos de interrupción&lt;br&gt;- todos los argumentos de línea de comandos&lt;br&gt;- el directorio de trabajo&lt;br&gt;- el flag de reporte de excepciones&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4119"/>
-        <source>Save session</source>
-        <translation>Guardar sesión</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4123"/>
-        <source>Save the projects session file.</source>
-        <translation>Guardar archivos de sessión de proyecto.</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4124"/>
-        <source>&lt;b&gt;Save session&lt;/b&gt;&lt;p&gt;This saves the projects session file. The session consists of the following data.&lt;br&gt;- all open source files&lt;br&gt;- all breakpoint&lt;br&gt;- the commandline arguments&lt;br&gt;- the working directory&lt;br&gt;- the exception reporting flag&lt;/p&gt;</source>
-        <translation>&lt;b&gt;Guardar sesión&lt;/b&gt;&lt;p&gt;Guarda el archivo de sesión de proyecto. La sesión consiste en los datos siguientes.&lt;br&gt;- todos los archivos de fuentes abiertos&lt;br&gt;- todos los puntos de interrupción&lt;br&gt;- todos los argumentos de línea de comandos&lt;br&gt;- el directorio de trabajo&lt;br&gt;- el flag de reporte de excepciones&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4137"/>
-        <source>Delete session</source>
-        <translation>Borrar sesión</translation>
-    </message>
-    <message>
         <location filename="../Project/Project.py" line="4141"/>
+        <source>&lt;b&gt;Load session&lt;/b&gt;&lt;p&gt;This loads the projects session file. The session consists of the following data.&lt;br&gt;- all open source files&lt;br&gt;- all breakpoint&lt;br&gt;- the commandline arguments&lt;br&gt;- the working directory&lt;br&gt;- the exception reporting flag&lt;/p&gt;</source>
+        <translation>&lt;b&gt;Cargar sesión&lt;/b&gt;&lt;p&gt;Carga el archivo de sesión de proyecto. La sesión consiste en los datos siguientes.&lt;br&gt;- todos los archivos de fuentes abiertos&lt;br&gt;- todos los puntos de interrupción&lt;br&gt;- todos los argumentos de línea de comandos&lt;br&gt;- el directorio de trabajo&lt;br&gt;- el flag de reporte de excepciones&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4154"/>
+        <source>Save session</source>
+        <translation>Guardar sesión</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4158"/>
+        <source>Save the projects session file.</source>
+        <translation>Guardar archivos de sessión de proyecto.</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4159"/>
+        <source>&lt;b&gt;Save session&lt;/b&gt;&lt;p&gt;This saves the projects session file. The session consists of the following data.&lt;br&gt;- all open source files&lt;br&gt;- all breakpoint&lt;br&gt;- the commandline arguments&lt;br&gt;- the working directory&lt;br&gt;- the exception reporting flag&lt;/p&gt;</source>
+        <translation>&lt;b&gt;Guardar sesión&lt;/b&gt;&lt;p&gt;Guarda el archivo de sesión de proyecto. La sesión consiste en los datos siguientes.&lt;br&gt;- todos los archivos de fuentes abiertos&lt;br&gt;- todos los puntos de interrupción&lt;br&gt;- todos los argumentos de línea de comandos&lt;br&gt;- el directorio de trabajo&lt;br&gt;- el flag de reporte de excepciones&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4172"/>
+        <source>Delete session</source>
+        <translation>Borrar sesión</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4176"/>
         <source>Delete the projects session file.</source>
         <translation>Borrar el archivo de sesión de proyecto.</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4142"/>
+        <location filename="../Project/Project.py" line="4177"/>
         <source>&lt;b&gt;Delete session&lt;/b&gt;&lt;p&gt;This deletes the projects session file&lt;/p&gt;</source>
         <translation>&lt;b&gt;Borrar sesión&lt;/b&gt;&lt;p&gt;Borra el archivo de sesión del proyecto&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4151"/>
+        <location filename="../Project/Project.py" line="4186"/>
         <source>Code Metrics</source>
         <translation>Métricas de código</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4151"/>
+        <location filename="../Project/Project.py" line="4186"/>
         <source>&amp;Code Metrics...</source>
         <translation>Métricas de &amp;código...</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4155"/>
+        <location filename="../Project/Project.py" line="4190"/>
         <source>Show some code metrics for the project.</source>
         <translation>Muestra algunas métricas del código para este proyecto.</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4157"/>
+        <location filename="../Project/Project.py" line="4192"/>
         <source>&lt;b&gt;Code Metrics...&lt;/b&gt;&lt;p&gt;This shows some code metrics for all Python files in the project.&lt;/p&gt;</source>
         <translation>&lt;b&gt;Métricas de Código...&lt;/b&gt;&lt;p&gt;Muestra algunas métricas de código para todos los archivos Python en el proyecto.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4165"/>
+        <location filename="../Project/Project.py" line="4200"/>
         <source>Python Code Coverage</source>
         <translation>Cobertura de Código Python</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4165"/>
-        <source>Code Co&amp;verage...</source>
-        <translation>Co&amp;bertura de código...</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4169"/>
-        <source>Show code coverage information for the project.</source>
-        <translation>Muestra información de cobertura de código para el proyecto.</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4171"/>
-        <source>&lt;b&gt;Code Coverage...&lt;/b&gt;&lt;p&gt;This shows the code coverage information for all Python files in the project.&lt;/p&gt;</source>
-        <translation>&lt;b&gt;Cobertura de Código...&lt;/b&gt;&lt;p&gt;Muestra la información de cobertura de código para todos los archivos Python en el proyecto.&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="5053"/>
-        <source>Profile Data</source>
-        <translation>Datos de perfil</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4179"/>
-        <source>&amp;Profile Data...</source>
-        <translation>Datos de &amp;pefil...</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4183"/>
-        <source>Show profiling data for the project.</source>
-        <translation>Mostrar datos de profiling para el proyecto.</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4185"/>
-        <source>&lt;b&gt;Profile Data...&lt;/b&gt;&lt;p&gt;This shows the profiling data for the project.&lt;/p&gt;</source>
-        <translation>&lt;b&gt;Datos de Profiling...&lt;/b&gt;&lt;p&gt;Muestra datos de profiling para el proyecto.&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="5107"/>
-        <source>Application Diagram</source>
-        <translation>Diagrama de Aplicación</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4194"/>
-        <source>&amp;Application Diagram...</source>
-        <translation>Diagrama de &amp;Aplicación...</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4198"/>
-        <source>Show a diagram of the project.</source>
-        <translation>Mostrar diagrama del proyecto.</translation>
-    </message>
-    <message>
         <location filename="../Project/Project.py" line="4200"/>
+        <source>Code Co&amp;verage...</source>
+        <translation>Co&amp;bertura de código...</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4204"/>
+        <source>Show code coverage information for the project.</source>
+        <translation>Muestra información de cobertura de código para el proyecto.</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4206"/>
+        <source>&lt;b&gt;Code Coverage...&lt;/b&gt;&lt;p&gt;This shows the code coverage information for all Python files in the project.&lt;/p&gt;</source>
+        <translation>&lt;b&gt;Cobertura de Código...&lt;/b&gt;&lt;p&gt;Muestra la información de cobertura de código para todos los archivos Python en el proyecto.&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="5088"/>
+        <source>Profile Data</source>
+        <translation>Datos de perfil</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4214"/>
+        <source>&amp;Profile Data...</source>
+        <translation>Datos de &amp;pefil...</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4218"/>
+        <source>Show profiling data for the project.</source>
+        <translation>Mostrar datos de profiling para el proyecto.</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4220"/>
+        <source>&lt;b&gt;Profile Data...&lt;/b&gt;&lt;p&gt;This shows the profiling data for the project.&lt;/p&gt;</source>
+        <translation>&lt;b&gt;Datos de Profiling...&lt;/b&gt;&lt;p&gt;Muestra datos de profiling para el proyecto.&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="5142"/>
+        <source>Application Diagram</source>
+        <translation>Diagrama de Aplicación</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4229"/>
+        <source>&amp;Application Diagram...</source>
+        <translation>Diagrama de &amp;Aplicación...</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4233"/>
+        <source>Show a diagram of the project.</source>
+        <translation>Mostrar diagrama del proyecto.</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4235"/>
         <source>&lt;b&gt;Application Diagram...&lt;/b&gt;&lt;p&gt;This shows a diagram of the project.&lt;/p&gt;</source>
         <translation>&lt;b&gt;Diagrama de Aplicación...&lt;/b&gt;&lt;p&gt;Muestra un diagrama del proyecto.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5300"/>
+        <location filename="../Project/Project.py" line="5335"/>
         <source>Create Package List</source>
         <translation>Crear Lista del Paquete</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4223"/>
+        <location filename="../Project/Project.py" line="4258"/>
         <source>Create &amp;Package List</source>
         <translation>Crear &amp;Package List</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5574"/>
+        <location filename="../Project/Project.py" line="5609"/>
         <source>Create Plugin Archive</source>
         <translation>Crear Archivo de Plugin</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4325"/>
+        <location filename="../Project/Project.py" line="4360"/>
         <source>&amp;Project</source>
         <translation>&amp;Proyecto</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4326"/>
+        <location filename="../Project/Project.py" line="4361"/>
         <source>Open &amp;Recent Projects</source>
         <translation>Abrir Proyectos &amp;Recientes</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4331"/>
+        <location filename="../Project/Project.py" line="4366"/>
         <source>&amp;Version Control</source>
         <translation>Control de &amp;Versiones</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4335"/>
+        <location filename="../Project/Project.py" line="4370"/>
         <source>Chec&amp;k</source>
         <translation>Veri&amp;ficar</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4337"/>
+        <location filename="../Project/Project.py" line="4372"/>
         <source>Sho&amp;w</source>
         <translation>V&amp;er</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4338"/>
+        <location filename="../Project/Project.py" line="4373"/>
         <source>&amp;Diagrams</source>
         <translation>&amp;Diagramas</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4327"/>
+        <location filename="../Project/Project.py" line="4362"/>
         <source>Session</source>
         <translation>Sesión</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4340"/>
+        <location filename="../Project/Project.py" line="4375"/>
         <source>Source &amp;Documentation</source>
         <translation>Origen de &amp;Documentación</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4328"/>
+        <location filename="../Project/Project.py" line="4363"/>
         <source>Debugger</source>
         <translation>Depurador</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4339"/>
+        <location filename="../Project/Project.py" line="4374"/>
         <source>Pac&amp;kagers</source>
         <translation>Empa&amp;quetadores</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4465"/>
+        <location filename="../Project/Project.py" line="4500"/>
         <source>Project</source>
         <translation>Proyecto</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4531"/>
+        <location filename="../Project/Project.py" line="4566"/>
         <source>&amp;Clear</source>
         <translation>&amp;Borrar</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4704"/>
+        <location filename="../Project/Project.py" line="4739"/>
         <source>Search New Files</source>
         <translation>Buscar nuevos archivos</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4704"/>
+        <location filename="../Project/Project.py" line="4739"/>
         <source>There were no new files found to be added.</source>
         <translation>No se han encontrado nuevos archivos para ser añadidos.</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4850"/>
+        <location filename="../Project/Project.py" line="4885"/>
         <source>Version Control System</source>
         <translation>Sistema de control de versiones</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4980"/>
+        <location filename="../Project/Project.py" line="5015"/>
         <source>Coverage Data</source>
         <translation>Datos de Cobertura</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5030"/>
+        <location filename="../Project/Project.py" line="5065"/>
         <source>There is no main script defined for the current project. Aborting</source>
         <translation>No hay script principal definido para el proyecto actual. Abortando</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5003"/>
+        <location filename="../Project/Project.py" line="5038"/>
         <source>Code Coverage</source>
         <translation>Cobertura de codigo</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5003"/>
+        <location filename="../Project/Project.py" line="5038"/>
         <source>Please select a coverage file</source>
         <translation>Por favor seleccione un archivo de cobertura</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5053"/>
+        <location filename="../Project/Project.py" line="5088"/>
         <source>Please select a profile file</source>
         <translation>Por favor seleccione un archivo de profiling</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5107"/>
+        <location filename="../Project/Project.py" line="5142"/>
         <source>Include module names?</source>
         <translation>¿Incluir nombres de módulos?</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5251"/>
+        <location filename="../Project/Project.py" line="5286"/>
         <source>&lt;p&gt;The file &lt;b&gt;PKGLIST&lt;/b&gt; already exists.&lt;/p&gt;&lt;p&gt;Overwrite it?&lt;/p&gt;</source>
         <translation>&lt;p&gt;El archivo &lt;b&gt;PKGLIST&lt;/b&gt; ya existe.&lt;/p&gt;&lt;p&gt;¿Desea sobreescribirlo?&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5319"/>
+        <location filename="../Project/Project.py" line="5354"/>
         <source>The project does not have a main script defined. Aborting...</source>
         <translation>No hay script principal definido para el proyecto actual. Abortando...</translation>
     </message>
@@ -50586,42 +50831,42 @@
         <translation>Registrando Tipo de Proyecto</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4239"/>
+        <location filename="../Project/Project.py" line="4274"/>
         <source>Create Plugin &amp;Archives</source>
         <translation>Crear &amp;Archivos de Plugin</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1393"/>
+        <location filename="../Project/Project.py" line="1405"/>
         <source>You have to specify a translation pattern first.</source>
         <translation>Debe especificar primero un patrón de traducción.</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="2684"/>
+        <location filename="../Project/Project.py" line="2701"/>
         <source>Translation Pattern</source>
         <translation>Patrón de Traducción</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="2684"/>
+        <location filename="../Project/Project.py" line="2701"/>
         <source>Enter the path pattern for translation files (use &apos;%language%&apos; in place of the language code):</source>
         <translation>Introduzca el patrón de ruta para los archivos de traducción (use &apos;%language%&apos; in lugar del código de idioma):</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4019"/>
+        <location filename="../Project/Project.py" line="4054"/>
         <source>Lexer Associations</source>
         <translation>Asociaciones de Analizador Léxico</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4019"/>
+        <location filename="../Project/Project.py" line="4054"/>
         <source>Lexer Associations...</source>
         <translation>Asociaciones de Analizador Léxico...</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4023"/>
+        <location filename="../Project/Project.py" line="4058"/>
         <source>Show the project lexer associations (overriding defaults)</source>
         <translation>Ver las asociaciones de analizador léxico del proyecto (sobreescribiendo valores por defecto)</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4025"/>
+        <location filename="../Project/Project.py" line="4060"/>
         <source>&lt;b&gt;Lexer Associations...&lt;/b&gt;&lt;p&gt;This shows a dialog to edit the lexer associations of the project. These associations override the global lexer associations. Lexers are used to highlight the editor text.&lt;/p&gt;</source>
         <translation>&lt;b&gt;Asociaciones de Analizador Léxico ...&lt;/b&gt;&lt;p&gt;Muestra un diálogo para editar las asociaciones de analizador léxico del proyecto. Estas asociaciones sobreescriben las asociaciones de analizador léxico globales. Los analizadores léxicos se utilizan para resaltar el texto en el editor.&lt;/p&gt;</translation>
     </message>
@@ -50641,112 +50886,112 @@
         <translation>Archivos Python3 (*.py *.py3);;Archivos de GUI Python3 (*.pyw *.pyw3);;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="805"/>
+        <location filename="../Project/Project.py" line="817"/>
         <source>&lt;p&gt;The project file &lt;b&gt;{0}&lt;/b&gt; could not be read.&lt;/p&gt;</source>
         <translation>&lt;p&gt;El archivo de proyecto &lt;b&gt;{0}&lt;/b&gt; no ha podido ser leído.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="908"/>
+        <location filename="../Project/Project.py" line="920"/>
         <source>&lt;p&gt;The project file &lt;b&gt;{0}&lt;/b&gt; could not be written.&lt;/p&gt;</source>
         <translation>&lt;p&gt;El archivo de proyecto &lt;b&gt;{0}&lt;/b&gt; no ha podido ser guardado.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="944"/>
+        <location filename="../Project/Project.py" line="956"/>
         <source>&lt;p&gt;The user specific project properties file &lt;b&gt;{0}&lt;/b&gt; could not be read.&lt;/p&gt;</source>
         <translation>&lt;p&gt;El archivo de propiedades de proyecto específicas del usuario &lt;b&gt;{0}&lt;/b&gt; no ha podido ser leído.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="968"/>
+        <location filename="../Project/Project.py" line="980"/>
         <source>&lt;p&gt;The user specific project properties file &lt;b&gt;{0}&lt;/b&gt; could not be written.&lt;/p&gt;</source>
         <translation>&lt;p&gt;El archivo de propiedades de proyecto específicas del usuario &lt;b&gt;{0}&lt;/b&gt; no ha podido ser guardado.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1026"/>
+        <location filename="../Project/Project.py" line="1038"/>
         <source>&lt;p&gt;The project session file &lt;b&gt;{0}&lt;/b&gt; could not be read.&lt;/p&gt;</source>
         <translation>&lt;p&gt;El archivo de sesión de proyecto &lt;b&gt;{0}&lt;/b&gt; no ha podido leerse.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1062"/>
+        <location filename="../Project/Project.py" line="1074"/>
         <source>&lt;p&gt;The project session file &lt;b&gt;{0}&lt;/b&gt; could not be written.&lt;/p&gt;</source>
         <translation>&lt;p&gt;El archivo de sesión de proyecto &lt;b&gt;{0}&lt;/b&gt; no ha podido guardarse.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1091"/>
+        <location filename="../Project/Project.py" line="1103"/>
         <source>&lt;p&gt;The project session file &lt;b&gt;{0}&lt;/b&gt; could not be deleted.&lt;/p&gt;</source>
         <translation>&lt;p&gt;El archivo de sesión de proyecto &lt;b&gt;{0}&lt;/b&gt; no ha podido borrarse.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1125"/>
+        <location filename="../Project/Project.py" line="1137"/>
         <source>&lt;p&gt;The tasks file &lt;b&gt;{0}&lt;/b&gt; could not be read.&lt;/p&gt;</source>
         <translation>&lt;p&gt;El archivo de tareas &lt;b&gt;{0}&lt;/b&gt; no puede leerse.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1145"/>
+        <location filename="../Project/Project.py" line="1157"/>
         <source>&lt;p&gt;The tasks file &lt;b&gt;{0}&lt;/b&gt; could not be written.&lt;/p&gt;</source>
         <translation>&lt;p&gt;El archivo de tareas &lt;b&gt;{0}&lt;/b&gt; no pudo ser guardado.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1204"/>
+        <location filename="../Project/Project.py" line="1216"/>
         <source>&lt;p&gt;The project debugger properties file &lt;b&gt;{0}&lt;/b&gt; could not be read.&lt;/p&gt;</source>
         <translation>&lt;p&gt;El archivo de propiedades del depurador del proyecto  &lt;b&gt;{0}&lt;/b&gt; no ha podido leerse.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1239"/>
+        <location filename="../Project/Project.py" line="1251"/>
         <source>&lt;p&gt;The project debugger properties file &lt;b&gt;{0}&lt;/b&gt; could not be written.&lt;/p&gt;</source>
         <translation>&lt;p&gt;El archivo de propiedades del depurador del proyecto  &lt;b&gt;{0}&lt;/b&gt; no pudo ser guardado.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1265"/>
+        <location filename="../Project/Project.py" line="1277"/>
         <source>&lt;p&gt;The project debugger properties file &lt;b&gt;{0}&lt;/b&gt; could not be deleted.&lt;/p&gt;</source>
         <translation>&lt;p&gt;El archivo de propiedades del depurador del proyecto  &lt;b&gt;{0}&lt;/b&gt; no pudo ser borrado.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1748"/>
+        <location filename="../Project/Project.py" line="1760"/>
         <source>&lt;p&gt;The file &lt;b&gt;{0}&lt;/b&gt; already exists.&lt;/p&gt;&lt;p&gt;Overwrite it?&lt;/p&gt;</source>
         <translation>&lt;p&gt;El archivo &lt;b&gt;{0}&lt;/b&gt; ya existe.&lt;/p&gt;&lt;p&gt;¿Desea sobreescribirlo?&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3130"/>
+        <location filename="../Project/Project.py" line="3147"/>
         <source>&lt;p&gt;The file &lt;b&gt;{0}&lt;/b&gt; already exists. Overwrite it?&lt;/p&gt;</source>
         <translation>&lt;p&gt;El archivo &lt;b&gt;{0}&lt;/b&gt; ya existe.&lt;/p&gt;&lt;p&gt;¿Desea sobreescribirlo?&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1988"/>
+        <location filename="../Project/Project.py" line="2000"/>
         <source>&lt;p&gt;The file &lt;b&gt;{0}&lt;/b&gt; could not be renamed.&lt;br /&gt;Reason: {1}&lt;/p&gt;</source>
         <translation>&lt;p&gt;El archivo &lt;b&gt;{0}&lt;/b&gt; no puede ser renombrado.&lt;br /&gt;Causa: {1}&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="2358"/>
+        <location filename="../Project/Project.py" line="2375"/>
         <source>&lt;p&gt;The project directory &lt;b&gt;{0}&lt;/b&gt; could not be created.&lt;/p&gt;</source>
         <translation>&lt;p&gt;El directorio de proyecto &lt;b&gt;{0}&lt;/b&gt; no pudo ser creado.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4850"/>
+        <location filename="../Project/Project.py" line="4885"/>
         <source>&lt;p&gt;The selected VCS &lt;b&gt;{0}&lt;/b&gt; could not be found.&lt;br/&gt;Disabling version control.&lt;/p&gt;&lt;p&gt;{1}&lt;/p&gt;</source>
         <translation>&lt;p&gt;El VCS seleccionado &lt;b&gt;{0}&lt;/b&gt; no ha sido encontrado.&lt;br&gt;Deshabilitando control de versiones.&lt;/p&gt;&lt;p&gt;{1}&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5300"/>
+        <location filename="../Project/Project.py" line="5335"/>
         <source>&lt;p&gt;The file &lt;b&gt;PKGLIST&lt;/b&gt; could not be created.&lt;/p&gt;&lt;p&gt;Reason: {0}&lt;/p&gt;</source>
         <translation>&lt;p&gt;El archivo &lt;b&gt;PKGLIST&lt;/b&gt; no puede ser creado.&lt;/p&gt;&lt;p&gt;Causa: {0}&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5460"/>
+        <location filename="../Project/Project.py" line="5495"/>
         <source>&lt;p&gt;The file &lt;b&gt;{0}&lt;/b&gt; could not be stored in the archive. Ignoring it.&lt;/p&gt;&lt;p&gt;Reason: {1}&lt;/p&gt;</source>
         <translation>&lt;p&gt;El fichero&lt;b&gt;{0}&lt;/b&gt; no ha podido ser almacenado en el archivo. Va a ser ignorado.&lt;/p&gt;&lt;p&gt;Causa: {1}&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5533"/>
+        <location filename="../Project/Project.py" line="5568"/>
         <source>&lt;p&gt;The plugin file &lt;b&gt;{0}&lt;/b&gt; could not be read.&lt;/p&gt;&lt;p&gt;Reason: {1}&lt;/p&gt;</source>
         <translation>&lt;p&gt;El archivo de plugin&lt;b&gt;{0}&lt;/b&gt; no puede ser leido.&lt;/p&gt;&lt;p&gt;Causa: {1}&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1671"/>
+        <location filename="../Project/Project.py" line="1683"/>
         <source>&lt;p&gt;The selected file &lt;b&gt;{0}&lt;/b&gt; could not be added to &lt;b&gt;{1}&lt;/b&gt;.&lt;/p&gt;&lt;p&gt;Reason: {2}&lt;/p&gt;</source>
         <translation>&lt;p&gt;El archivo seleccionado &lt;b&gt;{0}&lt;/b&gt; no ha podido se añadido a &lt;b&gt;{1}&lt;/b&gt;.&lt;/p&gt;&lt;p&gt;Razón: {2}&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1730"/>
+        <location filename="../Project/Project.py" line="1742"/>
         <source>&lt;p&gt;The target directory &lt;b&gt;{0}&lt;/b&gt; could not be created.&lt;/p&gt;&lt;p&gt;Reason: {1}&lt;/p&gt;</source>
         <translation>&lt;p&gt;El directorio de destino &lt;b&gt;{0}&lt;/b&gt; no ha podido ser creado.&lt;/p&gt;&lt;p&gt;Razón: {1}&lt;/p&gt;</translation>
     </message>
@@ -50756,32 +51001,32 @@
         <translation>Archivos Python2(*.py2);;Archivos de GUI Python2 (*.pyw2);;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="2441"/>
+        <location filename="../Project/Project.py" line="2458"/>
         <source>Create main script</source>
         <translation>Crear script principal</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="2441"/>
+        <location filename="../Project/Project.py" line="2458"/>
         <source>&lt;p&gt;The mainscript &lt;b&gt;{0}&lt;/b&gt; could not be created.&lt;br/&gt;Reason: {1}&lt;/p&gt;</source>
         <translation>&lt;p&gt;El script principal &lt;b&gt;{0}&lt;/b&gt; no se ha podido crear.&lt;br/&gt;Razón: {1}&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4208"/>
+        <location filename="../Project/Project.py" line="4243"/>
         <source>Load Diagram</source>
         <translation>Cargar Diagrama</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4208"/>
+        <location filename="../Project/Project.py" line="4243"/>
         <source>&amp;Load Diagram...</source>
         <translation>&amp;Cargar Diagrama...</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4212"/>
+        <location filename="../Project/Project.py" line="4247"/>
         <source>Load a diagram from file.</source>
         <translation>CArgar diagrama desde archivo.</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4214"/>
+        <location filename="../Project/Project.py" line="4249"/>
         <source>&lt;b&gt;Load Diagram...&lt;/b&gt;&lt;p&gt;This loads a diagram from file.&lt;/p&gt;</source>
         <translation>&lt;b&gt;Cargar Diagrama...&lt;/b&gt;&lt;p&gt;Carga un diagrama desde un archivo.&lt;/p&gt;</translation>
     </message>
@@ -50811,37 +51056,37 @@
         <translation>Consola PyQt5</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4839"/>
+        <location filename="../Project/Project.py" line="4874"/>
         <source>&lt;p&gt;The selected VCS &lt;b&gt;{0}&lt;/b&gt; could not be found. &lt;br/&gt;Reverting override.&lt;/p&gt;&lt;p&gt;{1}&lt;/p&gt;</source>
         <translation>&lt;p&gt;El VCS seleccionado &lt;b&gt;{0}&lt;/b&gt; no ha sido encontrado.&lt;br&gt;Revirtiendo sobreescritura.&lt;/p&gt;&lt;p&gt;{1}&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5574"/>
+        <location filename="../Project/Project.py" line="5609"/>
         <source>&lt;p&gt;The plugin file &lt;b&gt;{0}&lt;/b&gt; could not be read.&lt;/p&gt; &lt;p&gt;Reason: {1}&lt;/p&gt;</source>
         <translation>&lt;p&gt;El archivo de plugin&lt;b&gt;{0}&lt;/b&gt; no puede ser leido.&lt;/p&gt;&lt;p&gt;Causa: {1}&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4228"/>
+        <location filename="../Project/Project.py" line="4263"/>
         <source>Create an initial PKGLIST file for an eric6 plugin.</source>
         <translation>Crear un archivo inicial PKGLIST para un plugin para eric6.</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4230"/>
+        <location filename="../Project/Project.py" line="4265"/>
         <source>&lt;b&gt;Create Package List&lt;/b&gt;&lt;p&gt;This creates an initial list of files to include in an eric6 plugin archive. The list is created from the project file.&lt;/p&gt;</source>
         <translation>&lt;b&gt;Crear Package List&lt;/b&gt;&lt;p&gt;Crea una lista inicial de archivos para incluir en un archivo de plugin para eric6. Esta lista se crea a partir del archivo de proyecto.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4244"/>
+        <location filename="../Project/Project.py" line="4279"/>
         <source>Create eric6 plugin archive files.</source>
         <translation>Crear ficheros para archivo de plugin de eric6.</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4246"/>
+        <location filename="../Project/Project.py" line="4281"/>
         <source>&lt;b&gt;Create Plugin Archives&lt;/b&gt;&lt;p&gt;This creates eric6 plugin archive files using the list of files given in a PKGLIST* file. The archive name is built from the main script name if not designated in the package list file.&lt;/p&gt;</source>
         <translation>&lt;b&gt;Crear Archivo de Plugin&lt;/b&gt;&lt;p&gt;Crea ficheros para archivo de plugin de eric6 utilizando el listado de ficheros proporcionados en un archivo PKGLIST*. El nombre de archivo se crea a partir del nombre del script principal si no se desinga uno en el archivo de lista de package.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5424"/>
+        <location filename="../Project/Project.py" line="5459"/>
         <source>&lt;p&gt;The eric6 plugin archive file &lt;b&gt;{0}&lt;/b&gt; could not be created.&lt;/p&gt;&lt;p&gt;Reason: {1}&lt;/p&gt;</source>
         <translation>&lt;p&gt;El archivo de plugin de eric6 &lt;b&gt;{0}&lt;/b&gt; no ha podido ser creado. Abortando...&lt;/p&gt;&lt;p&gt;Razón: {1}&lt;/p&gt;</translation>
     </message>
@@ -50851,213 +51096,213 @@
         <translation>Eric6 Plugin</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="2933"/>
+        <location filename="../Project/Project.py" line="2950"/>
         <source>Create project management directory</source>
         <translation>Crear directorio de gestión del proyecto</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="2933"/>
+        <location filename="../Project/Project.py" line="2950"/>
         <source>&lt;p&gt;The project directory &lt;b&gt;{0}&lt;/b&gt; is not writable.&lt;/p&gt;</source>
         <translation>&lt;p&gt;El directorio del proyecto &lt;b&gt;{0}&lt;/b&gt; no se puede escribir.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3958"/>
+        <location filename="../Project/Project.py" line="3993"/>
         <source>Alt+Ctrl+P</source>
         <comment>Project|Search Project File</comment>
         <translation>Alt+Ctrl+P</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3964"/>
+        <location filename="../Project/Project.py" line="3999"/>
         <source>Search for a file in the project list of files.</source>
         <translation>Bucar un archivo en el listado de archivos del proyecto.</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3966"/>
+        <location filename="../Project/Project.py" line="4001"/>
         <source>&lt;b&gt;Search Project File&lt;/b&gt;&lt;p&gt;This searches for a file in the project list of files.&lt;/p&gt;</source>
         <translation>&lt;b&gt;Buscar Archivo en el Proyecto&lt;/b&gt;&lt;p&gt;Busca un archivo en el listado de archivos del proyecto.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3958"/>
+        <location filename="../Project/Project.py" line="3993"/>
         <source>Search Project File</source>
         <translation>Buscar Archivo en Proyecto</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3958"/>
+        <location filename="../Project/Project.py" line="3993"/>
         <source>Search Project File...</source>
         <translation>Buscar Archivo en Proyecto...</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5355"/>
+        <location filename="../Project/Project.py" line="5390"/>
         <source>Create Plugin Archives</source>
         <translation>Crear Archivos de Plugin</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4256"/>
+        <location filename="../Project/Project.py" line="4291"/>
         <source>Create Plugin Archives (Snapshot)</source>
         <translation>Crear Archivos de Plugin (Snapshot)</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4256"/>
+        <location filename="../Project/Project.py" line="4291"/>
         <source>Create Plugin Archives (&amp;Snapshot)</source>
         <translation>Crear Archivos de Plugin (&amp;Snapshot)</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4261"/>
+        <location filename="../Project/Project.py" line="4296"/>
         <source>Create eric6 plugin archive files (snapshot releases).</source>
         <translation>Crear ficheros para archivo de plugin de eric6 (snapshot releases).</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4263"/>
+        <location filename="../Project/Project.py" line="4298"/>
         <source>&lt;b&gt;Create Plugin Archives (Snapshot)&lt;/b&gt;&lt;p&gt;This creates eric6 plugin archive files using the list of files given in the PKGLIST* file. The archive name is built from the main script name if not designated in the package list file. The version entry of the main script is modified to reflect a snapshot release.&lt;/p&gt;</source>
         <translation>&lt;b&gt;Crear Archivos de Plugin (Snapshot)&lt;/b&gt;&lt;p&gt;Crea ficheros para archivo de plugin de eric6 usando el listado de ficheros dado en un archivo PKGLIST*. El nombre del archivo se construye a partir del nombre del script principal si no se designa uno en el archivo de package list. La entrada de versión del script principal se modifica para reflejar una snapshot release.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5333"/>
-        <source>Select package lists:</source>
-        <translation>Seleccionar package lists:</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="5351"/>
-        <source>Creating plugin archives...</source>
-        <translation>Creando archivos de plugin...</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="5351"/>
-        <source>Abort</source>
-        <translation>Abortar</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="5351"/>
-        <source>%v/%m Archives</source>
-        <translation>%v/%m Archivos</translation>
-    </message>
-    <message>
         <location filename="../Project/Project.py" line="5368"/>
+        <source>Select package lists:</source>
+        <translation>Seleccionar package lists:</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="5386"/>
+        <source>Creating plugin archives...</source>
+        <translation>Creando archivos de plugin...</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="5386"/>
+        <source>Abort</source>
+        <translation>Abortar</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="5386"/>
+        <source>%v/%m Archives</source>
+        <translation>%v/%m Archivos</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="5403"/>
         <source>&lt;p&gt;The file &lt;b&gt;{0}&lt;/b&gt; could not be read.&lt;/p&gt;&lt;p&gt;Reason: {1}&lt;/p&gt;</source>
         <translation>&lt;p&gt;El archivo&lt;b&gt;{0}&lt;/b&gt; no puede ser leído.&lt;/p&gt;&lt;p&gt;Causa: {1}&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5479"/>
+        <location filename="../Project/Project.py" line="5514"/>
         <source>&lt;p&gt;The eric6 plugin archive files were created with some errors.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Los ficheros para archivo de plugin de eric6 se han creado con errores.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5482"/>
+        <location filename="../Project/Project.py" line="5517"/>
         <source>&lt;p&gt;The eric6 plugin archive files were created successfully.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Los ficheros para archivo de plugin de eric6 se han creado correctamente.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5344"/>
+        <location filename="../Project/Project.py" line="5379"/>
         <source>&lt;p&gt;No package list files (PKGLIST*) available or selected. Aborting...&lt;/p&gt;</source>
         <translation>&lt;p&gt;No hay archivo de package list (PKGLIST*) disponible o seleccionado. Abortando...&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5396"/>
+        <location filename="../Project/Project.py" line="5431"/>
         <source>&lt;p&gt;The file &lt;b&gt;{0}&lt;/b&gt; is not ready yet.&lt;/p&gt;&lt;p&gt;Please rework it and delete the&apos;; initial_list&apos; line of the header.&lt;/p&gt;</source>
         <translation>&lt;p&gt;El archivo &lt;b&gt;{0}&lt;/b&gt; todavía no está listo.&lt;/p&gt;&lt;p&gt;Por favor, revíselo y borre la línea &apos;; initial_list&apos; del encabezado.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3949"/>
+        <location filename="../Project/Project.py" line="3984"/>
         <source>&lt;b&gt;Search new files...&lt;/b&gt;&lt;p&gt;This searches for new files (sources, *.ui, *.idl, *.proto) in the project directory and registered subdirectories.&lt;/p&gt;</source>
         <translation>&lt;b&gt;Buscar nuevos archivos...&lt;/b&gt;&lt;p&gt;Busca nuevos archivos (fuentes, *.ui, *.idl, *.proto) en el directorio del proyecto y en los subdirectorios registrados.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4007"/>
+        <location filename="../Project/Project.py" line="4042"/>
         <source>&lt;b&gt;Filetype Associations...&lt;/b&gt;&lt;p&gt;This shows a dialog to edit the file type associations of the project. These associations determine the type (source, form, interface, protocol or others) with a filename pattern. They are used when adding a file to the project and when performing a search for new files.&lt;/p&gt;</source>
         <translation>&lt;b&gt;Asociaciones de tipos de archivo...&lt;/b&gt;&lt;p&gt;Muestra un diálogo para editar asociaciones de tipos de archivo del proyecto. Estas asociaciones determinan el tipo (fuentes, formulario, interfaces, protocolos u otros) con un patrón de nombre de archivo. Se usan al añadir archivos al proyecto y al realizar una búsqueda de nuevos archivos.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1519"/>
+        <location filename="../Project/Project.py" line="1531"/>
         <source>&lt;p&gt;The selected translation file &lt;b&gt;{0}&lt;/b&gt; could not be deleted.&lt;/p&gt;&lt;p&gt;Reason: {1}&lt;/p&gt;</source>
         <translation>&lt;p&gt;El archivo de traducción seleccionado &lt;b&gt;{0}&lt;/b&gt; no se ha podido borrar.&lt;/p&gt;&lt;p&gt;Razón: {1}&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="2233"/>
+        <location filename="../Project/Project.py" line="2250"/>
         <source>&lt;p&gt;The selected file &lt;b&gt;{0}&lt;/b&gt; could not be deleted.&lt;/p&gt;&lt;p&gt;Reason: {1}&lt;/p&gt;</source>
         <translation>&lt;p&gt;El archivo seleccionado &lt;b&gt;{0}&lt;/b&gt; no se ha podido borrar.&lt;/p&gt;&lt;p&gt;Razón: {1}&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="2263"/>
+        <location filename="../Project/Project.py" line="2280"/>
         <source>&lt;p&gt;The selected directory &lt;b&gt;{0}&lt;/b&gt; could not be deleted.&lt;/p&gt;&lt;p&gt;Reason: {1}&lt;/p&gt;</source>
         <translation>&lt;p&gt;El directorio seleccionado &lt;b&gt;{0}&lt;/b&gt; no se ha podido borrar.&lt;/p&gt;&lt;p&gt;Razón: {1}&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="2756"/>
+        <location filename="../Project/Project.py" line="2773"/>
         <source>Create Makefile</source>
         <translation>Crear Makefile</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="2756"/>
+        <location filename="../Project/Project.py" line="2773"/>
         <source>&lt;p&gt;The makefile &lt;b&gt;{0}&lt;/b&gt; could not be created.&lt;br/&gt;Reason: {1}&lt;/p&gt;</source>
         <translation>&lt;p&gt;El makefile &lt;b&gt;{0}&lt;/b&gt; no se ha podido crear.&lt;br/&gt;Razón: {1}&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5760"/>
+        <location filename="../Project/Project.py" line="5795"/>
         <source>Execute Make</source>
         <translation>Ejecutar Make</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4277"/>
+        <location filename="../Project/Project.py" line="4312"/>
         <source>&amp;Execute Make</source>
         <translation>&amp;Ejecutar Make</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4281"/>
+        <location filename="../Project/Project.py" line="4316"/>
         <source>Perform a &apos;make&apos; run.</source>
         <translation>Ejecutar un &apos;make&apos;.</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4283"/>
+        <location filename="../Project/Project.py" line="4318"/>
         <source>&lt;b&gt;Execute Make&lt;/b&gt;&lt;p&gt;This performs a &apos;make&apos; run to rebuild the configured target.&lt;/p&gt;</source>
         <translation>&lt;b&gt;Ejecutar Make&lt;/b&gt;&lt;p&gt;Ejecuta un &apos;make&apos; para reconstruir el target configurado.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5740"/>
+        <location filename="../Project/Project.py" line="5775"/>
         <source>Test for Changes</source>
         <translation>Comprobar Cambios</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4291"/>
+        <location filename="../Project/Project.py" line="4326"/>
         <source>&amp;Test for Changes</source>
         <translation>&amp;Comprobar Cambios</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4295"/>
+        <location filename="../Project/Project.py" line="4330"/>
         <source>Question &apos;make&apos;, if a rebuild is needed.</source>
         <translation>Preguntar a &apos;make&apos; si es necesario reconstruir.</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4297"/>
+        <location filename="../Project/Project.py" line="4332"/>
         <source>&lt;b&gt;Test for Changes&lt;/b&gt;&lt;p&gt;This questions &apos;make&apos;, if a rebuild of the configured target is necessary.&lt;/p&gt;</source>
         <translation>&lt;b&gt;Comprobar Cambios&lt;/b&gt;&lt;p&gt;Pregunta a &apos;make si es necesario reconstruir el target configurado.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4342"/>
+        <location filename="../Project/Project.py" line="4377"/>
         <source>Make</source>
         <translation>Make</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5688"/>
+        <location filename="../Project/Project.py" line="5723"/>
         <source>The make process did not start.</source>
         <translation>El proceso make no ha comenzado.</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5733"/>
+        <location filename="../Project/Project.py" line="5768"/>
         <source>The make process crashed.</source>
         <translation>El proceso make ha fallado.</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5743"/>
+        <location filename="../Project/Project.py" line="5778"/>
         <source>&lt;p&gt;There are changes that require the configured make target &lt;b&gt;{0}&lt;/b&gt; to be rebuilt.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Hay cambios que requieren que el target make configurado &lt;b&gt;{0}&lt;/b&gt; se reconstruya.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5748"/>
+        <location filename="../Project/Project.py" line="5783"/>
         <source>&lt;p&gt;There are changes that require the default make target to be rebuilt.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Hay cambios que requieren que el target make por defecto se reconstruya.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5760"/>
+        <location filename="../Project/Project.py" line="5795"/>
         <source>The makefile contains errors.</source>
         <translation>El makefile contiene errores.</translation>
     </message>
@@ -51072,7 +51317,7 @@
         <translation>Consola PySide2</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4330"/>
+        <location filename="../Project/Project.py" line="4365"/>
         <source>Project-T&amp;ools</source>
         <translation>Herramientas de Pr&amp;ojecto</translation>
     </message>
@@ -51176,7 +51421,7 @@
         <translation>Estatus de VCS</translation>
     </message>
     <message>
-        <location filename="../Project/ProjectBrowserModel.py" line="782"/>
+        <location filename="../Project/ProjectBrowserModel.py" line="798"/>
         <source>local</source>
         <translation>local</translation>
     </message>
@@ -51189,16 +51434,6 @@
         <translation>&lt;b&gt;configurar ajustes del visor de proyecto&lt;/b&gt;</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/ProjectBrowserPage.ui" line="37"/>
-        <source>Colours</source>
-        <translation>Colores</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/ProjectBrowserPage.ui" line="56"/>
-        <source>Select the colour for highlighted entries in the Others viewer.</source>
-        <translation>Seleccione el color de resalte para las entradas en otros visores.</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/ProjectBrowserPage.ui" line="43"/>
         <source>Highlighted entries (Others):</source>
         <translation>Entradas resaltadas (otras):</translation>
@@ -51328,6 +51563,16 @@
         <source>Protocols (protobuf) Browser</source>
         <translation>Navegador de Protocolos (protobuf)</translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/ProjectBrowserPage.ui" line="37"/>
+        <source>Colors</source>
+        <translation>Colores</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/ProjectBrowserPage.ui" line="56"/>
+        <source>Select the color for highlighted entries in the Others viewer.</source>
+        <translation>Seleccione el color para entradas resaltadas en el visor &apos;Otros&apos;.</translation>
+    </message>
 </context>
 <context>
     <name>ProjectFormsBrowser</name>
@@ -61137,17 +61382,17 @@
         <translation>Borrar</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="835"/>
+        <location filename="../QScintilla/Shell.py" line="839"/>
         <source>Passive Debug Mode</source>
         <translation>Modo de depuración pasiva</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="839"/>
+        <location filename="../QScintilla/Shell.py" line="843"/>
         <source>No.</source>
         <translation>No.</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="2157"/>
+        <location filename="../QScintilla/Shell.py" line="2161"/>
         <source>Drop Error</source>
         <translation>Error al soltar</translation>
     </message>
@@ -61167,17 +61412,17 @@
         <translation>Mostrar</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="767"/>
+        <location filename="../QScintilla/Shell.py" line="771"/>
         <source>Select History</source>
         <translation>Seleccionar historial</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="767"/>
+        <location filename="../QScintilla/Shell.py" line="771"/>
         <source>Select the history entry to execute (most recent shown last).</source>
         <translation>Seleccionar la entrada del historial a ejecutar (las más recientes mostradas en último lugar).</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="836"/>
+        <location filename="../QScintilla/Shell.py" line="840"/>
         <source>
 Not connected</source>
         <translation>
@@ -61194,22 +61439,22 @@
         <translation>Cortar</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="841"/>
+        <location filename="../QScintilla/Shell.py" line="845"/>
         <source>{0} on {1}, {2}</source>
         <translation>{0} en {1}, {2}</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="1030"/>
+        <location filename="../QScintilla/Shell.py" line="1034"/>
         <source>StdOut: {0}</source>
         <translation>StdOut: {0}</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="1038"/>
+        <location filename="../QScintilla/Shell.py" line="1042"/>
         <source>StdErr: {0}</source>
         <translation>StdErr: {0}</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="2157"/>
+        <location filename="../QScintilla/Shell.py" line="2161"/>
         <source>&lt;p&gt;&lt;b&gt;{0}&lt;/b&gt; is not a file.&lt;/p&gt;</source>
         <translation>&lt;p&gt;&lt;b&gt;{0}&lt;/b&gt; no es un archivo.&lt;/p&gt;</translation>
     </message>
@@ -61219,7 +61464,7 @@
         <translation>Buscar</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="888"/>
+        <location filename="../QScintilla/Shell.py" line="892"/>
         <source>Exception &quot;{0}&quot;
 {1}
 File: {2}, Line: {3}
@@ -61230,14 +61475,14 @@
 </translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="923"/>
+        <location filename="../QScintilla/Shell.py" line="927"/>
         <source>Unspecified syntax error.
 </source>
         <translation>Error de sintaxis sin especificar.
 </translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="898"/>
+        <location filename="../QScintilla/Shell.py" line="902"/>
         <source>Exception &quot;{0}&quot;
 {1}
 </source>
@@ -61246,21 +61491,21 @@
 </translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="925"/>
+        <location filename="../QScintilla/Shell.py" line="929"/>
         <source>Syntax error &quot;{1}&quot; in file {0} at line {2}, character {3}.
 </source>
         <translation>Error de sintaxis &quot;{1}&quot; en archivo {0} en la línea {2}, carácter {3}.
 </translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="948"/>
+        <location filename="../QScintilla/Shell.py" line="952"/>
         <source>Signal &quot;{0}&quot; generated in file {1} at line {2}.
 Function: {3}({4})</source>
         <translation>Señal &quot;{0}&quot; generada en el archivo {1} y línea {2}.
 Función: {3}({4})</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="2015"/>
+        <location filename="../QScintilla/Shell.py" line="2019"/>
         <source>Project</source>
         <translation>Proyecto</translation>
     </message>
@@ -61290,7 +61535,7 @@
         <translation>Nombre Activo</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="1835"/>
+        <location filename="../QScintilla/Shell.py" line="1839"/>
         <source>Available Virtual Environments:
 {0}
 </source>
@@ -61299,7 +61544,7 @@
 </translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="1876"/>
+        <location filename="../QScintilla/Shell.py" line="1880"/>
         <source>Current Virtual Environment: &apos;{0}&apos;
 </source>
         <translation>Entorno Virtual Actual: &apos;{0}&apos;
@@ -69396,7 +69641,7 @@
         <translation>Sync Handler:</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/Sync/SyncCheckPage.py" line="56"/>
+        <location filename="../WebBrowser/Sync/SyncCheckPage.py" line="50"/>
         <source>Host:</source>
         <translation>Host:</translation>
     </message>
@@ -69426,22 +69671,22 @@
         <translation>Ajustes de Agente de Usuario:</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/Sync/SyncCheckPage.py" line="55"/>
+        <location filename="../WebBrowser/Sync/SyncCheckPage.py" line="49"/>
         <source>FTP</source>
         <translation>FTP</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/Sync/SyncCheckPage.py" line="68"/>
+        <location filename="../WebBrowser/Sync/SyncCheckPage.py" line="62"/>
         <source>No Synchronization</source>
         <translation>Sin Sincronización</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/Sync/SyncCheckPage.py" line="211"/>
+        <location filename="../WebBrowser/Sync/SyncCheckPage.py" line="204"/>
         <source>&lt;font color=&quot;#FF0000&quot;&gt;&lt;b&gt;Error:&lt;/b&gt; {0}&lt;/font&gt;</source>
         <translation>&lt;font color=&quot;#FF0000&quot;&gt;&lt;b&gt;Error:&lt;/b&gt; {0}&lt;/font&gt;</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/Sync/SyncCheckPage.py" line="63"/>
+        <location filename="../WebBrowser/Sync/SyncCheckPage.py" line="57"/>
         <source>Shared Directory</source>
         <translation>Directorio Compartido</translation>
     </message>
@@ -69451,7 +69696,7 @@
         <translation>Ajustes de Marcación Rápida:</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/Sync/SyncCheckPage.py" line="64"/>
+        <location filename="../WebBrowser/Sync/SyncCheckPage.py" line="58"/>
         <source>Directory:</source>
         <translation>Directorio:</translation>
     </message>
@@ -71121,12 +71366,12 @@
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/TasksPage.ui" line="105"/>
-        <source>Tasks Background Colours</source>
+        <source>Tasks Background Colors</source>
         <translation>Colores de Fondo para las Tareas</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/TasksPage.ui" line="206"/>
-        <source>Select the background colour for these tasks.</source>
+        <source>Select the background color for these tasks.</source>
         <translation>Seleccionar el color de fondo para estas tareas.</translation>
     </message>
 </context>
@@ -72188,27 +72433,27 @@
 <context>
     <name>Translator</name>
     <message>
-        <location filename="../Plugins/UiExtensionPlugins/Translator/Translator.py" line="52"/>
+        <location filename="../Plugins/UiExtensionPlugins/Translator/Translator.py" line="63"/>
         <source>Translator</source>
         <translation>Traductor</translation>
     </message>
     <message>
-        <location filename="../Plugins/UiExtensionPlugins/Translator/Translator.py" line="52"/>
+        <location filename="../Plugins/UiExtensionPlugins/Translator/Translator.py" line="63"/>
         <source>T&amp;ranslator</source>
         <translation>T&amp;raductor</translation>
     </message>
     <message>
-        <location filename="../Plugins/UiExtensionPlugins/Translator/Translator.py" line="52"/>
+        <location filename="../Plugins/UiExtensionPlugins/Translator/Translator.py" line="63"/>
         <source>Alt+Shift+R</source>
         <translation>Alt+Shift+R</translation>
     </message>
     <message>
-        <location filename="../Plugins/UiExtensionPlugins/Translator/Translator.py" line="58"/>
+        <location filename="../Plugins/UiExtensionPlugins/Translator/Translator.py" line="69"/>
         <source>Switch the input focus to the Translator window.</source>
         <translation>Cambiar el foco de input a la ventana del Traductor.</translation>
     </message>
     <message>
-        <location filename="../Plugins/UiExtensionPlugins/Translator/Translator.py" line="60"/>
+        <location filename="../Plugins/UiExtensionPlugins/Translator/Translator.py" line="71"/>
         <source>&lt;b&gt;Activate Translator&lt;/b&gt;&lt;p&gt;This switches the input focus to the Translator window.&lt;/p&gt;</source>
         <translation>&lt;b&gt;Activar Traductor&lt;/b&gt;&lt;p&gt;Cambia el foco de input a la ventana del Traductor.&lt;/p&gt;</translation>
     </message>
@@ -72216,52 +72461,52 @@
 <context>
     <name>TranslatorEngines</name>
     <message>
-        <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorEngines/__init__.py" line="37"/>
+        <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorEngines/__init__.py" line="39"/>
         <source>Google V.1</source>
         <translation>Google V.1</translation>
     </message>
     <message>
-        <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorEngines/__init__.py" line="39"/>
-        <source>MyMemory</source>
-        <translation>MyMemory</translation>
-    </message>
-    <message>
         <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorEngines/__init__.py" line="41"/>
-        <source>Glosbe</source>
-        <translation>Glosbe</translation>
+        <source>MyMemory</source>
+        <translation>MyMemory</translation>
     </message>
     <message>
         <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorEngines/__init__.py" line="43"/>
-        <source>PROMT</source>
-        <translation>PROMT</translation>
+        <source>Glosbe</source>
+        <translation>Glosbe</translation>
     </message>
     <message>
         <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorEngines/__init__.py" line="45"/>
-        <source>Yandex</source>
-        <translation>Yandex</translation>
-    </message>
-    <message>
-        <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorEngines/__init__.py" line="55"/>
-        <source>Unknow translation service name ({0})</source>
-        <translation>Nombre de servicio de traducción desconocido ({0})</translation>
+        <source>PROMT</source>
+        <translation>PROMT</translation>
     </message>
     <message>
         <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorEngines/__init__.py" line="47"/>
-        <source>Google V.2</source>
-        <translation>Google V.2</translation>
+        <source>Yandex</source>
+        <translation>Yandex</translation>
+    </message>
+    <message>
+        <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorEngines/__init__.py" line="57"/>
+        <source>Unknow translation service name ({0})</source>
+        <translation>Nombre de servicio de traducción desconocido ({0})</translation>
     </message>
     <message>
         <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorEngines/__init__.py" line="49"/>
-        <source>Microsoft</source>
-        <translation>Microsoft</translation>
+        <source>Google V.2</source>
+        <translation>Google V.2</translation>
     </message>
     <message>
         <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorEngines/__init__.py" line="51"/>
-        <source>DeepL Pro</source>
-        <translation>DeepL Pro</translation>
+        <source>Microsoft</source>
+        <translation>Microsoft</translation>
     </message>
     <message>
         <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorEngines/__init__.py" line="53"/>
+        <source>DeepL Pro</source>
+        <translation>DeepL Pro</translation>
+    </message>
+    <message>
+        <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorEngines/__init__.py" line="55"/>
         <source>IBM Watson</source>
         <translation>IBM Watson</translation>
     </message>
@@ -72489,16 +72734,6 @@
         <translation>Vietnamita</translation>
     </message>
     <message>
-        <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorLanguagesDb.py" line="79"/>
-        <source>Chinese S</source>
-        <translation>Chino S</translation>
-    </message>
-    <message>
-        <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorLanguagesDb.py" line="80"/>
-        <source>Chinese T</source>
-        <translation>Chino T</translation>
-    </message>
-    <message>
         <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorLanguagesDb.py" line="31"/>
         <source>Afrikaans</source>
         <translation>Afrikaans</translation>
@@ -72518,6 +72753,16 @@
         <source>Hebrew (iw)</source>
         <translation>Hebreo (iw)</translation>
     </message>
+    <message>
+        <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorLanguagesDb.py" line="79"/>
+        <source>Chinese (China)</source>
+        <translation>Chino (China)</translation>
+    </message>
+    <message>
+        <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorLanguagesDb.py" line="80"/>
+        <source>Chinese (Taiwan)</source>
+        <translation>Chino (Taiwan)</translation>
+    </message>
 </context>
 <context>
     <name>TranslatorPage</name>
@@ -72695,7 +72940,7 @@
 <context>
     <name>TranslatorPlugin</name>
     <message>
-        <location filename="../Plugins/PluginTranslator.py" line="65"/>
+        <location filename="../Plugins/PluginTranslator.py" line="71"/>
         <source>Translator</source>
         <translation>Traductor</translation>
     </message>
@@ -77197,61 +77442,31 @@
         <translation>Moonitorizar estado local solamente</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="128"/>
-        <source>Colours</source>
-        <translation>Colores</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="193"/>
         <source>VCS status &quot;modified&quot;:</source>
         <translation>Estado de VCS &quot;modificado&quot;:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="206"/>
-        <source>Select the background colour for entries with VCS status &quot;modified&quot;.</source>
-        <translation>Seleccione el color de fondo para las entradas con estado de VCS &quot;modificado&quot;.</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="134"/>
         <source>VCS status &quot;added&quot;:</source>
         <translation>Estado de VCS &quot;agregado&quot;:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="147"/>
-        <source>Select the background colour for entries with VCS status &quot;added&quot;.</source>
-        <translation>Seleccione el color de fondo para las entradas con estado de VCS &quot;agregado&quot;.</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="239"/>
         <source>VCS status &quot;needs update&quot;:</source>
         <translation>Estado de VCS &quot;necesita actualizar&quot;:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="252"/>
-        <source>Select the background colour for entries with VCS status &quot;needs update&quot;.</source>
-        <translation>Seleccione el color de fondo para las entradas con estado de VCS &quot;necesita actualizar&quot;.</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="157"/>
         <source>VCS status &quot;conflict&quot;:</source>
         <translation>Estado de VCS &quot;confilicto&quot;:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="170"/>
-        <source>Select the background colour for entries with VCS status &quot;conflict&quot;.</source>
-        <translation>Seleccione el color de fondo para las entradas con estado de VCS &quot;conflicto&quot;.</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="216"/>
         <source>VCS status &quot;replaced&quot;:</source>
         <translation>Estado de VCS &quot;reemplazado&quot;:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="229"/>
-        <source>Select the background colour for entries with VCS status &quot;replaced&quot;.</source>
-        <translation>Seleccione el color de fondo para las entradas con estado de VCS &quot;reemplazado&quot;.</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="115"/>
         <source>Select to enable automatic updates</source>
         <translation>Seleccione para habilitar actualizaciones automáticas</translation>
@@ -77267,9 +77482,39 @@
         <translation>Estado de VCS &quot;eliminado&quot;:</translation>
     </message>
     <message>
+        <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="128"/>
+        <source>Colors</source>
+        <translation>Colores</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="147"/>
+        <source>Select the background color for entries with VCS status &quot;added&quot;.</source>
+        <translation>Seleccionar el color de fondo para las entradas con estado de VCS &quot;añadido&quot;.</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="170"/>
+        <source>Select the background color for entries with VCS status &quot;conflict&quot;.</source>
+        <translation>Seleccionar el color de fondo para las entradas con estado de VCS &quot;conflicto&quot;.</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="206"/>
+        <source>Select the background color for entries with VCS status &quot;modified&quot;.</source>
+        <translation>Seleccionar el color de fondo para las entradas con estado de VCS &quot;modificado&quot;.</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="229"/>
+        <source>Select the background color for entries with VCS status &quot;replaced&quot;.</source>
+        <translation>Seleccionar el color de fondo para las entradas con estado de VCS &quot;reemplazado&quot;.</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="252"/>
+        <source>Select the background color for entries with VCS status &quot;needs update&quot;.</source>
+        <translation>Seleccionar el color de fondo para las entradas con estado de VCS &quot;necesita actualizar&quot;.</translation>
+    </message>
+    <message>
         <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="275"/>
-        <source>Select the background colour for entries with VCS status &quot;removed&quot;.</source>
-        <translation>Seleccione el color de fondo para las entradas con estado de VCS &quot;eliminado&quot;.</translation>
+        <source>Select the background color for entries with VCS status &quot;removed&quot;.</source>
+        <translation>Seleccionar el color de fondo para las entradas con estado de VCS &quot;eliminado&quot;.</translation>
     </message>
 </context>
 <context>
@@ -82216,21 +82461,6 @@
         <translation>Tamaño Mínimo Lógico de Fuente:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="279"/>
-        <source>Colours</source>
-        <translation>Colores</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="285"/>
-        <source>Background colour of secure URLs:</source>
-        <translation>Color de fondo de URLs seguras:</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="298"/>
-        <source>Select the background colour for secure URLs.</source>
-        <translation>Seleccione el color de fondo para las URLs seguras.</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="324"/>
         <source>Images</source>
         <translation>Imágenes</translation>
@@ -82325,6 +82555,21 @@
         <source>Show Scrollbars</source>
         <translation>Mostrar Barras de Herramientas</translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="279"/>
+        <source>Colors</source>
+        <translation>Colores</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="285"/>
+        <source>Background color of secure URLs:</source>
+        <translation>Color de fondo de URLs seguras:</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="298"/>
+        <source>Select the background color for secure URLs.</source>
+        <translation>Seleccione el color de fondo para las URLs seguras.</translation>
+    </message>
 </context>
 <context>
     <name>WebBrowserClearPrivateDataDialog</name>
@@ -83214,12 +83459,12 @@
         <translation> s</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserPage.py" line="171"/>
+        <location filename="../WebBrowser/WebBrowserPage.py" line="172"/>
         <source>Suspicuous URL detected</source>
         <translation>Detectada URL sospechosa</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserPage.py" line="171"/>
+        <location filename="../WebBrowser/WebBrowserPage.py" line="172"/>
         <source>&lt;p&gt;The URL &lt;b&gt;{0}&lt;/b&gt; was found in the Safe Browsing database.&lt;/p&gt;{1}</source>
         <translation>&lt;p&gt;La URL &lt;b&gt;{0}&lt;/b&gt; se ha encontrado en la base de datos de Navegación Segura.&lt;/p&gt;{1}</translation>
     </message>
@@ -83523,112 +83768,112 @@
 <context>
     <name>WebBrowserTabWidget</name>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="124"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="122"/>
         <source>Show a navigation menu</source>
         <translation>Mostrar un menú de navegación</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="137"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="135"/>
         <source>Show a navigation menu for closed tabs</source>
         <translation>Mostrar un menú de navegación para pestañas cerradas</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="151"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="149"/>
         <source>Open a new web browser tab</source>
         <translation>Abrir una nueva pestaña de navegador web</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="165"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="163"/>
         <source>New Tab</source>
         <translation>Nueva pestaña</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="169"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="167"/>
         <source>Move Left</source>
         <translation>Mover a la Izquierda</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="172"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="170"/>
         <source>Move Right</source>
         <translation>Mover a la Derecha</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="176"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="174"/>
         <source>Duplicate Page</source>
         <translation>Duplicar Página</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="179"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="177"/>
         <source>Close</source>
         <translation>Cerrar</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="182"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="180"/>
         <source>Close Others</source>
         <translation>Cerrar Otras</translation>
     </message>
     <message>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="211"/>
+        <source>Close All</source>
+        <translation>Cerrar todo</translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="186"/>
+        <source>Print Preview</source>
+        <translation>Vista Previa de Impresión</translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="189"/>
+        <source>Print</source>
+        <translation>Imprimir</translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="192"/>
+        <source>Print as PDF</source>
+        <translation>Imprimir como PDF</translation>
+    </message>
+    <message>
         <location filename="../WebBrowser/WebBrowserTabWidget.py" line="213"/>
-        <source>Close All</source>
-        <translation>Cerrar todo</translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="188"/>
-        <source>Print Preview</source>
-        <translation>Vista Previa de Impresión</translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="191"/>
-        <source>Print</source>
-        <translation>Imprimir</translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="194"/>
-        <source>Print as PDF</source>
-        <translation>Imprimir como PDF</translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="215"/>
         <source>Reload All</source>
         <translation>Recargar Todo</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="218"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="216"/>
         <source>Bookmark All Tabs</source>
         <translation>Todas las Pestañas a Marcadores</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="222"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="220"/>
         <source>Restore Closed Tab</source>
         <translation>Restaurar Pestaña Cerrada</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="458"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="456"/>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="898"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="892"/>
         <source>Loading...</source>
         <translation>Cargando...</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="918"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="912"/>
         <source>Finished loading</source>
         <translation>Carga terminada</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="920"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="914"/>
         <source>Failed to load</source>
         <translation>Ha fallado la carga</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="961"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="955"/>
         <source>Are you sure you want to close the window?</source>
         <translation>¿Realmente desea cerrar la ventana?</translation>
     </message>
     <message numerus="yes">
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="961"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="955"/>
         <source>Are you sure you want to close the window?
 You have %n tab(s) open.</source>
         <translation>
@@ -83639,47 +83884,47 @@
         </translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="968"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="962"/>
         <source>&amp;Quit</source>
         <translation>&amp;Salir</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="971"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="965"/>
         <source>C&amp;lose Current Tab</source>
         <translation>Cerrar Pestaña Actua&amp;l</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="1152"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="1146"/>
         <source>Restore All Closed Tabs</source>
         <translation>Restaurar Todas las Pestañas Cerradas</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="1154"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="1148"/>
         <source>Clear List</source>
         <translation>Borrar Lista</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="252"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="250"/>
         <source>Unmute Tab</source>
         <translation>Devolver Sonido a Pestaña</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="256"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="254"/>
         <source>Mute Tab</source>
         <translation>Silenciar Pestaña</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="755"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="753"/>
         <source>Print to PDF</source>
         <translation>Imprimir como PDF</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="705"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="703"/>
         <source>&lt;p&gt;The file &lt;b&gt;{0}&lt;/b&gt; exists already. Shall it be overwritten?&lt;/p&gt;</source>
         <translation>&lt;p&gt;El archivo&lt;b&gt;{0}&lt;/b&gt; ya existe. ¿Desea sobreescribirlo?&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="755"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="753"/>
         <source>&lt;p&gt;The PDF could not be written to file &lt;b&gt;{0}&lt;/b&gt;.&lt;/p&gt;&lt;p&gt;&lt;b&gt;Error:&lt;/b&gt; {1}&lt;/p&gt;</source>
         <translation>&lt;p&gt;El PDF no se ha podido guardar como archivo &lt;b&gt;{0}&lt;/b&gt;.&lt;/p&gt;&lt;p&gt;&lt;b&gt;Error:&lt;/b&gt; {1}&lt;/p&gt;</translation>
     </message>
--- a/eric6/i18n/eric6_fr.ts	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/i18n/eric6_fr.ts	Sat May 02 13:51:07 2020 +0200
@@ -1229,12 +1229,12 @@
         <translation>&lt;&lt;Autres&gt;&gt;</translation>
     </message>
     <message>
-        <location filename="../Graphics/ApplicationDiagramBuilder.py" line="292"/>
+        <location filename="../Graphics/ApplicationDiagramBuilder.py" line="294"/>
         <source>Load Diagram</source>
         <translation>Charger le diagramme</translation>
     </message>
     <message>
-        <location filename="../Graphics/ApplicationDiagramBuilder.py" line="292"/>
+        <location filename="../Graphics/ApplicationDiagramBuilder.py" line="294"/>
         <source>&lt;p&gt;The diagram belongs to the project &lt;b&gt;{0}&lt;/b&gt;. Shall this project be opened?&lt;/p&gt;</source>
         <translation>&lt;p&gt; Le diagramme appartient au projet &lt;b&gt;{0}&lt;/b&gt;. Est-ce que ce projet devrqit être ouvert ? &lt;/p&gt;</translation>
     </message>
@@ -2404,32 +2404,32 @@
 <context>
     <name>BrowserModel</name>
     <message>
-        <location filename="../UI/BrowserModel.py" line="62"/>
+        <location filename="../UI/BrowserModel.py" line="63"/>
         <source>Name</source>
         <translation>Nom</translation>
     </message>
     <message>
-        <location filename="../UI/BrowserModel.py" line="730"/>
+        <location filename="../UI/BrowserModel.py" line="731"/>
         <source>Attributes</source>
         <translation>Attributs</translation>
     </message>
     <message>
-        <location filename="../UI/BrowserModel.py" line="660"/>
+        <location filename="../UI/BrowserModel.py" line="661"/>
         <source>Globals</source>
         <translation>Variables globales</translation>
     </message>
     <message>
-        <location filename="../UI/BrowserModel.py" line="654"/>
+        <location filename="../UI/BrowserModel.py" line="655"/>
         <source>Coding: {0}</source>
         <translation>Codage: {0}</translation>
     </message>
     <message>
-        <location filename="../UI/BrowserModel.py" line="740"/>
+        <location filename="../UI/BrowserModel.py" line="741"/>
         <source>Class Attributes</source>
         <translation>Attributs de classe</translation>
     </message>
     <message>
-        <location filename="../UI/BrowserModel.py" line="666"/>
+        <location filename="../UI/BrowserModel.py" line="667"/>
         <source>Imports</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3116,54 +3116,54 @@
 <context>
     <name>CodeDocumentationViewer</name>
     <message>
-        <location filename="../UI/CodeDocumentationViewer.py" line="175"/>
+        <location filename="../UI/CodeDocumentationViewer.py" line="211"/>
         <source>Code Info Provider:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/CodeDocumentationViewer.py" line="188"/>
+        <location filename="../UI/CodeDocumentationViewer.py" line="224"/>
         <source>Select the code info provider</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/CodeDocumentationViewer.py" line="190"/>
+        <location filename="../UI/CodeDocumentationViewer.py" line="226"/>
         <source>&lt;disabled&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/CodeDocumentationViewer.py" line="371"/>
+        <location filename="../UI/CodeDocumentationViewer.py" line="407"/>
         <source>No documentation available</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/CodeDocumentationViewer.py" line="392"/>
+        <location filename="../UI/CodeDocumentationViewer.py" line="428"/>
         <source>No source code documentation provider has been registered. This function has been disabled.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/CodeDocumentationViewer.py" line="397"/>
+        <location filename="../UI/CodeDocumentationViewer.py" line="433"/>
         <source>This function has been disabled.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/CodeDocumentationViewerTemplate.py" line="137"/>
+        <location filename="../UI/CodeDocumentationViewerTemplate.py" line="139"/>
         <source>No further documentation available</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/CodeDocumentationViewerTemplate.py" line="58"/>
+        <location filename="../UI/CodeDocumentationViewerTemplate.py" line="60"/>
         <source>&lt;p&gt;&lt;b&gt;Definition:&lt;/b&gt; &lt;span class=&quot;def&quot;&gt;@NAME@@ARGSPEC@&lt;/span&gt;&lt;/p&gt;</source>
         <comment>Just translate &apos;Definition:&apos; and leave the rest intact.</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/CodeDocumentationViewerTemplate.py" line="68"/>
+        <location filename="../UI/CodeDocumentationViewerTemplate.py" line="70"/>
         <source>&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; @NOTE@&lt;/p&gt;</source>
         <comment>Just translate &apos;Note:&apos; and leave the rest intact.</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/CodeDocumentationViewerTemplate.py" line="63"/>
+        <location filename="../UI/CodeDocumentationViewerTemplate.py" line="65"/>
         <source>&lt;p&gt;&lt;b&gt;Type:&lt;/b&gt; @TYPE@&lt;/p&gt;</source>
         <comment>Just translate &apos;Type:&apos; and leave the rest intact.</comment>
         <translation type="unfinished"></translation>
@@ -4253,7 +4253,7 @@
     <message>
         <location filename="../Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.ui" line="143"/>
         <source>Colour</source>
-        <translation>Couleur</translation>
+        <translation type="obsolete">Couleur</translation>
     </message>
     <message>
         <location filename="../Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.ui" line="42"/>
@@ -4268,7 +4268,7 @@
     <message>
         <location filename="../Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.ui" line="155"/>
         <source>Enter a variable name or a colour</source>
-        <translation>Entrer un nom de variable ou une couleur</translation>
+        <translation type="obsolete">Entrer un nom de variable ou une couleur</translation>
     </message>
     <message>
         <location filename="../Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.ui" line="167"/>
@@ -4433,7 +4433,7 @@
     <message>
         <location filename="../Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.py" line="72"/>
         <source>&lt;p&gt;The colour &lt;b&gt;{0}&lt;/b&gt; is not valid.&lt;/p&gt;</source>
-        <translation>&lt;p&gt;La couleur &lt;b&gt;{0}&lt;/b&gt; n&apos;est pas valide.&lt;/p&gt;</translation>
+        <translation type="obsolete">&lt;p&gt;La couleur &lt;b&gt;{0}&lt;/b&gt; n&apos;est pas valide.&lt;/p&gt;</translation>
     </message>
     <message>
         <location filename="../Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.ui" line="55"/>
@@ -4446,11 +4446,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.ui" line="292"/>
-        <source>Colour Variable</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.ui" line="87"/>
         <source>Parent</source>
         <translation type="unfinished"></translation>
@@ -4490,6 +4485,26 @@
         <source>Enter the parent expression</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.ui" line="143"/>
+        <source>Color</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.ui" line="155"/>
+        <source>Enter a variable name or a color</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.ui" line="292"/>
+        <source>Color Variable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.py" line="72"/>
+        <source>&lt;p&gt;The color &lt;b&gt;{0}&lt;/b&gt; is not valid.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>CompareDialog</name>
@@ -6377,7 +6392,7 @@
         <translation>Filtrer &amp;avec:</translation>
     </message>
     <message>
-        <location filename="../Project/CreateDialogCodeDialog.py" line="577"/>
+        <location filename="../Project/CreateDialogCodeDialog.py" line="580"/>
         <source>Code Generation</source>
         <translation>Génération de code</translation>
     </message>
@@ -6402,17 +6417,17 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/CreateDialogCodeDialog.py" line="437"/>
+        <location filename="../Project/CreateDialogCodeDialog.py" line="440"/>
         <source>&lt;p&gt;Could not open the code template file &quot;{0}&quot;.&lt;/p&gt;&lt;p&gt;Reason: {1}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/CreateDialogCodeDialog.py" line="475"/>
+        <location filename="../Project/CreateDialogCodeDialog.py" line="478"/>
         <source>&lt;p&gt;Could not open the source file &quot;{0}&quot;.&lt;/p&gt;&lt;p&gt;Reason: {1}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/CreateDialogCodeDialog.py" line="577"/>
+        <location filename="../Project/CreateDialogCodeDialog.py" line="580"/>
         <source>&lt;p&gt;Could not write the source file &quot;{0}&quot;.&lt;/p&gt;&lt;p&gt;Reason: {1}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7633,21 +7648,6 @@
         <translation type="unfinished">Cocher, si le débogueur doit être lancé à distance</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="630"/>
-        <source>Background Colours</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="659"/>
-        <source>Select the background colour for changed items.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="695"/>
-        <source>Select the background colour for elements which are loaded for the first time.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="669"/>
         <source>Changed elements:</source>
         <translation type="unfinished"></translation>
@@ -7657,6 +7657,21 @@
         <source>First time opened elements:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="630"/>
+        <source>Background Colors</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="659"/>
+        <source>Select the background color for changed items.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="695"/>
+        <source>Select the background color for elements which are loaded for the first time.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DebuggerInterfacePython</name>
@@ -8142,110 +8157,110 @@
 <context>
     <name>DiffColoursPage</name>
     <message>
-        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="17"/>
-        <source>&lt;b&gt;Configure Diff colours&lt;/b&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="39"/>
-        <source>Select the background colour for header lines</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="42"/>
-        <source>Header Colour</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="52"/>
         <source>Header Line</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="65"/>
-        <source>Select the background colour for bad whitespace</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="68"/>
-        <source>Whitespace Colour</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="88"/>
-        <source>Select the text foreground colour</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="91"/>
-        <source>Text Colour</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="101"/>
         <source>Normal Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="114"/>
-        <source>Select the background colour for additions</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="117"/>
-        <source>Added Colour</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="127"/>
         <source>Added Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="140"/>
-        <source>Select the background colour for removed text</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="143"/>
-        <source>Removed Colour</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="153"/>
         <source>Removed Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="166"/>
-        <source>Select the background colour for replaced text</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="169"/>
-        <source>Replaced Colour</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="179"/>
         <source>Replaced Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="192"/>
-        <source>Select the background colour for context lines</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="195"/>
-        <source>Context Colour</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="205"/>
         <source>Context Line</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="17"/>
+        <source>&lt;b&gt;Configure Diff colors&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="39"/>
+        <source>Select the background color for header lines</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="42"/>
+        <source>Header Color</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="65"/>
+        <source>Select the background color for bad whitespace</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="68"/>
+        <source>Whitespace Color</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="88"/>
+        <source>Select the text foreground color</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="91"/>
+        <source>Text Color</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="114"/>
+        <source>Select the background color for additions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="117"/>
+        <source>Added Color</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="140"/>
+        <source>Select the background color for removed text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="143"/>
+        <source>Removed Color</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="166"/>
+        <source>Select the background color for replaced text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="169"/>
+        <source>Replaced Color</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="192"/>
+        <source>Select the background color for context lines</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="195"/>
+        <source>Context Color</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DiffDialog</name>
@@ -9411,7 +9426,7 @@
 <context>
     <name>E5GraphicsView</name>
     <message>
-        <location filename="../E5Graphics/E5GraphicsView.py" line="56"/>
+        <location filename="../E5Graphics/E5GraphicsView.py" line="58"/>
         <source>&lt;b&gt;Graphics View&lt;/b&gt;
 &lt;p&gt;This graphics view is used to show a diagram. 
 There are various actions available to manipulate the 
@@ -9438,7 +9453,7 @@
 </translation>
     </message>
     <message>
-        <location filename="../E5Graphics/E5GraphicsView.py" line="377"/>
+        <location filename="../E5Graphics/E5GraphicsView.py" line="416"/>
         <source>{0}, Page {1}</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11053,7 +11068,7 @@
         <translation>Éditer le point d&apos;arrêt...</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5607"/>
+        <location filename="../QScintilla/Editor.py" line="5615"/>
         <source>Enable breakpoint</source>
         <translation>Activer le point d&apos;arrêt</translation>
     </message>
@@ -11073,142 +11088,142 @@
         <translation>Effacer tous les points d&apos;arrêts</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="1955"/>
+        <location filename="../QScintilla/Editor.py" line="1956"/>
         <source>Modification of Read Only file</source>
         <translation>Modification de la lecture seule</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="1955"/>
+        <location filename="../QScintilla/Editor.py" line="1956"/>
         <source>You are attempting to change a read only file. Please save to a different file first.</source>
         <translation>Le fichier est en lecture seule. Sauvez d&apos;abord votre fichier sous un autre nom.</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="2663"/>
+        <location filename="../QScintilla/Editor.py" line="2664"/>
         <source>Printing...</source>
         <translation>Impression....</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="2680"/>
+        <location filename="../QScintilla/Editor.py" line="2681"/>
         <source>Printing completed</source>
         <translation>Impression terminée</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="2682"/>
+        <location filename="../QScintilla/Editor.py" line="2683"/>
         <source>Error while printing</source>
         <translation>Erreur durant l&apos;impression</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="2685"/>
+        <location filename="../QScintilla/Editor.py" line="2686"/>
         <source>Printing aborted</source>
         <translation>Impression abandonnée</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="3106"/>
+        <location filename="../QScintilla/Editor.py" line="3107"/>
         <source>Open File</source>
         <translation>Ouvrir Fichier</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="3295"/>
+        <location filename="../QScintilla/Editor.py" line="3296"/>
         <source>Save File</source>
         <translation>Enregistrer Fichier</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="3046"/>
+        <location filename="../QScintilla/Editor.py" line="3047"/>
         <source>File Modified</source>
         <translation>Fichier Modifié</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="4772"/>
+        <location filename="../QScintilla/Editor.py" line="4777"/>
         <source>Autocompletion</source>
         <translation>Autocompletion</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="4772"/>
+        <location filename="../QScintilla/Editor.py" line="4777"/>
         <source>Autocompletion is not available because there is no autocompletion source set.</source>
         <translation>L&apos;autocompletion n&apos;est pas disponible car aucune source d&apos;autocomplétion n&apos;est définie.</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5610"/>
+        <location filename="../QScintilla/Editor.py" line="5618"/>
         <source>Disable breakpoint</source>
         <translation>Désactiver le point d&apos;arrêt</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5985"/>
+        <location filename="../QScintilla/Editor.py" line="5993"/>
         <source>Code Coverage</source>
         <translation>Code Coverage</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5985"/>
+        <location filename="../QScintilla/Editor.py" line="5993"/>
         <source>Please select a coverage file</source>
         <translation>Sélectionner un fichier coverage</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6165"/>
+        <location filename="../QScintilla/Editor.py" line="6173"/>
         <source>Profile Data</source>
         <translation>Profiler de données</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6165"/>
+        <location filename="../QScintilla/Editor.py" line="6173"/>
         <source>Please select a profile file</source>
         <translation>Sélectionner un fichier profile</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6718"/>
+        <location filename="../QScintilla/Editor.py" line="6726"/>
         <source>Macro Name</source>
         <translation>Nom de la macro</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6718"/>
+        <location filename="../QScintilla/Editor.py" line="6726"/>
         <source>Select a macro name:</source>
         <translation>Sélectionner un nom de macro:</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6789"/>
+        <location filename="../QScintilla/Editor.py" line="6797"/>
         <source>Macro files (*.macro)</source>
         <translation>Fichier Macro (*.macro)</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6746"/>
+        <location filename="../QScintilla/Editor.py" line="6754"/>
         <source>Load macro file</source>
         <translation>Charger un fichier macro</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6769"/>
+        <location filename="../QScintilla/Editor.py" line="6777"/>
         <source>Error loading macro</source>
         <translation>Erreur lors du chargement de la macro</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6789"/>
+        <location filename="../QScintilla/Editor.py" line="6797"/>
         <source>Save macro file</source>
         <translation>Enregistrer le fichier macro</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6806"/>
+        <location filename="../QScintilla/Editor.py" line="6814"/>
         <source>Save macro</source>
         <translation>Enregistrer la macro</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6822"/>
+        <location filename="../QScintilla/Editor.py" line="6830"/>
         <source>Error saving macro</source>
         <translation>Erreur lors de l&apos;enregistrement de la macro</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6835"/>
+        <location filename="../QScintilla/Editor.py" line="6843"/>
         <source>Start Macro Recording</source>
         <translation>Démarrer l&apos;enregistrement de la macro</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6861"/>
+        <location filename="../QScintilla/Editor.py" line="6869"/>
         <source>Macro Recording</source>
         <translation>Enregistrement de macro</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6861"/>
+        <location filename="../QScintilla/Editor.py" line="6869"/>
         <source>Enter name of the macro:</source>
         <translation>Entrer le nom de la macro:</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7001"/>
+        <location filename="../QScintilla/Editor.py" line="7009"/>
         <source>File changed</source>
         <translation>Fichier modifié</translation>
     </message>
@@ -11228,7 +11243,7 @@
         <translation>Supprimer les flags d&apos;erreurs de syntaxe</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7307"/>
+        <location filename="../QScintilla/Editor.py" line="7320"/>
         <source>Drop Error</source>
         <translation>Erreur de suppression</translation>
     </message>
@@ -11238,12 +11253,12 @@
         <translation>Afficher le message d&apos;erreur de syntaxe</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6327"/>
+        <location filename="../QScintilla/Editor.py" line="6335"/>
         <source>Syntax Error</source>
         <translation>Erreur de syntaxe</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6327"/>
+        <location filename="../QScintilla/Editor.py" line="6335"/>
         <source>No syntax error message available.</source>
         <translation>Aucun message d&apos;erreur de syntaxe..</translation>
     </message>
@@ -11273,17 +11288,17 @@
         <translation>Ligne non executée précédente</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6048"/>
+        <location filename="../QScintilla/Editor.py" line="6056"/>
         <source>Show Code Coverage Annotations</source>
         <translation>Afficher les annotations de Code Coverage</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6041"/>
+        <location filename="../QScintilla/Editor.py" line="6049"/>
         <source>All lines have been covered.</source>
         <translation>Toutes les lignes ont été executées.</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6048"/>
+        <location filename="../QScintilla/Editor.py" line="6056"/>
         <source>There is no coverage file available.</source>
         <translation>Impossible de trouver le fichier de coverage.</translation>
     </message>
@@ -11318,72 +11333,72 @@
         <translation>Pas de langage</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7328"/>
+        <location filename="../QScintilla/Editor.py" line="7341"/>
         <source>Resources</source>
         <translation>Ressources</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7330"/>
+        <location filename="../QScintilla/Editor.py" line="7343"/>
         <source>Add file...</source>
         <translation>Ajouter un fichier...</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7332"/>
+        <location filename="../QScintilla/Editor.py" line="7345"/>
         <source>Add files...</source>
         <translation>Ajouter des fichiers...</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7334"/>
+        <location filename="../QScintilla/Editor.py" line="7347"/>
         <source>Add aliased file...</source>
         <translation>Ajouter un fichier alias...</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7337"/>
+        <location filename="../QScintilla/Editor.py" line="7350"/>
         <source>Add localized resource...</source>
         <translation>Ajouter une ressource localisée...</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7360"/>
+        <location filename="../QScintilla/Editor.py" line="7373"/>
         <source>Add file resource</source>
         <translation>Ajoute un fichier ressource</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7376"/>
+        <location filename="../QScintilla/Editor.py" line="7389"/>
         <source>Add file resources</source>
         <translation>Ajoute des fichiers ressources</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7403"/>
+        <location filename="../QScintilla/Editor.py" line="7416"/>
         <source>Add aliased file resource</source>
         <translation>Ajoute un alias de fichier ressource</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7469"/>
+        <location filename="../QScintilla/Editor.py" line="7482"/>
         <source>Package Diagram</source>
         <translation>Diagramme de package</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7469"/>
+        <location filename="../QScintilla/Editor.py" line="7482"/>
         <source>Include class attributes?</source>
         <translation>Inclure les attributs de classes ?</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7505"/>
+        <location filename="../QScintilla/Editor.py" line="7518"/>
         <source>Application Diagram</source>
         <translation>Diagramme de l&apos;application</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7505"/>
+        <location filename="../QScintilla/Editor.py" line="7518"/>
         <source>Include module names?</source>
         <translation>Inclure les noms de modules ?</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7341"/>
+        <location filename="../QScintilla/Editor.py" line="7354"/>
         <source>Add resource frame</source>
         <translation>Ajouter un cadre ressource</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6835"/>
+        <location filename="../QScintilla/Editor.py" line="6843"/>
         <source>Macro recording is already active. Start new?</source>
         <translation>L&apos;enregistrement de macro est déjà actif. En démarrer une nouvelle ?</translation>
     </message>
@@ -11428,12 +11443,12 @@
         <translation>Aucun format d&apos;exportation indiqué. Abandon...</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7491"/>
+        <location filename="../QScintilla/Editor.py" line="7504"/>
         <source>Imports Diagram</source>
         <translation>Diagramme des modules</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7491"/>
+        <location filename="../QScintilla/Editor.py" line="7504"/>
         <source>Include imports from external modules?</source>
         <translation>Inclure l&apos;importation de modules externes?</translation>
     </message>
@@ -11503,7 +11518,7 @@
         <translation>Sélectionne l&apos;analyseur Pygments à appliquer.</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7834"/>
+        <location filename="../QScintilla/Editor.py" line="7847"/>
         <source>Check spelling...</source>
         <translation>Correction orthographique...</translation>
     </message>
@@ -11513,12 +11528,12 @@
         <translation>Correction orthographique de la sélection...</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7837"/>
+        <location filename="../QScintilla/Editor.py" line="7850"/>
         <source>Add to dictionary</source>
         <translation>Ajouter au dictionnaire</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7839"/>
+        <location filename="../QScintilla/Editor.py" line="7852"/>
         <source>Ignore All</source>
         <translation>Tout ignorer</translation>
     </message>
@@ -11543,47 +11558,47 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="3046"/>
+        <location filename="../QScintilla/Editor.py" line="3047"/>
         <source>&lt;p&gt;The file &lt;b&gt;{0}&lt;/b&gt; has unsaved changes.&lt;/p&gt;</source>
         <translation type="unfinished">&lt;p&gt;Le fichier &lt;b&gt;{0}&lt;/b&gt; a des modifications non enregistrées. &lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="3106"/>
+        <location filename="../QScintilla/Editor.py" line="3107"/>
         <source>&lt;p&gt;The file &lt;b&gt;{0}&lt;/b&gt; could not be opened.&lt;/p&gt;&lt;p&gt;Reason: {1}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="3232"/>
+        <location filename="../QScintilla/Editor.py" line="3233"/>
         <source>&lt;p&gt;The file &lt;b&gt;{0}&lt;/b&gt; could not be saved.&lt;br/&gt;Reason: {1}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6760"/>
+        <location filename="../QScintilla/Editor.py" line="6768"/>
         <source>&lt;p&gt;The macro file &lt;b&gt;{0}&lt;/b&gt; could not be read.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6769"/>
+        <location filename="../QScintilla/Editor.py" line="6777"/>
         <source>&lt;p&gt;The macro file &lt;b&gt;{0}&lt;/b&gt; is corrupt.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6822"/>
+        <location filename="../QScintilla/Editor.py" line="6830"/>
         <source>&lt;p&gt;The macro file &lt;b&gt;{0}&lt;/b&gt; could not be written.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7166"/>
+        <location filename="../QScintilla/Editor.py" line="7179"/>
         <source>{0} (ro)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7307"/>
+        <location filename="../QScintilla/Editor.py" line="7320"/>
         <source>&lt;p&gt;&lt;b&gt;{0}&lt;/b&gt; is not a file.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7403"/>
+        <location filename="../QScintilla/Editor.py" line="7416"/>
         <source>Alias for file &lt;b&gt;{0}&lt;/b&gt;:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11608,27 +11623,27 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="3295"/>
+        <location filename="../QScintilla/Editor.py" line="3296"/>
         <source>&lt;p&gt;The file &lt;b&gt;{0}&lt;/b&gt; already exists. Overwrite it?&lt;/p&gt;</source>
         <translation type="unfinished">&lt;p&gt;Le fichier &lt;b&gt;{0}&lt;/b&gt;existe déjà. Écraser ?&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6806"/>
+        <location filename="../QScintilla/Editor.py" line="6814"/>
         <source>&lt;p&gt;The macro file &lt;b&gt;{0}&lt;/b&gt; already exists. Overwrite it?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6606"/>
+        <location filename="../QScintilla/Editor.py" line="6614"/>
         <source>Warning: {0}</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6613"/>
+        <location filename="../QScintilla/Editor.py" line="6621"/>
         <source>Error: {0}</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6997"/>
+        <location filename="../QScintilla/Editor.py" line="7005"/>
         <source>&lt;br&gt;&lt;b&gt;Warning:&lt;/b&gt; You will lose your changes upon reopening it.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11653,27 +11668,27 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="8255"/>
+        <location filename="../QScintilla/Editor.py" line="8268"/>
         <source>Sort Lines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="8255"/>
+        <location filename="../QScintilla/Editor.py" line="8268"/>
         <source>The selection contains illegal data for a numerical sort.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6541"/>
+        <location filename="../QScintilla/Editor.py" line="6549"/>
         <source>Warning</source>
         <translation type="unfinished">Warning</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6541"/>
+        <location filename="../QScintilla/Editor.py" line="6549"/>
         <source>No warning messages available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6603"/>
+        <location filename="../QScintilla/Editor.py" line="6611"/>
         <source>Style: {0}</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11698,7 +11713,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6991"/>
+        <location filename="../QScintilla/Editor.py" line="6999"/>
         <source>&lt;p&gt;The file &lt;b&gt;{0}&lt;/b&gt; has been changed while it was opened in eric6. Reread it?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11713,32 +11728,32 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="4902"/>
+        <location filename="../QScintilla/Editor.py" line="4907"/>
         <source>Auto-Completion Provider</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="4902"/>
+        <location filename="../QScintilla/Editor.py" line="4907"/>
         <source>The completion list provider &apos;{0}&apos; was already registered. Ignoring duplicate request.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5177"/>
+        <location filename="../QScintilla/Editor.py" line="5185"/>
         <source>Call-Tips Provider</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5177"/>
+        <location filename="../QScintilla/Editor.py" line="5185"/>
         <source>The call-tips provider &apos;{0}&apos; was already registered. Ignoring duplicate request.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="8344"/>
+        <location filename="../QScintilla/Editor.py" line="8357"/>
         <source>Register Mouse Click Handler</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="8344"/>
+        <location filename="../QScintilla/Editor.py" line="8357"/>
         <source>A mouse click handler for &quot;{0}&quot; was already registered by &quot;{1}&quot;. Aborting request by &quot;{2}&quot;...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11768,12 +11783,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="8465"/>
+        <location filename="../QScintilla/Editor.py" line="8478"/>
         <source>EditorConfig Properties</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="8465"/>
+        <location filename="../QScintilla/Editor.py" line="8478"/>
         <source>&lt;p&gt;The EditorConfig properties for file &lt;b&gt;{0}&lt;/b&gt; could not be loaded.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12317,21 +12332,21 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="122"/>
         <source>Colours</source>
-        <translation>Couleurs</translation>
+        <translation type="obsolete">Couleurs</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="128"/>
         <source>Background colour:</source>
-        <translation>Couleur de fond:</translation>
+        <translation type="obsolete">Couleur de fond:</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="141"/>
         <source>Select the background colour for calltips.</source>
-        <translation>Sélectionne la couleur de fond pour les calltips 
+        <translation type="obsolete">Sélectionne la couleur de fond pour les calltips 
 (cadre donnant des propositions d&apos;arguments pour les fonctions reconnues).</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="167"/>
+        <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="213"/>
         <source>Plug-In Behavior</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12361,20 +12376,55 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="176"/>
+        <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="222"/>
         <source>Qscintilla provided calltips are shown, if this option is enabled and calltips shall be provided by plug-ins (see calltips sub-page of the plug-in) and the plugin-ins don&apos;t deliver any calltips.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="179"/>
+        <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="225"/>
         <source>Show QScintilla calltips, if plug-ins fail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="173"/>
+        <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="219"/>
         <source>Select to show QScintilla provided calltips, if the selected plug-ins fail</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="122"/>
+        <source>Colors</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="128"/>
+        <source>Background color:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="141"/>
+        <source>Select the background color for calltips.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="164"/>
+        <source>Foreground color:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="177"/>
+        <source>Select the foreground color for calltips.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="187"/>
+        <source>Highlight color:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="200"/>
+        <source>Select the highlight color for calltips.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>EditorCalltipsQScintillaPage</name>
@@ -13329,12 +13379,12 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="273"/>
         <source>Select the background colour for all styles</source>
-        <translation>Sélectionne une couleur de fond pour tous les styles</translation>
+        <translation type="obsolete">Sélectionne une couleur de fond pour tous les styles</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="276"/>
         <source>All Background Colours</source>
-        <translation>Toutes les couleurs de fond</translation>
+        <translation type="obsolete">Toutes les couleurs de fond</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="325"/>
@@ -13344,12 +13394,12 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="184"/>
         <source>Select the background colour.</source>
-        <translation>Sélectionne la couleur de fond.</translation>
+        <translation type="obsolete">Sélectionne la couleur de fond.</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="187"/>
         <source>Background Colour</source>
-        <translation>Couleur de fond</translation>
+        <translation type="obsolete">Couleur de fond</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="194"/>
@@ -13364,12 +13414,12 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="174"/>
         <source>Select the foreground colour.</source>
-        <translation>Sélectionne la couleur des caractères.</translation>
+        <translation type="obsolete">Sélectionne la couleur des caractères.</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="177"/>
         <source>Foreground Colour</source>
-        <translation>Couleur des caractères</translation>
+        <translation type="obsolete">Couleur des caractères</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="17"/>
@@ -13571,6 +13621,36 @@
         <source>Press to set all sub-styles to default values</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="174"/>
+        <source>Select the foreground color.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="177"/>
+        <source>Foreground Color</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="184"/>
+        <source>Select the background color.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="187"/>
+        <source>Background Color</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="273"/>
+        <source>Select the background color for all styles</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="276"/>
+        <source>All Background Colors</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>EditorKeywordsPage</name>
@@ -14407,12 +14487,12 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorSearchPage.ui" line="127"/>
         <source>Marker Colour:</source>
-        <translation>Couleur du marquage:</translation>
+        <translation type="obsolete">Couleur du marquage:</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorSearchPage.ui" line="140"/>
         <source>Select the colour for the search markers.</source>
-        <translation>Sélectionne la couleur utilisée pour les marqueurs de recherche.</translation>
+        <translation type="obsolete">Sélectionne la couleur utilisée pour les marqueurs de recherche.</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorSearchPage.ui" line="168"/>
@@ -14439,6 +14519,16 @@
         <source>QScintilla Extended  Mode (C++11)</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorSearchPage.ui" line="127"/>
+        <source>Marker Color:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorSearchPage.ui" line="140"/>
+        <source>Select the color for the search markers.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>EditorSpellCheckingPage</name>
@@ -14480,12 +14570,12 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorSpellCheckingPage.ui" line="221"/>
         <source>Marker Colour:</source>
-        <translation>Couleur du marquage:</translation>
+        <translation type="obsolete">Couleur du marquage:</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorSpellCheckingPage.ui" line="234"/>
         <source>Select the colour for the spelling markers.</source>
-        <translation>Sélectionne la couleur de marquage des corrections orthographiques</translation>
+        <translation type="obsolete">Sélectionne la couleur de marquage des corrections orthographiques</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorSpellCheckingPage.ui" line="17"/>
@@ -14515,7 +14605,7 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorSpellCheckingPage.ui" line="215"/>
         <source>Colours</source>
-        <translation>Couleurs</translation>
+        <translation type="obsolete">Couleurs</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorSpellCheckingPage.ui" line="260"/>
@@ -14603,6 +14693,21 @@
 &lt;p&gt;Enter the file extension of pure text files. The complete contents of files with these extensions will be checked.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorSpellCheckingPage.ui" line="215"/>
+        <source>Colors</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorSpellCheckingPage.ui" line="221"/>
+        <source>Marker Color:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorSpellCheckingPage.ui" line="234"/>
+        <source>Select the color for the spelling markers.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>EditorStylesPage</name>
@@ -14765,27 +14870,27 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="515"/>
         <source>Select to use custom selection colours</source>
-        <translation>Cocher pour utiliser des couleurs de sélection personalisées</translation>
+        <translation type="obsolete">Cocher pour utiliser des couleurs de sélection personalisées</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="518"/>
         <source>&lt;b&gt;Use custom selection colours&lt;/b&gt;&lt;p&gt;Select this entry in order to use custom selection colours in the editor and shell windows. The colours for the selection foreground and background are defined on the colours page.&lt;/p&gt;</source>
-        <translation>&lt;b&gt;Utiliser des couleurs personalisées pour la sélection&lt;/b&gt;&lt;p&gt;Cocher cette case pour utiliser des couleurs personalisées pour la sélection de texte dans l&apos;éditeur et dans la fenêtre shell. Les couleurs de police et d&apos;arrière plan pour la sélection sont définies dans la section Couleur.&lt;/p&gt;</translation>
+        <translation type="obsolete">&lt;b&gt;Utiliser des couleurs personalisées pour la sélection&lt;/b&gt;&lt;p&gt;Cocher cette case pour utiliser des couleurs personalisées pour la sélection de texte dans l&apos;éditeur et dans la fenêtre shell. Les couleurs de police et d&apos;arrière plan pour la sélection sont définies dans la section Couleur.&lt;/p&gt;</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="521"/>
         <source>Use custom selection colours</source>
-        <translation>Utiliser des couleurs personlisées pour la sélection de texte</translation>
+        <translation type="obsolete">Utiliser des couleurs personlisées pour la sélection de texte</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="528"/>
         <source>Select, if selected text should be colourized by the lexer.</source>
-        <translation>Cocher si le texte sélectionné doit etre colorié par l&apos;analyseur syntaxique.</translation>
+        <translation type="obsolete">Cocher si le texte sélectionné doit etre colorié par l&apos;analyseur syntaxique.</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="531"/>
         <source>Colourize selected text</source>
-        <translation>Colorier le texte sélectionné</translation>
+        <translation type="obsolete">Colorier le texte sélectionné</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="538"/>
@@ -14805,7 +14910,7 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="565"/>
         <source>Select the foreground colour for the selection.</source>
-        <translation>Couleur des caractères pour la sélection.</translation>
+        <translation type="obsolete">Couleur des caractères pour la sélection.</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="575"/>
@@ -14815,7 +14920,7 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="588"/>
         <source>Select the background colour for the selection.</source>
-        <translation>Sélectionne la couleur de fond pour les caractères sélectionnés.</translation>
+        <translation type="obsolete">Sélectionne la couleur de fond pour les caractères sélectionnés.</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="609"/>
@@ -14840,7 +14945,7 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="648"/>
         <source>Select the colour for the caret.</source>
-        <translation>Couleur pour le curseur.</translation>
+        <translation type="obsolete">Couleur pour le curseur.</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="672"/>
@@ -14850,7 +14955,7 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="761"/>
         <source>Select the background colour for the line containing the caret.</source>
-        <translation>Sélection de la couleur de fond pour la ligne contenant le curseur.</translation>
+        <translation type="obsolete">Sélection de la couleur de fond pour la ligne contenant le curseur.</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="808"/>
@@ -14860,7 +14965,7 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="821"/>
         <source>Select the colour for the current line marker.</source>
-        <translation type="unfinished">Sélectionne la couleur de la ligne courante quand elle est marquée automatiquement.</translation>
+        <translation type="obsolete">Sélectionne la couleur de la ligne courante quand elle est marquée automatiquement.</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="831"/>
@@ -14870,7 +14975,7 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="844"/>
         <source>Select the colour for the error line marker.</source>
-        <translation type="unfinished">Sélectionne la couleur pour les lignes ayant une erreur.</translation>
+        <translation type="obsolete">Sélectionne la couleur pour les lignes ayant une erreur.</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="857"/>
@@ -14895,7 +15000,7 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="886"/>
         <source>Select the colour for highlighting matching braces.</source>
-        <translation>Sélectionne la couleur des parenthèses correctement fermées.</translation>
+        <translation type="obsolete">Sélectionne la couleur des parenthèses correctement fermées.</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="896"/>
@@ -14905,7 +15010,7 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="909"/>
         <source>Select the background colour for highlighting matching braces.</source>
-        <translation>Sélectionner une couleur de fond pour surligner le texte des parenthèses correctement refermées.</translation>
+        <translation type="obsolete">Sélectionner une couleur de fond pour surligner le texte des parenthèses correctement refermées.</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="925"/>
@@ -14915,7 +15020,7 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="932"/>
         <source>Select the colour for  highlighting nonmatching braces.</source>
-        <translation>Sélectionne la couleur des parenthèses mal fermées.</translation>
+        <translation type="obsolete">Sélectionne la couleur des parenthèses mal fermées.</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="948"/>
@@ -14925,7 +15030,7 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="955"/>
         <source>Select the background colour for  highlighting nonmatching braces.</source>
-        <translation>Sélectionner une couleur de fond pour surligner le texte des parenthèses non refermées.</translation>
+        <translation type="obsolete">Sélectionner une couleur de fond pour surligner le texte des parenthèses non refermées.</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="968"/>
@@ -14955,12 +15060,12 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1124"/>
         <source>Select the colour for the edge marker.</source>
-        <translation>Sélectionner la couleur de la bordure.</translation>
+        <translation type="obsolete">Sélectionner la couleur de la bordure.</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1134"/>
         <source>Background colour:</source>
-        <translation>Couleur de fond:</translation>
+        <translation type="obsolete">Couleur de fond:</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1147"/>
@@ -14995,7 +15100,7 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1222"/>
         <source>Change Background Colour</source>
-        <translation>Changement de la couleur de fond</translation>
+        <translation type="obsolete">Changement de la couleur de fond</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="2077"/>
@@ -15030,7 +15135,7 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="351"/>
         <source>Select the foreground colour for the margins</source>
-        <translation>Sélection de la couleur des numéros de ligne dans la marge</translation>
+        <translation type="obsolete">Sélection de la couleur des numéros de ligne dans la marge</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="361"/>
@@ -15040,7 +15145,7 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="374"/>
         <source>Select the background colour for the margins</source>
-        <translation>Sélection de la couleur de fond pour les marges</translation>
+        <translation type="obsolete">Sélection de la couleur de fond pour les marges</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="384"/>
@@ -15050,7 +15155,7 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="397"/>
         <source>Select the background colour for the foldmargin</source>
-        <translation>Sélectionne la couleur de la marge de pliage de code</translation>
+        <translation type="obsolete">Sélectionne la couleur de la marge de pliage de code</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="792"/>
@@ -15093,21 +15198,11 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="420"/>
-        <source>Select the foreground colour of the foldmarkers</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="430"/>
         <source>Foldmarkers background:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="443"/>
-        <source>Select the background colour of the foldmarkers</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="37"/>
         <source>&lt;b&gt;Note:&lt;/b&gt; Fonts and colors of the syntax highlighters have to be configured on the syntax highlighter styles page.</source>
         <translation type="unfinished"></translation>
@@ -15133,21 +15228,11 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1402"/>
-        <source>Press to select the foreground colour</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1405"/>
         <source>Foreground</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1412"/>
-        <source>Press to select the background colour</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1415"/>
         <source>Background</source>
         <translation type="unfinished"></translation>
@@ -15178,54 +15263,24 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1636"/>
-        <source>Select the foreground colour for visible whitespace</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1646"/>
         <source>Whitespace background:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1659"/>
-        <source>Select the background colour for visible whitespace</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="53"/>
-        <source>Select to set the colour of the edit area different to the default style</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="56"/>
-        <source>Override edit area colours</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="68"/>
         <source>Edit area foreground:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="81"/>
-        <source>Select the foreground colour for the edit area.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="91"/>
         <source>Edit area background:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="104"/>
-        <source>Select the background colour for the edit area.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="47"/>
         <source>Colours</source>
-        <translation type="unfinished">Couleurs</translation>
+        <translation type="obsolete">Couleurs</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1444"/>
@@ -15258,26 +15313,6 @@
         <translation type="unfinished"> ms</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1514"/>
-        <source>Unsaved changes colour:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1527"/>
-        <source>Select the colour for the change marker for unsaved changes.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1537"/>
-        <source>Saved changes colour:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1550"/>
-        <source>Select the colour for the change marker for saved changes.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1003"/>
         <source>Select the wrap mode for long lines</source>
         <translation type="unfinished"></translation>
@@ -15353,91 +15388,46 @@
         <translation type="unfinished">Erreurs:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1782"/>
-        <source>Select the colour for error markers</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1792"/>
         <source>Warnings:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1805"/>
-        <source>Select the colour for warning markers</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1815"/>
         <source>Bookmarks:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1828"/>
-        <source>Select the colour for bookmark markers</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1838"/>
         <source>Breakpoints:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1851"/>
-        <source>Select the colour for breakpoint markers</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1861"/>
         <source>Tasks:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1874"/>
-        <source>Select the colour for task markers</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1884"/>
         <source>Changes:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1897"/>
-        <source>Select the colour for change markers</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1907"/>
         <source>Coverage:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1920"/>
-        <source>Select the colour for coverage markers</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1930"/>
         <source>Current Line:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1943"/>
-        <source>Select the colour for the current line marker</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1999"/>
         <source>Background:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="2012"/>
-        <source>Select the background colour for the marker map</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1674"/>
         <source>Indentation Guides</source>
         <translation type="unfinished"></translation>
@@ -15458,31 +15448,16 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1705"/>
-        <source>Select the foreground colour for indentation guides</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1715"/>
         <source>Indentation Guides background:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1728"/>
-        <source>Select the background colour for indentation guides</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1953"/>
         <source>Search Markers:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1966"/>
-        <source>Select the colour for the search marker</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="2093"/>
         <source>Select to hide the Format Buttons bar when formatting is not supported</source>
         <translation type="unfinished"></translation>
@@ -15493,26 +15468,11 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="798"/>
-        <source>Select to indicate the debug markers using coloured line backgrounds, arrow indicators otherwise</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="801"/>
-        <source>Use background colours</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1976"/>
         <source>Conflict Marker Line:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1989"/>
-        <source>Select the colour for the conflict marker line marker</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1749"/>
         <source>Select to show the marker map right of the editor</source>
         <translation type="unfinished"></translation>
@@ -15659,8 +15619,263 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="47"/>
+        <source>Colors</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="53"/>
+        <source>Select to set the color of the edit area different to the default style</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="56"/>
+        <source>Override edit area colors</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="81"/>
+        <source>Select the foreground color for the edit area.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="104"/>
+        <source>Select the background color for the edit area.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="648"/>
+        <source>Select the color for the caret.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="351"/>
+        <source>Select the foreground color for the margins</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="374"/>
+        <source>Select the background color for the margins</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="397"/>
+        <source>Select the background color for the foldmargin</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="420"/>
+        <source>Select the foreground color of the foldmarkers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="443"/>
+        <source>Select the background color of the foldmarkers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="515"/>
+        <source>Select to use custom selection colors</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="518"/>
+        <source>&lt;b&gt;Use custom selection colors&lt;/b&gt;&lt;p&gt;Select this entry in order to use custom selection colors in the editor and shell windows. The colors for the selection foreground and background are defined on the colors page.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="521"/>
+        <source>Use custom selection colors</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="528"/>
+        <source>Select, if selected text should be colorized by the lexer.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="531"/>
+        <source>Colorize selected text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="565"/>
+        <source>Select the foreground color for the selection.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="588"/>
+        <source>Select the background color for the selection.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="761"/>
+        <source>Select the background color for the line containing the caret.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="798"/>
+        <source>Select to indicate the debug markers using colored line backgrounds, arrow indicators otherwise</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="801"/>
+        <source>Use background colors</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="821"/>
+        <source>Select the color for the current line marker.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="844"/>
+        <source>Select the color for the error line marker.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="886"/>
+        <source>Select the color for highlighting matching braces.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="909"/>
+        <source>Select the background color for highlighting matching braces.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="932"/>
+        <source>Select the color for  highlighting nonmatching braces.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="955"/>
+        <source>Select the background color for  highlighting nonmatching braces.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1124"/>
+        <source>Select the color for the edge marker.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1134"/>
+        <source>Background color:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1222"/>
+        <source>Change Background Color</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1402"/>
+        <source>Press to select the foreground color</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1412"/>
+        <source>Press to select the background color</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1514"/>
+        <source>Unsaved changes color:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1527"/>
+        <source>Select the color for the change marker for unsaved changes.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1537"/>
+        <source>Saved changes color:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1550"/>
+        <source>Select the color for the change marker for saved changes.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1636"/>
+        <source>Select the foreground color for visible whitespace</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1659"/>
+        <source>Select the background color for visible whitespace</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1705"/>
+        <source>Select the foreground color for indentation guides</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1728"/>
+        <source>Select the background color for indentation guides</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1763"/>
-        <source>Marker Colours</source>
+        <source>Marker Colors</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1782"/>
+        <source>Select the color for error markers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1805"/>
+        <source>Select the color for warning markers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1828"/>
+        <source>Select the color for bookmark markers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1851"/>
+        <source>Select the color for breakpoint markers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1874"/>
+        <source>Select the color for task markers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1897"/>
+        <source>Select the color for change markers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1920"/>
+        <source>Select the color for coverage markers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1943"/>
+        <source>Select the color for the current line marker</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1966"/>
+        <source>Select the color for the search marker</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1989"/>
+        <source>Select the color for the conflict marker line marker</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="2012"/>
+        <source>Select the background color for the marker map</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -16809,17 +17024,17 @@
     <message>
         <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="252"/>
         <source>Enter the filename of a CSS style sheet. Leave empty to use the colours defined below.</source>
-        <translation>Entrer le nom de fichier d&apos;une feuille de style CSS. Laisser vide pour utiliser les couleurs définies ci-dessous.</translation>
+        <translation type="obsolete">Entrer le nom de fichier d&apos;une feuille de style CSS. Laisser vide pour utiliser les couleurs définies ci-dessous.</translation>
     </message>
     <message>
         <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="262"/>
         <source>Colours</source>
-        <translation>Couleurs</translation>
+        <translation type="obsolete">Couleurs</translation>
     </message>
     <message>
         <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="268"/>
         <source>Press to select the class and function header background colour.</source>
-        <translation>Cliquer pour sélectionner la couleur de fond pour les en-têtes de classes et de fonctions.</translation>
+        <translation type="obsolete">Cliquer pour sélectionner la couleur de fond pour les en-têtes de classes et de fonctions.</translation>
     </message>
     <message>
         <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="271"/>
@@ -16829,7 +17044,7 @@
     <message>
         <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="278"/>
         <source>Press to select the class and function header foreground colour.</source>
-        <translation>Cliquer pour sélectionner une couleur de fond pour les en-têtes de classes et de fonctions.</translation>
+        <translation type="obsolete">Cliquer pour sélectionner une couleur de fond pour les en-têtes de classes et de fonctions.</translation>
     </message>
     <message>
         <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="281"/>
@@ -16839,7 +17054,7 @@
     <message>
         <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="288"/>
         <source>Press to select the level 2 header background colour.</source>
-        <translation>Cliquer pour sélectionner la couleur de fond pour les en-têtes de niveau 2.</translation>
+        <translation type="obsolete">Cliquer pour sélectionner la couleur de fond pour les en-têtes de niveau 2.</translation>
     </message>
     <message>
         <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="291"/>
@@ -16849,7 +17064,7 @@
     <message>
         <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="298"/>
         <source>Press to select the level 2 header foreground colour.</source>
-        <translation>Cliquer pour sélectionner la couleur des caractères pour les en-têtes de niveau 2.</translation>
+        <translation type="obsolete">Cliquer pour sélectionner la couleur des caractères pour les en-têtes de niveau 2.</translation>
     </message>
     <message>
         <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="301"/>
@@ -16859,7 +17074,7 @@
     <message>
         <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="308"/>
         <source>Press to select the level 1 header background colour.</source>
-        <translation>Cliquer pour sélectionner la couleur de fond des en-têtes de niveau 1.</translation>
+        <translation type="obsolete">Cliquer pour sélectionner la couleur de fond des en-têtes de niveau 1.</translation>
     </message>
     <message>
         <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="311"/>
@@ -16869,7 +17084,7 @@
     <message>
         <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="318"/>
         <source>Press to select the level 1 header foreground colour.</source>
-        <translation>Cliquer pour sélectionner la couleur des caractères pour les en-têtes de niveau 1.</translation>
+        <translation type="obsolete">Cliquer pour sélectionner la couleur des caractères pour les en-têtes de niveau 1.</translation>
     </message>
     <message>
         <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="321"/>
@@ -16879,7 +17094,7 @@
     <message>
         <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="328"/>
         <source>Press to select the body background colour.</source>
-        <translation>Cliquer pour sélectionner une couleur de fond pour le corps de texte.</translation>
+        <translation type="obsolete">Cliquer pour sélectionner une couleur de fond pour le corps de texte.</translation>
     </message>
     <message>
         <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="331"/>
@@ -16889,7 +17104,7 @@
     <message>
         <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="338"/>
         <source>Press to select the body foreground colour.</source>
-        <translation>Cliquer pour sélectionner une couleur de caractères pour le corps de texte.</translation>
+        <translation type="obsolete">Cliquer pour sélectionner une couleur de caractères pour le corps de texte.</translation>
     </message>
     <message>
         <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="341"/>
@@ -16899,7 +17114,7 @@
     <message>
         <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="348"/>
         <source>Press to select the foreground colour of links.</source>
-        <translation>Cliquer pour sélectionner une couleur de caractères pour les liens.</translation>
+        <translation type="obsolete">Cliquer pour sélectionner une couleur de caractères pour les liens.</translation>
     </message>
     <message>
         <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="351"/>
@@ -16909,7 +17124,7 @@
     <message>
         <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="358"/>
         <source>This shows an example of the selected colours.</source>
-        <translation>Cette fenêtre montre un exemple des couleurs sélectionnées.</translation>
+        <translation type="obsolete">Cette fenêtre montre un exemple des couleurs sélectionnées.</translation>
     </message>
     <message>
         <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="150"/>
@@ -17001,6 +17216,66 @@
         <source>&lt;?xml version=&quot;1.0&quot; encoding=&quot;utf-8&quot;?&gt;&lt;!DOCTYPE html PUBLIC &quot;-//W3C//DTD XHTML 1.0 Strict//EN&quot;&quot;http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd&quot;&gt;&lt;html&gt;&lt;head&gt;&lt;title&gt;&lt;/title&gt;&lt;/head&gt;&lt;body style=&quot;background-color:{BodyBgColor};color:{BodyColor}&quot;&gt;&lt;h1 style=&quot;background-color:{Level1HeaderBgColor};color:{Level1HeaderColor}&quot;&gt;Level 1 Header&lt;/h1&gt;&lt;h3 style=&quot;background-color:{Level2HeaderBgColor};color:{Level2HeaderColor}&quot;&gt;Level 2 Header&lt;/h3&gt;&lt;h2 style=&quot;background-color:{CFBgColor};color:{CFColor}&quot;&gt;Class and Function Header&lt;/h2&gt;Standard body text with &lt;a style=&quot;color:{LinkColor}&quot;&gt;some links&lt;/a&gt; embedded.&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="252"/>
+        <source>Enter the filename of a CSS style sheet. Leave empty to use the colors defined below.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="262"/>
+        <source>Colors</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="268"/>
+        <source>Press to select the class and function header background color.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="278"/>
+        <source>Press to select the class and function header foreground color.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="288"/>
+        <source>Press to select the level 2 header background color.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="298"/>
+        <source>Press to select the level 2 header foreground color.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="308"/>
+        <source>Press to select the level 1 header background color.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="318"/>
+        <source>Press to select the level 1 header foreground color.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="328"/>
+        <source>Press to select the body background color.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="338"/>
+        <source>Press to select the body foreground color.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="348"/>
+        <source>Press to select the foreground color of links.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="358"/>
+        <source>This shows an example of the selected colors.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>EricdocExecDialog</name>
@@ -17483,7 +17758,7 @@
 <context>
     <name>ExporterHTML</name>
     <message>
-        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="516"/>
+        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="537"/>
         <source>Export source</source>
         <translation>Exportation de source</translation>
     </message>
@@ -17493,25 +17768,45 @@
         <translation>Fichiers HTML (*.html)</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="448"/>
+        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="466"/>
         <source>&lt;p&gt;The source could not be exported to &lt;b&gt;{0}&lt;/b&gt;.&lt;/p&gt;&lt;p&gt;Reason: {1}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="457"/>
+        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="475"/>
         <source>&lt;p&gt;The source could not be exported to &lt;b&gt;{0}&lt;/b&gt;.&lt;/p&gt;&lt;p&gt;Reason: No HTML code generated.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="516"/>
+        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="537"/>
         <source>&lt;p&gt;Markdown export requires the &lt;b&gt;python-markdown&lt;/b&gt; package.&lt;br/&gt;Install it with your package manager, &apos;pip install docutils&apos; or see &lt;a href=&quot;http://pythonhosted.org/Markdown/install.html&quot;&gt; installation instructions.&lt;/a&gt;&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="484"/>
+        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="502"/>
         <source>&lt;p&gt;ReStructuredText export requires the &lt;b&gt;python-docutils&lt;/b&gt; package.&lt;br/&gt;Install it with your package manager, &apos;pip install docutils&apos; or see &lt;a href=&quot;http://pypi.python.org/pypi/docutils&quot;&gt;this page.&lt;/a&gt;&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="412"/>
+        <source>Light Background Color</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="413"/>
+        <source>Dark Background Color</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="416"/>
+        <source>Markdown Export</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="416"/>
+        <source>Select color scheme:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ExporterODT</name>
@@ -21197,12 +21492,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="101"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="106"/>
         <source>Commit ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="102"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="107"/>
         <source>Author</source>
         <translation type="unfinished">Auteur</translation>
     </message>
@@ -21212,7 +21507,7 @@
         <translation type="unfinished">Date</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="103"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="108"/>
         <source>Committer</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21222,7 +21517,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="104"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="109"/>
         <source>Subject</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21297,7 +21592,7 @@
         <translation type="unfinished">Copie depuis</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2098"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2100"/>
         <source>Differences</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21357,328 +21652,328 @@
         <translation type="unfinished">Alt+P</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="88"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="93"/>
         <source>&amp;Refresh</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="90"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="95"/>
         <source>Press to refresh the list of commits</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="98"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="103"/>
         <source>Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="99"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="104"/>
         <source>Filter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="105"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="110"/>
         <source>File</source>
         <translation type="unfinished">Fichier</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="122"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="128"/>
         <source>&lt;table&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Commit ID&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Date&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{1}&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Author&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{2} &amp;lt;{3}&amp;gt;&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Commit Date&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{4}&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Committer&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{5} &amp;lt;{6}&amp;gt;&lt;/td&gt;&lt;/tr&gt;{7}&lt;tr&gt;&lt;td&gt;&lt;b&gt;Subject&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{8}&lt;/td&gt;&lt;/tr&gt;{9}&lt;/table&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="134"/>
-        <source>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Parents&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</source>
-        <translation type="unfinished">&lt;tr&gt;&lt;td&gt;&lt;b&gt;Parents&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</translation>
-    </message>
-    <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="137"/>
-        <source>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Children&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="140"/>
-        <source>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Branches&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</source>
-        <translation type="unfinished">&lt;tr&gt;&lt;td&gt;&lt;b&gt;Branches&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</translation>
+        <source>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Parents&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</source>
+        <translation type="unfinished">&lt;tr&gt;&lt;td&gt;&lt;b&gt;Parents&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</translation>
     </message>
     <message>
         <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="143"/>
-        <source>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Tags&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</source>
-        <translation type="unfinished">&lt;tr&gt;&lt;td&gt;&lt;b&gt;Étiquettes&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</translation>
+        <source>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Children&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="146"/>
+        <source>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Branches&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</source>
+        <translation type="unfinished">&lt;tr&gt;&lt;td&gt;&lt;b&gt;Branches&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</translation>
+    </message>
+    <message>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="149"/>
+        <source>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Tags&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</source>
+        <translation type="unfinished">&lt;tr&gt;&lt;td&gt;&lt;b&gt;Étiquettes&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</translation>
+    </message>
+    <message>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="152"/>
         <source>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Message&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="197"/>
-        <source>Added</source>
-        <translation type="unfinished">Ajouté</translation>
-    </message>
-    <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="198"/>
-        <source>Deleted</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="199"/>
-        <source>Modified</source>
-        <translation type="unfinished">Modifié</translation>
-    </message>
-    <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="200"/>
-        <source>Copied</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="201"/>
-        <source>Renamed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="202"/>
-        <source>Type changed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="203"/>
-        <source>Unmerged</source>
-        <translation type="unfinished"></translation>
+        <source>Added</source>
+        <translation type="unfinished">Ajouté</translation>
     </message>
     <message>
         <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="204"/>
+        <source>Deleted</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="205"/>
+        <source>Modified</source>
+        <translation type="unfinished">Modifié</translation>
+    </message>
+    <message>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="206"/>
+        <source>Copied</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="207"/>
+        <source>Renamed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="208"/>
+        <source>Type changed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="209"/>
+        <source>Unmerged</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="210"/>
         <source>Unknown</source>
         <translation type="unfinished">Inconnu</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="240"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="246"/>
         <source>Show Commit ID Column</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="242"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="248"/>
         <source>Press to show the commit ID column</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="250"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="256"/>
         <source>Show Author Columns</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="252"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="258"/>
         <source>Press to show the author columns</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="260"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="266"/>
         <source>Show Committer Columns</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="262"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="268"/>
         <source>Press to show the committer columns</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="270"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="276"/>
         <source>Show Branches Column</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="272"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="278"/>
         <source>Press to show the branches column</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="280"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="286"/>
         <source>Show Tags Column</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="282"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="288"/>
         <source>Press to show the Tags column</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="309"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="315"/>
         <source>Copy Commits</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="311"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="317"/>
         <source>Cherry-pick the selected commits to the current branch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="316"/>
-        <source>Tag</source>
-        <translation type="unfinished">Tag</translation>
-    </message>
-    <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="318"/>
-        <source>Tag the selected commit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1792"/>
-        <source>Branch</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="322"/>
-        <source>Create a new branch at the selected commit.</source>
-        <translation type="unfinished"></translation>
+        <source>Tag</source>
+        <translation type="unfinished">Tag</translation>
     </message>
     <message>
         <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="324"/>
+        <source>Tag the selected commit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1794"/>
+        <source>Branch</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="328"/>
+        <source>Create a new branch at the selected commit.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="330"/>
         <source>Branch &amp;&amp; Switch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="326"/>
-        <source>Create a new branch at the selected commit and switch the work tree to it.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1844"/>
-        <source>Switch</source>
-        <translation type="unfinished">Basculer de version</translation>
-    </message>
-    <message>
         <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="332"/>
-        <source>Switch the working directory to the selected commit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1870"/>
-        <source>Show Short Log</source>
-        <translation type="unfinished"></translation>
+        <source>Create a new branch at the selected commit and switch the work tree to it.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1846"/>
+        <source>Switch</source>
+        <translation type="unfinished">Basculer de version</translation>
     </message>
     <message>
         <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="338"/>
+        <source>Switch the working directory to the selected commit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1872"/>
+        <source>Show Short Log</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="344"/>
         <source>Show a dialog with a log output for release notes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="341"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="347"/>
         <source>Describe</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="343"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="349"/>
         <source>Show the most recent tag reachable from a commit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="632"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="634"/>
         <source>The git process did not finish within 30s.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="635"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="637"/>
         <source>Could not start the git executable.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="638"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="640"/>
         <source>Git Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="754"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="756"/>
         <source>{0} ({1}%)</source>
         <comment>action, confidence</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="820"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="822"/>
         <source>Process Generation Error</source>
         <translation type="unfinished">Erreur du processus</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="820"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="822"/>
         <source>The process {0} could not be started. Ensure, that it is in the search path.</source>
         <translation type="unfinished">Impossible de lancer le processus {0}. Assurez-vous qu&apos;il est bien dans le chemin de recherche.</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1265"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1267"/>
         <source>Side-by-Side Diff to Parent {0}</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1277"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1279"/>
         <source>&lt;a href=&quot;sbsdiff:{0}_{1}&quot;&gt;Side-by-Side Compare&lt;/a&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1706"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1708"/>
         <source>Copy Changesets</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1844"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1846"/>
         <source>The project should be reread. Do this now?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1870"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1872"/>
         <source>Select a branch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1823"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1825"/>
         <source>Select a default branch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1823"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1825"/>
         <source>Branch &amp; Switch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2052"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2054"/>
         <source>Find Commit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2052"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2054"/>
         <source>&apos;{0}&apos; was not found.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2112"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2114"/>
         <source>Differences to Parent {0}</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2127"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2129"/>
         <source>Diff to Parent {0}</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2153"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2155"/>
         <source>There is no difference.</source>
         <translation type="unfinished">Aucune différence.</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2316"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2318"/>
         <source>Save Diff</source>
         <translation type="unfinished">Enregistrer Diff</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2282"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2284"/>
         <source>Patch Files (*.diff)</source>
         <translation type="unfinished">Fichiers Patch (*.diff)</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2299"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2301"/>
         <source>&lt;p&gt;The patch file &lt;b&gt;{0}&lt;/b&gt; already exists. Overwrite it?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2316"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2318"/>
         <source>&lt;p&gt;The patch file &lt;b&gt;{0}&lt;/b&gt; could not be saved.&lt;br&gt;Reason: {1}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -26119,20 +26414,60 @@
 <context>
     <name>GraphicsPage</name>
     <message>
-        <location filename="../Preferences/ConfigurationPages/GraphicsPage.ui" line="16"/>
+        <location filename="../Preferences/ConfigurationPages/GraphicsPage.ui" line="17"/>
         <source>&lt;b&gt;Configure graphics settings&lt;/b&gt;</source>
         <translation>&lt;b&gt;Configuration des paramètres graphiques&lt;/b&gt;</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/GraphicsPage.ui" line="38"/>
+        <location filename="../Preferences/ConfigurationPages/GraphicsPage.ui" line="43"/>
         <source>Press to select the font for the graphic items</source>
         <translation>Cliquer pour sélectionner une police pour les éléments graphiques</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/GraphicsPage.ui" line="51"/>
+        <location filename="../Preferences/ConfigurationPages/GraphicsPage.ui" line="56"/>
         <source>Graphics Font</source>
         <translation>Polices des graphiques</translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/GraphicsPage.ui" line="37"/>
+        <source>Font</source>
+        <translation type="unfinished">Police</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/GraphicsPage.ui" line="72"/>
+        <source>Drawing Mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/GraphicsPage.ui" line="78"/>
+        <source>Select to determine the drawing mode automatically</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/GraphicsPage.ui" line="81"/>
+        <source>Automatic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/GraphicsPage.ui" line="91"/>
+        <source>Select to draw black shapes on a white background</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/GraphicsPage.ui" line="94"/>
+        <source>Black On White</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/GraphicsPage.ui" line="101"/>
+        <source>Select to draw white shapes on a black background</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/GraphicsPage.ui" line="104"/>
+        <source>White On Black</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>GreaseMonkeyAddScriptDialog</name>
@@ -29123,21 +29458,11 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/HexEditorPage.ui" line="142"/>
-        <source>Select the foreground colour of the address area</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/HexEditorPage.ui" line="291"/>
         <source>Background:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/HexEditorPage.ui" line="165"/>
-        <source>Select the background colour of the address area</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/HexEditorPage.ui" line="178"/>
         <source>ASCII Area</source>
         <translation type="unfinished"></translation>
@@ -29168,31 +29493,11 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/HexEditorPage.ui" line="226"/>
-        <source>Select the foreground colour for highlighted data</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/HexEditorPage.ui" line="249"/>
-        <source>Select the background colour for highlighted data</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/HexEditorPage.ui" line="262"/>
         <source>Selection</source>
         <translation type="unfinished">Sélection</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/HexEditorPage.ui" line="281"/>
-        <source>Select the foreground colour of the selection</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/HexEditorPage.ui" line="304"/>
-        <source>Select the background colour of the selection</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/HexEditorPage.ui" line="317"/>
         <source>Font</source>
         <translation type="unfinished">Police</translation>
@@ -29223,6 +29528,36 @@
         <source>Enter the number of recent files to remember</source>
         <translation type="unfinished">Entrer le nombre de fichiers récents à retenir</translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/HexEditorPage.ui" line="142"/>
+        <source>Select the foreground color of the address area</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/HexEditorPage.ui" line="165"/>
+        <source>Select the background color of the address area</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/HexEditorPage.ui" line="226"/>
+        <source>Select the foreground color for highlighted data</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/HexEditorPage.ui" line="249"/>
+        <source>Select the background color for highlighted data</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/HexEditorPage.ui" line="281"/>
+        <source>Select the foreground color of the selection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/HexEditorPage.ui" line="304"/>
+        <source>Select the background color of the selection</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Hg</name>
@@ -31940,7 +32275,7 @@
 <context>
     <name>HgLogBrowserDialog</name>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="92"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="98"/>
         <source>Mercurial Log</source>
         <translation type="unfinished"></translation>
     </message>
@@ -31970,17 +32305,17 @@
         <translation type="unfinished">Sélectionner le champ à filtrer</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="122"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="128"/>
         <source>Revision</source>
         <translation type="unfinished">Révision</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="123"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="129"/>
         <source>Author</source>
         <translation type="unfinished">Auteur</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="124"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="130"/>
         <source>Message</source>
         <translation type="unfinished">Message</translation>
     </message>
@@ -32075,17 +32410,17 @@
         <translation type="obsolete">Alt+P</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="200"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="206"/>
         <source>Added</source>
         <translation type="unfinished">Ajouté</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="201"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="207"/>
         <source>Deleted</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="202"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="208"/>
         <source>Modified</source>
         <translation type="unfinished">Modifié</translation>
     </message>
@@ -32100,7 +32435,7 @@
         <translation type="obsolete">Impossible de lancer le processus {0}. Assurez-vous qu&apos;il est bien dans le chemin de recherche.</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="840"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="845"/>
         <source>Mercurial Error</source>
         <translation type="unfinished"></translation>
     </message>
@@ -32120,63 +32455,63 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="182"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="188"/>
         <source>All</source>
         <translation type="unfinished">Tous</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="94"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="100"/>
         <source>Mercurial Log (Incoming)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="96"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="102"/>
         <source>Mercurial Log (Outgoing)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="217"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="223"/>
         <source>Bookmarks</source>
         <translation type="unfinished">Signets</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="111"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="117"/>
         <source>Press to refresh the list of changesets</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="109"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="115"/>
         <source>&amp;Refresh</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="126"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="132"/>
         <source>Phase</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="268"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="275"/>
         <source>Change the phase of the selected revisions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="270"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="277"/>
         <source>&lt;b&gt;Change Phase&lt;/b&gt;
 &lt;p&gt;This changes the phase of the selected revisions. The selected revisions have to have the same current phase.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="266"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="273"/>
         <source>Change Phase</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2000"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2005"/>
         <source>Copy Changesets</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2343"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2348"/>
         <source>The project should be reread. Do this now?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -32186,42 +32521,42 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="257"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="264"/>
         <source>Copy the selected changesets to the current branch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="275"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="282"/>
         <source>Tag</source>
         <translation type="unfinished">Tag</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="278"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="285"/>
         <source>Tag the selected revision</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2072"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2077"/>
         <source>Switch</source>
         <translation type="unfinished">Basculer de version</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="288"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="295"/>
         <source>Switch the working directory to the selected revision</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="311"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="318"/>
         <source>Pull Large Files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="313"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="320"/>
         <source>Pull large files for selected revisions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1130"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1135"/>
         <source>{0} (large file)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -32246,147 +32581,147 @@
         <translation type="unfinished">Cliquer pour rechercher l&apos;occurence suivante</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="119"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="125"/>
         <source>Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="120"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="126"/>
         <source>Filter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="164"/>
-        <source>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Tags&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</source>
-        <translation type="unfinished">&lt;tr&gt;&lt;td&gt;&lt;b&gt;Étiquettes&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</translation>
-    </message>
-    <message>
         <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="170"/>
+        <source>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Tags&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</source>
+        <translation type="unfinished">&lt;tr&gt;&lt;td&gt;&lt;b&gt;Étiquettes&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</translation>
+    </message>
+    <message>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="176"/>
         <source>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Bookmarks&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</source>
         <translation type="unfinished">&lt;tr&gt;&lt;td&gt;&lt;b&gt;Signets&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2485"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2490"/>
         <source>Find Commit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2485"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2490"/>
         <source>&apos;{0}&apos; was not found.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="125"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="131"/>
         <source>File</source>
         <translation type="unfinished">Fichier</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="206"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="212"/>
         <source>Draft</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="207"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="213"/>
         <source>Public</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="208"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="214"/>
         <source>Secret</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2205"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2210"/>
         <source>Pull Changes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="309"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="316"/>
         <source>Pull changes from a remote repository</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="322"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="329"/>
         <source>Push Selected Changes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="325"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="332"/>
         <source>Push changes of the selected changeset and its ancestors to a remote repository</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="328"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="335"/>
         <source>Push All Changes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="331"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="338"/>
         <source>Push all changes to a remote repository</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2170"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2175"/>
         <source>Fetch Changes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2251"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2256"/>
         <source>Strip Changesets</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="317"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="324"/>
         <source>Fetch changes from a remote repository</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="374"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="381"/>
         <source>Strip changesets from a repository</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="293"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="300"/>
         <source>Define Bookmark...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="296"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="303"/>
         <source>Bookmark the selected revision</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="298"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="305"/>
         <source>Move Bookmark...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="301"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="308"/>
         <source>Move bookmark to the selected revision</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2095"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2100"/>
         <source>Define Bookmark</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2095"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2100"/>
         <source>Enter bookmark name for changeset &quot;{0}&quot;:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2119"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2124"/>
         <source>Move Bookmark</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2119"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2124"/>
         <source>Select the bookmark to be moved  to changeset &quot;{0}&quot;:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2058"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2063"/>
         <source>Select bookmark to switch to (leave empty to use revision):</source>
         <translation type="unfinished"></translation>
     </message>
@@ -32401,148 +32736,148 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="167"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="173"/>
         <source>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Latest Tag&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="148"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="154"/>
         <source>&lt;table&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Revision&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Date&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{1}&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Author&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{2}&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Branch&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{3}&lt;/td&gt;&lt;/tr&gt;{4}&lt;tr&gt;&lt;td&gt;&lt;b&gt;Message&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{5}&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="158"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="164"/>
         <source>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Parents&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</source>
         <translation type="unfinished">&lt;tr&gt;&lt;td&gt;&lt;b&gt;Parents&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="161"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="167"/>
         <source>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Children&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="260"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="267"/>
         <source>Merge with Changeset</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="263"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="270"/>
         <source>Merge the working directory with the selected changeset</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="336"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="343"/>
         <source>Create Changegroup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="339"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="346"/>
         <source>Create a changegroup file containing the selected changesets</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="341"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="348"/>
         <source>&lt;b&gt;Create Changegroup&lt;/b&gt;
 &lt;p&gt;This creates a changegroup file containing the selected revisions. If no revisions are selected, all changesets will be bundled. If one revision is selected, it will be interpreted as the base revision. Otherwise the lowest revision will be used as the base revision and all other revision will be bundled. If the dialog is showing outgoing changesets, all selected changesets will be bundled.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2343"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2348"/>
         <source>Apply Changegroup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="353"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="360"/>
         <source>Apply the currently viewed changegroup file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="358"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="365"/>
         <source>Sign Revisions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="361"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="368"/>
         <source>Add a signature for the selected revisions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="363"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="370"/>
         <source>Verify Signatures</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="366"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="373"/>
         <source>Verify all signatures there may be for the selected revision</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="379"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="386"/>
         <source>Select All Entries</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="381"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="388"/>
         <source>Deselect All Entries</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1369"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1374"/>
         <source>Side-by-Side Diff to Parent {0}</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1380"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1385"/>
         <source>&lt;a href=&quot;sbsdiff:{0}_{1}&quot;&gt;Side-by-Side Compare&lt;/a&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1521"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1526"/>
         <source>Pull Selected Changes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1522"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1527"/>
         <source>Fetch Selected Changes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2529"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2534"/>
         <source>Differences</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2539"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2544"/>
         <source>Differences to Parent {0}</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2555"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2560"/>
         <source>Diff to Parent {0}{1}</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2580"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2585"/>
         <source>There is no difference.</source>
         <translation type="unfinished">Aucune différence.</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2723"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2728"/>
         <source>Save Diff</source>
         <translation type="unfinished">Enregistrer Diff</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2690"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2695"/>
         <source>Patch Files (*.diff)</source>
         <translation type="unfinished">Fichiers Patch (*.diff)</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2707"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2712"/>
         <source>&lt;p&gt;The patch file &lt;b&gt;{0}&lt;/b&gt; already exists. Overwrite it?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2723"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2728"/>
         <source>&lt;p&gt;The patch file &lt;b&gt;{0}&lt;/b&gt; could not be saved.&lt;br&gt;Reason: {1}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -32552,22 +32887,22 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2528"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2533"/>
         <source>Generating differences ...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="98"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="104"/>
         <source>Mercurial Full Log</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="280"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="287"/>
         <source>Close Heads</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="283"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="290"/>
         <source>Close the selected heads</source>
         <translation type="unfinished"></translation>
     </message>
@@ -32985,12 +33320,12 @@
         <translation type="unfinished">Sélectionner tous les répertoires ayant une version</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="833"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="835"/>
         <source>Remove from repository only</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="833"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="835"/>
         <source>Do you really want to remove these files from the repository?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -35591,52 +35926,52 @@
 <context>
     <name>HgServeDialog</name>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py" line="49"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py" line="57"/>
         <source>Start Server</source>
         <translation type="unfinished">Démarrer serveur</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py" line="55"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py" line="63"/>
         <source>Stop Server</source>
         <translation type="unfinished">Arrêter serveur</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py" line="61"/>
-        <source>Start Browser</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py" line="69"/>
+        <source>Start Browser</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py" line="77"/>
         <source>Enter the server port</source>
         <translation type="unfinished">Entrer le port du serveur</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py" line="75"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py" line="83"/>
         <source>Select the style to use</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py" line="79"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py" line="87"/>
         <source>Server</source>
         <translation type="unfinished">Serveur</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py" line="86"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py" line="94"/>
         <source>Browser</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py" line="140"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py" line="148"/>
         <source>Process Generation Error</source>
         <translation type="unfinished">Erreur du processus</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py" line="140"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py" line="148"/>
         <source>The process {0} could not be started. Ensure, that it is in the search path.</source>
         <translation type="unfinished">Impossible de lancer le processus {0}. Assurez-vous qu&apos;il est bien dans le chemin de recherche.</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py" line="47"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py" line="50"/>
         <source>Mercurial Server</source>
         <translation type="unfinished"></translation>
     </message>
@@ -39036,37 +39371,37 @@
 <context>
     <name>IconsPage</name>
     <message>
-        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="118"/>
+        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="220"/>
         <source>Delete</source>
         <translation>Supprimer</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="128"/>
+        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="230"/>
         <source>Press to add the entered directory to the list</source>
         <translation>Cliquer pour ajouter le répertoire saisi à la liste</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="131"/>
+        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="233"/>
         <source>Add</source>
         <translation>Ajouter</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="156"/>
+        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="258"/>
         <source>Show</source>
         <translation>Afficher</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="75"/>
+        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="177"/>
         <source>Up</source>
         <translation>Haut</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="85"/>
+        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="187"/>
         <source>Down</source>
         <translation>Bas</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="44"/>
+        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="146"/>
         <source>List of icon directories</source>
         <translation>Liste des répertoires d&apos;icônes</translation>
     </message>
@@ -39081,18 +39416,103 @@
         <translation>&lt;font color=&quot;#FF0000&quot;&gt;&lt;b&gt;Note:&lt;/b&gt; Ces paramètres seront activés au prochain démarrage de l&apos;application.&lt;/font&gt;</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="115"/>
+        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="217"/>
         <source>Press to delete the selected directory from the list</source>
         <translation>Cliquer pour supprimer le répertoire sélectionné de la liste</translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="44"/>
+        <source>Default Icons</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="52"/>
+        <source>Select to select between Breeze (dark) and Breeze (light) based on the window lightness</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="55"/>
+        <source>Automatic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="65"/>
+        <source>Select to use the Breeze vector icons for light window background</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="68"/>
+        <source>Breeze (light)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="75"/>
+        <source>Select to use the Breeze vector icons for dark window background</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="78"/>
+        <source>Breeze (dark)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="85"/>
+        <source>Select to use the Oxygen pixmap icons</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="88"/>
+        <source>Oxygen</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="112"/>
+        <source>Press to show a dialog with a preview of the selected default icon set</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="140"/>
+        <source>Custom Icon Directories</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>IconsPreviewDialog</name>
     <message>
-        <location filename="../Preferences/ConfigurationPages/IconsPreviewDialog.ui" line="13"/>
+        <location filename="../Preferences/ConfigurationPages/IconsPreviewDialog.ui" line="14"/>
         <source>Icons Preview</source>
         <translation>Apercu d&apos;icônes</translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IconsPreviewDialog.ui" line="25"/>
+        <source>Directory:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IconsPreviewDialog.ui" line="38"/>
+        <source>Select the icons directory to be shown</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IconsPreviewDialog.ui" line="74"/>
+        <source>Invert Background</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IconsPreviewDialog.ui" line="87"/>
+        <source>Refresh</source>
+        <translation type="unfinished">Rafraichir</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IconsPreviewDialog.ui" line="84"/>
+        <source>Select to refresh the icons display</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IconsPreviewDialog.ui" line="71"/>
+        <source>Select to invert the background color</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>IdlCompilerDefineNameDialog</name>
@@ -41317,7 +41737,7 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="102"/>
         <source>Colours</source>
-        <translation type="unfinished">Couleurs</translation>
+        <translation type="obsolete">Couleurs</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="108"/>
@@ -41325,116 +41745,56 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="121"/>
-        <source>Select the colour for network messages</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="131"/>
         <source>Nick Names:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="144"/>
-        <source>Select the colour for nick names</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="154"/>
         <source>Server Messages:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="167"/>
-        <source>Select the colour for server messages</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="177"/>
         <source>Own Nick Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="190"/>
-        <source>Select the colour for own nick name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="200"/>
         <source>Channel Messages:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="213"/>
-        <source>Select the colour for channel messages</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="223"/>
         <source>Join Channel:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="236"/>
-        <source>Select the colour for join channel messages</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="246"/>
         <source>Error Messages:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="259"/>
-        <source>Select the colour for error messages</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="269"/>
         <source>Leave Channel:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="282"/>
-        <source>Select the colour for leave channel messages</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="292"/>
         <source>Timestamp:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="305"/>
-        <source>Select the colour for timestamps</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="315"/>
         <source>Channel Info:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="328"/>
-        <source>Select the colour for channel info messages</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="338"/>
         <source>Hyperlink:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="351"/>
-        <source>Select the colour for hyperlinks</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="364"/>
-        <source>Enable to allow coloured text in IRC messages</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="367"/>
         <source>Allow Colored Text in IRC Messages</source>
         <translation type="unfinished"></translation>
@@ -41540,21 +41900,11 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="824"/>
-        <source>Select the foreground colour for the marker</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="834"/>
         <source>Marker Background:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="847"/>
-        <source>Select the background colour for the marker</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="862"/>
         <source>Shutdown</source>
         <translation type="unfinished"></translation>
@@ -41569,6 +41919,81 @@
         <source>Confirm Shutdown When Connected</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="102"/>
+        <source>Colors</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="121"/>
+        <source>Select the color for network messages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="144"/>
+        <source>Select the color for nick names</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="167"/>
+        <source>Select the color for server messages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="190"/>
+        <source>Select the color for own nick name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="213"/>
+        <source>Select the color for channel messages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="236"/>
+        <source>Select the color for join channel messages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="259"/>
+        <source>Select the color for error messages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="282"/>
+        <source>Select the color for leave channel messages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="305"/>
+        <source>Select the color for timestamps</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="328"/>
+        <source>Select the color for channel info messages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="351"/>
+        <source>Select the color for hyperlinks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="364"/>
+        <source>Enable to allow colored text in IRC messages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="824"/>
+        <source>Select the foreground color for the marker</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="847"/>
+        <source>Select the background color for the marker</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>IrcServerEditDialog</name>
@@ -42945,257 +43370,257 @@
 <context>
     <name>LexerPygments</name>
     <message>
-        <location filename="../QScintilla/Lexers/LexerPygments.py" line="180"/>
+        <location filename="../QScintilla/Lexers/LexerPygments.py" line="196"/>
         <source>Default</source>
         <translation>Défaut</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/LexerPygments.py" line="181"/>
-        <source>Comment</source>
-        <translation>Commenter</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/LexerPygments.py" line="182"/>
-        <source>Preprocessor</source>
-        <translation>Préprocessing</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/LexerPygments.py" line="183"/>
-        <source>Keyword</source>
-        <translation>Mot-clé</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/LexerPygments.py" line="184"/>
-        <source>Pseudo Keyword</source>
-        <translation>Mot-clé Pseudo</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/LexerPygments.py" line="185"/>
-        <source>Type Keyword</source>
-        <translation>Mot-clé Type</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/LexerPygments.py" line="186"/>
-        <source>Operator</source>
-        <translation>Opérateur</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/LexerPygments.py" line="187"/>
-        <source>Word</source>
-        <translation>Mot</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/LexerPygments.py" line="188"/>
-        <source>Builtin</source>
-        <translation>Builtin</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/LexerPygments.py" line="189"/>
-        <source>Function or method name</source>
-        <translation>Fonction ou nom de méthode</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/LexerPygments.py" line="190"/>
-        <source>Class name</source>
-        <translation>Nom de classe</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/LexerPygments.py" line="191"/>
-        <source>Namespace</source>
-        <translation>Espace de noms</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/LexerPygments.py" line="192"/>
-        <source>Exception</source>
-        <translation>Exception</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/LexerPygments.py" line="193"/>
-        <source>Identifier</source>
-        <translation>Indentificateur</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/LexerPygments.py" line="194"/>
-        <source>Constant</source>
-        <translation>Constante</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/LexerPygments.py" line="195"/>
-        <source>Label</source>
-        <translation>Label</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/LexerPygments.py" line="196"/>
-        <source>Entity</source>
-        <translation>Entité</translation>
-    </message>
-    <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="197"/>
-        <source>Attribute</source>
-        <translation>Attribut</translation>
+        <source>Comment</source>
+        <translation>Commenter</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="198"/>
-        <source>Tag</source>
-        <translation>Tag</translation>
+        <source>Preprocessor</source>
+        <translation>Préprocessing</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="199"/>
-        <source>Decorator</source>
-        <translation>Décorateur</translation>
+        <source>Keyword</source>
+        <translation>Mot-clé</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="200"/>
-        <source>String</source>
-        <translation>Chaine de caractères</translation>
+        <source>Pseudo Keyword</source>
+        <translation>Mot-clé Pseudo</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="201"/>
-        <source>Documentation string</source>
-        <translation>Chaîne de documentation</translation>
+        <source>Type Keyword</source>
+        <translation>Mot-clé Type</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="202"/>
-        <source>Scalar</source>
-        <translation>Scalaire</translation>
+        <source>Operator</source>
+        <translation>Opérateur</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="203"/>
-        <source>Escape</source>
-        <translation>Echappement</translation>
+        <source>Word</source>
+        <translation>Mot</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="204"/>
-        <source>Regular expression</source>
-        <translation>Expression régulière</translation>
+        <source>Builtin</source>
+        <translation>Builtin</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="205"/>
-        <source>Symbol</source>
-        <translation>Symbole</translation>
+        <source>Function or method name</source>
+        <translation>Fonction ou nom de méthode</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="206"/>
-        <source>Other string</source>
-        <translation>Autre chaîne</translation>
+        <source>Class name</source>
+        <translation>Nom de classe</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="207"/>
-        <source>Number</source>
-        <translation>Numéro</translation>
+        <source>Namespace</source>
+        <translation>Espace de noms</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="208"/>
-        <source>Heading</source>
-        <translation>Titre</translation>
+        <source>Exception</source>
+        <translation>Exception</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="209"/>
-        <source>Subheading</source>
-        <translation>Sous-titre</translation>
+        <source>Identifier</source>
+        <translation>Indentificateur</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="210"/>
-        <source>Deleted</source>
-        <translation>Effacé</translation>
+        <source>Constant</source>
+        <translation>Constante</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="211"/>
-        <source>Inserted</source>
-        <translation>Inséré</translation>
+        <source>Label</source>
+        <translation>Label</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="212"/>
-        <source>Generic error</source>
-        <translation>Erreur générique</translation>
+        <source>Entity</source>
+        <translation>Entité</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="213"/>
-        <source>Emphasized text</source>
-        <translation>Texte à mettre en valeur</translation>
+        <source>Attribute</source>
+        <translation>Attribut</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="214"/>
-        <source>Strong text</source>
-        <translation>Texte en gras</translation>
+        <source>Tag</source>
+        <translation>Tag</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="215"/>
-        <source>Prompt</source>
-        <translation>Prompt</translation>
+        <source>Decorator</source>
+        <translation>Décorateur</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="216"/>
-        <source>Output</source>
-        <translation>Sortie</translation>
+        <source>String</source>
+        <translation>Chaine de caractères</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="217"/>
-        <source>Traceback</source>
-        <translation>Traceback</translation>
+        <source>Documentation string</source>
+        <translation>Chaîne de documentation</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="218"/>
-        <source>Error</source>
-        <translation>Erreur</translation>
+        <source>Scalar</source>
+        <translation>Scalaire</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="219"/>
-        <source>Comment block</source>
-        <translation type="unfinished"></translation>
+        <source>Escape</source>
+        <translation>Echappement</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="220"/>
-        <source>Property</source>
-        <translation type="unfinished"></translation>
+        <source>Regular expression</source>
+        <translation>Expression régulière</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="221"/>
-        <source>Character</source>
-        <translation type="unfinished"></translation>
+        <source>Symbol</source>
+        <translation>Symbole</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="222"/>
-        <source>Here document</source>
-        <translation type="unfinished"></translation>
+        <source>Other string</source>
+        <translation>Autre chaîne</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="223"/>
-        <source>Punctuation</source>
-        <translation type="unfinished"></translation>
+        <source>Number</source>
+        <translation>Numéro</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="224"/>
-        <source>Hashbang</source>
-        <translation type="unfinished"></translation>
+        <source>Heading</source>
+        <translation>Titre</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="225"/>
-        <source>Reserved Keyword</source>
-        <translation type="unfinished"></translation>
+        <source>Subheading</source>
+        <translation>Sous-titre</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="226"/>
-        <source>Literal</source>
-        <translation type="unfinished"></translation>
+        <source>Deleted</source>
+        <translation>Effacé</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="227"/>
-        <source>Double quoted string</source>
-        <translation type="unfinished"></translation>
+        <source>Inserted</source>
+        <translation>Inséré</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="228"/>
-        <source>Single quoted string</source>
-        <translation type="unfinished"></translation>
+        <source>Generic error</source>
+        <translation>Erreur générique</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="229"/>
-        <source>Backtick string</source>
-        <translation type="unfinished"></translation>
+        <source>Emphasized text</source>
+        <translation>Texte à mettre en valeur</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="230"/>
+        <source>Strong text</source>
+        <translation>Texte en gras</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/LexerPygments.py" line="231"/>
+        <source>Prompt</source>
+        <translation>Prompt</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/LexerPygments.py" line="232"/>
+        <source>Output</source>
+        <translation>Sortie</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/LexerPygments.py" line="233"/>
+        <source>Traceback</source>
+        <translation>Traceback</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/LexerPygments.py" line="234"/>
+        <source>Error</source>
+        <translation>Erreur</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/LexerPygments.py" line="235"/>
+        <source>Comment block</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/LexerPygments.py" line="236"/>
+        <source>Property</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/LexerPygments.py" line="237"/>
+        <source>Character</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/LexerPygments.py" line="238"/>
+        <source>Here document</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/LexerPygments.py" line="239"/>
+        <source>Punctuation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/LexerPygments.py" line="240"/>
+        <source>Hashbang</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/LexerPygments.py" line="241"/>
+        <source>Reserved Keyword</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/LexerPygments.py" line="242"/>
+        <source>Literal</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/LexerPygments.py" line="243"/>
+        <source>Double quoted string</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/LexerPygments.py" line="244"/>
+        <source>Single quoted string</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/LexerPygments.py" line="245"/>
+        <source>Backtick string</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/LexerPygments.py" line="246"/>
         <source>Whitespace</source>
         <translation type="unfinished"></translation>
     </message>
@@ -44260,14 +44685,9 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/LogViewerPage.ui" line="49"/>
-        <source>Error Colour:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/LogViewerPage.ui" line="62"/>
         <source>Select the colour for text sent to stderr</source>
-        <translation type="unfinished">Sélection de la couleur du texte envoyé par stderr</translation>
+        <translation type="obsolete">Sélection de la couleur du texte envoyé par stderr</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/LogViewerPage.ui" line="87"/>
@@ -44304,6 +44724,16 @@
         <source>&lt;b&gt;Message Filters for both&lt;/b&gt;&lt;p&gt;This list shows the configured message filters used to suppress messages received via stdout or stderr.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/LogViewerPage.ui" line="49"/>
+        <source>Error Color:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/LogViewerPage.ui" line="62"/>
+        <source>Select the color for text sent to stderr</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MakePropertiesDialog</name>
@@ -45089,27 +45519,27 @@
 <context>
     <name>MicroPythonDevice</name>
     <message>
-        <location filename="../MicroPython/MicroPythonDevices.py" line="207"/>
+        <location filename="../MicroPython/MicroPythonDevices.py" line="214"/>
         <source>Unsupported Device</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonDevices.py" line="217"/>
+        <location filename="../MicroPython/MicroPythonDevices.py" line="224"/>
         <source>REPL is not supported by this device.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonDevices.py" line="236"/>
+        <location filename="../MicroPython/MicroPythonDevices.py" line="243"/>
         <source>Plotter is not supported by this device.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonDevices.py" line="255"/>
+        <location filename="../MicroPython/MicroPythonDevices.py" line="262"/>
         <source>Running scripts is not supported by this device.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonDevices.py" line="275"/>
+        <location filename="../MicroPython/MicroPythonDevices.py" line="282"/>
         <source>File Manager is not supported by this device.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -45373,27 +45803,27 @@
 <context>
     <name>MicroPythonGraphWidget</name>
     <message>
-        <location filename="../MicroPython/MicroPythonGraphWidget.py" line="63"/>
+        <location filename="../MicroPython/MicroPythonGraphWidget.py" line="64"/>
         <source>Press to save the raw data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonGraphWidget.py" line="72"/>
+        <location filename="../MicroPython/MicroPythonGraphWidget.py" line="73"/>
         <source>max. X:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonGraphWidget.py" line="81"/>
+        <location filename="../MicroPython/MicroPythonGraphWidget.py" line="82"/>
         <source>Enter the maximum number of data points to be plotted.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonGraphWidget.py" line="311"/>
+        <location filename="../MicroPython/MicroPythonGraphWidget.py" line="329"/>
         <source>Save Chart Data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonGraphWidget.py" line="311"/>
+        <location filename="../MicroPython/MicroPythonGraphWidget.py" line="329"/>
         <source>&lt;p&gt;The chart data could not be saved into file &lt;b&gt;{0}&lt;/b&gt;.&lt;/p&gt;&lt;p&gt;Reason: {1}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -45461,93 +45891,168 @@
         <translation type="unfinished">Retour à la ligne automatique</translation>
     </message>
     <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="169"/>
+        <source>MPY Cross Compiler</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="175"/>
+        <source>Program:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="191"/>
+        <source>Enter the path of the cross compiler executable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.py" line="67"/>
+        <source>All Files (*)</source>
+        <translation type="unfinished">Tous fichiers (*)</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="298"/>
+        <source>Documentation</source>
+        <translation type="unfinished">Documentation</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="304"/>
+        <source>MicroPython:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="311"/>
+        <source>Enter the URL for the MicroPython documentation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="318"/>
+        <source>CircuitPython:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="325"/>
+        <source>Enter the URL for the CircuitPython documentation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="332"/>
+        <source>BBC micro:bit:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="339"/>
+        <source>Enter the URL for the BBC micro:bit MicroPython documentation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="201"/>
+        <source>PyBoard</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="207"/>
+        <source>dfu-util Path:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="223"/>
+        <source>Enter the path of the dfu-util flashing executable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="233"/>
+        <source>Firmware</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="246"/>
+        <source>Enter the URL for the MicroPython firmware for PyBoard, ESP8266 and ESP32</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="260"/>
+        <source>Enter the URL for the CircuitPython firmware</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="274"/>
+        <source>Enter the URL for the BBC micro:bit Firmware</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="140"/>
-        <source>MPY Cross Compiler</source>
+        <source>Chart Pane</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="146"/>
-        <source>Program:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="162"/>
-        <source>Enter the path of the cross compiler executable</source>
+        <source>Color Theme:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="159"/>
+        <source>Select the color scheme of the chart</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/MicroPythonPage.py" line="42"/>
-        <source>All Files (*)</source>
-        <translation type="unfinished">Tous fichiers (*)</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="255"/>
-        <source>Documentation</source>
-        <translation type="unfinished">Documentation</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="261"/>
-        <source>MicroPython:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="268"/>
-        <source>Enter the URL for the MicroPython documentation</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="275"/>
-        <source>CircuitPython:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="282"/>
-        <source>Enter the URL for the CircuitPython documentation</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="289"/>
-        <source>BBC micro:bit:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="296"/>
-        <source>Enter the URL for the BBC micro:bit MicroPython documentation</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="172"/>
-        <source>PyBoard</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="178"/>
-        <source>dfu-util Path:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="194"/>
-        <source>Enter the path of the dfu-util flashing executable</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="204"/>
-        <source>Firmware</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="217"/>
-        <source>Enter the URL for the MicroPython firmware for PyBoard, ESP8266 and ESP32</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="231"/>
-        <source>Enter the URL for the CircuitPython firmware</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="245"/>
-        <source>Enter the URL for the BBC micro:bit Firmware</source>
+        <source>Automatic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.py" line="44"/>
+        <source>Light</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.py" line="46"/>
+        <source>Dark</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.py" line="48"/>
+        <source>Blue Cerulean</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.py" line="50"/>
+        <source>Brown Sand</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.py" line="52"/>
+        <source>Blue NCS</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.py" line="54"/>
+        <source>High Contrast</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.py" line="56"/>
+        <source>Blue Icy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.py" line="58"/>
+        <source>Qt</source>
+        <translation type="unfinished">Qt</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="346"/>
+        <source>Calliope mini:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="288"/>
+        <source>Enter the URL for the Callope mini Firmware</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="353"/>
+        <source>Enter the URL for the Calliope mini MicroPython documentation</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -45592,17 +46097,17 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="420"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="460"/>
         <source>Press to connect the selected device</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="226"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="263"/>
         <source>&lt;h3&gt;The QtSerialPort package is not available.&lt;br/&gt;MicroPython support is deactivated.&lt;/h3&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message numerus="yes">
-        <location filename="../MicroPython/MicroPythonWidget.py" line="263"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="300"/>
         <source>%n supported device(s) detected.</source>
         <translation type="unfinished">
             <numerusform></numerusform>
@@ -45610,42 +46115,42 @@
         </translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="269"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="306"/>
         <source>{0} at {1}</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="277"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="314"/>
         <source>No supported devices detected.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="390"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="430"/>
         <source>Clear</source>
         <translation type="unfinished">Effacer</translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="392"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="432"/>
         <source>Copy</source>
         <translation type="unfinished">Copier</translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="393"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="433"/>
         <source>Paste</source>
         <translation type="unfinished">Coller</translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="415"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="455"/>
         <source>Press to disconnect the current device</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="436"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="476"/>
         <source>No device attached</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="436"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="476"/>
         <source>Please ensure the device is plugged into your computer and selected.
 
 It must have a version of MicroPython (or CircuitPython) flashed onto it before anything will work.
@@ -45654,217 +46159,217 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="463"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="503"/>
         <source>Start REPL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="463"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="503"/>
         <source>&lt;p&gt;The REPL cannot be started.&lt;/p&gt;&lt;p&gt;Reason: {0}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="853"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="893"/>
         <source>Serial Device Connect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="853"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="893"/>
         <source>&lt;p&gt;Cannot connect to device at serial port &lt;b&gt;{0}&lt;/b&gt;.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="898"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="938"/>
         <source>Run Script</source>
         <translation type="unfinished">Lancer le script</translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="881"/>
-        <source>There is no editor open. Abort...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="889"/>
-        <source>The current editor does not contain a script. Abort...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="898"/>
-        <source>&lt;p&gt;Cannot run script.&lt;/p&gt;&lt;p&gt;Reason: {0}&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="921"/>
-        <source>Open Python File</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../MicroPython/MicroPythonWidget.py" line="921"/>
+        <source>There is no editor open. Abort...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="929"/>
+        <source>The current editor does not contain a script. Abort...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="938"/>
+        <source>&lt;p&gt;Cannot run script.&lt;/p&gt;&lt;p&gt;Reason: {0}&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="961"/>
+        <source>Open Python File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="961"/>
         <source>Python3 Files (*.py);;All Files (*)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="965"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1005"/>
         <source>Start Chart</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="965"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1005"/>
         <source>&lt;p&gt;The Chart cannot be started.&lt;/p&gt;&lt;p&gt;Reason: {0}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="994"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1034"/>
         <source>Unsaved Chart Data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="994"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1034"/>
         <source>The chart contains unsaved data.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1045"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1085"/>
         <source>Start File Manager</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1045"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1085"/>
         <source>&lt;p&gt;The File Manager cannot be started.&lt;/p&gt;&lt;p&gt;Reason: {0}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1096"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1136"/>
         <source>Show Version</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1099"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1139"/>
         <source>Show Implementation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1210"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1250"/>
         <source>Synchronize Time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1107"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1147"/>
         <source>Show Device Time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1110"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1150"/>
         <source>Show Local Time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1421"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1461"/>
         <source>Compile Python File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1481"/>
+        <source>Compile Current Editor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1188"/>
+        <source>&lt;h3&gt;Device Version Information&lt;/h3&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1197"/>
+        <source>No version information available.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1199"/>
+        <source>Device Version Information</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1222"/>
+        <source>unknown</source>
+        <translation type="unfinished">inconnu</translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1226"/>
+        <source>Device Implementation Information</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1226"/>
+        <source>&lt;h3&gt;Device Implementation Information&lt;/h3&gt;&lt;p&gt;This device contains &lt;b&gt;{0} {1}&lt;/b&gt;.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1250"/>
+        <source>&lt;p&gt;The time of the connected device was synchronized with the local time.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1272"/>
+        <source>&lt;h3&gt;Device Date and Time&lt;/h3&gt;&lt;table&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Date&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Time&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{1}&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1280"/>
+        <source>&lt;h3&gt;Device Date and Time&lt;/h3&gt;&lt;p&gt;{0}&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1294"/>
+        <source>Device Date and Time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1307"/>
+        <source>Local Date and Time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1307"/>
+        <source>&lt;h3&gt;Local Date and Time&lt;/h3&gt;&lt;table&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Date&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Time&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{1}&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1374"/>
+        <source>Error handling device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1374"/>
+        <source>&lt;p&gt;There was an error communicating with the connected device.&lt;/p&gt;&lt;p&gt;Method: {0}&lt;/p&gt;&lt;p&gt;Message: {1}&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1413"/>
+        <source>The MicroPython cross compiler &lt;b&gt;mpy-cross&lt;/b&gt; cannot be found. Ensure it is in the search path or configure it on the MicroPython configuration page.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1431"/>
+        <source>Python Files (*.py);;All Files (*)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../MicroPython/MicroPythonWidget.py" line="1441"/>
-        <source>Compile Current Editor</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1148"/>
-        <source>&lt;h3&gt;Device Version Information&lt;/h3&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1157"/>
-        <source>No version information available.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1159"/>
-        <source>Device Version Information</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1182"/>
-        <source>unknown</source>
-        <translation type="unfinished">inconnu</translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1186"/>
-        <source>Device Implementation Information</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1186"/>
-        <source>&lt;h3&gt;Device Implementation Information&lt;/h3&gt;&lt;p&gt;This device contains &lt;b&gt;{0} {1}&lt;/b&gt;.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1210"/>
-        <source>&lt;p&gt;The time of the connected device was synchronized with the local time.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1232"/>
-        <source>&lt;h3&gt;Device Date and Time&lt;/h3&gt;&lt;table&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Date&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Time&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{1}&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1240"/>
-        <source>&lt;h3&gt;Device Date and Time&lt;/h3&gt;&lt;p&gt;{0}&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1254"/>
-        <source>Device Date and Time</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1267"/>
-        <source>Local Date and Time</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1267"/>
-        <source>&lt;h3&gt;Local Date and Time&lt;/h3&gt;&lt;table&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Date&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Time&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{1}&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1334"/>
-        <source>Error handling device</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1334"/>
-        <source>&lt;p&gt;There was an error communicating with the connected device.&lt;/p&gt;&lt;p&gt;Method: {0}&lt;/p&gt;&lt;p&gt;Message: {1}&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1373"/>
-        <source>The MicroPython cross compiler &lt;b&gt;mpy-cross&lt;/b&gt; cannot be found. Ensure it is in the search path or configure it on the MicroPython configuration page.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1391"/>
-        <source>Python Files (*.py);;All Files (*)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1401"/>
         <source>The Python file &lt;b&gt;{0}&lt;/b&gt; does not exist. Aborting...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1411"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1451"/>
         <source>&apos;mpy-cross&apos; Output</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1434"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1474"/>
         <source>The current editor does not contain a Python file. Aborting...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="175"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="211"/>
         <source>MicroPython Menu</source>
         <translation type="unfinished"></translation>
     </message>
@@ -45874,47 +46379,47 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="978"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1018"/>
         <source>&#xc2;&#xb5;Py Chart</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1058"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1098"/>
         <source>&#xc2;&#xb5;Py Files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1134"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1174"/>
         <source>Show Documentation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1138"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1178"/>
         <source>Configure</source>
         <translation type="unfinished">Configuration</translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1113"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1153"/>
         <source>Show Time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1130"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1170"/>
         <source>Download Firmware</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1310"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1350"/>
         <source>Date and Time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1293"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1333"/>
         <source>&lt;table&gt;&lt;tr&gt;&lt;th&gt;&lt;/th&gt;&lt;th&gt;Local Date and Time&lt;/th&gt;&lt;th&gt;Device Date and Time&lt;/th&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Date&lt;/b&gt;&lt;/td&gt;&lt;td align=&apos;center&apos;&gt;{0}&lt;/td&gt;&lt;td align=&apos;center&apos;&gt;{2}&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Time&lt;/b&gt;&lt;/td&gt;&lt;td align=&apos;center&apos;&gt;{1}&lt;/td&gt;&lt;td align=&apos;center&apos;&gt;{3}&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1310"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1350"/>
         <source>&lt;table&gt;&lt;tr&gt;&lt;th&gt;Local Date and Time&lt;/th&gt;&lt;th&gt;Device Date and Time&lt;/th&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td align=&apos;center&apos;&gt;{0} {1}&lt;/td&gt;&lt;td align=&apos;center&apos;&gt;{2}&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -45922,85 +46427,90 @@
 <context>
     <name>MicrobitDevice</name>
     <message>
-        <location filename="../MicroPython/MicrobitDevices.py" line="67"/>
+        <location filename="../MicroPython/MicrobitDevices.py" line="74"/>
         <source>BBC micro:bit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicrobitDevices.py" line="134"/>
+        <location filename="../MicroPython/MicrobitDevices.py" line="149"/>
         <source>Workspace Directory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicrobitDevices.py" line="134"/>
-        <source>Could not find an attached BBC micro:bit.
+        <location filename="../MicroPython/MicrobitDevices.py" line="186"/>
+        <source>Save Script as &apos;main.py&apos;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicrobitDevices.py" line="188"/>
+        <source>Save the current script as &apos;main.py&apos; on the connected device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicrobitDevices.py" line="241"/>
+        <source>MicroPython Firmware Files (*.hex);;All Files (*)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicrobitDevices.py" line="286"/>
+        <source>The script is empty. Aborting.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicrobitDevices.py" line="276"/>
+        <source>The current editor does not contain a Python script. Write it anyway?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicrobitDevices.py" line="314"/>
+        <source>&lt;p&gt;The script could not be saved to the device.&lt;/p&gt;&lt;p&gt;Reason: {0}&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicrobitDevices.py" line="241"/>
+        <source>Flash MicroPython Firmware</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicrobitDevices.py" line="273"/>
+        <source>Save Script</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicrobitDevices.py" line="303"/>
+        <source>Save Script as &apos;{0}&apos;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicrobitDevices.py" line="294"/>
+        <source>Enter a file name on the device:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicrobitDevices.py" line="183"/>
+        <source>Save the current script to the selected device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicrobitDevices.py" line="77"/>
+        <source>Calliope mini</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicrobitDevices.py" line="232"/>
+        <source>Could not find an attached {0}.
 
 Please make sure the device is plugged into this computer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicrobitDevices.py" line="171"/>
-        <source>Save Script as &apos;main.py&apos;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicrobitDevices.py" line="173"/>
-        <source>Save the current script as &apos;main.py&apos; on the connected device</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicrobitDevices.py" line="177"/>
-        <source>Reset micro:bit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicrobitDevices.py" line="201"/>
-        <source>MicroPython Firmware Files (*.hex);;All Files (*)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicrobitDevices.py" line="246"/>
-        <source>The script is empty. Aborting.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicrobitDevices.py" line="236"/>
-        <source>The current editor does not contain a Python script. Write it anyway?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicrobitDevices.py" line="274"/>
-        <source>&lt;p&gt;The script could not be saved to the device.&lt;/p&gt;&lt;p&gt;Reason: {0}&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicrobitDevices.py" line="201"/>
-        <source>Flash MicroPython Firmware</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicrobitDevices.py" line="233"/>
-        <source>Save Script</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicrobitDevices.py" line="190"/>
-        <source>The BBC micro:bit is not ready for flashing. See the &lt;a href=&quot;https://microbit.org/guide/firmware/&quot;&gt;micro:bit web site&lt;/a&gt; for details.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicrobitDevices.py" line="263"/>
-        <source>Save Script as &apos;{0}&apos;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicrobitDevices.py" line="254"/>
-        <source>Enter a file name on the device:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicrobitDevices.py" line="168"/>
-        <source>Save the current script to the selected device</source>
+        <location filename="../MicroPython/MicrobitDevices.py" line="192"/>
+        <source>Reset {0}</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicrobitDevices.py" line="213"/>
+        <source>&lt;p&gt;The BBC micro:bit is not ready for flashing. Follow these instructions.&lt;/p&gt;&lt;ul&gt;&lt;li&gt;unplug USB cable and any batteries&lt;/li&gt;&lt;li&gt;keep RESET button pressed an plug USB cable back in&lt;/li&gt;&lt;li&gt;a drive called MAINTENANCE should be available&lt;/li&gt;&lt;/ul&gt;&lt;p&gt;See the &lt;a href=&quot;https://microbit.org/guide/firmware/&quot;&gt;micro:bit web site&lt;/a&gt; for details.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -49852,7 +50362,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message numerus="yes">
-        <location filename="../PipInterface/PipPackagesWidget.py" line="635"/>
+        <location filename="../PipInterface/PipPackagesWidget.py" line="645"/>
         <source>%n package(s) found.</source>
         <translation type="unfinished">
             <numerusform></numerusform>
@@ -49860,102 +50370,102 @@
         </translation>
     </message>
     <message>
-        <location filename="../PipInterface/PipPackagesWidget.py" line="888"/>
+        <location filename="../PipInterface/PipPackagesWidget.py" line="898"/>
         <source>Search PyPI</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../PipInterface/PipPackagesWidget.py" line="673"/>
+        <location filename="../PipInterface/PipPackagesWidget.py" line="683"/>
         <source>&lt;p&gt;The package search did not return anything.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../PipInterface/PipPackagesWidget.py" line="710"/>
+        <location filename="../PipInterface/PipPackagesWidget.py" line="720"/>
         <source>&lt;p&gt;The package search failed.&lt;/p&gt;&lt;p&gt;Reason: {0}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../PipInterface/PipPackagesWidget.py" line="715"/>
+        <location filename="../PipInterface/PipPackagesWidget.py" line="725"/>
         <source>Error: {0}</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../PipInterface/PipPackagesWidget.py" line="848"/>
+        <location filename="../PipInterface/PipPackagesWidget.py" line="858"/>
         <source>Show Package Details</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../PipInterface/PipPackagesWidget.py" line="848"/>
+        <location filename="../PipInterface/PipPackagesWidget.py" line="858"/>
         <source>Select the package version:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../PipInterface/PipPackagesWidget.py" line="888"/>
+        <location filename="../PipInterface/PipPackagesWidget.py" line="898"/>
         <source>&lt;p&gt;No package details info for &lt;b&gt;{0}&lt;/b&gt; available.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../PipInterface/PipPackagesWidget.py" line="904"/>
+        <location filename="../PipInterface/PipPackagesWidget.py" line="914"/>
         <source>Install Pip</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../PipInterface/PipPackagesWidget.py" line="907"/>
-        <source>Install Pip to User-Site</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../PipInterface/PipPackagesWidget.py" line="910"/>
-        <source>Repair Pip</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../PipInterface/PipPackagesWidget.py" line="1005"/>
-        <source>Install Packages</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../PipInterface/PipPackagesWidget.py" line="917"/>
-        <source>Install Local Package</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../PipInterface/PipPackagesWidget.py" line="921"/>
-        <source>Install Requirements</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../PipInterface/PipPackagesWidget.py" line="924"/>
-        <source>Uninstall Requirements</source>
+        <source>Install Pip to User-Site</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../PipInterface/PipPackagesWidget.py" line="920"/>
+        <source>Repair Pip</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../PipInterface/PipPackagesWidget.py" line="1015"/>
+        <source>Install Packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../PipInterface/PipPackagesWidget.py" line="927"/>
+        <source>Install Local Package</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../PipInterface/PipPackagesWidget.py" line="931"/>
+        <source>Install Requirements</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../PipInterface/PipPackagesWidget.py" line="934"/>
+        <source>Uninstall Requirements</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../PipInterface/PipPackagesWidget.py" line="937"/>
         <source>Generate Requirements...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../PipInterface/PipPackagesWidget.py" line="932"/>
+        <location filename="../PipInterface/PipPackagesWidget.py" line="942"/>
         <source>Edit User Configuration...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../PipInterface/PipPackagesWidget.py" line="935"/>
+        <location filename="../PipInterface/PipPackagesWidget.py" line="945"/>
         <source>Edit Environment Configuration...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../PipInterface/PipPackagesWidget.py" line="940"/>
+        <location filename="../PipInterface/PipPackagesWidget.py" line="950"/>
         <source>Configure...</source>
         <translation type="unfinished">Configuration...</translation>
     </message>
     <message>
-        <location filename="../PipInterface/PipPackagesWidget.py" line="1118"/>
+        <location filename="../PipInterface/PipPackagesWidget.py" line="1128"/>
         <source>Edit Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../PipInterface/PipPackagesWidget.py" line="1118"/>
+        <location filename="../PipInterface/PipPackagesWidget.py" line="1128"/>
         <source>No valid configuration path determined. Aborting</source>
         <translation type="unfinished"></translation>
     </message>
@@ -51232,17 +51742,17 @@
 <context>
     <name>Preferences</name>
     <message>
-        <location filename="../Preferences/__init__.py" line="1624"/>
+        <location filename="../Preferences/__init__.py" line="1640"/>
         <source>Export Preferences</source>
         <translation>Export des préférences</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1652"/>
+        <location filename="../Preferences/__init__.py" line="1668"/>
         <source>Import Preferences</source>
         <translation>Import des préférences</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1652"/>
+        <location filename="../Preferences/__init__.py" line="1668"/>
         <source>Properties File (*.ini);;All Files (*)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -51444,7 +51954,7 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/PrinterPage.ui" line="77"/>
         <source>Colour</source>
-        <translation>Couleur</translation>
+        <translation type="obsolete">Couleur</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/PrinterPage.ui" line="84"/>
@@ -51484,7 +51994,7 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/PrinterPage.ui" line="49"/>
         <source>Colour Mode:</source>
-        <translation>Mode de couleur:</translation>
+        <translation type="obsolete">Mode de couleur:</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/PrinterPage.ui" line="94"/>
@@ -51541,6 +52051,16 @@
         <source> DPI</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/PrinterPage.ui" line="49"/>
+        <source>Color Mode:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/PrinterPage.ui" line="77"/>
+        <source>Color</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ProgramsDialog</name>
@@ -51763,492 +52283,492 @@
 <context>
     <name>Project</name>
     <message>
-        <location filename="../Project/Project.py" line="805"/>
+        <location filename="../Project/Project.py" line="817"/>
         <source>Read project file</source>
         <translation>Lire un fichier projet</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="908"/>
+        <location filename="../Project/Project.py" line="920"/>
         <source>Save project file</source>
         <translation>Enregistrer le fichier projet</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1026"/>
+        <location filename="../Project/Project.py" line="1038"/>
         <source>Read project session</source>
         <translation>Lire la session du projet</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1251"/>
+        <location filename="../Project/Project.py" line="1263"/>
         <source>Please save the project first.</source>
         <translation>Prière d&apos;enregistrer votre projet d&apos;abord.</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1062"/>
+        <location filename="../Project/Project.py" line="1074"/>
         <source>Save project session</source>
         <translation>Enregistrer la session</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1393"/>
+        <location filename="../Project/Project.py" line="1405"/>
         <source>Add Language</source>
         <translation>Ajouter une langue</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1519"/>
+        <location filename="../Project/Project.py" line="1531"/>
         <source>Delete translation</source>
         <translation>Supprimer la traduction</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1684"/>
+        <location filename="../Project/Project.py" line="1696"/>
         <source>Add file</source>
         <translation>Ajouter un fichier</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1816"/>
+        <location filename="../Project/Project.py" line="1828"/>
         <source>The target directory must not be empty.</source>
         <translation>Le répertoire cible ne doit pas être vide.</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1827"/>
+        <location filename="../Project/Project.py" line="1839"/>
         <source>Add directory</source>
         <translation>Ajouter un répertoire</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1827"/>
+        <location filename="../Project/Project.py" line="1839"/>
         <source>The source directory must not be empty.</source>
         <translation>Le répertoire source ne doit pas être vide.</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="2233"/>
+        <location filename="../Project/Project.py" line="2250"/>
         <source>Delete file</source>
         <translation>Suppression de fichier</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="2358"/>
+        <location filename="../Project/Project.py" line="2375"/>
         <source>Create project directory</source>
         <translation>Création d&apos;un répertoire projet</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3831"/>
+        <location filename="../Project/Project.py" line="3866"/>
         <source>New project</source>
         <translation>Nouveau projet</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3845"/>
+        <location filename="../Project/Project.py" line="3880"/>
         <source>Open project</source>
         <translation>Ouvir un projet</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3882"/>
+        <location filename="../Project/Project.py" line="3917"/>
         <source>Save project as</source>
         <translation>Enregistrer le projet sous</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3130"/>
+        <location filename="../Project/Project.py" line="3147"/>
         <source>Save File</source>
         <translation>Enregistrer Fichier</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3166"/>
+        <location filename="../Project/Project.py" line="3183"/>
         <source>Close Project</source>
         <translation>Fermer le projet</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3166"/>
+        <location filename="../Project/Project.py" line="3183"/>
         <source>The current project has unsaved changes.</source>
         <translation>Le projet courant a des modifications non enregistrées.</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4062"/>
+        <location filename="../Project/Project.py" line="4097"/>
         <source>&amp;Save</source>
         <translation>&amp;Enregistrer</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3831"/>
+        <location filename="../Project/Project.py" line="3866"/>
         <source>&amp;New...</source>
         <translation>&amp;Nouveau...</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3836"/>
+        <location filename="../Project/Project.py" line="3871"/>
         <source>Generate a new project</source>
         <translation>Génerer un nouveau projet</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3837"/>
+        <location filename="../Project/Project.py" line="3872"/>
         <source>&lt;b&gt;New...&lt;/b&gt;&lt;p&gt;This opens a dialog for entering the info for a new project.&lt;/p&gt;</source>
         <translation>&lt;b&gt;Nouveau...&lt;/b&gt;&lt;p&gt;Ouvre une boite de dialogue pour entrer les paramètres d&apos;un nouveau projet.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3845"/>
+        <location filename="../Project/Project.py" line="3880"/>
         <source>&amp;Open...</source>
         <translation>&amp;Ouvrir...</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3850"/>
+        <location filename="../Project/Project.py" line="3885"/>
         <source>Open an existing project</source>
         <translation>Ouvrir un projet existant</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3851"/>
-        <source>&lt;b&gt;Open...&lt;/b&gt;&lt;p&gt;This opens an existing project.&lt;/p&gt;</source>
-        <translation>&lt;b&gt;Ouvrir...&lt;/b&gt;&lt;p&gt;Ouvre un projet existant.&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="3858"/>
-        <source>Close project</source>
-        <translation>Fermer le projet</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="3858"/>
-        <source>&amp;Close</source>
-        <translation>&amp;Fermer</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="3862"/>
-        <source>Close the current project</source>
-        <translation>Fermer le projet en cours</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="3863"/>
-        <source>&lt;b&gt;Close&lt;/b&gt;&lt;p&gt;This closes the current project.&lt;/p&gt;</source>
-        <translation>&lt;b&gt;Fermer&lt;/b&gt;&lt;p&gt;Ferme le projet en cours.&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="3870"/>
-        <source>Save project</source>
-        <translation>Enregistrer le projet</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="3874"/>
-        <source>Save the current project</source>
-        <translation>Enregistre le projet courant</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="3875"/>
-        <source>&lt;b&gt;Save&lt;/b&gt;&lt;p&gt;This saves the current project.&lt;/p&gt;</source>
-        <translation>&lt;b&gt;Enregistrer&lt;/b&gt;&lt;p&gt;Enregistre le projet en cours.&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="3882"/>
-        <source>Save &amp;as...</source>
-        <translation>&amp;Enregistrer sous...</translation>
-    </message>
-    <message>
         <location filename="../Project/Project.py" line="3886"/>
+        <source>&lt;b&gt;Open...&lt;/b&gt;&lt;p&gt;This opens an existing project.&lt;/p&gt;</source>
+        <translation>&lt;b&gt;Ouvrir...&lt;/b&gt;&lt;p&gt;Ouvre un projet existant.&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="3893"/>
+        <source>Close project</source>
+        <translation>Fermer le projet</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="3893"/>
+        <source>&amp;Close</source>
+        <translation>&amp;Fermer</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="3897"/>
+        <source>Close the current project</source>
+        <translation>Fermer le projet en cours</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="3898"/>
+        <source>&lt;b&gt;Close&lt;/b&gt;&lt;p&gt;This closes the current project.&lt;/p&gt;</source>
+        <translation>&lt;b&gt;Fermer&lt;/b&gt;&lt;p&gt;Ferme le projet en cours.&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="3905"/>
+        <source>Save project</source>
+        <translation>Enregistrer le projet</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="3909"/>
+        <source>Save the current project</source>
+        <translation>Enregistre le projet courant</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="3910"/>
+        <source>&lt;b&gt;Save&lt;/b&gt;&lt;p&gt;This saves the current project.&lt;/p&gt;</source>
+        <translation>&lt;b&gt;Enregistrer&lt;/b&gt;&lt;p&gt;Enregistre le projet en cours.&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="3917"/>
+        <source>Save &amp;as...</source>
+        <translation>&amp;Enregistrer sous...</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="3921"/>
         <source>Save the current project to a new file</source>
         <translation>Enregistre le projet en cours dans un nouveau fichier</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3888"/>
+        <location filename="../Project/Project.py" line="3923"/>
         <source>&lt;b&gt;Save as&lt;/b&gt;&lt;p&gt;This saves the current project to a new file.&lt;/p&gt;</source>
         <translation>&lt;b&gt;Enregistrer sous&lt;/b&gt;&lt;p&gt;Enregistre le projet en cours dans un nouveau fichier.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3928"/>
+        <location filename="../Project/Project.py" line="3963"/>
         <source>Add translation to project</source>
         <translation>Ajouter une traduction au projet</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3928"/>
+        <location filename="../Project/Project.py" line="3963"/>
         <source>Add &amp;translation...</source>
         <translation>Ajouter une &amp;traduction...</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3933"/>
+        <location filename="../Project/Project.py" line="3968"/>
         <source>Add a translation to the current project</source>
         <translation>Ajoute une traduction au projet en cours</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3935"/>
+        <location filename="../Project/Project.py" line="3970"/>
         <source>&lt;b&gt;Add translation...&lt;/b&gt;&lt;p&gt;This opens a dialog for add a translation to the current project.&lt;/p&gt;</source>
         <translation>&lt;b&gt;Ajouter une traduction...&lt;/b&gt;&lt;p&gt;Ouvre une boite de dialogue pour ajouter une traduction au projet courant.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3943"/>
+        <location filename="../Project/Project.py" line="3978"/>
         <source>Search new files</source>
         <translation>Rechercher des nouveaux fichiers</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3943"/>
-        <source>Searc&amp;h new files...</source>
-        <translation>Re&amp;chercher des nouveaux fichiers...</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="3947"/>
-        <source>Search new files in the project directory.</source>
-        <translation>Recherche des nouveaux fichiers dans le répertoire du projet.</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="3973"/>
-        <source>Project properties</source>
-        <translation>Propriétés du projet</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="3973"/>
-        <source>&amp;Properties...</source>
-        <translation>&amp;Propriétés...</translation>
-    </message>
-    <message>
         <location filename="../Project/Project.py" line="3978"/>
+        <source>Searc&amp;h new files...</source>
+        <translation>Re&amp;chercher des nouveaux fichiers...</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="3982"/>
+        <source>Search new files in the project directory.</source>
+        <translation>Recherche des nouveaux fichiers dans le répertoire du projet.</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4008"/>
+        <source>Project properties</source>
+        <translation>Propriétés du projet</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4008"/>
+        <source>&amp;Properties...</source>
+        <translation>&amp;Propriétés...</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4013"/>
         <source>Show the project properties</source>
         <translation>Affiche les propriétés du projet</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3979"/>
+        <location filename="../Project/Project.py" line="4014"/>
         <source>&lt;b&gt;Properties...&lt;/b&gt;&lt;p&gt;This shows a dialog to edit the project properties.&lt;/p&gt;</source>
         <translation>&lt;b&gt;Propriétés...&lt;/b&gt;&lt;p&gt;Affiche une boite de dialogue pour éditer les propriétés du projet.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4101"/>
+        <location filename="../Project/Project.py" line="4136"/>
         <source>Load session</source>
         <translation>Charger la session</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4105"/>
+        <location filename="../Project/Project.py" line="4140"/>
         <source>Load the projects session file.</source>
         <translation>Charge le fichier de session du projet.</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4106"/>
+        <location filename="../Project/Project.py" line="4141"/>
         <source>&lt;b&gt;Load session&lt;/b&gt;&lt;p&gt;This loads the projects session file. The session consists of the following data.&lt;br&gt;- all open source files&lt;br&gt;- all breakpoint&lt;br&gt;- the commandline arguments&lt;br&gt;- the working directory&lt;br&gt;- the exception reporting flag&lt;/p&gt;</source>
         <translation>&lt;b&gt;Charger la session&lt;/b&gt;&lt;p&gt;Charge le fichier session du projet. Une session est constituée par les données suivantes.&lt;br&gt;- tous les fichiers open source&lt;br&gt;- tous les points d&apos;arrêts&lt;br&gt;- les arguments de ligne de commande&lt;br&gt;- le répertoire de travail&lt;br&gt;- le flag de rapport d&apos;exception&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4119"/>
+        <location filename="../Project/Project.py" line="4154"/>
         <source>Save session</source>
         <translation>Enregistrer la session</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4123"/>
+        <location filename="../Project/Project.py" line="4158"/>
         <source>Save the projects session file.</source>
         <translation>Enregistre le fichier de session du projet.</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4124"/>
+        <location filename="../Project/Project.py" line="4159"/>
         <source>&lt;b&gt;Save session&lt;/b&gt;&lt;p&gt;This saves the projects session file. The session consists of the following data.&lt;br&gt;- all open source files&lt;br&gt;- all breakpoint&lt;br&gt;- the commandline arguments&lt;br&gt;- the working directory&lt;br&gt;- the exception reporting flag&lt;/p&gt;</source>
         <translation>&lt;b&gt;Enregistrer la session&lt;/b&gt;&lt;p&gt;Enregistrer le fichier session du projet. Une session est constituée par les données suivantes.&lt;br&gt;- tous les fichiers open source&lt;br&gt;- tous les points d&apos;arrêts&lt;br&gt;- les arguments de ligne de commande&lt;br&gt;- le répertoire de travail&lt;br&gt;- le flag de rapport d&apos;exception&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4151"/>
+        <location filename="../Project/Project.py" line="4186"/>
         <source>Code Metrics</source>
         <translation>Statistiques du code</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4151"/>
+        <location filename="../Project/Project.py" line="4186"/>
         <source>&amp;Code Metrics...</source>
         <translation>Statistiques du &amp;Code...</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4155"/>
+        <location filename="../Project/Project.py" line="4190"/>
         <source>Show some code metrics for the project.</source>
         <translation>Affiche des statistiques sur le code du projet.</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4157"/>
+        <location filename="../Project/Project.py" line="4192"/>
         <source>&lt;b&gt;Code Metrics...&lt;/b&gt;&lt;p&gt;This shows some code metrics for all Python files in the project.&lt;/p&gt;</source>
         <translation>&lt;b&gt;Statistiques du Code...&lt;/b&gt;&lt;p&gt;Affiche des statistiques sur le code de tous les fichiers Python du projet.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4165"/>
+        <location filename="../Project/Project.py" line="4200"/>
         <source>Python Code Coverage</source>
         <translation> Code Coverage Python</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4165"/>
-        <source>Code Co&amp;verage...</source>
-        <translation>Code Co&amp;verage...</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4169"/>
-        <source>Show code coverage information for the project.</source>
-        <translation>Affiche les informations de code coverage pour le projet.</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4171"/>
-        <source>&lt;b&gt;Code Coverage...&lt;/b&gt;&lt;p&gt;This shows the code coverage information for all Python files in the project.&lt;/p&gt;</source>
-        <translation>&lt;b&gt;Code Coverage...&lt;/b&gt;&lt;p&gt;Affiche les informations de code coverage pour le projet.&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="5053"/>
-        <source>Profile Data</source>
-        <translation>Profiling des données</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4179"/>
-        <source>&amp;Profile Data...</source>
-        <translation>&amp;Profiling des données...</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4183"/>
-        <source>Show profiling data for the project.</source>
-        <translation>Affiche le profiling des données du projet.</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4185"/>
-        <source>&lt;b&gt;Profile Data...&lt;/b&gt;&lt;p&gt;This shows the profiling data for the project.&lt;/p&gt;</source>
-        <translation>&lt;b&gt;Profilling des données...&lt;/b&gt;&lt;p&gt;Affiche le profiling des données du projet.&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="5107"/>
-        <source>Application Diagram</source>
-        <translation>Diagramme de l&apos;application</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4194"/>
-        <source>&amp;Application Diagram...</source>
-        <translation>&amp;Diagramme de l&apos;application...</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4198"/>
-        <source>Show a diagram of the project.</source>
-        <translation>Affiche le diagramme de l&apos;application.</translation>
-    </message>
-    <message>
         <location filename="../Project/Project.py" line="4200"/>
+        <source>Code Co&amp;verage...</source>
+        <translation>Code Co&amp;verage...</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4204"/>
+        <source>Show code coverage information for the project.</source>
+        <translation>Affiche les informations de code coverage pour le projet.</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4206"/>
+        <source>&lt;b&gt;Code Coverage...&lt;/b&gt;&lt;p&gt;This shows the code coverage information for all Python files in the project.&lt;/p&gt;</source>
+        <translation>&lt;b&gt;Code Coverage...&lt;/b&gt;&lt;p&gt;Affiche les informations de code coverage pour le projet.&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="5088"/>
+        <source>Profile Data</source>
+        <translation>Profiling des données</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4214"/>
+        <source>&amp;Profile Data...</source>
+        <translation>&amp;Profiling des données...</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4218"/>
+        <source>Show profiling data for the project.</source>
+        <translation>Affiche le profiling des données du projet.</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4220"/>
+        <source>&lt;b&gt;Profile Data...&lt;/b&gt;&lt;p&gt;This shows the profiling data for the project.&lt;/p&gt;</source>
+        <translation>&lt;b&gt;Profilling des données...&lt;/b&gt;&lt;p&gt;Affiche le profiling des données du projet.&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="5142"/>
+        <source>Application Diagram</source>
+        <translation>Diagramme de l&apos;application</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4229"/>
+        <source>&amp;Application Diagram...</source>
+        <translation>&amp;Diagramme de l&apos;application...</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4233"/>
+        <source>Show a diagram of the project.</source>
+        <translation>Affiche le diagramme de l&apos;application.</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4235"/>
         <source>&lt;b&gt;Application Diagram...&lt;/b&gt;&lt;p&gt;This shows a diagram of the project.&lt;/p&gt;</source>
         <translation>&lt;b&gt;Diagramme de l&apos;application...&lt;/b&gt;&lt;p&gt;Affiche le diagramme du projet.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4326"/>
+        <location filename="../Project/Project.py" line="4361"/>
         <source>Open &amp;Recent Projects</source>
         <translation>Ouvrir un projet &amp;récent</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4338"/>
+        <location filename="../Project/Project.py" line="4373"/>
         <source>&amp;Diagrams</source>
         <translation>&amp;Diagrammes</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4335"/>
+        <location filename="../Project/Project.py" line="4370"/>
         <source>Chec&amp;k</source>
         <translation>&amp;Vérification</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4331"/>
+        <location filename="../Project/Project.py" line="4366"/>
         <source>&amp;Version Control</source>
         <translation>&amp;Contrôle de version</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4337"/>
+        <location filename="../Project/Project.py" line="4372"/>
         <source>Sho&amp;w</source>
         <translation>&amp;Affichage</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4340"/>
+        <location filename="../Project/Project.py" line="4375"/>
         <source>Source &amp;Documentation</source>
         <translation>&amp;Documentation automatique</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4704"/>
+        <location filename="../Project/Project.py" line="4739"/>
         <source>Search New Files</source>
         <translation>Rechercher des nouveaux fichiers</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4704"/>
+        <location filename="../Project/Project.py" line="4739"/>
         <source>There were no new files found to be added.</source>
         <translation>Aucun fichier à ajouter n&apos;a été trouvé.</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4850"/>
+        <location filename="../Project/Project.py" line="4885"/>
         <source>Version Control System</source>
         <translation>Système de conrôle des versions (VCS)</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4980"/>
+        <location filename="../Project/Project.py" line="5015"/>
         <source>Coverage Data</source>
         <translation>Coverage de données</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5030"/>
+        <location filename="../Project/Project.py" line="5065"/>
         <source>There is no main script defined for the current project. Aborting</source>
         <translation>Il n&apos;y a pas de script principal défini dans le projet en cours. Abandon</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1964"/>
+        <location filename="../Project/Project.py" line="1976"/>
         <source>Rename file</source>
         <translation>Renommer le fichier</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1988"/>
+        <location filename="../Project/Project.py" line="2000"/>
         <source>Rename File</source>
         <translation>Renommer le fichier</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="2965"/>
+        <location filename="../Project/Project.py" line="2982"/>
         <source>New Project</source>
         <translation>Nouveau projet</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="2474"/>
+        <location filename="../Project/Project.py" line="2491"/>
         <source>Add existing files to the project?</source>
         <translation>Ajouter des fichiers existant au projet ?</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="2601"/>
+        <location filename="../Project/Project.py" line="2618"/>
         <source>Would you like to edit the VCS command options?</source>
         <translation>Voulez-vous éditer les options de commande VCS ?</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="2544"/>
+        <location filename="../Project/Project.py" line="2561"/>
         <source>Shall the project file be added to the repository?</source>
         <translation>Le fichier projet doit-il être ajouté au référentiel?</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="2573"/>
+        <location filename="../Project/Project.py" line="2590"/>
         <source>Select version control system for the project</source>
         <translation>Sélectionner un système de contrôle de version (VCS) pour le projet</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3913"/>
+        <location filename="../Project/Project.py" line="3948"/>
         <source>Add directory to project</source>
         <translation>Ajouter un répertoire au projet</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3913"/>
+        <location filename="../Project/Project.py" line="3948"/>
         <source>Add directory...</source>
         <translation>Ajouter un répertoire...</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3918"/>
+        <location filename="../Project/Project.py" line="3953"/>
         <source>Add a directory to the current project</source>
         <translation>Ajouter un répertoire au projet courant</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3920"/>
+        <location filename="../Project/Project.py" line="3955"/>
         <source>&lt;b&gt;Add directory...&lt;/b&gt;&lt;p&gt;This opens a dialog for adding a directory to the current project.&lt;/p&gt;</source>
         <translation>&lt;b&gt;Ajouter un répertoire...&lt;/b&gt;&lt;p&gt;Ouvre une fenêtre pour ajouter un répertoire au projet courant.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5003"/>
+        <location filename="../Project/Project.py" line="5038"/>
         <source>Code Coverage</source>
         <translation>Code Coverage</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5003"/>
+        <location filename="../Project/Project.py" line="5038"/>
         <source>Please select a coverage file</source>
         <translation>Sélectionner un fichier coverage</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5053"/>
+        <location filename="../Project/Project.py" line="5088"/>
         <source>Please select a profile file</source>
         <translation>Sélectionner un fichier profile</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1091"/>
+        <location filename="../Project/Project.py" line="1103"/>
         <source>Delete project session</source>
         <translation>Supprime la session de projet</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4137"/>
+        <location filename="../Project/Project.py" line="4172"/>
         <source>Delete session</source>
         <translation>Supprimer la session</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4141"/>
+        <location filename="../Project/Project.py" line="4176"/>
         <source>Delete the projects session file.</source>
         <translation>Suppression du fichier session de projet.</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4142"/>
+        <location filename="../Project/Project.py" line="4177"/>
         <source>&lt;b&gt;Delete session&lt;/b&gt;&lt;p&gt;This deletes the projects session file&lt;/p&gt;</source>
         <translation>&lt;b&gt;Suppression de session&lt;/b&gt;&lt;p&gt;Ceci supprime le fichier session de projet.&lt;/p&gt;</translation>
     </message>
@@ -52263,242 +52783,242 @@
         <translation>Autre</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5107"/>
+        <location filename="../Project/Project.py" line="5142"/>
         <source>Include module names?</source>
         <translation>Inclure les noms de modules ?</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="2263"/>
+        <location filename="../Project/Project.py" line="2280"/>
         <source>Delete directory</source>
         <translation>Suppression répertoire</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1125"/>
+        <location filename="../Project/Project.py" line="1137"/>
         <source>Read tasks</source>
         <translation>Tâches lues</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1145"/>
+        <location filename="../Project/Project.py" line="1157"/>
         <source>Save tasks</source>
         <translation>Tâches enregistrées</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1204"/>
+        <location filename="../Project/Project.py" line="1216"/>
         <source>Read debugger properties</source>
         <translation>Lecture des propriétés du débogueur</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1239"/>
+        <location filename="../Project/Project.py" line="1251"/>
         <source>Save debugger properties</source>
         <translation>Enregistrement des propriétés du débogueur</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1265"/>
+        <location filename="../Project/Project.py" line="1277"/>
         <source>Delete debugger properties</source>
         <translation>Suppression des propriétés du débogueur</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4037"/>
+        <location filename="../Project/Project.py" line="4072"/>
         <source>Debugger Properties</source>
         <translation>Propriétés du Débogueur</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4037"/>
+        <location filename="../Project/Project.py" line="4072"/>
         <source>Debugger &amp;Properties...</source>
         <translation>Débogueur &amp; Propriétés...</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4041"/>
+        <location filename="../Project/Project.py" line="4076"/>
         <source>Show the debugger properties</source>
         <translation>Affichage des propriétés du débogueur</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4042"/>
+        <location filename="../Project/Project.py" line="4077"/>
         <source>&lt;b&gt;Debugger Properties...&lt;/b&gt;&lt;p&gt;This shows a dialog to edit project specific debugger settings.&lt;/p&gt;</source>
         <translation>&lt;b&gt;Propriétés du Débogueur...&lt;/b&gt;&lt;p&gt;Affiche une boite de dialogue permettant d&apos;éditer les proprités du débogueur, spécifiques au projet.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4050"/>
+        <location filename="../Project/Project.py" line="4085"/>
         <source>Load</source>
         <translation>Charger</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4050"/>
+        <location filename="../Project/Project.py" line="4085"/>
         <source>&amp;Load</source>
         <translation>&amp;Charger</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4054"/>
+        <location filename="../Project/Project.py" line="4089"/>
         <source>Load the debugger properties</source>
         <translation>Charger les propriétés du débogueur</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4062"/>
+        <location filename="../Project/Project.py" line="4097"/>
         <source>Save</source>
         <translation>Enregistrer</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4066"/>
+        <location filename="../Project/Project.py" line="4101"/>
         <source>Save the debugger properties</source>
         <translation>Enregistrer les propriétés du débogueur</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4074"/>
+        <location filename="../Project/Project.py" line="4109"/>
         <source>Delete</source>
         <translation>Supprimer</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4074"/>
+        <location filename="../Project/Project.py" line="4109"/>
         <source>&amp;Delete</source>
         <translation>&amp;Supprimer</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4078"/>
+        <location filename="../Project/Project.py" line="4113"/>
         <source>Delete the debugger properties</source>
         <translation>Supprimer les propriétés du débogueur</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4087"/>
+        <location filename="../Project/Project.py" line="4122"/>
         <source>Reset</source>
         <translation>Réinitialiser</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4087"/>
+        <location filename="../Project/Project.py" line="4122"/>
         <source>&amp;Reset</source>
         <translation>&amp;Réinitialiser</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4091"/>
+        <location filename="../Project/Project.py" line="4126"/>
         <source>Reset the debugger properties</source>
         <translation>Réinitialise des propriétés du débogueur</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4328"/>
+        <location filename="../Project/Project.py" line="4363"/>
         <source>Debugger</source>
         <translation>Débogueur</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4327"/>
+        <location filename="../Project/Project.py" line="4362"/>
         <source>Session</source>
         <translation>Session</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4055"/>
+        <location filename="../Project/Project.py" line="4090"/>
         <source>&lt;b&gt;Load Debugger Properties&lt;/b&gt;&lt;p&gt;This loads the project specific debugger settings.&lt;/p&gt;</source>
         <translation>&lt;b&gt;Chargement des Propriétés du Débogueur&lt;/b&gt;&lt;p&gt;Charge la configuration du débogueur spécifique au projet.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4067"/>
+        <location filename="../Project/Project.py" line="4102"/>
         <source>&lt;b&gt;Save Debugger Properties&lt;/b&gt;&lt;p&gt;This saves the project specific debugger settings.&lt;/p&gt;</source>
         <translation>&lt;b&gt;Enregistrement des Propriétés du Débogueur&lt;/b&gt;&lt;p&gt;Enregistre la configuration du débogueur spécifique au projet.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4079"/>
+        <location filename="../Project/Project.py" line="4114"/>
         <source>&lt;b&gt;Delete Debugger Properties&lt;/b&gt;&lt;p&gt;This deletes the file containing the project specific debugger settings.&lt;/p&gt;</source>
         <translation>&lt;b&gt;Suppression des Propriétés du Débogueur...&lt;/b&gt;&lt;p&gt;Supprime la configuration du débogueur spécifique au projet.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4092"/>
+        <location filename="../Project/Project.py" line="4127"/>
         <source>&lt;b&gt;Reset Debugger Properties&lt;/b&gt;&lt;p&gt;This resets the project specific debugger settings.&lt;/p&gt;</source>
         <translation>&lt;b&gt;Réinitialiser les propriétés du débogueur&lt;/b&gt;&lt;p&gt;Réinitialise la configuration du débogueur spécifique au projet.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4001"/>
+        <location filename="../Project/Project.py" line="4036"/>
         <source>Filetype Associations</source>
         <translation>Association des types de fichiers</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4001"/>
+        <location filename="../Project/Project.py" line="4036"/>
         <source>Filetype Associations...</source>
         <translation>Association des types de fichiers...</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4005"/>
+        <location filename="../Project/Project.py" line="4040"/>
         <source>Show the project filetype associations</source>
         <translation>Affiche les asociation Fichier/Type de fichier pour le projet</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4339"/>
+        <location filename="../Project/Project.py" line="4374"/>
         <source>Pac&amp;kagers</source>
         <translation>Création de pac&amp;kage</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3897"/>
+        <location filename="../Project/Project.py" line="3932"/>
         <source>Add files to project</source>
         <translation>Ajouter des fichiers au projet</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3897"/>
+        <location filename="../Project/Project.py" line="3932"/>
         <source>Add &amp;files...</source>
         <translation>Ajouter des &amp;fichiers...</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3902"/>
+        <location filename="../Project/Project.py" line="3937"/>
         <source>Add files to the current project</source>
         <translation>Ajouter des fichiers au projet courant</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3904"/>
+        <location filename="../Project/Project.py" line="3939"/>
         <source>&lt;b&gt;Add files...&lt;/b&gt;&lt;p&gt;This opens a dialog for adding files to the current project. The place to add is determined by the file extension.&lt;/p&gt;</source>
         <translation>&lt;b&gt;Ajouter des fichiers...&lt;/b&gt;&lt;p&gt;Ouvre une boite de dialogue pour ajouter des fichiers au projet courant. La position pour l&apos;insertion est déterminée par l&apos;extension du fichier.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3115"/>
+        <location filename="../Project/Project.py" line="3132"/>
         <source>Project Files (*.e4p)</source>
         <translation>Fichiers projets (*.e4p)</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4325"/>
+        <location filename="../Project/Project.py" line="4360"/>
         <source>&amp;Project</source>
         <translation>&amp;Projet</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4465"/>
+        <location filename="../Project/Project.py" line="4500"/>
         <source>Project</source>
         <translation>Projet</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4531"/>
+        <location filename="../Project/Project.py" line="4566"/>
         <source>&amp;Clear</source>
         <translation>&amp;Effacer</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="944"/>
+        <location filename="../Project/Project.py" line="956"/>
         <source>Read user project properties</source>
         <translation>Lire les propriétés utilisateur du projet</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="968"/>
+        <location filename="../Project/Project.py" line="980"/>
         <source>Save user project properties</source>
         <translation>Enregistrer les propriétés utilisateur du projet</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3986"/>
+        <location filename="../Project/Project.py" line="4021"/>
         <source>User project properties</source>
         <translation>Propriétés utilisateur du projet</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3986"/>
+        <location filename="../Project/Project.py" line="4021"/>
         <source>&amp;User Properties...</source>
         <translation>Propriétés &amp;Utilisateur...</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3991"/>
+        <location filename="../Project/Project.py" line="4026"/>
         <source>Show the user specific project properties</source>
         <translation>Afficher le propriétés utilisateurs spécifiques au projet</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3993"/>
+        <location filename="../Project/Project.py" line="4028"/>
         <source>&lt;b&gt;User Properties...&lt;/b&gt;&lt;p&gt;This shows a dialog to edit the user specific project properties.&lt;/p&gt;</source>
         <translation>&lt;b&gt;Propriétés utilisateur...&lt;/b&gt;&lt;p&gt;Affiche une fenêtre permettant d&apos;éditer les propriétés du projet spécifiques à l&apos;utilisateur.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3343"/>
+        <location filename="../Project/Project.py" line="3360"/>
         <source>Syntax errors detected</source>
         <translation>Erreurs de syntaxe détectées</translation>
     </message>
     <message numerus="yes">
-        <location filename="../Project/Project.py" line="3343"/>
+        <location filename="../Project/Project.py" line="3360"/>
         <source>The project contains %n file(s) with syntax errors.</source>
         <translation>
             <numerusform>Le projet contient %n fichier avec des erreurs de syntaxe.</numerusform>
@@ -52506,42 +53026,42 @@
         </translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5300"/>
+        <location filename="../Project/Project.py" line="5335"/>
         <source>Create Package List</source>
         <translation>Création de la liste de package</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4223"/>
+        <location filename="../Project/Project.py" line="4258"/>
         <source>Create &amp;Package List</source>
         <translation type="unfinished">Création de l&apos;&amp;archive du plugin</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5574"/>
+        <location filename="../Project/Project.py" line="5609"/>
         <source>Create Plugin Archive</source>
         <translation>Création de l&apos;archive du plugin</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5251"/>
+        <location filename="../Project/Project.py" line="5286"/>
         <source>&lt;p&gt;The file &lt;b&gt;PKGLIST&lt;/b&gt; already exists.&lt;/p&gt;&lt;p&gt;Overwrite it?&lt;/p&gt;</source>
         <translation>&lt;p&gt;Le fichier &lt;b&gt;PKGLIST&lt;/b&gt; existe déjà.&lt;/p&gt;&lt;p&gt;Ecraser ?&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5319"/>
+        <location filename="../Project/Project.py" line="5354"/>
         <source>The project does not have a main script defined. Aborting...</source>
         <translation>Le projet n&apos;a pas de script principal défini. Abandon...</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1715"/>
+        <location filename="../Project/Project.py" line="1727"/>
         <source>&lt;p&gt;The source directory doesn&apos;t contain any files belonging to the selected category.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Le répertoire source ne contient aucun fichier correspondant à la catégorie sélectionnée.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="2965"/>
+        <location filename="../Project/Project.py" line="2982"/>
         <source>Select Version Control System</source>
         <translation>Sélectionner un système de contrôle de version</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="2580"/>
+        <location filename="../Project/Project.py" line="2597"/>
         <source>None</source>
         <translation>Auncun</translation>
     </message>
@@ -52551,42 +53071,42 @@
         <translation>Enregistrement du type de projet</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4239"/>
+        <location filename="../Project/Project.py" line="4274"/>
         <source>Create Plugin &amp;Archives</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1393"/>
+        <location filename="../Project/Project.py" line="1405"/>
         <source>You have to specify a translation pattern first.</source>
         <translation>Vous devez d&apos;abord spécifier un pattern de traduction.</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="2684"/>
+        <location filename="../Project/Project.py" line="2701"/>
         <source>Translation Pattern</source>
         <translation>Pattern de traduction</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="2684"/>
+        <location filename="../Project/Project.py" line="2701"/>
         <source>Enter the path pattern for translation files (use &apos;%language%&apos; in place of the language code):</source>
         <translation>Entrer le pattern pour les fichiers de traduction (utiliser la balise &apos;%language%&apos; à la place de la langue à utiliser):</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4019"/>
+        <location filename="../Project/Project.py" line="4054"/>
         <source>Lexer Associations</source>
         <translation>Association des types de fichiers</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4019"/>
+        <location filename="../Project/Project.py" line="4054"/>
         <source>Lexer Associations...</source>
         <translation>Association des types de fichiers...</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4023"/>
+        <location filename="../Project/Project.py" line="4058"/>
         <source>Show the project lexer associations (overriding defaults)</source>
         <translation>Affiche les asociations Fichier/Type de fichier pour le projet (sans tenir compte des valeurs par défaut)</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4025"/>
+        <location filename="../Project/Project.py" line="4060"/>
         <source>&lt;b&gt;Lexer Associations...&lt;/b&gt;&lt;p&gt;This shows a dialog to edit the lexer associations of the project. These associations override the global lexer associations. Lexers are used to highlight the editor text.&lt;/p&gt;</source>
         <translation>&lt;b&gt;Associations des types de fichiers...&lt;/b&gt;&lt;p&gt;Permet d&apos;associer les types de fichiers aux analyseurs syntaxiques pour le projet en cours. Ces associations sont prioritaires sur les associations de fichiers configurées par défaut.&lt;/p&gt;</translation>
     </message>
@@ -52606,112 +53126,112 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="805"/>
+        <location filename="../Project/Project.py" line="817"/>
         <source>&lt;p&gt;The project file &lt;b&gt;{0}&lt;/b&gt; could not be read.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="908"/>
+        <location filename="../Project/Project.py" line="920"/>
         <source>&lt;p&gt;The project file &lt;b&gt;{0}&lt;/b&gt; could not be written.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="944"/>
+        <location filename="../Project/Project.py" line="956"/>
         <source>&lt;p&gt;The user specific project properties file &lt;b&gt;{0}&lt;/b&gt; could not be read.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="968"/>
+        <location filename="../Project/Project.py" line="980"/>
         <source>&lt;p&gt;The user specific project properties file &lt;b&gt;{0}&lt;/b&gt; could not be written.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1026"/>
+        <location filename="../Project/Project.py" line="1038"/>
         <source>&lt;p&gt;The project session file &lt;b&gt;{0}&lt;/b&gt; could not be read.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1062"/>
+        <location filename="../Project/Project.py" line="1074"/>
         <source>&lt;p&gt;The project session file &lt;b&gt;{0}&lt;/b&gt; could not be written.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1091"/>
+        <location filename="../Project/Project.py" line="1103"/>
         <source>&lt;p&gt;The project session file &lt;b&gt;{0}&lt;/b&gt; could not be deleted.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1125"/>
+        <location filename="../Project/Project.py" line="1137"/>
         <source>&lt;p&gt;The tasks file &lt;b&gt;{0}&lt;/b&gt; could not be read.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1145"/>
+        <location filename="../Project/Project.py" line="1157"/>
         <source>&lt;p&gt;The tasks file &lt;b&gt;{0}&lt;/b&gt; could not be written.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1204"/>
+        <location filename="../Project/Project.py" line="1216"/>
         <source>&lt;p&gt;The project debugger properties file &lt;b&gt;{0}&lt;/b&gt; could not be read.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1239"/>
+        <location filename="../Project/Project.py" line="1251"/>
         <source>&lt;p&gt;The project debugger properties file &lt;b&gt;{0}&lt;/b&gt; could not be written.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1265"/>
+        <location filename="../Project/Project.py" line="1277"/>
         <source>&lt;p&gt;The project debugger properties file &lt;b&gt;{0}&lt;/b&gt; could not be deleted.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1748"/>
+        <location filename="../Project/Project.py" line="1760"/>
         <source>&lt;p&gt;The file &lt;b&gt;{0}&lt;/b&gt; already exists.&lt;/p&gt;&lt;p&gt;Overwrite it?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3130"/>
+        <location filename="../Project/Project.py" line="3147"/>
         <source>&lt;p&gt;The file &lt;b&gt;{0}&lt;/b&gt; already exists. Overwrite it?&lt;/p&gt;</source>
         <translation type="unfinished">&lt;p&gt;Le fichier &lt;b&gt;{0}&lt;/b&gt;existe déjà. Écraser ?&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1988"/>
+        <location filename="../Project/Project.py" line="2000"/>
         <source>&lt;p&gt;The file &lt;b&gt;{0}&lt;/b&gt; could not be renamed.&lt;br /&gt;Reason: {1}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="2358"/>
+        <location filename="../Project/Project.py" line="2375"/>
         <source>&lt;p&gt;The project directory &lt;b&gt;{0}&lt;/b&gt; could not be created.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4850"/>
+        <location filename="../Project/Project.py" line="4885"/>
         <source>&lt;p&gt;The selected VCS &lt;b&gt;{0}&lt;/b&gt; could not be found.&lt;br/&gt;Disabling version control.&lt;/p&gt;&lt;p&gt;{1}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5300"/>
+        <location filename="../Project/Project.py" line="5335"/>
         <source>&lt;p&gt;The file &lt;b&gt;PKGLIST&lt;/b&gt; could not be created.&lt;/p&gt;&lt;p&gt;Reason: {0}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5460"/>
+        <location filename="../Project/Project.py" line="5495"/>
         <source>&lt;p&gt;The file &lt;b&gt;{0}&lt;/b&gt; could not be stored in the archive. Ignoring it.&lt;/p&gt;&lt;p&gt;Reason: {1}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5533"/>
+        <location filename="../Project/Project.py" line="5568"/>
         <source>&lt;p&gt;The plugin file &lt;b&gt;{0}&lt;/b&gt; could not be read.&lt;/p&gt;&lt;p&gt;Reason: {1}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1671"/>
+        <location filename="../Project/Project.py" line="1683"/>
         <source>&lt;p&gt;The selected file &lt;b&gt;{0}&lt;/b&gt; could not be added to &lt;b&gt;{1}&lt;/b&gt;.&lt;/p&gt;&lt;p&gt;Reason: {2}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1730"/>
+        <location filename="../Project/Project.py" line="1742"/>
         <source>&lt;p&gt;The target directory &lt;b&gt;{0}&lt;/b&gt; could not be created.&lt;/p&gt;&lt;p&gt;Reason: {1}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -52721,32 +53241,32 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="2441"/>
+        <location filename="../Project/Project.py" line="2458"/>
         <source>Create main script</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="2441"/>
+        <location filename="../Project/Project.py" line="2458"/>
         <source>&lt;p&gt;The mainscript &lt;b&gt;{0}&lt;/b&gt; could not be created.&lt;br/&gt;Reason: {1}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4208"/>
+        <location filename="../Project/Project.py" line="4243"/>
         <source>Load Diagram</source>
         <translation type="unfinished">Charger le diagramme</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4208"/>
+        <location filename="../Project/Project.py" line="4243"/>
         <source>&amp;Load Diagram...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4212"/>
+        <location filename="../Project/Project.py" line="4247"/>
         <source>Load a diagram from file.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4214"/>
+        <location filename="../Project/Project.py" line="4249"/>
         <source>&lt;b&gt;Load Diagram...&lt;/b&gt;&lt;p&gt;This loads a diagram from file.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -52776,37 +53296,37 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4839"/>
+        <location filename="../Project/Project.py" line="4874"/>
         <source>&lt;p&gt;The selected VCS &lt;b&gt;{0}&lt;/b&gt; could not be found. &lt;br/&gt;Reverting override.&lt;/p&gt;&lt;p&gt;{1}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5574"/>
+        <location filename="../Project/Project.py" line="5609"/>
         <source>&lt;p&gt;The plugin file &lt;b&gt;{0}&lt;/b&gt; could not be read.&lt;/p&gt; &lt;p&gt;Reason: {1}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4228"/>
+        <location filename="../Project/Project.py" line="4263"/>
         <source>Create an initial PKGLIST file for an eric6 plugin.</source>
         <translation type="unfinished">Créé le fichier d&apos;archive pour un plugin eric4. {5 ?} {6 ?}</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4230"/>
+        <location filename="../Project/Project.py" line="4265"/>
         <source>&lt;b&gt;Create Package List&lt;/b&gt;&lt;p&gt;This creates an initial list of files to include in an eric6 plugin archive. The list is created from the project file.&lt;/p&gt;</source>
         <translation type="unfinished">&lt;b&gt;Création de l&apos;archive du plugin&lt;/b&gt;&lt;p&gt;Ceci créé une archive contenant l&apos;ensemble des fichiers indiqués dans le fichier PKGLIST. Le nom de l&apos;archive est construit à partir du nom du script principal.&lt;/p&gt; {5 ?} {6 ?}</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4244"/>
+        <location filename="../Project/Project.py" line="4279"/>
         <source>Create eric6 plugin archive files.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4246"/>
+        <location filename="../Project/Project.py" line="4281"/>
         <source>&lt;b&gt;Create Plugin Archives&lt;/b&gt;&lt;p&gt;This creates eric6 plugin archive files using the list of files given in a PKGLIST* file. The archive name is built from the main script name if not designated in the package list file.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5424"/>
+        <location filename="../Project/Project.py" line="5459"/>
         <source>&lt;p&gt;The eric6 plugin archive file &lt;b&gt;{0}&lt;/b&gt; could not be created.&lt;/p&gt;&lt;p&gt;Reason: {1}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -52816,213 +53336,213 @@
         <translation type="unfinished">Plugin Eric4 {6 ?}</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="2933"/>
+        <location filename="../Project/Project.py" line="2950"/>
         <source>Create project management directory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="2933"/>
+        <location filename="../Project/Project.py" line="2950"/>
         <source>&lt;p&gt;The project directory &lt;b&gt;{0}&lt;/b&gt; is not writable.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3958"/>
+        <location filename="../Project/Project.py" line="3993"/>
         <source>Alt+Ctrl+P</source>
         <comment>Project|Search Project File</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3964"/>
+        <location filename="../Project/Project.py" line="3999"/>
         <source>Search for a file in the project list of files.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3966"/>
+        <location filename="../Project/Project.py" line="4001"/>
         <source>&lt;b&gt;Search Project File&lt;/b&gt;&lt;p&gt;This searches for a file in the project list of files.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3958"/>
+        <location filename="../Project/Project.py" line="3993"/>
         <source>Search Project File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3958"/>
+        <location filename="../Project/Project.py" line="3993"/>
         <source>Search Project File...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5355"/>
+        <location filename="../Project/Project.py" line="5390"/>
         <source>Create Plugin Archives</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4256"/>
+        <location filename="../Project/Project.py" line="4291"/>
         <source>Create Plugin Archives (Snapshot)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4256"/>
+        <location filename="../Project/Project.py" line="4291"/>
         <source>Create Plugin Archives (&amp;Snapshot)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4261"/>
+        <location filename="../Project/Project.py" line="4296"/>
         <source>Create eric6 plugin archive files (snapshot releases).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4263"/>
+        <location filename="../Project/Project.py" line="4298"/>
         <source>&lt;b&gt;Create Plugin Archives (Snapshot)&lt;/b&gt;&lt;p&gt;This creates eric6 plugin archive files using the list of files given in the PKGLIST* file. The archive name is built from the main script name if not designated in the package list file. The version entry of the main script is modified to reflect a snapshot release.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5333"/>
-        <source>Select package lists:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="5351"/>
-        <source>Creating plugin archives...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="5351"/>
-        <source>Abort</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="5351"/>
-        <source>%v/%m Archives</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Project/Project.py" line="5368"/>
+        <source>Select package lists:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="5386"/>
+        <source>Creating plugin archives...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="5386"/>
+        <source>Abort</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="5386"/>
+        <source>%v/%m Archives</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="5403"/>
         <source>&lt;p&gt;The file &lt;b&gt;{0}&lt;/b&gt; could not be read.&lt;/p&gt;&lt;p&gt;Reason: {1}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5479"/>
+        <location filename="../Project/Project.py" line="5514"/>
         <source>&lt;p&gt;The eric6 plugin archive files were created with some errors.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5482"/>
+        <location filename="../Project/Project.py" line="5517"/>
         <source>&lt;p&gt;The eric6 plugin archive files were created successfully.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5344"/>
+        <location filename="../Project/Project.py" line="5379"/>
         <source>&lt;p&gt;No package list files (PKGLIST*) available or selected. Aborting...&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5396"/>
+        <location filename="../Project/Project.py" line="5431"/>
         <source>&lt;p&gt;The file &lt;b&gt;{0}&lt;/b&gt; is not ready yet.&lt;/p&gt;&lt;p&gt;Please rework it and delete the&apos;; initial_list&apos; line of the header.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3949"/>
+        <location filename="../Project/Project.py" line="3984"/>
         <source>&lt;b&gt;Search new files...&lt;/b&gt;&lt;p&gt;This searches for new files (sources, *.ui, *.idl, *.proto) in the project directory and registered subdirectories.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4007"/>
+        <location filename="../Project/Project.py" line="4042"/>
         <source>&lt;b&gt;Filetype Associations...&lt;/b&gt;&lt;p&gt;This shows a dialog to edit the file type associations of the project. These associations determine the type (source, form, interface, protocol or others) with a filename pattern. They are used when adding a file to the project and when performing a search for new files.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1519"/>
+        <location filename="../Project/Project.py" line="1531"/>
         <source>&lt;p&gt;The selected translation file &lt;b&gt;{0}&lt;/b&gt; could not be deleted.&lt;/p&gt;&lt;p&gt;Reason: {1}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="2233"/>
+        <location filename="../Project/Project.py" line="2250"/>
         <source>&lt;p&gt;The selected file &lt;b&gt;{0}&lt;/b&gt; could not be deleted.&lt;/p&gt;&lt;p&gt;Reason: {1}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="2263"/>
+        <location filename="../Project/Project.py" line="2280"/>
         <source>&lt;p&gt;The selected directory &lt;b&gt;{0}&lt;/b&gt; could not be deleted.&lt;/p&gt;&lt;p&gt;Reason: {1}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="2756"/>
+        <location filename="../Project/Project.py" line="2773"/>
         <source>Create Makefile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="2756"/>
+        <location filename="../Project/Project.py" line="2773"/>
         <source>&lt;p&gt;The makefile &lt;b&gt;{0}&lt;/b&gt; could not be created.&lt;br/&gt;Reason: {1}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5760"/>
+        <location filename="../Project/Project.py" line="5795"/>
         <source>Execute Make</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4277"/>
+        <location filename="../Project/Project.py" line="4312"/>
         <source>&amp;Execute Make</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4281"/>
+        <location filename="../Project/Project.py" line="4316"/>
         <source>Perform a &apos;make&apos; run.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4283"/>
+        <location filename="../Project/Project.py" line="4318"/>
         <source>&lt;b&gt;Execute Make&lt;/b&gt;&lt;p&gt;This performs a &apos;make&apos; run to rebuild the configured target.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5740"/>
+        <location filename="../Project/Project.py" line="5775"/>
         <source>Test for Changes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4291"/>
+        <location filename="../Project/Project.py" line="4326"/>
         <source>&amp;Test for Changes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4295"/>
+        <location filename="../Project/Project.py" line="4330"/>
         <source>Question &apos;make&apos;, if a rebuild is needed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4297"/>
+        <location filename="../Project/Project.py" line="4332"/>
         <source>&lt;b&gt;Test for Changes&lt;/b&gt;&lt;p&gt;This questions &apos;make&apos;, if a rebuild of the configured target is necessary.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4342"/>
+        <location filename="../Project/Project.py" line="4377"/>
         <source>Make</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5688"/>
+        <location filename="../Project/Project.py" line="5723"/>
         <source>The make process did not start.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5733"/>
+        <location filename="../Project/Project.py" line="5768"/>
         <source>The make process crashed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5743"/>
+        <location filename="../Project/Project.py" line="5778"/>
         <source>&lt;p&gt;There are changes that require the configured make target &lt;b&gt;{0}&lt;/b&gt; to be rebuilt.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5748"/>
+        <location filename="../Project/Project.py" line="5783"/>
         <source>&lt;p&gt;There are changes that require the default make target to be rebuilt.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5760"/>
+        <location filename="../Project/Project.py" line="5795"/>
         <source>The makefile contains errors.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -53037,7 +53557,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4330"/>
+        <location filename="../Project/Project.py" line="4365"/>
         <source>Project-T&amp;ools</source>
         <translation type="unfinished"></translation>
     </message>
@@ -53141,7 +53661,7 @@
         <translation>VCS Status</translation>
     </message>
     <message>
-        <location filename="../Project/ProjectBrowserModel.py" line="782"/>
+        <location filename="../Project/ProjectBrowserModel.py" line="798"/>
         <source>local</source>
         <translation>local</translation>
     </message>
@@ -53151,7 +53671,7 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/ProjectBrowserPage.ui" line="56"/>
         <source>Select the colour for highlighted entries in the Others viewer.</source>
-        <translation>Sélection d&apos;une couleur pour les entrée sélectionées dans la section Autres.</translation>
+        <translation type="obsolete">Sélection d&apos;une couleur pour les entrée sélectionées dans la section Autres.</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/ProjectBrowserPage.ui" line="43"/>
@@ -53166,7 +53686,7 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/ProjectBrowserPage.ui" line="37"/>
         <source>Colours</source>
-        <translation>Couleurs</translation>
+        <translation type="obsolete">Couleurs</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/ProjectBrowserPage.ui" line="219"/>
@@ -53293,6 +53813,16 @@
         <source>Protocols (protobuf) Browser</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/ProjectBrowserPage.ui" line="37"/>
+        <source>Colors</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/ProjectBrowserPage.ui" line="56"/>
+        <source>Select the color for highlighted entries in the Others viewer.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ProjectFormsBrowser</name>
@@ -63065,12 +63595,12 @@
         <translation>Effacer</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="2157"/>
+        <location filename="../QScintilla/Shell.py" line="2161"/>
         <source>Drop Error</source>
         <translation>Erreur de suppression</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="839"/>
+        <location filename="../QScintilla/Shell.py" line="843"/>
         <source>No.</source>
         <translation>Non.</translation>
     </message>
@@ -63080,7 +63610,7 @@
         <translation>Lancer...</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="835"/>
+        <location filename="../QScintilla/Shell.py" line="839"/>
         <source>Passive Debug Mode</source>
         <translation>Mode débogueur passif</translation>
     </message>
@@ -63100,17 +63630,17 @@
         <translation>Afficher</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="767"/>
+        <location filename="../QScintilla/Shell.py" line="771"/>
         <source>Select History</source>
         <translation>Historique</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="767"/>
+        <location filename="../QScintilla/Shell.py" line="771"/>
         <source>Select the history entry to execute (most recent shown last).</source>
         <translation>Sélectionner une entrée à executer (la plus récente est à la fin).</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="836"/>
+        <location filename="../QScintilla/Shell.py" line="840"/>
         <source>
 Not connected</source>
         <translation>Non connexté</translation>
@@ -63126,22 +63656,22 @@
         <translation type="unfinished">Couper</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="841"/>
+        <location filename="../QScintilla/Shell.py" line="845"/>
         <source>{0} on {1}, {2}</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="1030"/>
+        <location filename="../QScintilla/Shell.py" line="1034"/>
         <source>StdOut: {0}</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="1038"/>
+        <location filename="../QScintilla/Shell.py" line="1042"/>
         <source>StdErr: {0}</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="2157"/>
+        <location filename="../QScintilla/Shell.py" line="2161"/>
         <source>&lt;p&gt;&lt;b&gt;{0}&lt;/b&gt; is not a file.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -63151,7 +63681,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="888"/>
+        <location filename="../QScintilla/Shell.py" line="892"/>
         <source>Exception &quot;{0}&quot;
 {1}
 File: {2}, Line: {3}
@@ -63159,32 +63689,32 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="923"/>
+        <location filename="../QScintilla/Shell.py" line="927"/>
         <source>Unspecified syntax error.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="898"/>
+        <location filename="../QScintilla/Shell.py" line="902"/>
         <source>Exception &quot;{0}&quot;
 {1}
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="925"/>
+        <location filename="../QScintilla/Shell.py" line="929"/>
         <source>Syntax error &quot;{1}&quot; in file {0} at line {2}, character {3}.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="948"/>
+        <location filename="../QScintilla/Shell.py" line="952"/>
         <source>Signal &quot;{0}&quot; generated in file {1} at line {2}.
 Function: {3}({4})</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="2015"/>
+        <location filename="../QScintilla/Shell.py" line="2019"/>
         <source>Project</source>
         <translation type="unfinished">Projet</translation>
     </message>
@@ -63214,14 +63744,14 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="1835"/>
+        <location filename="../QScintilla/Shell.py" line="1839"/>
         <source>Available Virtual Environments:
 {0}
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="1876"/>
+        <location filename="../QScintilla/Shell.py" line="1880"/>
         <source>Current Virtual Environment: &apos;{0}&apos;
 </source>
         <translation type="unfinished"></translation>
@@ -71329,7 +71859,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/Sync/SyncCheckPage.py" line="56"/>
+        <location filename="../WebBrowser/Sync/SyncCheckPage.py" line="50"/>
         <source>Host:</source>
         <translation type="unfinished">Hôte:</translation>
     </message>
@@ -71359,22 +71889,22 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/Sync/SyncCheckPage.py" line="55"/>
+        <location filename="../WebBrowser/Sync/SyncCheckPage.py" line="49"/>
         <source>FTP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/Sync/SyncCheckPage.py" line="68"/>
+        <location filename="../WebBrowser/Sync/SyncCheckPage.py" line="62"/>
         <source>No Synchronization</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/Sync/SyncCheckPage.py" line="211"/>
+        <location filename="../WebBrowser/Sync/SyncCheckPage.py" line="204"/>
         <source>&lt;font color=&quot;#FF0000&quot;&gt;&lt;b&gt;Error:&lt;/b&gt; {0}&lt;/font&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/Sync/SyncCheckPage.py" line="63"/>
+        <location filename="../WebBrowser/Sync/SyncCheckPage.py" line="57"/>
         <source>Shared Directory</source>
         <translation type="unfinished"></translation>
     </message>
@@ -71384,7 +71914,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/Sync/SyncCheckPage.py" line="64"/>
+        <location filename="../WebBrowser/Sync/SyncCheckPage.py" line="58"/>
         <source>Directory:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -73058,12 +73588,12 @@
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/TasksPage.ui" line="105"/>
-        <source>Tasks Background Colours</source>
+        <source>Tasks Background Colors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/TasksPage.ui" line="206"/>
-        <source>Select the background colour for these tasks.</source>
+        <source>Select the background color for these tasks.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -74121,27 +74651,27 @@
 <context>
     <name>Translator</name>
     <message>
-        <location filename="../Plugins/UiExtensionPlugins/Translator/Translator.py" line="52"/>
+        <location filename="../Plugins/UiExtensionPlugins/Translator/Translator.py" line="63"/>
         <source>Translator</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/UiExtensionPlugins/Translator/Translator.py" line="52"/>
+        <location filename="../Plugins/UiExtensionPlugins/Translator/Translator.py" line="63"/>
         <source>T&amp;ranslator</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/UiExtensionPlugins/Translator/Translator.py" line="52"/>
+        <location filename="../Plugins/UiExtensionPlugins/Translator/Translator.py" line="63"/>
         <source>Alt+Shift+R</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/UiExtensionPlugins/Translator/Translator.py" line="58"/>
+        <location filename="../Plugins/UiExtensionPlugins/Translator/Translator.py" line="69"/>
         <source>Switch the input focus to the Translator window.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/UiExtensionPlugins/Translator/Translator.py" line="60"/>
+        <location filename="../Plugins/UiExtensionPlugins/Translator/Translator.py" line="71"/>
         <source>&lt;b&gt;Activate Translator&lt;/b&gt;&lt;p&gt;This switches the input focus to the Translator window.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -74149,52 +74679,52 @@
 <context>
     <name>TranslatorEngines</name>
     <message>
-        <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorEngines/__init__.py" line="37"/>
+        <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorEngines/__init__.py" line="39"/>
         <source>Google V.1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorEngines/__init__.py" line="39"/>
-        <source>MyMemory</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorEngines/__init__.py" line="41"/>
-        <source>Glosbe</source>
+        <source>MyMemory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorEngines/__init__.py" line="43"/>
-        <source>PROMT</source>
+        <source>Glosbe</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorEngines/__init__.py" line="45"/>
-        <source>Yandex</source>
+        <source>PROMT</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorEngines/__init__.py" line="47"/>
-        <source>Google V.2</source>
+        <source>Yandex</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorEngines/__init__.py" line="49"/>
+        <source>Google V.2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorEngines/__init__.py" line="51"/>
         <source>Microsoft</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorEngines/__init__.py" line="57"/>
+        <source>Unknow translation service name ({0})</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorEngines/__init__.py" line="55"/>
-        <source>Unknow translation service name ({0})</source>
+        <source>IBM Watson</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorEngines/__init__.py" line="53"/>
-        <source>IBM Watson</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorEngines/__init__.py" line="51"/>
         <source>DeepL Pro</source>
         <translation type="unfinished"></translation>
     </message>
@@ -74443,12 +74973,12 @@
     </message>
     <message>
         <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorLanguagesDb.py" line="79"/>
-        <source>Chinese S</source>
+        <source>Chinese (China)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorLanguagesDb.py" line="80"/>
-        <source>Chinese T</source>
+        <source>Chinese (Taiwan)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -74628,7 +75158,7 @@
 <context>
     <name>TranslatorPlugin</name>
     <message>
-        <location filename="../Plugins/PluginTranslator.py" line="65"/>
+        <location filename="../Plugins/PluginTranslator.py" line="71"/>
         <source>Translator</source>
         <translation type="unfinished"></translation>
     </message>
@@ -76268,7 +76798,7 @@
         <translation>&lt;b&gt;Raccourcis claviers&lt;/b&gt;&lt;p&gt;Edite les raccourcis claviers pour l&apos;application.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="6329"/>
+        <location filename="../UI/UserInterface.py" line="6327"/>
         <source>Export Keyboard Shortcuts</source>
         <translation>Exporter les raccourcis clavier</translation>
     </message>
@@ -76288,7 +76818,7 @@
         <translation>&lt;b&gt;Exporter les raccourcis clavier&lt;/b&gt;&lt;p&gt;Exporte les raccourcis claviers de l&apos;application.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="6353"/>
+        <location filename="../UI/UserInterface.py" line="6351"/>
         <source>Import Keyboard Shortcuts</source>
         <translation>Importer des raccourcis clavier</translation>
     </message>
@@ -76464,7 +76994,7 @@
         <translation type="obsolete">Il n&apos;y a pas de script principal défini dans le projet en cours. Abandon</translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="6916"/>
+        <location filename="../UI/UserInterface.py" line="6914"/>
         <source>Drop Error</source>
         <translation>Erreur de suppression</translation>
     </message>
@@ -76599,12 +77129,12 @@
         <translation>Visualisueur de tâches</translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="6523"/>
+        <location filename="../UI/UserInterface.py" line="6521"/>
         <source>Save tasks</source>
         <translation>Enregistrement des tâches</translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="6552"/>
+        <location filename="../UI/UserInterface.py" line="6550"/>
         <source>Read tasks</source>
         <translation>Lecture des tâches</translation>
     </message>
@@ -76805,12 +77335,12 @@
         <translation>&lt;p&gt;L&apos;emplacement de la documentation PyQt4 n&apos;a pas été configuré.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="7287"/>
+        <location filename="../UI/UserInterface.py" line="7285"/>
         <source>Error during updates check</source>
         <translation>Erreur durant la recherche de mises à jour</translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="7268"/>
+        <location filename="../UI/UserInterface.py" line="7266"/>
         <source>Update available</source>
         <translation>Mise à jour disponible</translation>
     </message>
@@ -76820,17 +77350,17 @@
         <translation type="obsolete">&lt;h3&gt;Numéros de version&lt;/h3&gt;&lt;table&gt;</translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="7326"/>
+        <location filename="../UI/UserInterface.py" line="7324"/>
         <source>&lt;/table&gt;</source>
         <translation>&lt;/table&gt;</translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="6121"/>
+        <location filename="../UI/UserInterface.py" line="6119"/>
         <source>Open Browser</source>
         <translation type="unfinished">Ouverture du navigateur</translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="6121"/>
+        <location filename="../UI/UserInterface.py" line="6119"/>
         <source>Could not start a web browser</source>
         <translation type="unfinished">Impossible de lancer le navigateur web</translation>
     </message>
@@ -76855,17 +77385,17 @@
         <translation>Afficher les &amp;outils externes</translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="7101"/>
+        <location filename="../UI/UserInterface.py" line="7099"/>
         <source>&amp;Cancel</source>
         <translation>&amp;Annuler</translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="7287"/>
+        <location filename="../UI/UserInterface.py" line="7285"/>
         <source>Could not perform updates check.</source>
         <translation>Impossible de vérifier les mises à jour.</translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="7363"/>
+        <location filename="../UI/UserInterface.py" line="7361"/>
         <source>First time usage</source>
         <translation>Première utilisation</translation>
     </message>
@@ -76960,7 +77490,7 @@
         <translation>Affiche les versions disponibles pour le téléchargement</translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="7311"/>
+        <location filename="../UI/UserInterface.py" line="7309"/>
         <source>&lt;h3&gt;Available versions&lt;/h3&gt;&lt;table&gt;</source>
         <translation>&lt;h3&gt;Versions disponibles&lt;/h3&gt;&lt;table&gt;</translation>
     </message>
@@ -77055,12 +77585,12 @@
         <translation>Outils externes</translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="6648"/>
+        <location filename="../UI/UserInterface.py" line="6646"/>
         <source>Save session</source>
         <translation>Enregistrer la session</translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="6632"/>
+        <location filename="../UI/UserInterface.py" line="6630"/>
         <source>Read session</source>
         <translation>Chargement de session</translation>
     </message>
@@ -77402,32 +77932,32 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="6523"/>
+        <location filename="../UI/UserInterface.py" line="6521"/>
         <source>&lt;p&gt;The tasks file &lt;b&gt;{0}&lt;/b&gt; could not be written.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="6552"/>
+        <location filename="../UI/UserInterface.py" line="6550"/>
         <source>&lt;p&gt;The tasks file &lt;b&gt;{0}&lt;/b&gt; could not be read.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="6586"/>
+        <location filename="../UI/UserInterface.py" line="6584"/>
         <source>&lt;p&gt;The session file &lt;b&gt;{0}&lt;/b&gt; could not be written.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="6632"/>
+        <location filename="../UI/UserInterface.py" line="6630"/>
         <source>&lt;p&gt;The session file &lt;b&gt;{0}&lt;/b&gt; could not be read.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="6916"/>
+        <location filename="../UI/UserInterface.py" line="6914"/>
         <source>&lt;p&gt;&lt;b&gt;{0}&lt;/b&gt; is not a file.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="7110"/>
+        <location filename="../UI/UserInterface.py" line="7108"/>
         <source>Trying host {0}</source>
         <translation type="unfinished"></translation>
     </message>
@@ -77462,7 +77992,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="6353"/>
+        <location filename="../UI/UserInterface.py" line="6351"/>
         <source>Keyboard shortcut file (*.e4k)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -77502,17 +78032,17 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="7176"/>
+        <location filename="../UI/UserInterface.py" line="7174"/>
         <source>Error getting versions information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="7169"/>
+        <location filename="../UI/UserInterface.py" line="7167"/>
         <source>The versions information could not be downloaded. Please go online and try again.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="7176"/>
+        <location filename="../UI/UserInterface.py" line="7174"/>
         <source>The versions information could not be downloaded for the last 7 days. Please go online and try again.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -77603,7 +78133,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="7382"/>
+        <location filename="../UI/UserInterface.py" line="7380"/>
         <source>Select Workspace Directory</source>
         <translation type="unfinished"></translation>
     </message>
@@ -77978,7 +78508,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="7101"/>
+        <location filename="../UI/UserInterface.py" line="7099"/>
         <source>%v/%m</source>
         <translation type="unfinished"></translation>
     </message>
@@ -77998,7 +78528,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="7105"/>
+        <location filename="../UI/UserInterface.py" line="7103"/>
         <source>Version Check</source>
         <translation type="unfinished"></translation>
     </message>
@@ -78073,22 +78603,22 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="7268"/>
+        <location filename="../UI/UserInterface.py" line="7266"/>
         <source>The update to &lt;b&gt;{0}&lt;/b&gt; of eric6 is available at &lt;b&gt;{1}&lt;/b&gt;. Would you like to get it?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="7280"/>
+        <location filename="../UI/UserInterface.py" line="7278"/>
         <source>Eric6 is up to date</source>
         <translation type="unfinished">Eric4 est à jour {5 ?} {6 ?}</translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="7280"/>
+        <location filename="../UI/UserInterface.py" line="7278"/>
         <source>You are using the latest version of eric6</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="7363"/>
+        <location filename="../UI/UserInterface.py" line="7361"/>
         <source>eric6 has not been configured yet. The configuration dialog will be started.</source>
         <translation type="unfinished">eric4 n&apos;a pas encore été configuré. La fenêtre de configuration va être ouverte. {5 ?} {6 ?}</translation>
     </message>
@@ -78108,7 +78638,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="7121"/>
+        <location filename="../UI/UserInterface.py" line="7119"/>
         <source>The versions information cannot not be downloaded because you are &lt;b&gt;offline&lt;/b&gt;. Please go online and try again.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -78153,7 +78683,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="6670"/>
+        <location filename="../UI/UserInterface.py" line="6668"/>
         <source>Load session</source>
         <translation type="unfinished">Charger la session</translation>
     </message>
@@ -78168,17 +78698,17 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="6670"/>
+        <location filename="../UI/UserInterface.py" line="6668"/>
         <source>eric6 Session Files (*.e5s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="6721"/>
+        <location filename="../UI/UserInterface.py" line="6719"/>
         <source>Crash Session found!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="6721"/>
+        <location filename="../UI/UserInterface.py" line="6719"/>
         <source>A session file of a crashed session was found. Shall this session be restored?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -78193,17 +78723,17 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="7256"/>
+        <location filename="../UI/UserInterface.py" line="7254"/>
         <source>Update Check</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="7256"/>
+        <location filename="../UI/UserInterface.py" line="7254"/>
         <source>You installed eric directly from the source code. There is no possibility to check for the availability of an update.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="7246"/>
+        <location filename="../UI/UserInterface.py" line="7244"/>
         <source>You are using a snapshot release of eric6. A more up-to-date stable release might be available.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -79208,7 +79738,7 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="128"/>
         <source>Colours</source>
-        <translation>Couleurs</translation>
+        <translation type="obsolete">Couleurs</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="193"/>
@@ -79218,7 +79748,7 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="206"/>
         <source>Select the background colour for entries with VCS status &quot;modified&quot;.</source>
-        <translation>Sélection d&apos;une couleur de fond pour les entrée ayant le statut VCS &quot;modifié&quot;.</translation>
+        <translation type="obsolete">Sélection d&apos;une couleur de fond pour les entrée ayant le statut VCS &quot;modifié&quot;.</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="134"/>
@@ -79228,7 +79758,7 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="147"/>
         <source>Select the background colour for entries with VCS status &quot;added&quot;.</source>
-        <translation>Sélection d&apos;une couleur de fond pour les entrée ayant le statut VCS &quot;ajouté&quot;.</translation>
+        <translation type="obsolete">Sélection d&apos;une couleur de fond pour les entrée ayant le statut VCS &quot;ajouté&quot;.</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="239"/>
@@ -79238,7 +79768,7 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="252"/>
         <source>Select the background colour for entries with VCS status &quot;needs update&quot;.</source>
-        <translation>Sélection d&apos;une couleur de fond pour le status VCS &quot;besoin de mise à jour&quot;.</translation>
+        <translation type="obsolete">Sélection d&apos;une couleur de fond pour le status VCS &quot;besoin de mise à jour&quot;.</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="157"/>
@@ -79248,7 +79778,7 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="170"/>
         <source>Select the background colour for entries with VCS status &quot;conflict&quot;.</source>
-        <translation>Sélection d&apos;une couleur de fond pour le status VCS &quot;conflit&quot;.</translation>
+        <translation type="obsolete">Sélection d&apos;une couleur de fond pour le status VCS &quot;conflit&quot;.</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="216"/>
@@ -79258,7 +79788,7 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="229"/>
         <source>Select the background colour for entries with VCS status &quot;replaced&quot;.</source>
-        <translation>Sélection d&apos;une couleur de fond pour les entrée ayant le statut VCS &quot;remplacé&quot;.</translation>
+        <translation type="obsolete">Sélection d&apos;une couleur de fond pour les entrée ayant le statut VCS &quot;remplacé&quot;.</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="115"/>
@@ -79276,8 +79806,38 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="128"/>
+        <source>Colors</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="147"/>
+        <source>Select the background color for entries with VCS status &quot;added&quot;.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="170"/>
+        <source>Select the background color for entries with VCS status &quot;conflict&quot;.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="206"/>
+        <source>Select the background color for entries with VCS status &quot;modified&quot;.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="229"/>
+        <source>Select the background color for entries with VCS status &quot;replaced&quot;.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="252"/>
+        <source>Select the background color for entries with VCS status &quot;needs update&quot;.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="275"/>
-        <source>Select the background colour for entries with VCS status &quot;removed&quot;.</source>
+        <source>Select the background color for entries with VCS status &quot;removed&quot;.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -84216,17 +84776,17 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="279"/>
         <source>Colours</source>
-        <translation type="unfinished">Couleurs</translation>
+        <translation type="obsolete">Couleurs</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="285"/>
         <source>Background colour of secure URLs:</source>
-        <translation type="unfinished">Couleur de fond pour les URLs sécurisées:</translation>
+        <translation type="obsolete">Couleur de fond pour les URLs sécurisées:</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="298"/>
         <source>Select the background colour for secure URLs.</source>
-        <translation type="unfinished">Sélectionne une couleur de fond pour les URLs sécurisées.</translation>
+        <translation type="obsolete">Sélectionne une couleur de fond pour les URLs sécurisées.</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="324"/>
@@ -84323,6 +84883,21 @@
         <source>Show Scrollbars</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="279"/>
+        <source>Colors</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="285"/>
+        <source>Background color of secure URLs:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="298"/>
+        <source>Select the background color for secure URLs.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>WebBrowserClearPrivateDataDialog</name>
@@ -85212,12 +85787,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserPage.py" line="171"/>
+        <location filename="../WebBrowser/WebBrowserPage.py" line="172"/>
         <source>Suspicuous URL detected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserPage.py" line="171"/>
+        <location filename="../WebBrowser/WebBrowserPage.py" line="172"/>
         <source>&lt;p&gt;The URL &lt;b&gt;{0}&lt;/b&gt; was found in the Safe Browsing database.&lt;/p&gt;{1}</source>
         <translation type="unfinished"></translation>
     </message>
@@ -85507,112 +86082,112 @@
 <context>
     <name>WebBrowserTabWidget</name>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="124"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="122"/>
         <source>Show a navigation menu</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="137"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="135"/>
         <source>Show a navigation menu for closed tabs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="151"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="149"/>
         <source>Open a new web browser tab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="165"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="163"/>
         <source>New Tab</source>
         <translation type="unfinished">Nouvel onglet</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="169"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="167"/>
         <source>Move Left</source>
         <translation type="unfinished">Déplacer vers la gauche</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="172"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="170"/>
         <source>Move Right</source>
         <translation type="unfinished">Déplacer vers la droite</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="176"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="174"/>
         <source>Duplicate Page</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="179"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="177"/>
         <source>Close</source>
         <translation type="unfinished">Fermer</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="182"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="180"/>
         <source>Close Others</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="211"/>
+        <source>Close All</source>
+        <translation type="unfinished">Tout fermer</translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="186"/>
+        <source>Print Preview</source>
+        <translation type="unfinished">Aperçu avant impression</translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="189"/>
+        <source>Print</source>
+        <translation type="unfinished">Imprimer</translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="192"/>
+        <source>Print as PDF</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../WebBrowser/WebBrowserTabWidget.py" line="213"/>
-        <source>Close All</source>
-        <translation type="unfinished">Tout fermer</translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="188"/>
-        <source>Print Preview</source>
-        <translation type="unfinished">Aperçu avant impression</translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="191"/>
-        <source>Print</source>
-        <translation type="unfinished">Imprimer</translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="194"/>
-        <source>Print as PDF</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="215"/>
         <source>Reload All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="218"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="216"/>
         <source>Bookmark All Tabs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="222"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="220"/>
         <source>Restore Closed Tab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="458"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="456"/>
         <source>...</source>
         <translation type="unfinished">...</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="898"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="892"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="918"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="912"/>
         <source>Finished loading</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="920"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="914"/>
         <source>Failed to load</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="961"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="955"/>
         <source>Are you sure you want to close the window?</source>
         <translation type="unfinished"></translation>
     </message>
     <message numerus="yes">
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="961"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="955"/>
         <source>Are you sure you want to close the window?
 You have %n tab(s) open.</source>
         <translation type="unfinished">
@@ -85621,47 +86196,47 @@
         </translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="968"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="962"/>
         <source>&amp;Quit</source>
         <translation type="unfinished">&amp;Quitter</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="971"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="965"/>
         <source>C&amp;lose Current Tab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="1152"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="1146"/>
         <source>Restore All Closed Tabs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="1154"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="1148"/>
         <source>Clear List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="252"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="250"/>
         <source>Unmute Tab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="256"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="254"/>
         <source>Mute Tab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="755"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="753"/>
         <source>Print to PDF</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="705"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="703"/>
         <source>&lt;p&gt;The file &lt;b&gt;{0}&lt;/b&gt; exists already. Shall it be overwritten?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="755"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="753"/>
         <source>&lt;p&gt;The PDF could not be written to file &lt;b&gt;{0}&lt;/b&gt;.&lt;/p&gt;&lt;p&gt;&lt;b&gt;Error:&lt;/b&gt; {1}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
--- a/eric6/i18n/eric6_it.ts	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/i18n/eric6_it.ts	Sat May 02 13:51:07 2020 +0200
@@ -1229,12 +1229,12 @@
         <translation>&lt;&lt;Altri&gt;&gt;</translation>
     </message>
     <message>
-        <location filename="../Graphics/ApplicationDiagramBuilder.py" line="292"/>
+        <location filename="../Graphics/ApplicationDiagramBuilder.py" line="294"/>
         <source>Load Diagram</source>
         <translation>Carico Diagramma</translation>
     </message>
     <message>
-        <location filename="../Graphics/ApplicationDiagramBuilder.py" line="292"/>
+        <location filename="../Graphics/ApplicationDiagramBuilder.py" line="294"/>
         <source>&lt;p&gt;The diagram belongs to the project &lt;b&gt;{0}&lt;/b&gt;. Shall this project be opened?&lt;/p&gt;</source>
         <translation>&lt;p&gt;Il Diagramma appartiene al progetto &lt;b&gt;{0}&lt;/b&gt;. Si deve aprire il progetto?&lt;/p&gt;</translation>
     </message>
@@ -2405,32 +2405,32 @@
 <context>
     <name>BrowserModel</name>
     <message>
-        <location filename="../UI/BrowserModel.py" line="62"/>
+        <location filename="../UI/BrowserModel.py" line="63"/>
         <source>Name</source>
         <translation>Nome</translation>
     </message>
     <message>
-        <location filename="../UI/BrowserModel.py" line="730"/>
+        <location filename="../UI/BrowserModel.py" line="731"/>
         <source>Attributes</source>
         <translation>Attributi</translation>
     </message>
     <message>
-        <location filename="../UI/BrowserModel.py" line="660"/>
+        <location filename="../UI/BrowserModel.py" line="661"/>
         <source>Globals</source>
         <translation>Globali</translation>
     </message>
     <message>
-        <location filename="../UI/BrowserModel.py" line="654"/>
+        <location filename="../UI/BrowserModel.py" line="655"/>
         <source>Coding: {0}</source>
         <translation>Codifica: {0}</translation>
     </message>
     <message>
-        <location filename="../UI/BrowserModel.py" line="740"/>
+        <location filename="../UI/BrowserModel.py" line="741"/>
         <source>Class Attributes</source>
         <translation>Attributi della Classe</translation>
     </message>
     <message>
-        <location filename="../UI/BrowserModel.py" line="666"/>
+        <location filename="../UI/BrowserModel.py" line="667"/>
         <source>Imports</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3206,54 +3206,54 @@
 <context>
     <name>CodeDocumentationViewer</name>
     <message>
-        <location filename="../UI/CodeDocumentationViewer.py" line="175"/>
+        <location filename="../UI/CodeDocumentationViewer.py" line="211"/>
         <source>Code Info Provider:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/CodeDocumentationViewer.py" line="188"/>
+        <location filename="../UI/CodeDocumentationViewer.py" line="224"/>
         <source>Select the code info provider</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/CodeDocumentationViewer.py" line="190"/>
+        <location filename="../UI/CodeDocumentationViewer.py" line="226"/>
         <source>&lt;disabled&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/CodeDocumentationViewer.py" line="371"/>
+        <location filename="../UI/CodeDocumentationViewer.py" line="407"/>
         <source>No documentation available</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/CodeDocumentationViewer.py" line="392"/>
+        <location filename="../UI/CodeDocumentationViewer.py" line="428"/>
         <source>No source code documentation provider has been registered. This function has been disabled.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/CodeDocumentationViewer.py" line="397"/>
+        <location filename="../UI/CodeDocumentationViewer.py" line="433"/>
         <source>This function has been disabled.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/CodeDocumentationViewerTemplate.py" line="137"/>
+        <location filename="../UI/CodeDocumentationViewerTemplate.py" line="139"/>
         <source>No further documentation available</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/CodeDocumentationViewerTemplate.py" line="58"/>
+        <location filename="../UI/CodeDocumentationViewerTemplate.py" line="60"/>
         <source>&lt;p&gt;&lt;b&gt;Definition:&lt;/b&gt; &lt;span class=&quot;def&quot;&gt;@NAME@@ARGSPEC@&lt;/span&gt;&lt;/p&gt;</source>
         <comment>Just translate &apos;Definition:&apos; and leave the rest intact.</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/CodeDocumentationViewerTemplate.py" line="68"/>
+        <location filename="../UI/CodeDocumentationViewerTemplate.py" line="70"/>
         <source>&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; @NOTE@&lt;/p&gt;</source>
         <comment>Just translate &apos;Note:&apos; and leave the rest intact.</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/CodeDocumentationViewerTemplate.py" line="63"/>
+        <location filename="../UI/CodeDocumentationViewerTemplate.py" line="65"/>
         <source>&lt;p&gt;&lt;b&gt;Type:&lt;/b&gt; @TYPE@&lt;/p&gt;</source>
         <comment>Just translate &apos;Type:&apos; and leave the rest intact.</comment>
         <translation type="unfinished"></translation>
@@ -4347,7 +4347,7 @@
     <message>
         <location filename="../Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.ui" line="143"/>
         <source>Colour</source>
-        <translation>Colore</translation>
+        <translation type="obsolete">Colore</translation>
     </message>
     <message>
         <location filename="../Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.ui" line="42"/>
@@ -4362,7 +4362,7 @@
     <message>
         <location filename="../Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.ui" line="155"/>
         <source>Enter a variable name or a colour</source>
-        <translation>Inserisci un nome di variabile o un colore</translation>
+        <translation type="obsolete">Inserisci un nome di variabile o un colore</translation>
     </message>
     <message>
         <location filename="../Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.ui" line="167"/>
@@ -4527,7 +4527,7 @@
     <message>
         <location filename="../Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.py" line="72"/>
         <source>&lt;p&gt;The colour &lt;b&gt;{0}&lt;/b&gt; is not valid.&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Il colore &lt;b&gt;{0}&lt;/b&gt; non è valido.&lt;/p&gt;</translation>
+        <translation type="obsolete">&lt;p&gt;Il colore &lt;b&gt;{0}&lt;/b&gt; non è valido.&lt;/p&gt;</translation>
     </message>
     <message>
         <location filename="../Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.ui" line="55"/>
@@ -4542,7 +4542,7 @@
     <message>
         <location filename="../Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.ui" line="292"/>
         <source>Colour Variable</source>
-        <translation>Variabile Colore</translation>
+        <translation type="obsolete">Variabile Colore</translation>
     </message>
     <message>
         <location filename="../Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.ui" line="87"/>
@@ -4584,6 +4584,26 @@
         <source>Enter the parent expression</source>
         <translation>Inserisci il genitore</translation>
     </message>
+    <message>
+        <location filename="../Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.ui" line="143"/>
+        <source>Color</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.ui" line="155"/>
+        <source>Enter a variable name or a color</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.ui" line="292"/>
+        <source>Color Variable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.py" line="72"/>
+        <source>&lt;p&gt;The color &lt;b&gt;{0}&lt;/b&gt; is not valid.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>CompareDialog</name>
@@ -6497,7 +6517,7 @@
         <translation>&amp;Filtra con:</translation>
     </message>
     <message>
-        <location filename="../Project/CreateDialogCodeDialog.py" line="577"/>
+        <location filename="../Project/CreateDialogCodeDialog.py" line="580"/>
         <source>Code Generation</source>
         <translation>Generazione del codice</translation>
     </message>
@@ -6522,17 +6542,17 @@
         <translation>&lt;p&gt;C&apos;è un errore nel caricamento del form&lt;b&gt;{0}&lt;/b&gt;.&lt;/p&gt;&lt;p&gt;{1}&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/CreateDialogCodeDialog.py" line="437"/>
+        <location filename="../Project/CreateDialogCodeDialog.py" line="440"/>
         <source>&lt;p&gt;Could not open the code template file &quot;{0}&quot;.&lt;/p&gt;&lt;p&gt;Reason: {1}&lt;/p&gt;</source>
         <translation>&lt;p&gt;Non posso aprire il file del modello del codice &quot;{0}&quot;.&lt;p&gt;&lt;p&gt;Ragione: {1}&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/CreateDialogCodeDialog.py" line="475"/>
+        <location filename="../Project/CreateDialogCodeDialog.py" line="478"/>
         <source>&lt;p&gt;Could not open the source file &quot;{0}&quot;.&lt;/p&gt;&lt;p&gt;Reason: {1}&lt;/p&gt;</source>
         <translation>&lt;p&gt;Non posso aprire il file sorgente &quot;{0}&quot;.&lt;/p&gt;&lt;p&gt;Ragione: {1}&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/CreateDialogCodeDialog.py" line="577"/>
+        <location filename="../Project/CreateDialogCodeDialog.py" line="580"/>
         <source>&lt;p&gt;Could not write the source file &quot;{0}&quot;.&lt;/p&gt;&lt;p&gt;Reason: {1}&lt;/p&gt;</source>
         <translation>&lt;p&gt;Non posso scrivere il file sorgente &quot;{0}&quot;.&lt;/p&gt;&lt;p&gt;Ragione: {1}&lt;/p&gt;</translation>
     </message>
@@ -7753,21 +7773,6 @@
         <translation type="unfinished">Seleziona, se il debug deve essere eseguito da remoto</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="630"/>
-        <source>Background Colours</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="659"/>
-        <source>Select the background colour for changed items.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="695"/>
-        <source>Select the background colour for elements which are loaded for the first time.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="669"/>
         <source>Changed elements:</source>
         <translation type="unfinished"></translation>
@@ -7777,6 +7782,21 @@
         <source>First time opened elements:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="630"/>
+        <source>Background Colors</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="659"/>
+        <source>Select the background color for changed items.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="695"/>
+        <source>Select the background color for elements which are loaded for the first time.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DebuggerInterfacePython</name>
@@ -8261,110 +8281,110 @@
 <context>
     <name>DiffColoursPage</name>
     <message>
-        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="17"/>
-        <source>&lt;b&gt;Configure Diff colours&lt;/b&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="39"/>
-        <source>Select the background colour for header lines</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="42"/>
-        <source>Header Colour</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="52"/>
         <source>Header Line</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="65"/>
-        <source>Select the background colour for bad whitespace</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="68"/>
-        <source>Whitespace Colour</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="88"/>
-        <source>Select the text foreground colour</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="91"/>
-        <source>Text Colour</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="101"/>
         <source>Normal Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="114"/>
-        <source>Select the background colour for additions</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="117"/>
-        <source>Added Colour</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="127"/>
         <source>Added Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="140"/>
-        <source>Select the background colour for removed text</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="143"/>
-        <source>Removed Colour</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="153"/>
         <source>Removed Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="166"/>
-        <source>Select the background colour for replaced text</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="169"/>
-        <source>Replaced Colour</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="179"/>
         <source>Replaced Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="192"/>
-        <source>Select the background colour for context lines</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="195"/>
-        <source>Context Colour</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="205"/>
         <source>Context Line</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="17"/>
+        <source>&lt;b&gt;Configure Diff colors&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="39"/>
+        <source>Select the background color for header lines</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="42"/>
+        <source>Header Color</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="65"/>
+        <source>Select the background color for bad whitespace</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="68"/>
+        <source>Whitespace Color</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="88"/>
+        <source>Select the text foreground color</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="91"/>
+        <source>Text Color</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="114"/>
+        <source>Select the background color for additions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="117"/>
+        <source>Added Color</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="140"/>
+        <source>Select the background color for removed text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="143"/>
+        <source>Removed Color</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="166"/>
+        <source>Select the background color for replaced text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="169"/>
+        <source>Replaced Color</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="192"/>
+        <source>Select the background color for context lines</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="195"/>
+        <source>Context Color</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DiffDialog</name>
@@ -9625,7 +9645,7 @@
 <context>
     <name>E5GraphicsView</name>
     <message>
-        <location filename="../E5Graphics/E5GraphicsView.py" line="56"/>
+        <location filename="../E5Graphics/E5GraphicsView.py" line="58"/>
         <source>&lt;b&gt;Graphics View&lt;/b&gt;
 &lt;p&gt;This graphics view is used to show a diagram. 
 There are various actions available to manipulate the 
@@ -9656,7 +9676,7 @@
 </translation>
     </message>
     <message>
-        <location filename="../E5Graphics/E5GraphicsView.py" line="377"/>
+        <location filename="../E5Graphics/E5GraphicsView.py" line="416"/>
         <source>{0}, Page {1}</source>
         <translation>{0}, Pagina {1}</translation>
     </message>
@@ -11335,7 +11355,7 @@
         <translation>Modifica Breakpoint...</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5607"/>
+        <location filename="../QScintilla/Editor.py" line="5615"/>
         <source>Enable breakpoint</source>
         <translation>Abilita breakpoint</translation>
     </message>
@@ -11355,142 +11375,142 @@
         <translation>Elimina tutti i breakpoint</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="1955"/>
+        <location filename="../QScintilla/Editor.py" line="1956"/>
         <source>Modification of Read Only file</source>
         <translation>Modifica di un file di sola lettura</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="1955"/>
+        <location filename="../QScintilla/Editor.py" line="1956"/>
         <source>You are attempting to change a read only file. Please save to a different file first.</source>
         <translation>Stai tentando di modificare un file in sola lettura. Per favore prima salva come un file diverso.</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="2663"/>
+        <location filename="../QScintilla/Editor.py" line="2664"/>
         <source>Printing...</source>
         <translation>In stampa...</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="2680"/>
+        <location filename="../QScintilla/Editor.py" line="2681"/>
         <source>Printing completed</source>
         <translation>Stampa completata</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="2682"/>
+        <location filename="../QScintilla/Editor.py" line="2683"/>
         <source>Error while printing</source>
         <translation>Errore durante la stampa</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="2685"/>
+        <location filename="../QScintilla/Editor.py" line="2686"/>
         <source>Printing aborted</source>
         <translation>Stampa annullata</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="3106"/>
+        <location filename="../QScintilla/Editor.py" line="3107"/>
         <source>Open File</source>
         <translation>Apri File</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="3295"/>
+        <location filename="../QScintilla/Editor.py" line="3296"/>
         <source>Save File</source>
         <translation>Salva file</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="3046"/>
+        <location filename="../QScintilla/Editor.py" line="3047"/>
         <source>File Modified</source>
         <translation>File modificato</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="4772"/>
+        <location filename="../QScintilla/Editor.py" line="4777"/>
         <source>Autocompletion</source>
         <translation>Autocompletamento</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="4772"/>
+        <location filename="../QScintilla/Editor.py" line="4777"/>
         <source>Autocompletion is not available because there is no autocompletion source set.</source>
         <translation>L&apos;autocomplentamento non è disponibile perchè non ci sono fonti impostate.</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5610"/>
+        <location filename="../QScintilla/Editor.py" line="5618"/>
         <source>Disable breakpoint</source>
         <translation>Disabilita breakpoint</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5985"/>
+        <location filename="../QScintilla/Editor.py" line="5993"/>
         <source>Code Coverage</source>
         <translation>Analisi codice</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5985"/>
+        <location filename="../QScintilla/Editor.py" line="5993"/>
         <source>Please select a coverage file</source>
         <translation>Per favore seleziona un file per l&apos;analisi</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6165"/>
+        <location filename="../QScintilla/Editor.py" line="6173"/>
         <source>Profile Data</source>
         <translation>Profilazione dati</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6165"/>
+        <location filename="../QScintilla/Editor.py" line="6173"/>
         <source>Please select a profile file</source>
         <translation>Per favore seleziona un file per la profilazione</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6718"/>
+        <location filename="../QScintilla/Editor.py" line="6726"/>
         <source>Macro Name</source>
         <translation>Nome Macro</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6718"/>
+        <location filename="../QScintilla/Editor.py" line="6726"/>
         <source>Select a macro name:</source>
         <translation>Seleziona un nome per la macro:</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6789"/>
+        <location filename="../QScintilla/Editor.py" line="6797"/>
         <source>Macro files (*.macro)</source>
         <translation>File Macro (*.macro)</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6746"/>
+        <location filename="../QScintilla/Editor.py" line="6754"/>
         <source>Load macro file</source>
         <translation>Carica un file di macro</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6769"/>
+        <location filename="../QScintilla/Editor.py" line="6777"/>
         <source>Error loading macro</source>
         <translation>Errore nel caricamento della macro</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6789"/>
+        <location filename="../QScintilla/Editor.py" line="6797"/>
         <source>Save macro file</source>
         <translation>Salva un file di macro</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6806"/>
+        <location filename="../QScintilla/Editor.py" line="6814"/>
         <source>Save macro</source>
         <translation>Salva macro</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6822"/>
+        <location filename="../QScintilla/Editor.py" line="6830"/>
         <source>Error saving macro</source>
         <translation>Errore nel salvataggio della macro</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6835"/>
+        <location filename="../QScintilla/Editor.py" line="6843"/>
         <source>Start Macro Recording</source>
         <translation>Avvia registrazione della macro</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6861"/>
+        <location filename="../QScintilla/Editor.py" line="6869"/>
         <source>Macro Recording</source>
         <translation>Registrazione Macro</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6861"/>
+        <location filename="../QScintilla/Editor.py" line="6869"/>
         <source>Enter name of the macro:</source>
         <translation>Inserisci un nome per la macro:</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7001"/>
+        <location filename="../QScintilla/Editor.py" line="7009"/>
         <source>File changed</source>
         <translation>File modificato</translation>
     </message>
@@ -11510,7 +11530,7 @@
         <translation>Elimina errori di sintassi</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7307"/>
+        <location filename="../QScintilla/Editor.py" line="7320"/>
         <source>Drop Error</source>
         <translation>Errore Drop</translation>
     </message>
@@ -11520,12 +11540,12 @@
         <translation>Mostra i messaggi degli errori di sintassi</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6327"/>
+        <location filename="../QScintilla/Editor.py" line="6335"/>
         <source>Syntax Error</source>
         <translation>Errore di sintassi</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6327"/>
+        <location filename="../QScintilla/Editor.py" line="6335"/>
         <source>No syntax error message available.</source>
         <translation>Nessun messaggio degli errori di sintassi disponibile.</translation>
     </message>
@@ -11555,17 +11575,17 @@
         <translation>File non analizzato precedente</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6048"/>
+        <location filename="../QScintilla/Editor.py" line="6056"/>
         <source>Show Code Coverage Annotations</source>
         <translation>Mostra le annotazioni dell&apos;analisi del codice</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6041"/>
+        <location filename="../QScintilla/Editor.py" line="6049"/>
         <source>All lines have been covered.</source>
         <translation>Tutte le linee sono state analizzate.</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6048"/>
+        <location filename="../QScintilla/Editor.py" line="6056"/>
         <source>There is no coverage file available.</source>
         <translation>Non ci sono file di analisi disponibili.</translation>
     </message>
@@ -11600,72 +11620,72 @@
         <translation>Nessun linguaggio</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7328"/>
+        <location filename="../QScintilla/Editor.py" line="7341"/>
         <source>Resources</source>
         <translation>Risorse</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7330"/>
+        <location filename="../QScintilla/Editor.py" line="7343"/>
         <source>Add file...</source>
         <translation>Aggiungi file...</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7332"/>
+        <location filename="../QScintilla/Editor.py" line="7345"/>
         <source>Add files...</source>
         <translation>Aggiungi files...</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7334"/>
+        <location filename="../QScintilla/Editor.py" line="7347"/>
         <source>Add aliased file...</source>
         <translation>Aggiungi file sinonimo...</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7337"/>
+        <location filename="../QScintilla/Editor.py" line="7350"/>
         <source>Add localized resource...</source>
         <translation>Aggiungi una risorsa localizzata...</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7360"/>
+        <location filename="../QScintilla/Editor.py" line="7373"/>
         <source>Add file resource</source>
         <translation>Aggiungi un file risorse</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7376"/>
+        <location filename="../QScintilla/Editor.py" line="7389"/>
         <source>Add file resources</source>
         <translation>Aggiundi dei file risorse</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7403"/>
+        <location filename="../QScintilla/Editor.py" line="7416"/>
         <source>Add aliased file resource</source>
         <translation>Aggiungi file sinonimo delle risorse</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7469"/>
+        <location filename="../QScintilla/Editor.py" line="7482"/>
         <source>Package Diagram</source>
         <translation>Diagrammi del package</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7469"/>
+        <location filename="../QScintilla/Editor.py" line="7482"/>
         <source>Include class attributes?</source>
         <translation>Includi gli attributi della classe ?</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7505"/>
+        <location filename="../QScintilla/Editor.py" line="7518"/>
         <source>Application Diagram</source>
         <translation>Diagrammi dell&apos;applicazione</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7505"/>
+        <location filename="../QScintilla/Editor.py" line="7518"/>
         <source>Include module names?</source>
         <translation>Includi i nomi dei moduli ?</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7341"/>
+        <location filename="../QScintilla/Editor.py" line="7354"/>
         <source>Add resource frame</source>
         <translation>Aggiungi riquadro delle risorse</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6835"/>
+        <location filename="../QScintilla/Editor.py" line="6843"/>
         <source>Macro recording is already active. Start new?</source>
         <translation>Registrazione macro già attiva. Avvia nuovamente ?</translation>
     </message>
@@ -11710,12 +11730,12 @@
         <translation>Nessun formato di export impostato. Annullamento...</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7491"/>
+        <location filename="../QScintilla/Editor.py" line="7504"/>
         <source>Imports Diagram</source>
         <translation>Importa diagrammi</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7491"/>
+        <location filename="../QScintilla/Editor.py" line="7504"/>
         <source>Include imports from external modules?</source>
         <translation>Includi gli import dai moduli esterni ?</translation>
     </message>
@@ -11785,7 +11805,7 @@
         <translation>Selezione l&apos;analizzatore lessicale di Pygments da applicare.</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7834"/>
+        <location filename="../QScintilla/Editor.py" line="7847"/>
         <source>Check spelling...</source>
         <translation>Controllo sillabazione...</translation>
     </message>
@@ -11795,12 +11815,12 @@
         <translation>Controllo sillabazione della selezione...</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7837"/>
+        <location filename="../QScintilla/Editor.py" line="7850"/>
         <source>Add to dictionary</source>
         <translation>Aggiungi al dizionario</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7839"/>
+        <location filename="../QScintilla/Editor.py" line="7852"/>
         <source>Ignore All</source>
         <translation>Ignora tutto</translation>
     </message>
@@ -11825,47 +11845,47 @@
         <translation>Alternative ({0})</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="3046"/>
+        <location filename="../QScintilla/Editor.py" line="3047"/>
         <source>&lt;p&gt;The file &lt;b&gt;{0}&lt;/b&gt; has unsaved changes.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Il file &lt;b&gt;{0}&lt;/b&gt; contiene modifiche non salvate.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="3106"/>
+        <location filename="../QScintilla/Editor.py" line="3107"/>
         <source>&lt;p&gt;The file &lt;b&gt;{0}&lt;/b&gt; could not be opened.&lt;/p&gt;&lt;p&gt;Reason: {1}&lt;/p&gt;</source>
         <translation>&lt;p&gt;Il file &lt;b&gt;{0}&lt;/b&gt; non può essere aperto.&lt;br /&gt;Motivo: {1}&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="3232"/>
+        <location filename="../QScintilla/Editor.py" line="3233"/>
         <source>&lt;p&gt;The file &lt;b&gt;{0}&lt;/b&gt; could not be saved.&lt;br/&gt;Reason: {1}&lt;/p&gt;</source>
         <translation>&lt;p&gt;Il file &lt;b&gt;{0}&lt;/b&gt; non può essere salvato.&lt;br /&gt;Motivo: {1}&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6760"/>
+        <location filename="../QScintilla/Editor.py" line="6768"/>
         <source>&lt;p&gt;The macro file &lt;b&gt;{0}&lt;/b&gt; could not be read.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Il file macro &lt;b&gt;{0}&lt;/b&gt; non può essere letto.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6769"/>
+        <location filename="../QScintilla/Editor.py" line="6777"/>
         <source>&lt;p&gt;The macro file &lt;b&gt;{0}&lt;/b&gt; is corrupt.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Il file macro &lt;b&gt;{0}&lt;/b&gt; è danneggiato.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6822"/>
+        <location filename="../QScintilla/Editor.py" line="6830"/>
         <source>&lt;p&gt;The macro file &lt;b&gt;{0}&lt;/b&gt; could not be written.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Il file macro &lt;b&gt;{0}&lt;/b&gt; non può essere scritto.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7166"/>
+        <location filename="../QScintilla/Editor.py" line="7179"/>
         <source>{0} (ro)</source>
         <translation>{0} (ro)</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7307"/>
+        <location filename="../QScintilla/Editor.py" line="7320"/>
         <source>&lt;p&gt;&lt;b&gt;{0}&lt;/b&gt; is not a file.&lt;/p&gt;</source>
         <translation>&lt;p&gt;&lt;b&gt;{0}&lt;/b&gt; non è un file.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7403"/>
+        <location filename="../QScintilla/Editor.py" line="7416"/>
         <source>Alias for file &lt;b&gt;{0}&lt;/b&gt;:</source>
         <translation>Alias per il file &lt;b&gt;{0}&lt;/b&gt;:</translation>
     </message>
@@ -11890,27 +11910,27 @@
         <translation>Pulisci warning</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="3295"/>
+        <location filename="../QScintilla/Editor.py" line="3296"/>
         <source>&lt;p&gt;The file &lt;b&gt;{0}&lt;/b&gt; already exists. Overwrite it?&lt;/p&gt;</source>
         <translation>&lt;p&gt;Il file &lt;b&gt;{0}&lt;/b&gt; esiste già. Sovrascriverlo ?&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6806"/>
+        <location filename="../QScintilla/Editor.py" line="6814"/>
         <source>&lt;p&gt;The macro file &lt;b&gt;{0}&lt;/b&gt; already exists. Overwrite it?&lt;/p&gt;</source>
         <translation>&lt;p&gt;Il file  delle macro &lt;b&gt;{0}&lt;/b&gt; esiste già.Sovrascriverlo ?&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6606"/>
+        <location filename="../QScintilla/Editor.py" line="6614"/>
         <source>Warning: {0}</source>
         <translation>Attenzione: {0}</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6613"/>
+        <location filename="../QScintilla/Editor.py" line="6621"/>
         <source>Error: {0}</source>
         <translation>Errore: {0}</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6997"/>
+        <location filename="../QScintilla/Editor.py" line="7005"/>
         <source>&lt;br&gt;&lt;b&gt;Warning:&lt;/b&gt; You will lose your changes upon reopening it.</source>
         <translation>&lt;br&gt;&lt;b&gt;Attenzione:&lt;/b&gt; con la riapertura le modifiche andranno perse.</translation>
     </message>
@@ -11935,27 +11955,27 @@
         <translation>Modifica precedente</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="8255"/>
+        <location filename="../QScintilla/Editor.py" line="8268"/>
         <source>Sort Lines</source>
         <translation>Righe ordinate</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="8255"/>
+        <location filename="../QScintilla/Editor.py" line="8268"/>
         <source>The selection contains illegal data for a numerical sort.</source>
         <translation>La selezione contiene dati non validi per un ordinamento numerico.</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6541"/>
+        <location filename="../QScintilla/Editor.py" line="6549"/>
         <source>Warning</source>
         <translation>Attenzione</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6541"/>
+        <location filename="../QScintilla/Editor.py" line="6549"/>
         <source>No warning messages available.</source>
         <translation>Nessun messaggio di attenzione disponibile.</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6603"/>
+        <location filename="../QScintilla/Editor.py" line="6611"/>
         <source>Style: {0}</source>
         <translation>Stile: {0}</translation>
     </message>
@@ -11980,7 +12000,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6991"/>
+        <location filename="../QScintilla/Editor.py" line="6999"/>
         <source>&lt;p&gt;The file &lt;b&gt;{0}&lt;/b&gt; has been changed while it was opened in eric6. Reread it?&lt;/p&gt;</source>
         <translation type="unfinished">&lt;p&gt;Il file &lt;b&gt;{0}&lt;/b&gt; è stato modificato mentre era aperto in eric6. Rileggerlo ?&lt;/p&gt;</translation>
     </message>
@@ -11995,32 +12015,32 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="4902"/>
+        <location filename="../QScintilla/Editor.py" line="4907"/>
         <source>Auto-Completion Provider</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="4902"/>
+        <location filename="../QScintilla/Editor.py" line="4907"/>
         <source>The completion list provider &apos;{0}&apos; was already registered. Ignoring duplicate request.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5177"/>
+        <location filename="../QScintilla/Editor.py" line="5185"/>
         <source>Call-Tips Provider</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5177"/>
+        <location filename="../QScintilla/Editor.py" line="5185"/>
         <source>The call-tips provider &apos;{0}&apos; was already registered. Ignoring duplicate request.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="8344"/>
+        <location filename="../QScintilla/Editor.py" line="8357"/>
         <source>Register Mouse Click Handler</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="8344"/>
+        <location filename="../QScintilla/Editor.py" line="8357"/>
         <source>A mouse click handler for &quot;{0}&quot; was already registered by &quot;{1}&quot;. Aborting request by &quot;{2}&quot;...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12050,12 +12070,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="8465"/>
+        <location filename="../QScintilla/Editor.py" line="8478"/>
         <source>EditorConfig Properties</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="8465"/>
+        <location filename="../QScintilla/Editor.py" line="8478"/>
         <source>&lt;p&gt;The EditorConfig properties for file &lt;b&gt;{0}&lt;/b&gt; could not be loaded.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12593,35 +12613,35 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="122"/>
         <source>Colours</source>
-        <translation>Colori</translation>
+        <translation type="obsolete">Colori</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="128"/>
         <source>Background colour:</source>
-        <translation>Colore sfondo:</translation>
+        <translation type="obsolete">Colore sfondo:</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="141"/>
         <source>Select the background colour for calltips.</source>
-        <translation>Seleziona il colore di background per i calltips.</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="167"/>
+        <translation type="obsolete">Seleziona il colore di background per i calltips.</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="213"/>
         <source>Plug-In Behavior</source>
         <translation>Comportamento Plug-in</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="173"/>
+        <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="219"/>
         <source>Select to show QScintilla provided calltips, if the selected plug-ins fail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="176"/>
+        <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="222"/>
         <source>Qscintilla provided calltips are shown, if this option is enabled and calltips shall be provided by plug-ins (see calltips sub-page of the plug-in) and the plugin-ins don&apos;t deliver any calltips.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="179"/>
+        <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="225"/>
         <source>Show QScintilla calltips, if plug-ins fail</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12650,6 +12670,41 @@
         <source>Above Text</source>
         <translation>Testo superiore</translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="122"/>
+        <source>Colors</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="128"/>
+        <source>Background color:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="141"/>
+        <source>Select the background color for calltips.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="164"/>
+        <source>Foreground color:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="177"/>
+        <source>Select the foreground color for calltips.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="187"/>
+        <source>Highlight color:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="200"/>
+        <source>Select the highlight color for calltips.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>EditorCalltipsQScintillaPage</name>
@@ -13602,12 +13657,12 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="273"/>
         <source>Select the background colour for all styles</source>
-        <translation>Seleziona il colore dello sfondo per tutti gli stili</translation>
+        <translation type="obsolete">Seleziona il colore dello sfondo per tutti gli stili</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="276"/>
         <source>All Background Colours</source>
-        <translation>Tutti i colori di sfondo</translation>
+        <translation type="obsolete">Tutti i colori di sfondo</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="325"/>
@@ -13617,12 +13672,12 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="184"/>
         <source>Select the background colour.</source>
-        <translation>Seleziona il colore di sfondo.</translation>
+        <translation type="obsolete">Seleziona il colore di sfondo.</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="187"/>
         <source>Background Colour</source>
-        <translation>Colore di sfondo</translation>
+        <translation type="obsolete">Colore di sfondo</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="194"/>
@@ -13637,12 +13692,12 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="174"/>
         <source>Select the foreground colour.</source>
-        <translation>Seleziona il colore di primo piano.</translation>
+        <translation type="obsolete">Seleziona il colore di primo piano.</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="177"/>
         <source>Foreground Colour</source>
-        <translation>Colore di primo piano</translation>
+        <translation type="obsolete">Colore di primo piano</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="17"/>
@@ -13849,6 +13904,36 @@
         <source>Press to set all sub-styles to default values</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="174"/>
+        <source>Select the foreground color.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="177"/>
+        <source>Foreground Color</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="184"/>
+        <source>Select the background color.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="187"/>
+        <source>Background Color</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="273"/>
+        <source>Select the background color for all styles</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="276"/>
+        <source>All Background Colors</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>EditorKeywordsPage</name>
@@ -14685,12 +14770,12 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorSearchPage.ui" line="127"/>
         <source>Marker Colour:</source>
-        <translation>Colore marcatori:</translation>
+        <translation type="obsolete">Colore marcatori:</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorSearchPage.ui" line="140"/>
         <source>Select the colour for the search markers.</source>
-        <translation>Seleziona il colore per i marcatori della ricerca.</translation>
+        <translation type="obsolete">Seleziona il colore per i marcatori della ricerca.</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorSearchPage.ui" line="168"/>
@@ -14717,6 +14802,16 @@
         <source>QScintilla Extended  Mode (C++11)</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorSearchPage.ui" line="127"/>
+        <source>Marker Color:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorSearchPage.ui" line="140"/>
+        <source>Select the color for the search markers.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>EditorSpellCheckingPage</name>
@@ -14758,12 +14853,12 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorSpellCheckingPage.ui" line="221"/>
         <source>Marker Colour:</source>
-        <translation>Colori dei marcatori:</translation>
+        <translation type="obsolete">Colori dei marcatori:</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorSpellCheckingPage.ui" line="234"/>
         <source>Select the colour for the spelling markers.</source>
-        <translation>Selezione il colore per i marcatori della sillabazione.</translation>
+        <translation type="obsolete">Selezione il colore per i marcatori della sillabazione.</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorSpellCheckingPage.ui" line="17"/>
@@ -14793,7 +14888,7 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorSpellCheckingPage.ui" line="215"/>
         <source>Colours</source>
-        <translation>Colori</translation>
+        <translation type="obsolete">Colori</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorSpellCheckingPage.ui" line="260"/>
@@ -14881,6 +14976,21 @@
 &lt;p&gt;Enter the file extension of pure text files. The complete contents of files with these extensions will be checked.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorSpellCheckingPage.ui" line="215"/>
+        <source>Colors</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorSpellCheckingPage.ui" line="221"/>
+        <source>Marker Color:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorSpellCheckingPage.ui" line="234"/>
+        <source>Select the color for the spelling markers.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>EditorStylesPage</name>
@@ -15042,27 +15152,27 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="515"/>
         <source>Select to use custom selection colours</source>
-        <translation>Selezione per usare colori personalizzati per la selezione</translation>
+        <translation type="obsolete">Selezione per usare colori personalizzati per la selezione</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="518"/>
         <source>&lt;b&gt;Use custom selection colours&lt;/b&gt;&lt;p&gt;Select this entry in order to use custom selection colours in the editor and shell windows. The colours for the selection foreground and background are defined on the colours page.&lt;/p&gt;</source>
-        <translation>&lt;b&gt;Usa colori personalizzati per la selezione&lt;/b&gt;&lt;p&gt;Seleziona per poter usare colori personalizzati per la selezione nella finestra dell&apos;editor e nella shell. I colori per la selezione del primo piano e dello sfondo sono definiti sulla pagina dei colori.&lt;/p&gt;</translation>
+        <translation type="obsolete">&lt;b&gt;Usa colori personalizzati per la selezione&lt;/b&gt;&lt;p&gt;Seleziona per poter usare colori personalizzati per la selezione nella finestra dell&apos;editor e nella shell. I colori per la selezione del primo piano e dello sfondo sono definiti sulla pagina dei colori.&lt;/p&gt;</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="521"/>
         <source>Use custom selection colours</source>
-        <translation>Usa colori personalizzati per le selezione</translation>
+        <translation type="obsolete">Usa colori personalizzati per le selezione</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="528"/>
         <source>Select, if selected text should be colourized by the lexer.</source>
-        <translation>Seleziona, se il testo selezionato deve essere colorato dall&apos;analizzatore lessicale.</translation>
+        <translation type="obsolete">Seleziona, se il testo selezionato deve essere colorato dall&apos;analizzatore lessicale.</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="531"/>
         <source>Colourize selected text</source>
-        <translation>Colora testo selezionato</translation>
+        <translation type="obsolete">Colora testo selezionato</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="538"/>
@@ -15082,7 +15192,7 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="565"/>
         <source>Select the foreground colour for the selection.</source>
-        <translation>Seleziona il colore di primo piano per la selezione.</translation>
+        <translation type="obsolete">Seleziona il colore di primo piano per la selezione.</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="575"/>
@@ -15092,7 +15202,7 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="588"/>
         <source>Select the background colour for the selection.</source>
-        <translation>Seleziona il colore di sfondo per la selezione.</translation>
+        <translation type="obsolete">Seleziona il colore di sfondo per la selezione.</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="609"/>
@@ -15117,7 +15227,7 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="648"/>
         <source>Select the colour for the caret.</source>
-        <translation>Seleziona il colore per il caret.</translation>
+        <translation type="obsolete">Seleziona il colore per il caret.</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="672"/>
@@ -15127,7 +15237,7 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="761"/>
         <source>Select the background colour for the line containing the caret.</source>
-        <translation>Seleziona il colore di sfondo per una linea contenente il caret.</translation>
+        <translation type="obsolete">Seleziona il colore di sfondo per una linea contenente il caret.</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="808"/>
@@ -15137,7 +15247,7 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="821"/>
         <source>Select the colour for the current line marker.</source>
-        <translation type="unfinished">Seleziona il colore per il marcatore di linea corrente.</translation>
+        <translation type="obsolete">Seleziona il colore per il marcatore di linea corrente.</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="831"/>
@@ -15147,7 +15257,7 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="844"/>
         <source>Select the colour for the error line marker.</source>
-        <translation type="unfinished">Seleziona il colore per il marcatore di linea di errore.</translation>
+        <translation type="obsolete">Seleziona il colore per il marcatore di linea di errore.</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="857"/>
@@ -15172,7 +15282,7 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="886"/>
         <source>Select the colour for highlighting matching braces.</source>
-        <translation>Seleziona il colore di evidenziazione delle parentesi bilanciate.</translation>
+        <translation type="obsolete">Seleziona il colore di evidenziazione delle parentesi bilanciate.</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="896"/>
@@ -15182,7 +15292,7 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="909"/>
         <source>Select the background colour for highlighting matching braces.</source>
-        <translation>Seleziona il colore di sfondo per evidenziare le parentesi bilanciate.</translation>
+        <translation type="obsolete">Seleziona il colore di sfondo per evidenziare le parentesi bilanciate.</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="925"/>
@@ -15192,7 +15302,7 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="932"/>
         <source>Select the colour for  highlighting nonmatching braces.</source>
-        <translation>Seleziona il colore per evidenziare parentesi non bilanciate.</translation>
+        <translation type="obsolete">Seleziona il colore per evidenziare parentesi non bilanciate.</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="948"/>
@@ -15202,7 +15312,7 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="955"/>
         <source>Select the background colour for  highlighting nonmatching braces.</source>
-        <translation>Seleziona il colore di sfondo per l&apos;evidenziazione delle parentesi non bilanciate.</translation>
+        <translation type="obsolete">Seleziona il colore di sfondo per l&apos;evidenziazione delle parentesi non bilanciate.</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="968"/>
@@ -15232,12 +15342,12 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1124"/>
         <source>Select the colour for the edge marker.</source>
-        <translation>Seleziona il colore per il marcatore del bordo.</translation>
+        <translation type="obsolete">Seleziona il colore per il marcatore del bordo.</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1134"/>
         <source>Background colour:</source>
-        <translation>Colore di sfondo:</translation>
+        <translation type="obsolete">Colore di sfondo:</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1147"/>
@@ -15272,7 +15382,7 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1222"/>
         <source>Change Background Colour</source>
-        <translation>Cambia colore di sfondo</translation>
+        <translation type="obsolete">Cambia colore di sfondo</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="2077"/>
@@ -15307,7 +15417,7 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="351"/>
         <source>Select the foreground colour for the margins</source>
-        <translation>Seleziona il colore di primo piano per i margini</translation>
+        <translation type="obsolete">Seleziona il colore di primo piano per i margini</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="361"/>
@@ -15317,7 +15427,7 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="374"/>
         <source>Select the background colour for the margins</source>
-        <translation>Seleziona il colore di sfondo per i margini</translation>
+        <translation type="obsolete">Seleziona il colore di sfondo per i margini</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="384"/>
@@ -15327,7 +15437,7 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="397"/>
         <source>Select the background colour for the foldmargin</source>
-        <translation>Seleziona il colore di sfondo per il margine di compressione</translation>
+        <translation type="obsolete">Seleziona il colore di sfondo per il margine di compressione</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="792"/>
@@ -15372,7 +15482,7 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="420"/>
         <source>Select the foreground colour of the foldmarkers</source>
-        <translation>Seleziona il colore di foreground per i foldmarkers</translation>
+        <translation type="obsolete">Seleziona il colore di foreground per i foldmarkers</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="430"/>
@@ -15382,7 +15492,7 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="443"/>
         <source>Select the background colour of the foldmarkers</source>
-        <translation>Seleziona il colore di sfondo per il foldmarkers</translation>
+        <translation type="obsolete">Seleziona il colore di sfondo per il foldmarkers</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="37"/>
@@ -15412,7 +15522,7 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1402"/>
         <source>Press to select the foreground colour</source>
-        <translation>Premi per selezionare il colore di primo piano</translation>
+        <translation type="obsolete">Premi per selezionare il colore di primo piano</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1405"/>
@@ -15422,7 +15532,7 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1412"/>
         <source>Press to select the background colour</source>
-        <translation>Premi per selezionare il colore di sfondo</translation>
+        <translation type="obsolete">Premi per selezionare il colore di sfondo</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1415"/>
@@ -15457,7 +15567,7 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1636"/>
         <source>Select the foreground colour for visible whitespace</source>
-        <translation>Seleziona il colore in primo piano per visualizzare gli spazi</translation>
+        <translation type="obsolete">Seleziona il colore in primo piano per visualizzare gli spazi</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1646"/>
@@ -15467,17 +15577,17 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1659"/>
         <source>Select the background colour for visible whitespace</source>
-        <translation>Seleziona il colore in secondo piano per visualizzare gli spazi</translation>
+        <translation type="obsolete">Seleziona il colore in secondo piano per visualizzare gli spazi</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="53"/>
         <source>Select to set the colour of the edit area different to the default style</source>
-        <translation>Seleziona per settare il colore dell&apos;area di edit diversa dallo stile in difetto</translation>
+        <translation type="obsolete">Seleziona per settare il colore dell&apos;area di edit diversa dallo stile in difetto</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="56"/>
         <source>Override edit area colours</source>
-        <translation>Byapssare i colori dell&apos;area di modifica</translation>
+        <translation type="obsolete">Byapssare i colori dell&apos;area di modifica</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="68"/>
@@ -15487,7 +15597,7 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="81"/>
         <source>Select the foreground colour for the edit area.</source>
-        <translation>Seleziona il colore in primo piano per l&apos;area di modifica.</translation>
+        <translation type="obsolete">Seleziona il colore in primo piano per l&apos;area di modifica.</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="91"/>
@@ -15497,12 +15607,12 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="104"/>
         <source>Select the background colour for the edit area.</source>
-        <translation>Seleziona il colore in secondo piano per l&apos;area di modifica.</translation>
+        <translation type="obsolete">Seleziona il colore in secondo piano per l&apos;area di modifica.</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="47"/>
         <source>Colours</source>
-        <translation>Colori</translation>
+        <translation type="obsolete">Colori</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1444"/>
@@ -15537,22 +15647,22 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1514"/>
         <source>Unsaved changes colour:</source>
-        <translation>Colore modifiche non salvate:</translation>
+        <translation type="obsolete">Colore modifiche non salvate:</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1527"/>
         <source>Select the colour for the change marker for unsaved changes.</source>
-        <translation>Seleziona il colore per marcare le modifiche non salvate.</translation>
+        <translation type="obsolete">Seleziona il colore per marcare le modifiche non salvate.</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1537"/>
         <source>Saved changes colour:</source>
-        <translation>Colore delle modifiche salvate:</translation>
+        <translation type="obsolete">Colore delle modifiche salvate:</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1550"/>
         <source>Select the colour for the change marker for saved changes.</source>
-        <translation>Seleziona il colore per marcare le modifiche salvate.</translation>
+        <translation type="obsolete">Seleziona il colore per marcare le modifiche salvate.</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1003"/>
@@ -15640,91 +15750,46 @@
         <translation type="unfinished">Errori:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1782"/>
-        <source>Select the colour for error markers</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1792"/>
         <source>Warnings:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1805"/>
-        <source>Select the colour for warning markers</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1815"/>
         <source>Bookmarks:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1828"/>
-        <source>Select the colour for bookmark markers</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1838"/>
         <source>Breakpoints:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1851"/>
-        <source>Select the colour for breakpoint markers</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1861"/>
         <source>Tasks:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1874"/>
-        <source>Select the colour for task markers</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1884"/>
         <source>Changes:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1897"/>
-        <source>Select the colour for change markers</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1907"/>
         <source>Coverage:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1920"/>
-        <source>Select the colour for coverage markers</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1930"/>
         <source>Current Line:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1943"/>
-        <source>Select the colour for the current line marker</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1999"/>
         <source>Background:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="2012"/>
-        <source>Select the background colour for the marker map</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1674"/>
         <source>Indentation Guides</source>
         <translation type="unfinished"></translation>
@@ -15745,31 +15810,16 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1705"/>
-        <source>Select the foreground colour for indentation guides</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1715"/>
         <source>Indentation Guides background:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1728"/>
-        <source>Select the background colour for indentation guides</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1953"/>
         <source>Search Markers:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1966"/>
-        <source>Select the colour for the search marker</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="2093"/>
         <source>Select to hide the Format Buttons bar when formatting is not supported</source>
         <translation type="unfinished"></translation>
@@ -15780,26 +15830,11 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="798"/>
-        <source>Select to indicate the debug markers using coloured line backgrounds, arrow indicators otherwise</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="801"/>
-        <source>Use background colours</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1976"/>
         <source>Conflict Marker Line:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1989"/>
-        <source>Select the colour for the conflict marker line marker</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1749"/>
         <source>Select to show the marker map right of the editor</source>
         <translation type="unfinished"></translation>
@@ -15946,8 +15981,263 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="47"/>
+        <source>Colors</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="53"/>
+        <source>Select to set the color of the edit area different to the default style</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="56"/>
+        <source>Override edit area colors</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="81"/>
+        <source>Select the foreground color for the edit area.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="104"/>
+        <source>Select the background color for the edit area.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="648"/>
+        <source>Select the color for the caret.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="351"/>
+        <source>Select the foreground color for the margins</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="374"/>
+        <source>Select the background color for the margins</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="397"/>
+        <source>Select the background color for the foldmargin</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="420"/>
+        <source>Select the foreground color of the foldmarkers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="443"/>
+        <source>Select the background color of the foldmarkers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="515"/>
+        <source>Select to use custom selection colors</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="518"/>
+        <source>&lt;b&gt;Use custom selection colors&lt;/b&gt;&lt;p&gt;Select this entry in order to use custom selection colors in the editor and shell windows. The colors for the selection foreground and background are defined on the colors page.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="521"/>
+        <source>Use custom selection colors</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="528"/>
+        <source>Select, if selected text should be colorized by the lexer.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="531"/>
+        <source>Colorize selected text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="565"/>
+        <source>Select the foreground color for the selection.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="588"/>
+        <source>Select the background color for the selection.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="761"/>
+        <source>Select the background color for the line containing the caret.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="798"/>
+        <source>Select to indicate the debug markers using colored line backgrounds, arrow indicators otherwise</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="801"/>
+        <source>Use background colors</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="821"/>
+        <source>Select the color for the current line marker.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="844"/>
+        <source>Select the color for the error line marker.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="886"/>
+        <source>Select the color for highlighting matching braces.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="909"/>
+        <source>Select the background color for highlighting matching braces.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="932"/>
+        <source>Select the color for  highlighting nonmatching braces.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="955"/>
+        <source>Select the background color for  highlighting nonmatching braces.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1124"/>
+        <source>Select the color for the edge marker.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1134"/>
+        <source>Background color:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1222"/>
+        <source>Change Background Color</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1402"/>
+        <source>Press to select the foreground color</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1412"/>
+        <source>Press to select the background color</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1514"/>
+        <source>Unsaved changes color:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1527"/>
+        <source>Select the color for the change marker for unsaved changes.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1537"/>
+        <source>Saved changes color:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1550"/>
+        <source>Select the color for the change marker for saved changes.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1636"/>
+        <source>Select the foreground color for visible whitespace</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1659"/>
+        <source>Select the background color for visible whitespace</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1705"/>
+        <source>Select the foreground color for indentation guides</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1728"/>
+        <source>Select the background color for indentation guides</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1763"/>
-        <source>Marker Colours</source>
+        <source>Marker Colors</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1782"/>
+        <source>Select the color for error markers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1805"/>
+        <source>Select the color for warning markers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1828"/>
+        <source>Select the color for bookmark markers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1851"/>
+        <source>Select the color for breakpoint markers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1874"/>
+        <source>Select the color for task markers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1897"/>
+        <source>Select the color for change markers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1920"/>
+        <source>Select the color for coverage markers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1943"/>
+        <source>Select the color for the current line marker</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1966"/>
+        <source>Select the color for the search marker</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1989"/>
+        <source>Select the color for the conflict marker line marker</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="2012"/>
+        <source>Select the background color for the marker map</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -17136,17 +17426,17 @@
     <message>
         <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="252"/>
         <source>Enter the filename of a CSS style sheet. Leave empty to use the colours defined below.</source>
-        <translation>Inserisci il nome di un foglio di stile CSS. Lascia vuoto per usare i colori definiti sotto.</translation>
+        <translation type="obsolete">Inserisci il nome di un foglio di stile CSS. Lascia vuoto per usare i colori definiti sotto.</translation>
     </message>
     <message>
         <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="262"/>
         <source>Colours</source>
-        <translation>Colori</translation>
+        <translation type="obsolete">Colori</translation>
     </message>
     <message>
         <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="268"/>
         <source>Press to select the class and function header background colour.</source>
-        <translation>Premi per selezionare il colore di sfondo della classe e l&apos;header.</translation>
+        <translation type="obsolete">Premi per selezionare il colore di sfondo della classe e l&apos;header.</translation>
     </message>
     <message>
         <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="271"/>
@@ -17156,7 +17446,7 @@
     <message>
         <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="278"/>
         <source>Press to select the class and function header foreground colour.</source>
-        <translation>Premi per selezionare il colore di primo piano della classe e l&apos;header delle funzioni.</translation>
+        <translation type="obsolete">Premi per selezionare il colore di primo piano della classe e l&apos;header delle funzioni.</translation>
     </message>
     <message>
         <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="281"/>
@@ -17166,7 +17456,7 @@
     <message>
         <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="288"/>
         <source>Press to select the level 2 header background colour.</source>
-        <translation>Premi per selezionare il colore di sfondo degli header di 2° livello.</translation>
+        <translation type="obsolete">Premi per selezionare il colore di sfondo degli header di 2° livello.</translation>
     </message>
     <message>
         <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="291"/>
@@ -17176,7 +17466,7 @@
     <message>
         <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="298"/>
         <source>Press to select the level 2 header foreground colour.</source>
-        <translation>Premi per selezionare il colore di primo piano degli header di 2° livello.</translation>
+        <translation type="obsolete">Premi per selezionare il colore di primo piano degli header di 2° livello.</translation>
     </message>
     <message>
         <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="301"/>
@@ -17186,7 +17476,7 @@
     <message>
         <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="308"/>
         <source>Press to select the level 1 header background colour.</source>
-        <translation>Premi per selezionare il colore di sfondo degli header di 1° livello.</translation>
+        <translation type="obsolete">Premi per selezionare il colore di sfondo degli header di 1° livello.</translation>
     </message>
     <message>
         <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="311"/>
@@ -17196,7 +17486,7 @@
     <message>
         <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="318"/>
         <source>Press to select the level 1 header foreground colour.</source>
-        <translation>Premi per selezionare il colore di primo piano degli header di 1° livello.</translation>
+        <translation type="obsolete">Premi per selezionare il colore di primo piano degli header di 1° livello.</translation>
     </message>
     <message>
         <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="321"/>
@@ -17206,7 +17496,7 @@
     <message>
         <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="328"/>
         <source>Press to select the body background colour.</source>
-        <translation>Premi per selezionare il colore di sfondo del corpo.</translation>
+        <translation type="obsolete">Premi per selezionare il colore di sfondo del corpo.</translation>
     </message>
     <message>
         <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="331"/>
@@ -17216,7 +17506,7 @@
     <message>
         <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="338"/>
         <source>Press to select the body foreground colour.</source>
-        <translation>Premi per selezionare il colore di primo piano del corpo.</translation>
+        <translation type="obsolete">Premi per selezionare il colore di primo piano del corpo.</translation>
     </message>
     <message>
         <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="341"/>
@@ -17226,7 +17516,7 @@
     <message>
         <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="348"/>
         <source>Press to select the foreground colour of links.</source>
-        <translation>Premi per selezionare il colore di sfondo dei link.</translation>
+        <translation type="obsolete">Premi per selezionare il colore di sfondo dei link.</translation>
     </message>
     <message>
         <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="351"/>
@@ -17236,7 +17526,7 @@
     <message>
         <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="358"/>
         <source>This shows an example of the selected colours.</source>
-        <translation>Mostra un esempio dei colori selezionati.</translation>
+        <translation type="obsolete">Mostra un esempio dei colori selezionati.</translation>
     </message>
     <message>
         <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="150"/>
@@ -17328,6 +17618,66 @@
         <source>&lt;?xml version=&quot;1.0&quot; encoding=&quot;utf-8&quot;?&gt;&lt;!DOCTYPE html PUBLIC &quot;-//W3C//DTD XHTML 1.0 Strict//EN&quot;&quot;http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd&quot;&gt;&lt;html&gt;&lt;head&gt;&lt;title&gt;&lt;/title&gt;&lt;/head&gt;&lt;body style=&quot;background-color:{BodyBgColor};color:{BodyColor}&quot;&gt;&lt;h1 style=&quot;background-color:{Level1HeaderBgColor};color:{Level1HeaderColor}&quot;&gt;Level 1 Header&lt;/h1&gt;&lt;h3 style=&quot;background-color:{Level2HeaderBgColor};color:{Level2HeaderColor}&quot;&gt;Level 2 Header&lt;/h3&gt;&lt;h2 style=&quot;background-color:{CFBgColor};color:{CFColor}&quot;&gt;Class and Function Header&lt;/h2&gt;Standard body text with &lt;a style=&quot;color:{LinkColor}&quot;&gt;some links&lt;/a&gt; embedded.&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;?xml version=&quot;1.0&quot; encoding=&quot;utf-8&quot;?&gt;&lt;!DOCTYPE html PUBLIC &quot;-//W3C//DTD XHTML 1.0 Strict//EN&quot;&quot;http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd&quot;&gt;&lt;html&gt;&lt;head&gt;&lt;title&gt;&lt;/title&gt;&lt;/head&gt;&lt;body style=&quot;background-color:{BodyBgColor};color:{BodyColor}&quot;&gt;&lt;h1 style=&quot;background-color:{Level1HeaderBgColor};color:{Level1HeaderColor}&quot;&gt;Level 1 Header&lt;/h1&gt;&lt;h3 style=&quot;background-color:{Level2HeaderBgColor};color:{Level2HeaderColor}&quot;&gt;Level 2 Header&lt;/h3&gt;&lt;h2 style=&quot;background-color:{CFBgColor};color:{CFColor}&quot;&gt;Class and Function Header&lt;/h2&gt;Standard body text with &lt;a style=&quot;color:{LinkColor}&quot;&gt;some links&lt;/a&gt; embedded.&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
+    <message>
+        <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="252"/>
+        <source>Enter the filename of a CSS style sheet. Leave empty to use the colors defined below.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="262"/>
+        <source>Colors</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="268"/>
+        <source>Press to select the class and function header background color.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="278"/>
+        <source>Press to select the class and function header foreground color.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="288"/>
+        <source>Press to select the level 2 header background color.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="298"/>
+        <source>Press to select the level 2 header foreground color.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="308"/>
+        <source>Press to select the level 1 header background color.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="318"/>
+        <source>Press to select the level 1 header foreground color.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="328"/>
+        <source>Press to select the body background color.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="338"/>
+        <source>Press to select the body foreground color.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="348"/>
+        <source>Press to select the foreground color of links.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="358"/>
+        <source>This shows an example of the selected colors.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>EricdocExecDialog</name>
@@ -17813,7 +18163,7 @@
 <context>
     <name>ExporterHTML</name>
     <message>
-        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="516"/>
+        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="537"/>
         <source>Export source</source>
         <translation>Esporta sorgenti</translation>
     </message>
@@ -17823,25 +18173,45 @@
         <translation>File HTML (*.html)</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="448"/>
+        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="466"/>
         <source>&lt;p&gt;The source could not be exported to &lt;b&gt;{0}&lt;/b&gt;.&lt;/p&gt;&lt;p&gt;Reason: {1}&lt;/p&gt;</source>
         <translation>&lt;p&gt;Il sorgente non può essere esportato a &lt;b&gt;{0}&lt;/b&gt;.&lt;/p&gt;&lt;p&gt;Motivo: {1}&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="457"/>
+        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="475"/>
         <source>&lt;p&gt;The source could not be exported to &lt;b&gt;{0}&lt;/b&gt;.&lt;/p&gt;&lt;p&gt;Reason: No HTML code generated.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="516"/>
+        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="537"/>
         <source>&lt;p&gt;Markdown export requires the &lt;b&gt;python-markdown&lt;/b&gt; package.&lt;br/&gt;Install it with your package manager, &apos;pip install docutils&apos; or see &lt;a href=&quot;http://pythonhosted.org/Markdown/install.html&quot;&gt; installation instructions.&lt;/a&gt;&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="484"/>
+        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="502"/>
         <source>&lt;p&gt;ReStructuredText export requires the &lt;b&gt;python-docutils&lt;/b&gt; package.&lt;br/&gt;Install it with your package manager, &apos;pip install docutils&apos; or see &lt;a href=&quot;http://pypi.python.org/pypi/docutils&quot;&gt;this page.&lt;/a&gt;&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="412"/>
+        <source>Light Background Color</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="413"/>
+        <source>Dark Background Color</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="416"/>
+        <source>Markdown Export</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="416"/>
+        <source>Select color scheme:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ExporterODT</name>
@@ -21596,12 +21966,12 @@
         <translation type="unfinished">Graph</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="101"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="106"/>
         <source>Commit ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="102"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="107"/>
         <source>Author</source>
         <translation type="unfinished">Autore</translation>
     </message>
@@ -21611,7 +21981,7 @@
         <translation type="unfinished">Data</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="103"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="108"/>
         <source>Committer</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21621,7 +21991,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="104"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="109"/>
         <source>Subject</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21696,7 +22066,7 @@
         <translation type="unfinished">Copia da</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2098"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2100"/>
         <source>Differences</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21756,328 +22126,328 @@
         <translation type="unfinished">Alt+P</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="88"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="93"/>
         <source>&amp;Refresh</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="90"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="95"/>
         <source>Press to refresh the list of commits</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="98"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="103"/>
         <source>Find</source>
         <translation type="unfinished">Trova</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="99"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="104"/>
         <source>Filter</source>
         <translation type="unfinished">Filtro</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="105"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="110"/>
         <source>File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="122"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="128"/>
         <source>&lt;table&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Commit ID&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Date&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{1}&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Author&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{2} &amp;lt;{3}&amp;gt;&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Commit Date&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{4}&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Committer&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{5} &amp;lt;{6}&amp;gt;&lt;/td&gt;&lt;/tr&gt;{7}&lt;tr&gt;&lt;td&gt;&lt;b&gt;Subject&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{8}&lt;/td&gt;&lt;/tr&gt;{9}&lt;/table&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="134"/>
-        <source>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Parents&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</source>
-        <translation type="unfinished">&lt;tr&gt;&lt;td&gt;&lt;b&gt;Origini&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</translation>
-    </message>
-    <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="137"/>
-        <source>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Children&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="140"/>
-        <source>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Branches&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</source>
-        <translation type="unfinished">&lt;tr&gt;&lt;td&gt;&lt;b&gt;Branches&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</translation>
+        <source>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Parents&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</source>
+        <translation type="unfinished">&lt;tr&gt;&lt;td&gt;&lt;b&gt;Origini&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</translation>
     </message>
     <message>
         <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="143"/>
-        <source>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Tags&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</source>
-        <translation type="unfinished">&lt;tr&gt;&lt;td&gt;&lt;b&gt;Tags&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</translation>
+        <source>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Children&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="146"/>
+        <source>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Branches&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</source>
+        <translation type="unfinished">&lt;tr&gt;&lt;td&gt;&lt;b&gt;Branches&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</translation>
+    </message>
+    <message>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="149"/>
+        <source>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Tags&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</source>
+        <translation type="unfinished">&lt;tr&gt;&lt;td&gt;&lt;b&gt;Tags&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</translation>
+    </message>
+    <message>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="152"/>
         <source>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Message&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="197"/>
-        <source>Added</source>
-        <translation type="unfinished">Aggiunto</translation>
-    </message>
-    <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="198"/>
-        <source>Deleted</source>
-        <translation type="unfinished">Cancellato</translation>
-    </message>
-    <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="199"/>
-        <source>Modified</source>
-        <translation type="unfinished">Modificato</translation>
-    </message>
-    <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="200"/>
-        <source>Copied</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="201"/>
-        <source>Renamed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="202"/>
-        <source>Type changed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="203"/>
-        <source>Unmerged</source>
-        <translation type="unfinished"></translation>
+        <source>Added</source>
+        <translation type="unfinished">Aggiunto</translation>
     </message>
     <message>
         <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="204"/>
+        <source>Deleted</source>
+        <translation type="unfinished">Cancellato</translation>
+    </message>
+    <message>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="205"/>
+        <source>Modified</source>
+        <translation type="unfinished">Modificato</translation>
+    </message>
+    <message>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="206"/>
+        <source>Copied</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="207"/>
+        <source>Renamed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="208"/>
+        <source>Type changed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="209"/>
+        <source>Unmerged</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="210"/>
         <source>Unknown</source>
         <translation type="unfinished">Sconosciuto</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="240"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="246"/>
         <source>Show Commit ID Column</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="242"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="248"/>
         <source>Press to show the commit ID column</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="250"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="256"/>
         <source>Show Author Columns</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="252"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="258"/>
         <source>Press to show the author columns</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="260"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="266"/>
         <source>Show Committer Columns</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="262"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="268"/>
         <source>Press to show the committer columns</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="270"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="276"/>
         <source>Show Branches Column</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="272"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="278"/>
         <source>Press to show the branches column</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="280"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="286"/>
         <source>Show Tags Column</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="282"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="288"/>
         <source>Press to show the Tags column</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="309"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="315"/>
         <source>Copy Commits</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="311"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="317"/>
         <source>Cherry-pick the selected commits to the current branch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="316"/>
-        <source>Tag</source>
-        <translation type="unfinished">Tag</translation>
-    </message>
-    <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="318"/>
-        <source>Tag the selected commit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1792"/>
-        <source>Branch</source>
-        <translation type="unfinished">Branch</translation>
-    </message>
-    <message>
         <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="322"/>
-        <source>Create a new branch at the selected commit.</source>
-        <translation type="unfinished"></translation>
+        <source>Tag</source>
+        <translation type="unfinished">Tag</translation>
     </message>
     <message>
         <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="324"/>
+        <source>Tag the selected commit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1794"/>
+        <source>Branch</source>
+        <translation type="unfinished">Branch</translation>
+    </message>
+    <message>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="328"/>
+        <source>Create a new branch at the selected commit.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="330"/>
         <source>Branch &amp;&amp; Switch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="326"/>
-        <source>Create a new branch at the selected commit and switch the work tree to it.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1844"/>
-        <source>Switch</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="332"/>
-        <source>Switch the working directory to the selected commit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1870"/>
-        <source>Show Short Log</source>
+        <source>Create a new branch at the selected commit and switch the work tree to it.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1846"/>
+        <source>Switch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="338"/>
+        <source>Switch the working directory to the selected commit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1872"/>
+        <source>Show Short Log</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="344"/>
         <source>Show a dialog with a log output for release notes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="341"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="347"/>
         <source>Describe</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="343"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="349"/>
         <source>Show the most recent tag reachable from a commit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="632"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="634"/>
         <source>The git process did not finish within 30s.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="635"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="637"/>
         <source>Could not start the git executable.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="638"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="640"/>
         <source>Git Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="754"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="756"/>
         <source>{0} ({1}%)</source>
         <comment>action, confidence</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="820"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="822"/>
         <source>Process Generation Error</source>
         <translation type="unfinished">Errore Generazione Processo</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="820"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="822"/>
         <source>The process {0} could not be started. Ensure, that it is in the search path.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1265"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1267"/>
         <source>Side-by-Side Diff to Parent {0}</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1277"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1279"/>
         <source>&lt;a href=&quot;sbsdiff:{0}_{1}&quot;&gt;Side-by-Side Compare&lt;/a&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1706"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1708"/>
         <source>Copy Changesets</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1844"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1846"/>
         <source>The project should be reread. Do this now?</source>
         <translation type="unfinished">Il progetto deve essere riletto. Farlo ora ?</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1870"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1872"/>
         <source>Select a branch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1823"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1825"/>
         <source>Select a default branch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1823"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1825"/>
         <source>Branch &amp; Switch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2052"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2054"/>
         <source>Find Commit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2052"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2054"/>
         <source>&apos;{0}&apos; was not found.</source>
         <translation type="unfinished">&apos;{0}&apos; non è stato trovato.</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2112"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2114"/>
         <source>Differences to Parent {0}</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2127"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2129"/>
         <source>Diff to Parent {0}</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2153"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2155"/>
         <source>There is no difference.</source>
         <translation type="unfinished">Non ci sono differenze.</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2316"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2318"/>
         <source>Save Diff</source>
         <translation type="unfinished">Salva Diff</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2282"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2284"/>
         <source>Patch Files (*.diff)</source>
         <translation type="unfinished">File Patch (*.diff)</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2299"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2301"/>
         <source>&lt;p&gt;The patch file &lt;b&gt;{0}&lt;/b&gt; already exists. Overwrite it?&lt;/p&gt;</source>
         <translation type="unfinished">&lt;p&gt;Il file  patch &lt;b&gt;{0}&lt;/b&gt; esiste già.Sovrascriverlo ?&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2316"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2318"/>
         <source>&lt;p&gt;The patch file &lt;b&gt;{0}&lt;/b&gt; could not be saved.&lt;br&gt;Reason: {1}&lt;/p&gt;</source>
         <translation type="unfinished">&lt;p&gt;Il file &lt;b&gt;{0}&lt;/b&gt; non può essere salvato.&lt;br /&gt;Motivo: {1}&lt;/p&gt;</translation>
     </message>
@@ -26520,20 +26890,60 @@
 <context>
     <name>GraphicsPage</name>
     <message>
-        <location filename="../Preferences/ConfigurationPages/GraphicsPage.ui" line="16"/>
+        <location filename="../Preferences/ConfigurationPages/GraphicsPage.ui" line="17"/>
         <source>&lt;b&gt;Configure graphics settings&lt;/b&gt;</source>
         <translation>&lt;b&gt;Configura impostazioni grafice&lt;/b&gt;</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/GraphicsPage.ui" line="38"/>
+        <location filename="../Preferences/ConfigurationPages/GraphicsPage.ui" line="43"/>
         <source>Press to select the font for the graphic items</source>
         <translation>Premi per selezionare un font per gli elementi grafici</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/GraphicsPage.ui" line="51"/>
+        <location filename="../Preferences/ConfigurationPages/GraphicsPage.ui" line="56"/>
         <source>Graphics Font</source>
         <translation>Font Grafico</translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/GraphicsPage.ui" line="37"/>
+        <source>Font</source>
+        <translation type="unfinished">Font</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/GraphicsPage.ui" line="72"/>
+        <source>Drawing Mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/GraphicsPage.ui" line="78"/>
+        <source>Select to determine the drawing mode automatically</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/GraphicsPage.ui" line="81"/>
+        <source>Automatic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/GraphicsPage.ui" line="91"/>
+        <source>Select to draw black shapes on a white background</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/GraphicsPage.ui" line="94"/>
+        <source>Black On White</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/GraphicsPage.ui" line="101"/>
+        <source>Select to draw white shapes on a black background</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/GraphicsPage.ui" line="104"/>
+        <source>White On Black</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>GreaseMonkeyAddScriptDialog</name>
@@ -31143,21 +31553,11 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/HexEditorPage.ui" line="142"/>
-        <source>Select the foreground colour of the address area</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/HexEditorPage.ui" line="291"/>
         <source>Background:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/HexEditorPage.ui" line="165"/>
-        <source>Select the background colour of the address area</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/HexEditorPage.ui" line="178"/>
         <source>ASCII Area</source>
         <translation type="unfinished"></translation>
@@ -31188,31 +31588,11 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/HexEditorPage.ui" line="226"/>
-        <source>Select the foreground colour for highlighted data</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/HexEditorPage.ui" line="249"/>
-        <source>Select the background colour for highlighted data</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/HexEditorPage.ui" line="262"/>
         <source>Selection</source>
         <translation type="unfinished">Selezione</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/HexEditorPage.ui" line="281"/>
-        <source>Select the foreground colour of the selection</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/HexEditorPage.ui" line="304"/>
-        <source>Select the background colour of the selection</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/HexEditorPage.ui" line="317"/>
         <source>Font</source>
         <translation type="unfinished">Font</translation>
@@ -31242,6 +31622,36 @@
         <source>Enter the number of recent files to remember</source>
         <translation type="unfinished">Inserisci il numero di file recenti da ricordare</translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/HexEditorPage.ui" line="142"/>
+        <source>Select the foreground color of the address area</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/HexEditorPage.ui" line="165"/>
+        <source>Select the background color of the address area</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/HexEditorPage.ui" line="226"/>
+        <source>Select the foreground color for highlighted data</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/HexEditorPage.ui" line="249"/>
+        <source>Select the background color for highlighted data</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/HexEditorPage.ui" line="281"/>
+        <source>Select the foreground color of the selection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/HexEditorPage.ui" line="304"/>
+        <source>Select the background color of the selection</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Hg</name>
@@ -34047,7 +34457,7 @@
 <context>
     <name>HgLogBrowserDialog</name>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="92"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="98"/>
         <source>Mercurial Log</source>
         <translation>Mercurial Log</translation>
     </message>
@@ -34077,17 +34487,17 @@
         <translation>Seleziona il campo su cui filtrare</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="122"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="128"/>
         <source>Revision</source>
         <translation>Revisione</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="123"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="129"/>
         <source>Author</source>
         <translation>Autore</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="124"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="130"/>
         <source>Message</source>
         <translation>Messaggio</translation>
     </message>
@@ -34197,17 +34607,17 @@
         <translation type="obsolete">Alt+P</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="200"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="206"/>
         <source>Added</source>
         <translation>Aggiunto</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="201"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="207"/>
         <source>Deleted</source>
         <translation>Cancellato</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="202"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="208"/>
         <source>Modified</source>
         <translation>Modificato</translation>
     </message>
@@ -34232,7 +34642,7 @@
         <translation type="obsolete">Non posso avviare l&apos;eseguibile hg.</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="840"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="845"/>
         <source>Mercurial Error</source>
         <translation>Mercurial Error</translation>
     </message>
@@ -34252,63 +34662,63 @@
         <translation>Seleziona il branch su cui filtrare</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="182"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="188"/>
         <source>All</source>
         <translation>Tutti</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="94"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="100"/>
         <source>Mercurial Log (Incoming)</source>
         <translation>Mercurial Log (Incoming)</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="96"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="102"/>
         <source>Mercurial Log (Outgoing)</source>
         <translation>Mercurial Log (Outgoing)</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="217"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="223"/>
         <source>Bookmarks</source>
         <translation type="unfinished">Segnalibri</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="111"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="117"/>
         <source>Press to refresh the list of changesets</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="109"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="115"/>
         <source>&amp;Refresh</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="126"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="132"/>
         <source>Phase</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="268"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="275"/>
         <source>Change the phase of the selected revisions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="270"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="277"/>
         <source>&lt;b&gt;Change Phase&lt;/b&gt;
 &lt;p&gt;This changes the phase of the selected revisions. The selected revisions have to have the same current phase.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="266"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="273"/>
         <source>Change Phase</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2000"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2005"/>
         <source>Copy Changesets</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2343"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2348"/>
         <source>The project should be reread. Do this now?</source>
         <translation type="unfinished">Il progetto deve essere riletto. Farlo ora ?</translation>
     </message>
@@ -34318,42 +34728,42 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="257"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="264"/>
         <source>Copy the selected changesets to the current branch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="275"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="282"/>
         <source>Tag</source>
         <translation type="unfinished">Tag</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="278"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="285"/>
         <source>Tag the selected revision</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2072"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2077"/>
         <source>Switch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="288"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="295"/>
         <source>Switch the working directory to the selected revision</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="311"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="318"/>
         <source>Pull Large Files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="313"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="320"/>
         <source>Pull large files for selected revisions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1130"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1135"/>
         <source>{0} (large file)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -34378,147 +34788,147 @@
         <translation type="unfinished">Premi per trovare la prossima occorrenza</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="119"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="125"/>
         <source>Find</source>
         <translation type="unfinished">Trova</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="120"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="126"/>
         <source>Filter</source>
         <translation type="unfinished">Filtro</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="164"/>
-        <source>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Tags&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</source>
-        <translation type="unfinished">&lt;tr&gt;&lt;td&gt;&lt;b&gt;Tags&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</translation>
-    </message>
-    <message>
         <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="170"/>
+        <source>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Tags&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</source>
+        <translation type="unfinished">&lt;tr&gt;&lt;td&gt;&lt;b&gt;Tags&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</translation>
+    </message>
+    <message>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="176"/>
         <source>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Bookmarks&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</source>
         <translation type="unfinished">&lt;tr&gt;&lt;td&gt;&lt;b&gt;Segnalibri&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2485"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2490"/>
         <source>Find Commit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2485"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2490"/>
         <source>&apos;{0}&apos; was not found.</source>
         <translation type="unfinished">&apos;{0}&apos; non è stato trovato.</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="125"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="131"/>
         <source>File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="206"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="212"/>
         <source>Draft</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="207"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="213"/>
         <source>Public</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="208"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="214"/>
         <source>Secret</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2205"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2210"/>
         <source>Pull Changes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="309"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="316"/>
         <source>Pull changes from a remote repository</source>
         <translation type="unfinished">Pull changes da un repository remoto</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="322"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="329"/>
         <source>Push Selected Changes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="325"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="332"/>
         <source>Push changes of the selected changeset and its ancestors to a remote repository</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="328"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="335"/>
         <source>Push All Changes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="331"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="338"/>
         <source>Push all changes to a remote repository</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2170"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2175"/>
         <source>Fetch Changes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2251"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2256"/>
         <source>Strip Changesets</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="317"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="324"/>
         <source>Fetch changes from a remote repository</source>
         <translation type="unfinished">Recupero modifiche da un repository remoto</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="374"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="381"/>
         <source>Strip changesets from a repository</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="293"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="300"/>
         <source>Define Bookmark...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="296"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="303"/>
         <source>Bookmark the selected revision</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="298"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="305"/>
         <source>Move Bookmark...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="301"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="308"/>
         <source>Move bookmark to the selected revision</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2095"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2100"/>
         <source>Define Bookmark</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2095"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2100"/>
         <source>Enter bookmark name for changeset &quot;{0}&quot;:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2119"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2124"/>
         <source>Move Bookmark</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2119"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2124"/>
         <source>Select the bookmark to be moved  to changeset &quot;{0}&quot;:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2058"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2063"/>
         <source>Select bookmark to switch to (leave empty to use revision):</source>
         <translation type="unfinished"></translation>
     </message>
@@ -34533,148 +34943,148 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="167"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="173"/>
         <source>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Latest Tag&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="148"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="154"/>
         <source>&lt;table&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Revision&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Date&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{1}&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Author&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{2}&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Branch&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{3}&lt;/td&gt;&lt;/tr&gt;{4}&lt;tr&gt;&lt;td&gt;&lt;b&gt;Message&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{5}&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="158"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="164"/>
         <source>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Parents&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</source>
         <translation type="unfinished">&lt;tr&gt;&lt;td&gt;&lt;b&gt;Origini&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="161"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="167"/>
         <source>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Children&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="260"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="267"/>
         <source>Merge with Changeset</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="263"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="270"/>
         <source>Merge the working directory with the selected changeset</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="336"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="343"/>
         <source>Create Changegroup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="339"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="346"/>
         <source>Create a changegroup file containing the selected changesets</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="341"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="348"/>
         <source>&lt;b&gt;Create Changegroup&lt;/b&gt;
 &lt;p&gt;This creates a changegroup file containing the selected revisions. If no revisions are selected, all changesets will be bundled. If one revision is selected, it will be interpreted as the base revision. Otherwise the lowest revision will be used as the base revision and all other revision will be bundled. If the dialog is showing outgoing changesets, all selected changesets will be bundled.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2343"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2348"/>
         <source>Apply Changegroup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="353"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="360"/>
         <source>Apply the currently viewed changegroup file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="358"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="365"/>
         <source>Sign Revisions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="361"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="368"/>
         <source>Add a signature for the selected revisions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="363"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="370"/>
         <source>Verify Signatures</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="366"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="373"/>
         <source>Verify all signatures there may be for the selected revision</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="379"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="386"/>
         <source>Select All Entries</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="381"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="388"/>
         <source>Deselect All Entries</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1369"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1374"/>
         <source>Side-by-Side Diff to Parent {0}</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1380"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1385"/>
         <source>&lt;a href=&quot;sbsdiff:{0}_{1}&quot;&gt;Side-by-Side Compare&lt;/a&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1521"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1526"/>
         <source>Pull Selected Changes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1522"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1527"/>
         <source>Fetch Selected Changes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2529"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2534"/>
         <source>Differences</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2539"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2544"/>
         <source>Differences to Parent {0}</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2555"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2560"/>
         <source>Diff to Parent {0}{1}</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2580"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2585"/>
         <source>There is no difference.</source>
         <translation type="unfinished">Non ci sono differenze.</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2723"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2728"/>
         <source>Save Diff</source>
         <translation type="unfinished">Salva Diff</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2690"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2695"/>
         <source>Patch Files (*.diff)</source>
         <translation type="unfinished">File Patch (*.diff)</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2707"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2712"/>
         <source>&lt;p&gt;The patch file &lt;b&gt;{0}&lt;/b&gt; already exists. Overwrite it?&lt;/p&gt;</source>
         <translation type="unfinished">&lt;p&gt;Il file  patch &lt;b&gt;{0}&lt;/b&gt; esiste già.Sovrascriverlo ?&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2723"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2728"/>
         <source>&lt;p&gt;The patch file &lt;b&gt;{0}&lt;/b&gt; could not be saved.&lt;br&gt;Reason: {1}&lt;/p&gt;</source>
         <translation type="unfinished">&lt;p&gt;Il file &lt;b&gt;{0}&lt;/b&gt; non può essere salvato.&lt;br /&gt;Motivo: {1}&lt;/p&gt;</translation>
     </message>
@@ -34684,22 +35094,22 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2528"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2533"/>
         <source>Generating differences ...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="98"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="104"/>
         <source>Mercurial Full Log</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="280"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="287"/>
         <source>Close Heads</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="283"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="290"/>
         <source>Close the selected heads</source>
         <translation type="unfinished"></translation>
     </message>
@@ -35118,12 +35528,12 @@
         <translation>Seleziona tutte le directory controllate</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="833"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="835"/>
         <source>Remove from repository only</source>
         <translation>Rimuovi solo dal repository</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="833"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="835"/>
         <source>Do you really want to remove these files from the repository?</source>
         <translation>Vuoi veramente rimuovere questi file dal repository ?</translation>
     </message>
@@ -37739,52 +38149,52 @@
 <context>
     <name>HgServeDialog</name>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py" line="47"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py" line="50"/>
         <source>Mercurial Server</source>
         <translation>Server Mercurial</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py" line="49"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py" line="57"/>
         <source>Start Server</source>
         <translation>Avvia Server</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py" line="55"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py" line="63"/>
         <source>Stop Server</source>
         <translation>Ferma Server</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py" line="61"/>
-        <source>Start Browser</source>
-        <translation>Avvia Browser</translation>
-    </message>
-    <message>
         <location filename="../Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py" line="69"/>
+        <source>Start Browser</source>
+        <translation>Avvia Browser</translation>
+    </message>
+    <message>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py" line="77"/>
         <source>Enter the server port</source>
         <translation>Inserisci la porta del server</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py" line="75"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py" line="83"/>
         <source>Select the style to use</source>
         <translation>Seleziona lo stile da usare</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py" line="79"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py" line="87"/>
         <source>Server</source>
         <translation>Server</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py" line="86"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py" line="94"/>
         <source>Browser</source>
         <translation>Browser</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py" line="140"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py" line="148"/>
         <source>Process Generation Error</source>
         <translation>Errore Generazione Processo</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py" line="140"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py" line="148"/>
         <source>The process {0} could not be started. Ensure, that it is in the search path.</source>
         <translation>Il processo {0}  non può essere avviato. Assicurarsi che sia nel path.</translation>
     </message>
@@ -41239,37 +41649,37 @@
 <context>
     <name>IconsPage</name>
     <message>
-        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="118"/>
+        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="220"/>
         <source>Delete</source>
         <translation>Cancella</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="128"/>
+        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="230"/>
         <source>Press to add the entered directory to the list</source>
         <translation>Premi per aggiungere la directory inserita alla lista</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="131"/>
+        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="233"/>
         <source>Add</source>
         <translation>Aggiungi</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="156"/>
+        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="258"/>
         <source>Show</source>
         <translation>Mostra</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="75"/>
+        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="177"/>
         <source>Up</source>
         <translation>Su</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="85"/>
+        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="187"/>
         <source>Down</source>
         <translation>Giù</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="44"/>
+        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="146"/>
         <source>List of icon directories</source>
         <translation>Lista della directory di icone</translation>
     </message>
@@ -41284,18 +41694,103 @@
         <translation>&lt;font color=&quot;#FF0000&quot;&gt;&lt;b&gt;Nota:&lt;/b&gt; Queste impostazioni verranno attivate al prossimo avvio dell&apos;applicazione.&lt;/font&gt;</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="115"/>
+        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="217"/>
         <source>Press to delete the selected directory from the list</source>
         <translation>Premi per cancellare la directory selezionata dalla lista</translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="44"/>
+        <source>Default Icons</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="52"/>
+        <source>Select to select between Breeze (dark) and Breeze (light) based on the window lightness</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="55"/>
+        <source>Automatic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="65"/>
+        <source>Select to use the Breeze vector icons for light window background</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="68"/>
+        <source>Breeze (light)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="75"/>
+        <source>Select to use the Breeze vector icons for dark window background</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="78"/>
+        <source>Breeze (dark)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="85"/>
+        <source>Select to use the Oxygen pixmap icons</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="88"/>
+        <source>Oxygen</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="112"/>
+        <source>Press to show a dialog with a preview of the selected default icon set</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="140"/>
+        <source>Custom Icon Directories</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>IconsPreviewDialog</name>
     <message>
-        <location filename="../Preferences/ConfigurationPages/IconsPreviewDialog.ui" line="13"/>
+        <location filename="../Preferences/ConfigurationPages/IconsPreviewDialog.ui" line="14"/>
         <source>Icons Preview</source>
         <translation>Preview delle icone</translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IconsPreviewDialog.ui" line="25"/>
+        <source>Directory:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IconsPreviewDialog.ui" line="38"/>
+        <source>Select the icons directory to be shown</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IconsPreviewDialog.ui" line="74"/>
+        <source>Invert Background</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IconsPreviewDialog.ui" line="87"/>
+        <source>Refresh</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IconsPreviewDialog.ui" line="84"/>
+        <source>Select to refresh the icons display</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IconsPreviewDialog.ui" line="71"/>
+        <source>Select to invert the background color</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>IdlCompilerDefineNameDialog</name>
@@ -43522,7 +44017,7 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="102"/>
         <source>Colours</source>
-        <translation type="unfinished">Colori</translation>
+        <translation type="obsolete">Colori</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="108"/>
@@ -43530,116 +44025,56 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="121"/>
-        <source>Select the colour for network messages</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="131"/>
         <source>Nick Names:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="144"/>
-        <source>Select the colour for nick names</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="154"/>
         <source>Server Messages:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="167"/>
-        <source>Select the colour for server messages</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="177"/>
         <source>Own Nick Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="190"/>
-        <source>Select the colour for own nick name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="200"/>
         <source>Channel Messages:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="213"/>
-        <source>Select the colour for channel messages</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="223"/>
         <source>Join Channel:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="236"/>
-        <source>Select the colour for join channel messages</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="246"/>
         <source>Error Messages:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="259"/>
-        <source>Select the colour for error messages</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="269"/>
         <source>Leave Channel:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="282"/>
-        <source>Select the colour for leave channel messages</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="292"/>
         <source>Timestamp:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="305"/>
-        <source>Select the colour for timestamps</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="315"/>
         <source>Channel Info:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="328"/>
-        <source>Select the colour for channel info messages</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="338"/>
         <source>Hyperlink:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="351"/>
-        <source>Select the colour for hyperlinks</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="364"/>
-        <source>Enable to allow coloured text in IRC messages</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="367"/>
         <source>Allow Colored Text in IRC Messages</source>
         <translation type="unfinished"></translation>
@@ -43745,21 +44180,11 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="824"/>
-        <source>Select the foreground colour for the marker</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="834"/>
         <source>Marker Background:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="847"/>
-        <source>Select the background colour for the marker</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="862"/>
         <source>Shutdown</source>
         <translation type="unfinished"></translation>
@@ -43774,6 +44199,81 @@
         <source>Confirm Shutdown When Connected</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="102"/>
+        <source>Colors</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="121"/>
+        <source>Select the color for network messages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="144"/>
+        <source>Select the color for nick names</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="167"/>
+        <source>Select the color for server messages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="190"/>
+        <source>Select the color for own nick name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="213"/>
+        <source>Select the color for channel messages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="236"/>
+        <source>Select the color for join channel messages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="259"/>
+        <source>Select the color for error messages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="282"/>
+        <source>Select the color for leave channel messages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="305"/>
+        <source>Select the color for timestamps</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="328"/>
+        <source>Select the color for channel info messages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="351"/>
+        <source>Select the color for hyperlinks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="364"/>
+        <source>Enable to allow colored text in IRC messages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="824"/>
+        <source>Select the foreground color for the marker</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="847"/>
+        <source>Select the background color for the marker</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>IrcServerEditDialog</name>
@@ -45178,257 +45678,257 @@
 <context>
     <name>LexerPygments</name>
     <message>
-        <location filename="../QScintilla/Lexers/LexerPygments.py" line="180"/>
+        <location filename="../QScintilla/Lexers/LexerPygments.py" line="196"/>
         <source>Default</source>
         <translation>Default</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/LexerPygments.py" line="181"/>
-        <source>Comment</source>
-        <translation>Commenta</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/LexerPygments.py" line="182"/>
-        <source>Preprocessor</source>
-        <translation>Preprocessore</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/LexerPygments.py" line="183"/>
-        <source>Keyword</source>
-        <translation>Parola chiave</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/LexerPygments.py" line="184"/>
-        <source>Pseudo Keyword</source>
-        <translation>Pseudo parola chiave</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/LexerPygments.py" line="185"/>
-        <source>Type Keyword</source>
-        <translation>Tipo parola chiave</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/LexerPygments.py" line="186"/>
-        <source>Operator</source>
-        <translation>Operatore</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/LexerPygments.py" line="187"/>
-        <source>Word</source>
-        <translation>Parola</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/LexerPygments.py" line="188"/>
-        <source>Builtin</source>
-        <translation>Builtin</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/LexerPygments.py" line="189"/>
-        <source>Function or method name</source>
-        <translation>Nome funzione o metodo</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/LexerPygments.py" line="190"/>
-        <source>Class name</source>
-        <translation>Nome classe</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/LexerPygments.py" line="191"/>
-        <source>Namespace</source>
-        <translation>Namespace</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/LexerPygments.py" line="192"/>
-        <source>Exception</source>
-        <translation>Eccezione</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/LexerPygments.py" line="193"/>
-        <source>Identifier</source>
-        <translation>Identificatore</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/LexerPygments.py" line="194"/>
-        <source>Constant</source>
-        <translation>Costante</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/LexerPygments.py" line="195"/>
-        <source>Label</source>
-        <translation>Etichetta</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/LexerPygments.py" line="196"/>
-        <source>Entity</source>
-        <translation>Entità</translation>
-    </message>
-    <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="197"/>
-        <source>Attribute</source>
-        <translation>Attributo</translation>
+        <source>Comment</source>
+        <translation>Commenta</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="198"/>
-        <source>Tag</source>
-        <translation>Tag</translation>
+        <source>Preprocessor</source>
+        <translation>Preprocessore</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="199"/>
-        <source>Decorator</source>
-        <translation>Decoratore</translation>
+        <source>Keyword</source>
+        <translation>Parola chiave</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="200"/>
-        <source>String</source>
-        <translation>Stringa</translation>
+        <source>Pseudo Keyword</source>
+        <translation>Pseudo parola chiave</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="201"/>
-        <source>Documentation string</source>
-        <translation>Stringa di documentazione</translation>
+        <source>Type Keyword</source>
+        <translation>Tipo parola chiave</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="202"/>
-        <source>Scalar</source>
-        <translation>Scalare</translation>
+        <source>Operator</source>
+        <translation>Operatore</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="203"/>
-        <source>Escape</source>
-        <translation>Escape</translation>
+        <source>Word</source>
+        <translation>Parola</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="204"/>
-        <source>Regular expression</source>
-        <translation>Espressione regolare</translation>
+        <source>Builtin</source>
+        <translation>Builtin</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="205"/>
-        <source>Symbol</source>
-        <translation>Simbolo</translation>
+        <source>Function or method name</source>
+        <translation>Nome funzione o metodo</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="206"/>
-        <source>Other string</source>
-        <translation>Altre stringhe</translation>
+        <source>Class name</source>
+        <translation>Nome classe</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="207"/>
-        <source>Number</source>
-        <translation>Numero</translation>
+        <source>Namespace</source>
+        <translation>Namespace</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="208"/>
-        <source>Heading</source>
-        <translation>Intestazione</translation>
+        <source>Exception</source>
+        <translation>Eccezione</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="209"/>
-        <source>Subheading</source>
-        <translation>Sottointestazione</translation>
+        <source>Identifier</source>
+        <translation>Identificatore</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="210"/>
-        <source>Deleted</source>
-        <translation>Cancellato</translation>
+        <source>Constant</source>
+        <translation>Costante</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="211"/>
-        <source>Inserted</source>
-        <translation>Inserito</translation>
+        <source>Label</source>
+        <translation>Etichetta</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="212"/>
-        <source>Generic error</source>
-        <translation>Errore generico</translation>
+        <source>Entity</source>
+        <translation>Entità</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="213"/>
-        <source>Emphasized text</source>
-        <translation>Testo enfatizzato</translation>
+        <source>Attribute</source>
+        <translation>Attributo</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="214"/>
-        <source>Strong text</source>
-        <translation>Testo evidenziato</translation>
+        <source>Tag</source>
+        <translation>Tag</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="215"/>
-        <source>Prompt</source>
-        <translation>Prompt</translation>
+        <source>Decorator</source>
+        <translation>Decoratore</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="216"/>
-        <source>Output</source>
-        <translation>Output</translation>
+        <source>String</source>
+        <translation>Stringa</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="217"/>
-        <source>Traceback</source>
-        <translation>Traceback</translation>
+        <source>Documentation string</source>
+        <translation>Stringa di documentazione</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="218"/>
-        <source>Error</source>
-        <translation>Errore</translation>
+        <source>Scalar</source>
+        <translation>Scalare</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="219"/>
-        <source>Comment block</source>
-        <translation>Blocco di commenti</translation>
+        <source>Escape</source>
+        <translation>Escape</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="220"/>
-        <source>Property</source>
-        <translation>Proprietà</translation>
+        <source>Regular expression</source>
+        <translation>Espressione regolare</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="221"/>
-        <source>Character</source>
-        <translation>Carattere</translation>
+        <source>Symbol</source>
+        <translation>Simbolo</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="222"/>
-        <source>Here document</source>
-        <translation>Documento</translation>
+        <source>Other string</source>
+        <translation>Altre stringhe</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="223"/>
-        <source>Punctuation</source>
-        <translation>Punteggiatura</translation>
+        <source>Number</source>
+        <translation>Numero</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="224"/>
-        <source>Hashbang</source>
-        <translation type="unfinished"></translation>
+        <source>Heading</source>
+        <translation>Intestazione</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="225"/>
-        <source>Reserved Keyword</source>
-        <translation type="unfinished"></translation>
+        <source>Subheading</source>
+        <translation>Sottointestazione</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="226"/>
-        <source>Literal</source>
-        <translation type="unfinished"></translation>
+        <source>Deleted</source>
+        <translation>Cancellato</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="227"/>
-        <source>Double quoted string</source>
-        <translation type="unfinished"></translation>
+        <source>Inserted</source>
+        <translation>Inserito</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="228"/>
-        <source>Single quoted string</source>
-        <translation type="unfinished"></translation>
+        <source>Generic error</source>
+        <translation>Errore generico</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="229"/>
-        <source>Backtick string</source>
-        <translation type="unfinished"></translation>
+        <source>Emphasized text</source>
+        <translation>Testo enfatizzato</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="230"/>
+        <source>Strong text</source>
+        <translation>Testo evidenziato</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/LexerPygments.py" line="231"/>
+        <source>Prompt</source>
+        <translation>Prompt</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/LexerPygments.py" line="232"/>
+        <source>Output</source>
+        <translation>Output</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/LexerPygments.py" line="233"/>
+        <source>Traceback</source>
+        <translation>Traceback</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/LexerPygments.py" line="234"/>
+        <source>Error</source>
+        <translation>Errore</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/LexerPygments.py" line="235"/>
+        <source>Comment block</source>
+        <translation>Blocco di commenti</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/LexerPygments.py" line="236"/>
+        <source>Property</source>
+        <translation>Proprietà</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/LexerPygments.py" line="237"/>
+        <source>Character</source>
+        <translation>Carattere</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/LexerPygments.py" line="238"/>
+        <source>Here document</source>
+        <translation>Documento</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/LexerPygments.py" line="239"/>
+        <source>Punctuation</source>
+        <translation>Punteggiatura</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/LexerPygments.py" line="240"/>
+        <source>Hashbang</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/LexerPygments.py" line="241"/>
+        <source>Reserved Keyword</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/LexerPygments.py" line="242"/>
+        <source>Literal</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/LexerPygments.py" line="243"/>
+        <source>Double quoted string</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/LexerPygments.py" line="244"/>
+        <source>Single quoted string</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/LexerPygments.py" line="245"/>
+        <source>Backtick string</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/LexerPygments.py" line="246"/>
         <source>Whitespace</source>
         <translation type="unfinished">Spazio</translation>
     </message>
@@ -46493,14 +46993,9 @@
         <translation type="unfinished">Mostra per un nuovo output</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/LogViewerPage.ui" line="49"/>
-        <source>Error Colour:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/LogViewerPage.ui" line="62"/>
         <source>Select the colour for text sent to stderr</source>
-        <translation type="unfinished">Seleziona il colore per il testo inviato a stderr</translation>
+        <translation type="obsolete">Seleziona il colore per il testo inviato a stderr</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/LogViewerPage.ui" line="87"/>
@@ -46537,6 +47032,16 @@
         <source>&lt;b&gt;Message Filters for both&lt;/b&gt;&lt;p&gt;This list shows the configured message filters used to suppress messages received via stdout or stderr.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/LogViewerPage.ui" line="49"/>
+        <source>Error Color:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/LogViewerPage.ui" line="62"/>
+        <source>Select the color for text sent to stderr</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MakePropertiesDialog</name>
@@ -47322,27 +47827,27 @@
 <context>
     <name>MicroPythonDevice</name>
     <message>
-        <location filename="../MicroPython/MicroPythonDevices.py" line="207"/>
+        <location filename="../MicroPython/MicroPythonDevices.py" line="214"/>
         <source>Unsupported Device</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonDevices.py" line="217"/>
+        <location filename="../MicroPython/MicroPythonDevices.py" line="224"/>
         <source>REPL is not supported by this device.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonDevices.py" line="236"/>
+        <location filename="../MicroPython/MicroPythonDevices.py" line="243"/>
         <source>Plotter is not supported by this device.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonDevices.py" line="255"/>
+        <location filename="../MicroPython/MicroPythonDevices.py" line="262"/>
         <source>Running scripts is not supported by this device.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonDevices.py" line="275"/>
+        <location filename="../MicroPython/MicroPythonDevices.py" line="282"/>
         <source>File Manager is not supported by this device.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -47606,27 +48111,27 @@
 <context>
     <name>MicroPythonGraphWidget</name>
     <message>
-        <location filename="../MicroPython/MicroPythonGraphWidget.py" line="63"/>
+        <location filename="../MicroPython/MicroPythonGraphWidget.py" line="64"/>
         <source>Press to save the raw data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonGraphWidget.py" line="72"/>
+        <location filename="../MicroPython/MicroPythonGraphWidget.py" line="73"/>
         <source>max. X:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonGraphWidget.py" line="81"/>
+        <location filename="../MicroPython/MicroPythonGraphWidget.py" line="82"/>
         <source>Enter the maximum number of data points to be plotted.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonGraphWidget.py" line="311"/>
+        <location filename="../MicroPython/MicroPythonGraphWidget.py" line="329"/>
         <source>Save Chart Data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonGraphWidget.py" line="311"/>
+        <location filename="../MicroPython/MicroPythonGraphWidget.py" line="329"/>
         <source>&lt;p&gt;The chart data could not be saved into file &lt;b&gt;{0}&lt;/b&gt;.&lt;/p&gt;&lt;p&gt;Reason: {1}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -47694,93 +48199,168 @@
         <translation type="unfinished">Dividi linee lunghe</translation>
     </message>
     <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="169"/>
+        <source>MPY Cross Compiler</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="175"/>
+        <source>Program:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="191"/>
+        <source>Enter the path of the cross compiler executable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.py" line="67"/>
+        <source>All Files (*)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="298"/>
+        <source>Documentation</source>
+        <translation type="unfinished">Documentazione</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="304"/>
+        <source>MicroPython:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="311"/>
+        <source>Enter the URL for the MicroPython documentation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="318"/>
+        <source>CircuitPython:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="325"/>
+        <source>Enter the URL for the CircuitPython documentation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="332"/>
+        <source>BBC micro:bit:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="339"/>
+        <source>Enter the URL for the BBC micro:bit MicroPython documentation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="201"/>
+        <source>PyBoard</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="207"/>
+        <source>dfu-util Path:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="223"/>
+        <source>Enter the path of the dfu-util flashing executable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="233"/>
+        <source>Firmware</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="246"/>
+        <source>Enter the URL for the MicroPython firmware for PyBoard, ESP8266 and ESP32</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="260"/>
+        <source>Enter the URL for the CircuitPython firmware</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="274"/>
+        <source>Enter the URL for the BBC micro:bit Firmware</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="140"/>
-        <source>MPY Cross Compiler</source>
+        <source>Chart Pane</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="146"/>
-        <source>Program:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="162"/>
-        <source>Enter the path of the cross compiler executable</source>
+        <source>Color Theme:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="159"/>
+        <source>Select the color scheme of the chart</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/MicroPythonPage.py" line="42"/>
-        <source>All Files (*)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="255"/>
-        <source>Documentation</source>
-        <translation type="unfinished">Documentazione</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="261"/>
-        <source>MicroPython:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="268"/>
-        <source>Enter the URL for the MicroPython documentation</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="275"/>
-        <source>CircuitPython:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="282"/>
-        <source>Enter the URL for the CircuitPython documentation</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="289"/>
-        <source>BBC micro:bit:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="296"/>
-        <source>Enter the URL for the BBC micro:bit MicroPython documentation</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="172"/>
-        <source>PyBoard</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="178"/>
-        <source>dfu-util Path:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="194"/>
-        <source>Enter the path of the dfu-util flashing executable</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="204"/>
-        <source>Firmware</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="217"/>
-        <source>Enter the URL for the MicroPython firmware for PyBoard, ESP8266 and ESP32</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="231"/>
-        <source>Enter the URL for the CircuitPython firmware</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="245"/>
-        <source>Enter the URL for the BBC micro:bit Firmware</source>
+        <source>Automatic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.py" line="44"/>
+        <source>Light</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.py" line="46"/>
+        <source>Dark</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.py" line="48"/>
+        <source>Blue Cerulean</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.py" line="50"/>
+        <source>Brown Sand</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.py" line="52"/>
+        <source>Blue NCS</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.py" line="54"/>
+        <source>High Contrast</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.py" line="56"/>
+        <source>Blue Icy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.py" line="58"/>
+        <source>Qt</source>
+        <translation type="unfinished">Qt</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="346"/>
+        <source>Calliope mini:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="288"/>
+        <source>Enter the URL for the Callope mini Firmware</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="353"/>
+        <source>Enter the URL for the Calliope mini MicroPython documentation</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -47825,17 +48405,17 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="420"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="460"/>
         <source>Press to connect the selected device</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="226"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="263"/>
         <source>&lt;h3&gt;The QtSerialPort package is not available.&lt;br/&gt;MicroPython support is deactivated.&lt;/h3&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message numerus="yes">
-        <location filename="../MicroPython/MicroPythonWidget.py" line="263"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="300"/>
         <source>%n supported device(s) detected.</source>
         <translation type="unfinished">
             <numerusform></numerusform>
@@ -47843,42 +48423,42 @@
         </translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="269"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="306"/>
         <source>{0} at {1}</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="277"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="314"/>
         <source>No supported devices detected.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="390"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="430"/>
         <source>Clear</source>
         <translation type="unfinished">Pulisci</translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="392"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="432"/>
         <source>Copy</source>
         <translation type="unfinished">Copia</translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="393"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="433"/>
         <source>Paste</source>
         <translation type="unfinished">Incolla</translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="415"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="455"/>
         <source>Press to disconnect the current device</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="436"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="476"/>
         <source>No device attached</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="436"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="476"/>
         <source>Please ensure the device is plugged into your computer and selected.
 
 It must have a version of MicroPython (or CircuitPython) flashed onto it before anything will work.
@@ -47887,217 +48467,217 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="463"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="503"/>
         <source>Start REPL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="463"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="503"/>
         <source>&lt;p&gt;The REPL cannot be started.&lt;/p&gt;&lt;p&gt;Reason: {0}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="853"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="893"/>
         <source>Serial Device Connect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="853"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="893"/>
         <source>&lt;p&gt;Cannot connect to device at serial port &lt;b&gt;{0}&lt;/b&gt;.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="898"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="938"/>
         <source>Run Script</source>
         <translation type="unfinished">Esegui Script</translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="881"/>
-        <source>There is no editor open. Abort...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="889"/>
-        <source>The current editor does not contain a script. Abort...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="898"/>
-        <source>&lt;p&gt;Cannot run script.&lt;/p&gt;&lt;p&gt;Reason: {0}&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="921"/>
-        <source>Open Python File</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../MicroPython/MicroPythonWidget.py" line="921"/>
+        <source>There is no editor open. Abort...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="929"/>
+        <source>The current editor does not contain a script. Abort...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="938"/>
+        <source>&lt;p&gt;Cannot run script.&lt;/p&gt;&lt;p&gt;Reason: {0}&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="961"/>
+        <source>Open Python File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="961"/>
         <source>Python3 Files (*.py);;All Files (*)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="965"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1005"/>
         <source>Start Chart</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="965"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1005"/>
         <source>&lt;p&gt;The Chart cannot be started.&lt;/p&gt;&lt;p&gt;Reason: {0}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="994"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1034"/>
         <source>Unsaved Chart Data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="994"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1034"/>
         <source>The chart contains unsaved data.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1045"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1085"/>
         <source>Start File Manager</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1045"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1085"/>
         <source>&lt;p&gt;The File Manager cannot be started.&lt;/p&gt;&lt;p&gt;Reason: {0}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1096"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1136"/>
         <source>Show Version</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1099"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1139"/>
         <source>Show Implementation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1210"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1250"/>
         <source>Synchronize Time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1107"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1147"/>
         <source>Show Device Time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1110"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1150"/>
         <source>Show Local Time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1421"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1461"/>
         <source>Compile Python File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1481"/>
+        <source>Compile Current Editor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1188"/>
+        <source>&lt;h3&gt;Device Version Information&lt;/h3&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1197"/>
+        <source>No version information available.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1199"/>
+        <source>Device Version Information</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1222"/>
+        <source>unknown</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1226"/>
+        <source>Device Implementation Information</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1226"/>
+        <source>&lt;h3&gt;Device Implementation Information&lt;/h3&gt;&lt;p&gt;This device contains &lt;b&gt;{0} {1}&lt;/b&gt;.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1250"/>
+        <source>&lt;p&gt;The time of the connected device was synchronized with the local time.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1272"/>
+        <source>&lt;h3&gt;Device Date and Time&lt;/h3&gt;&lt;table&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Date&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Time&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{1}&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1280"/>
+        <source>&lt;h3&gt;Device Date and Time&lt;/h3&gt;&lt;p&gt;{0}&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1294"/>
+        <source>Device Date and Time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1307"/>
+        <source>Local Date and Time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1307"/>
+        <source>&lt;h3&gt;Local Date and Time&lt;/h3&gt;&lt;table&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Date&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Time&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{1}&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1374"/>
+        <source>Error handling device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1374"/>
+        <source>&lt;p&gt;There was an error communicating with the connected device.&lt;/p&gt;&lt;p&gt;Method: {0}&lt;/p&gt;&lt;p&gt;Message: {1}&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1413"/>
+        <source>The MicroPython cross compiler &lt;b&gt;mpy-cross&lt;/b&gt; cannot be found. Ensure it is in the search path or configure it on the MicroPython configuration page.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1431"/>
+        <source>Python Files (*.py);;All Files (*)</source>
+        <translation type="unfinished">File Python (*.py);;Tutti i File (*)</translation>
+    </message>
+    <message>
         <location filename="../MicroPython/MicroPythonWidget.py" line="1441"/>
-        <source>Compile Current Editor</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1148"/>
-        <source>&lt;h3&gt;Device Version Information&lt;/h3&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1157"/>
-        <source>No version information available.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1159"/>
-        <source>Device Version Information</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1182"/>
-        <source>unknown</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1186"/>
-        <source>Device Implementation Information</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1186"/>
-        <source>&lt;h3&gt;Device Implementation Information&lt;/h3&gt;&lt;p&gt;This device contains &lt;b&gt;{0} {1}&lt;/b&gt;.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1210"/>
-        <source>&lt;p&gt;The time of the connected device was synchronized with the local time.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1232"/>
-        <source>&lt;h3&gt;Device Date and Time&lt;/h3&gt;&lt;table&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Date&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Time&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{1}&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1240"/>
-        <source>&lt;h3&gt;Device Date and Time&lt;/h3&gt;&lt;p&gt;{0}&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1254"/>
-        <source>Device Date and Time</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1267"/>
-        <source>Local Date and Time</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1267"/>
-        <source>&lt;h3&gt;Local Date and Time&lt;/h3&gt;&lt;table&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Date&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Time&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{1}&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1334"/>
-        <source>Error handling device</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1334"/>
-        <source>&lt;p&gt;There was an error communicating with the connected device.&lt;/p&gt;&lt;p&gt;Method: {0}&lt;/p&gt;&lt;p&gt;Message: {1}&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1373"/>
-        <source>The MicroPython cross compiler &lt;b&gt;mpy-cross&lt;/b&gt; cannot be found. Ensure it is in the search path or configure it on the MicroPython configuration page.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1391"/>
-        <source>Python Files (*.py);;All Files (*)</source>
-        <translation type="unfinished">File Python (*.py);;Tutti i File (*)</translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1401"/>
         <source>The Python file &lt;b&gt;{0}&lt;/b&gt; does not exist. Aborting...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1411"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1451"/>
         <source>&apos;mpy-cross&apos; Output</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1434"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1474"/>
         <source>The current editor does not contain a Python file. Aborting...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="175"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="211"/>
         <source>MicroPython Menu</source>
         <translation type="unfinished"></translation>
     </message>
@@ -48107,47 +48687,47 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="978"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1018"/>
         <source>&#xc2;&#xb5;Py Chart</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1058"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1098"/>
         <source>&#xc2;&#xb5;Py Files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1134"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1174"/>
         <source>Show Documentation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1138"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1178"/>
         <source>Configure</source>
         <translation type="unfinished">Configura</translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1113"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1153"/>
         <source>Show Time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1130"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1170"/>
         <source>Download Firmware</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1310"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1350"/>
         <source>Date and Time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1293"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1333"/>
         <source>&lt;table&gt;&lt;tr&gt;&lt;th&gt;&lt;/th&gt;&lt;th&gt;Local Date and Time&lt;/th&gt;&lt;th&gt;Device Date and Time&lt;/th&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Date&lt;/b&gt;&lt;/td&gt;&lt;td align=&apos;center&apos;&gt;{0}&lt;/td&gt;&lt;td align=&apos;center&apos;&gt;{2}&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Time&lt;/b&gt;&lt;/td&gt;&lt;td align=&apos;center&apos;&gt;{1}&lt;/td&gt;&lt;td align=&apos;center&apos;&gt;{3}&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1310"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1350"/>
         <source>&lt;table&gt;&lt;tr&gt;&lt;th&gt;Local Date and Time&lt;/th&gt;&lt;th&gt;Device Date and Time&lt;/th&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td align=&apos;center&apos;&gt;{0} {1}&lt;/td&gt;&lt;td align=&apos;center&apos;&gt;{2}&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -48155,85 +48735,90 @@
 <context>
     <name>MicrobitDevice</name>
     <message>
-        <location filename="../MicroPython/MicrobitDevices.py" line="67"/>
+        <location filename="../MicroPython/MicrobitDevices.py" line="74"/>
         <source>BBC micro:bit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicrobitDevices.py" line="134"/>
+        <location filename="../MicroPython/MicrobitDevices.py" line="149"/>
         <source>Workspace Directory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicrobitDevices.py" line="134"/>
-        <source>Could not find an attached BBC micro:bit.
+        <location filename="../MicroPython/MicrobitDevices.py" line="186"/>
+        <source>Save Script as &apos;main.py&apos;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicrobitDevices.py" line="188"/>
+        <source>Save the current script as &apos;main.py&apos; on the connected device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicrobitDevices.py" line="241"/>
+        <source>MicroPython Firmware Files (*.hex);;All Files (*)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicrobitDevices.py" line="286"/>
+        <source>The script is empty. Aborting.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicrobitDevices.py" line="276"/>
+        <source>The current editor does not contain a Python script. Write it anyway?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicrobitDevices.py" line="314"/>
+        <source>&lt;p&gt;The script could not be saved to the device.&lt;/p&gt;&lt;p&gt;Reason: {0}&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicrobitDevices.py" line="241"/>
+        <source>Flash MicroPython Firmware</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicrobitDevices.py" line="273"/>
+        <source>Save Script</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicrobitDevices.py" line="303"/>
+        <source>Save Script as &apos;{0}&apos;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicrobitDevices.py" line="294"/>
+        <source>Enter a file name on the device:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicrobitDevices.py" line="183"/>
+        <source>Save the current script to the selected device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicrobitDevices.py" line="77"/>
+        <source>Calliope mini</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicrobitDevices.py" line="232"/>
+        <source>Could not find an attached {0}.
 
 Please make sure the device is plugged into this computer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicrobitDevices.py" line="171"/>
-        <source>Save Script as &apos;main.py&apos;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicrobitDevices.py" line="173"/>
-        <source>Save the current script as &apos;main.py&apos; on the connected device</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicrobitDevices.py" line="177"/>
-        <source>Reset micro:bit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicrobitDevices.py" line="201"/>
-        <source>MicroPython Firmware Files (*.hex);;All Files (*)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicrobitDevices.py" line="246"/>
-        <source>The script is empty. Aborting.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicrobitDevices.py" line="236"/>
-        <source>The current editor does not contain a Python script. Write it anyway?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicrobitDevices.py" line="274"/>
-        <source>&lt;p&gt;The script could not be saved to the device.&lt;/p&gt;&lt;p&gt;Reason: {0}&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicrobitDevices.py" line="201"/>
-        <source>Flash MicroPython Firmware</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicrobitDevices.py" line="233"/>
-        <source>Save Script</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicrobitDevices.py" line="190"/>
-        <source>The BBC micro:bit is not ready for flashing. See the &lt;a href=&quot;https://microbit.org/guide/firmware/&quot;&gt;micro:bit web site&lt;/a&gt; for details.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicrobitDevices.py" line="263"/>
-        <source>Save Script as &apos;{0}&apos;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicrobitDevices.py" line="254"/>
-        <source>Enter a file name on the device:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicrobitDevices.py" line="168"/>
-        <source>Save the current script to the selected device</source>
+        <location filename="../MicroPython/MicrobitDevices.py" line="192"/>
+        <source>Reset {0}</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicrobitDevices.py" line="213"/>
+        <source>&lt;p&gt;The BBC micro:bit is not ready for flashing. Follow these instructions.&lt;/p&gt;&lt;ul&gt;&lt;li&gt;unplug USB cable and any batteries&lt;/li&gt;&lt;li&gt;keep RESET button pressed an plug USB cable back in&lt;/li&gt;&lt;li&gt;a drive called MAINTENANCE should be available&lt;/li&gt;&lt;/ul&gt;&lt;p&gt;See the &lt;a href=&quot;https://microbit.org/guide/firmware/&quot;&gt;micro:bit web site&lt;/a&gt; for details.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -52233,7 +52818,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message numerus="yes">
-        <location filename="../PipInterface/PipPackagesWidget.py" line="635"/>
+        <location filename="../PipInterface/PipPackagesWidget.py" line="645"/>
         <source>%n package(s) found.</source>
         <translation type="unfinished">
             <numerusform></numerusform>
@@ -52241,102 +52826,102 @@
         </translation>
     </message>
     <message>
-        <location filename="../PipInterface/PipPackagesWidget.py" line="888"/>
+        <location filename="../PipInterface/PipPackagesWidget.py" line="898"/>
         <source>Search PyPI</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../PipInterface/PipPackagesWidget.py" line="673"/>
+        <location filename="../PipInterface/PipPackagesWidget.py" line="683"/>
         <source>&lt;p&gt;The package search did not return anything.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../PipInterface/PipPackagesWidget.py" line="710"/>
+        <location filename="../PipInterface/PipPackagesWidget.py" line="720"/>
         <source>&lt;p&gt;The package search failed.&lt;/p&gt;&lt;p&gt;Reason: {0}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../PipInterface/PipPackagesWidget.py" line="715"/>
+        <location filename="../PipInterface/PipPackagesWidget.py" line="725"/>
         <source>Error: {0}</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../PipInterface/PipPackagesWidget.py" line="848"/>
+        <location filename="../PipInterface/PipPackagesWidget.py" line="858"/>
         <source>Show Package Details</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../PipInterface/PipPackagesWidget.py" line="848"/>
+        <location filename="../PipInterface/PipPackagesWidget.py" line="858"/>
         <source>Select the package version:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../PipInterface/PipPackagesWidget.py" line="888"/>
+        <location filename="../PipInterface/PipPackagesWidget.py" line="898"/>
         <source>&lt;p&gt;No package details info for &lt;b&gt;{0}&lt;/b&gt; available.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../PipInterface/PipPackagesWidget.py" line="904"/>
+        <location filename="../PipInterface/PipPackagesWidget.py" line="914"/>
         <source>Install Pip</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../PipInterface/PipPackagesWidget.py" line="907"/>
-        <source>Install Pip to User-Site</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../PipInterface/PipPackagesWidget.py" line="910"/>
-        <source>Repair Pip</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../PipInterface/PipPackagesWidget.py" line="1005"/>
-        <source>Install Packages</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../PipInterface/PipPackagesWidget.py" line="917"/>
-        <source>Install Local Package</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../PipInterface/PipPackagesWidget.py" line="921"/>
-        <source>Install Requirements</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../PipInterface/PipPackagesWidget.py" line="924"/>
-        <source>Uninstall Requirements</source>
+        <source>Install Pip to User-Site</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../PipInterface/PipPackagesWidget.py" line="920"/>
+        <source>Repair Pip</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../PipInterface/PipPackagesWidget.py" line="1015"/>
+        <source>Install Packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../PipInterface/PipPackagesWidget.py" line="927"/>
+        <source>Install Local Package</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../PipInterface/PipPackagesWidget.py" line="931"/>
+        <source>Install Requirements</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../PipInterface/PipPackagesWidget.py" line="934"/>
+        <source>Uninstall Requirements</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../PipInterface/PipPackagesWidget.py" line="937"/>
         <source>Generate Requirements...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../PipInterface/PipPackagesWidget.py" line="932"/>
+        <location filename="../PipInterface/PipPackagesWidget.py" line="942"/>
         <source>Edit User Configuration...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../PipInterface/PipPackagesWidget.py" line="935"/>
+        <location filename="../PipInterface/PipPackagesWidget.py" line="945"/>
         <source>Edit Environment Configuration...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../PipInterface/PipPackagesWidget.py" line="940"/>
+        <location filename="../PipInterface/PipPackagesWidget.py" line="950"/>
         <source>Configure...</source>
         <translation type="unfinished">Configura...</translation>
     </message>
     <message>
-        <location filename="../PipInterface/PipPackagesWidget.py" line="1118"/>
+        <location filename="../PipInterface/PipPackagesWidget.py" line="1128"/>
         <source>Edit Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../PipInterface/PipPackagesWidget.py" line="1118"/>
+        <location filename="../PipInterface/PipPackagesWidget.py" line="1128"/>
         <source>No valid configuration path determined. Aborting</source>
         <translation type="unfinished"></translation>
     </message>
@@ -53617,17 +54202,17 @@
 <context>
     <name>Preferences</name>
     <message>
-        <location filename="../Preferences/__init__.py" line="1624"/>
+        <location filename="../Preferences/__init__.py" line="1640"/>
         <source>Export Preferences</source>
         <translation>Esporta Preferenze</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1652"/>
+        <location filename="../Preferences/__init__.py" line="1668"/>
         <source>Import Preferences</source>
         <translation>Importa Preferenze</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1652"/>
+        <location filename="../Preferences/__init__.py" line="1668"/>
         <source>Properties File (*.ini);;All Files (*)</source>
         <translation>File proprietà (*.ini);;Tutti i file(*)</translation>
     </message>
@@ -53829,7 +54414,7 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/PrinterPage.ui" line="77"/>
         <source>Colour</source>
-        <translation>Colore</translation>
+        <translation type="obsolete">Colore</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/PrinterPage.ui" line="84"/>
@@ -53869,7 +54454,7 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/PrinterPage.ui" line="49"/>
         <source>Colour Mode:</source>
-        <translation>Modalità colore:</translation>
+        <translation type="obsolete">Modalità colore:</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/PrinterPage.ui" line="94"/>
@@ -53926,6 +54511,16 @@
         <source> DPI</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/PrinterPage.ui" line="49"/>
+        <source>Color Mode:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/PrinterPage.ui" line="77"/>
+        <source>Color</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ProgramsDialog</name>
@@ -54148,492 +54743,492 @@
 <context>
     <name>Project</name>
     <message>
-        <location filename="../Project/Project.py" line="805"/>
+        <location filename="../Project/Project.py" line="817"/>
         <source>Read project file</source>
         <translation>Leggi file progetto</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="908"/>
+        <location filename="../Project/Project.py" line="920"/>
         <source>Save project file</source>
         <translation>Salva file progetto</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1026"/>
+        <location filename="../Project/Project.py" line="1038"/>
         <source>Read project session</source>
         <translation>Leggi sessione del progetto</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1251"/>
+        <location filename="../Project/Project.py" line="1263"/>
         <source>Please save the project first.</source>
         <translation>Prima salvare il progetto.</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1062"/>
+        <location filename="../Project/Project.py" line="1074"/>
         <source>Save project session</source>
         <translation>Salva sessione di progetto</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1393"/>
+        <location filename="../Project/Project.py" line="1405"/>
         <source>Add Language</source>
         <translation>Aggiungi Lingua</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1519"/>
+        <location filename="../Project/Project.py" line="1531"/>
         <source>Delete translation</source>
         <translation>Cancella traduzione</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1684"/>
+        <location filename="../Project/Project.py" line="1696"/>
         <source>Add file</source>
         <translation>Aggiungi file</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1816"/>
+        <location filename="../Project/Project.py" line="1828"/>
         <source>The target directory must not be empty.</source>
         <translation>La directory di destinazione non deve essere vuota.</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1827"/>
+        <location filename="../Project/Project.py" line="1839"/>
         <source>Add directory</source>
         <translation>Aggiungi directory</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1827"/>
+        <location filename="../Project/Project.py" line="1839"/>
         <source>The source directory must not be empty.</source>
         <translation>La directory sorgente non deve essere vuota.</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="2233"/>
+        <location filename="../Project/Project.py" line="2250"/>
         <source>Delete file</source>
         <translation>Cancella file</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="2358"/>
+        <location filename="../Project/Project.py" line="2375"/>
         <source>Create project directory</source>
         <translation>Crea la directory del progetto</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3831"/>
+        <location filename="../Project/Project.py" line="3866"/>
         <source>New project</source>
         <translation>Nuovo progetto</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3845"/>
+        <location filename="../Project/Project.py" line="3880"/>
         <source>Open project</source>
         <translation>Apri progetto</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3882"/>
+        <location filename="../Project/Project.py" line="3917"/>
         <source>Save project as</source>
         <translation>Salva progetto come</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3130"/>
+        <location filename="../Project/Project.py" line="3147"/>
         <source>Save File</source>
         <translation>Salva file</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3166"/>
+        <location filename="../Project/Project.py" line="3183"/>
         <source>Close Project</source>
         <translation>Chiudi progetto</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3166"/>
+        <location filename="../Project/Project.py" line="3183"/>
         <source>The current project has unsaved changes.</source>
         <translation>Il progetto attuale ha delle modifiche non salvate.</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4062"/>
+        <location filename="../Project/Project.py" line="4097"/>
         <source>&amp;Save</source>
         <translation>&amp;Salva</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3831"/>
+        <location filename="../Project/Project.py" line="3866"/>
         <source>&amp;New...</source>
         <translation>&amp;Nuovo...</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3836"/>
+        <location filename="../Project/Project.py" line="3871"/>
         <source>Generate a new project</source>
         <translation>Genera un nuovo progetto</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3837"/>
+        <location filename="../Project/Project.py" line="3872"/>
         <source>&lt;b&gt;New...&lt;/b&gt;&lt;p&gt;This opens a dialog for entering the info for a new project.&lt;/p&gt;</source>
         <translation>&lt;b&gt;Nuovo...&lt;/b&gt;&lt;p&gt;Apre un dialogo per l&apos;inserimento delle informazioni per un nuovo progetto.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3845"/>
+        <location filename="../Project/Project.py" line="3880"/>
         <source>&amp;Open...</source>
         <translation>&amp;Apri...</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3850"/>
+        <location filename="../Project/Project.py" line="3885"/>
         <source>Open an existing project</source>
         <translation>Apri un progetto esistente</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3851"/>
-        <source>&lt;b&gt;Open...&lt;/b&gt;&lt;p&gt;This opens an existing project.&lt;/p&gt;</source>
-        <translation>&lt;b&gt;Apri...&lt;/b&gt;&lt;p&gt;Apre un progetto esistente.&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="3858"/>
-        <source>Close project</source>
-        <translation>Chiudi progetto</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="3858"/>
-        <source>&amp;Close</source>
-        <translation>&amp;Chiudi</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="3862"/>
-        <source>Close the current project</source>
-        <translation>Chiudi il progetto corrente</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="3863"/>
-        <source>&lt;b&gt;Close&lt;/b&gt;&lt;p&gt;This closes the current project.&lt;/p&gt;</source>
-        <translation>&lt;b&gt;Chiudi&lt;/b&gt;&lt;p&gt;Chiude l&apos;attuale progetto.&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="3870"/>
-        <source>Save project</source>
-        <translation>Salva progetto</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="3874"/>
-        <source>Save the current project</source>
-        <translation>Salva il progetto corrente</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="3875"/>
-        <source>&lt;b&gt;Save&lt;/b&gt;&lt;p&gt;This saves the current project.&lt;/p&gt;</source>
-        <translation>&lt;b&gt;Salva&lt;/b&gt;&lt;p&gt;Salva l&apos;attuale progetto.&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="3882"/>
-        <source>Save &amp;as...</source>
-        <translation>S&amp;alva come...</translation>
-    </message>
-    <message>
         <location filename="../Project/Project.py" line="3886"/>
+        <source>&lt;b&gt;Open...&lt;/b&gt;&lt;p&gt;This opens an existing project.&lt;/p&gt;</source>
+        <translation>&lt;b&gt;Apri...&lt;/b&gt;&lt;p&gt;Apre un progetto esistente.&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="3893"/>
+        <source>Close project</source>
+        <translation>Chiudi progetto</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="3893"/>
+        <source>&amp;Close</source>
+        <translation>&amp;Chiudi</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="3897"/>
+        <source>Close the current project</source>
+        <translation>Chiudi il progetto corrente</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="3898"/>
+        <source>&lt;b&gt;Close&lt;/b&gt;&lt;p&gt;This closes the current project.&lt;/p&gt;</source>
+        <translation>&lt;b&gt;Chiudi&lt;/b&gt;&lt;p&gt;Chiude l&apos;attuale progetto.&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="3905"/>
+        <source>Save project</source>
+        <translation>Salva progetto</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="3909"/>
+        <source>Save the current project</source>
+        <translation>Salva il progetto corrente</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="3910"/>
+        <source>&lt;b&gt;Save&lt;/b&gt;&lt;p&gt;This saves the current project.&lt;/p&gt;</source>
+        <translation>&lt;b&gt;Salva&lt;/b&gt;&lt;p&gt;Salva l&apos;attuale progetto.&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="3917"/>
+        <source>Save &amp;as...</source>
+        <translation>S&amp;alva come...</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="3921"/>
         <source>Save the current project to a new file</source>
         <translation>Salva il progetto attuale come un nuovo file</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3888"/>
+        <location filename="../Project/Project.py" line="3923"/>
         <source>&lt;b&gt;Save as&lt;/b&gt;&lt;p&gt;This saves the current project to a new file.&lt;/p&gt;</source>
         <translation>&lt;b&gt;Salva as &lt;/b&gt;&lt;p&gt;Salva l&apos;attuale progetto come nuovo.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3928"/>
+        <location filename="../Project/Project.py" line="3963"/>
         <source>Add translation to project</source>
         <translation>Aggiungi le traduzioni al progetto</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3928"/>
+        <location filename="../Project/Project.py" line="3963"/>
         <source>Add &amp;translation...</source>
         <translation>Aggiungi &amp;traduzione...</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3933"/>
+        <location filename="../Project/Project.py" line="3968"/>
         <source>Add a translation to the current project</source>
         <translation>Aggiungi le traduzioni al progetto corrente</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3935"/>
+        <location filename="../Project/Project.py" line="3970"/>
         <source>&lt;b&gt;Add translation...&lt;/b&gt;&lt;p&gt;This opens a dialog for add a translation to the current project.&lt;/p&gt;</source>
         <translation>&lt;b&gt;Aggiungi traduzione...&lt;/b&gt;&lt;p&gt;Apre un dialogo per aggiungere una traduzione al progetto corrente.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3943"/>
+        <location filename="../Project/Project.py" line="3978"/>
         <source>Search new files</source>
         <translation>Cerca nuovi file</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3943"/>
-        <source>Searc&amp;h new files...</source>
-        <translation>Cerca &amp;nuovi file...</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="3947"/>
-        <source>Search new files in the project directory.</source>
-        <translation>Cerca nei file nella directory del progetto.</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="3973"/>
-        <source>Project properties</source>
-        <translation>Proprietà del progetto</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="3973"/>
-        <source>&amp;Properties...</source>
-        <translation>&amp;Proprietà...</translation>
-    </message>
-    <message>
         <location filename="../Project/Project.py" line="3978"/>
+        <source>Searc&amp;h new files...</source>
+        <translation>Cerca &amp;nuovi file...</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="3982"/>
+        <source>Search new files in the project directory.</source>
+        <translation>Cerca nei file nella directory del progetto.</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4008"/>
+        <source>Project properties</source>
+        <translation>Proprietà del progetto</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4008"/>
+        <source>&amp;Properties...</source>
+        <translation>&amp;Proprietà...</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4013"/>
         <source>Show the project properties</source>
         <translation>Mostra le proprietà del progetto</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3979"/>
+        <location filename="../Project/Project.py" line="4014"/>
         <source>&lt;b&gt;Properties...&lt;/b&gt;&lt;p&gt;This shows a dialog to edit the project properties.&lt;/p&gt;</source>
         <translation>&lt;b&gt;Proprietà...&lt;/b&gt;&lt;p&gt;Mosta un dialogo per modificare le proprietà di un progetto.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4101"/>
+        <location filename="../Project/Project.py" line="4136"/>
         <source>Load session</source>
         <translation>Carica sessione</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4105"/>
+        <location filename="../Project/Project.py" line="4140"/>
         <source>Load the projects session file.</source>
         <translation>Carica il file di sessione del progetto.</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4106"/>
+        <location filename="../Project/Project.py" line="4141"/>
         <source>&lt;b&gt;Load session&lt;/b&gt;&lt;p&gt;This loads the projects session file. The session consists of the following data.&lt;br&gt;- all open source files&lt;br&gt;- all breakpoint&lt;br&gt;- the commandline arguments&lt;br&gt;- the working directory&lt;br&gt;- the exception reporting flag&lt;/p&gt;</source>
         <translation>&lt;b&gt;Carica sessione&lt;/b&gt;&lt;p&gt;Questo carica la sessione del progetto.La sessione è composta dai seguenti dati.&lt;br&gt;- tutti i file sorgente aperti&lt;br&gt;- tutti i breakpoint&lt;br&gt;- gli argomenti alla riga di comango&lt;br&gt;- la directory di lavoro&lt;br&gt;- il flag di segnalazione delle eccezioni&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4119"/>
+        <location filename="../Project/Project.py" line="4154"/>
         <source>Save session</source>
         <translation>Salva sessione</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4123"/>
+        <location filename="../Project/Project.py" line="4158"/>
         <source>Save the projects session file.</source>
         <translation>Salva il file sessione del progetto.</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4124"/>
+        <location filename="../Project/Project.py" line="4159"/>
         <source>&lt;b&gt;Save session&lt;/b&gt;&lt;p&gt;This saves the projects session file. The session consists of the following data.&lt;br&gt;- all open source files&lt;br&gt;- all breakpoint&lt;br&gt;- the commandline arguments&lt;br&gt;- the working directory&lt;br&gt;- the exception reporting flag&lt;/p&gt;</source>
         <translation>&lt;b&gt;Salva sessione&lt;/b&gt;&lt;p&gt;Questo carica la sessione del progetto.La sessione è composta dai seguenti dati.&lt;br&gt;- tutti i file sorgente aperti&lt;br&gt;- tutti i breakpoint&lt;br&gt;- gli argomenti alla riga di comango&lt;br&gt;- la directory di lavoro&lt;br&gt;- il flag di segnalazione delle eccezioni&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4151"/>
+        <location filename="../Project/Project.py" line="4186"/>
         <source>Code Metrics</source>
         <translation>Statistiche codice</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4151"/>
+        <location filename="../Project/Project.py" line="4186"/>
         <source>&amp;Code Metrics...</source>
         <translation>Statistiche &amp;codice...</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4155"/>
+        <location filename="../Project/Project.py" line="4190"/>
         <source>Show some code metrics for the project.</source>
         <translation>Mostra alcune statistiche del codice per il progetto.</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4157"/>
+        <location filename="../Project/Project.py" line="4192"/>
         <source>&lt;b&gt;Code Metrics...&lt;/b&gt;&lt;p&gt;This shows some code metrics for all Python files in the project.&lt;/p&gt;</source>
         <translation>&lt;b&gt;Statistiche codice...&lt;/b&gt;&lt;p&gt;Mostra alcune statistiche di tutti i file Python nel progetto.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4165"/>
+        <location filename="../Project/Project.py" line="4200"/>
         <source>Python Code Coverage</source>
         <translation>Analisi codice Python</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4165"/>
-        <source>Code Co&amp;verage...</source>
-        <translation>A&amp;nalisi codice...</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4169"/>
-        <source>Show code coverage information for the project.</source>
-        <translation>Mostra le informazioni dell&apos;analisi del codice del progetto.</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4171"/>
-        <source>&lt;b&gt;Code Coverage...&lt;/b&gt;&lt;p&gt;This shows the code coverage information for all Python files in the project.&lt;/p&gt;</source>
-        <translation>&lt;b&gt;Analisi codice...&lt;/b&gt;&lt;p&gt;Mostra le analisi  del codice di tutti i file Python nel progetto.&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="5053"/>
-        <source>Profile Data</source>
-        <translation>Profilazione dati</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4179"/>
-        <source>&amp;Profile Data...</source>
-        <translation>&amp;Profilazione dati...</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4183"/>
-        <source>Show profiling data for the project.</source>
-        <translation>Mostra la profilazione dei dati per il progetto.</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4185"/>
-        <source>&lt;b&gt;Profile Data...&lt;/b&gt;&lt;p&gt;This shows the profiling data for the project.&lt;/p&gt;</source>
-        <translation>&lt;b&gt;Profilazione dati...&lt;/b&gt;&lt;p&gt;Mostra la profilazione dei dati per il progetto.&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="5107"/>
-        <source>Application Diagram</source>
-        <translation>Diagrammi dell&apos;applicazione</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4194"/>
-        <source>&amp;Application Diagram...</source>
-        <translation>Diagramma dell&apos; &amp;Applicazione...</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4198"/>
-        <source>Show a diagram of the project.</source>
-        <translation>Mostra un diagramma del progetto.</translation>
-    </message>
-    <message>
         <location filename="../Project/Project.py" line="4200"/>
+        <source>Code Co&amp;verage...</source>
+        <translation>A&amp;nalisi codice...</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4204"/>
+        <source>Show code coverage information for the project.</source>
+        <translation>Mostra le informazioni dell&apos;analisi del codice del progetto.</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4206"/>
+        <source>&lt;b&gt;Code Coverage...&lt;/b&gt;&lt;p&gt;This shows the code coverage information for all Python files in the project.&lt;/p&gt;</source>
+        <translation>&lt;b&gt;Analisi codice...&lt;/b&gt;&lt;p&gt;Mostra le analisi  del codice di tutti i file Python nel progetto.&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="5088"/>
+        <source>Profile Data</source>
+        <translation>Profilazione dati</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4214"/>
+        <source>&amp;Profile Data...</source>
+        <translation>&amp;Profilazione dati...</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4218"/>
+        <source>Show profiling data for the project.</source>
+        <translation>Mostra la profilazione dei dati per il progetto.</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4220"/>
+        <source>&lt;b&gt;Profile Data...&lt;/b&gt;&lt;p&gt;This shows the profiling data for the project.&lt;/p&gt;</source>
+        <translation>&lt;b&gt;Profilazione dati...&lt;/b&gt;&lt;p&gt;Mostra la profilazione dei dati per il progetto.&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="5142"/>
+        <source>Application Diagram</source>
+        <translation>Diagrammi dell&apos;applicazione</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4229"/>
+        <source>&amp;Application Diagram...</source>
+        <translation>Diagramma dell&apos; &amp;Applicazione...</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4233"/>
+        <source>Show a diagram of the project.</source>
+        <translation>Mostra un diagramma del progetto.</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4235"/>
         <source>&lt;b&gt;Application Diagram...&lt;/b&gt;&lt;p&gt;This shows a diagram of the project.&lt;/p&gt;</source>
         <translation>&lt;b&gt;Diagrammi dell&apos;applicazione...&lt;/b&gt;&lt;p&gt;Mostra un diagramma del progetto.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4326"/>
+        <location filename="../Project/Project.py" line="4361"/>
         <source>Open &amp;Recent Projects</source>
         <translation>Apri un progetto &amp;recente</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4338"/>
+        <location filename="../Project/Project.py" line="4373"/>
         <source>&amp;Diagrams</source>
         <translation>&amp;Diagrammi</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4335"/>
+        <location filename="../Project/Project.py" line="4370"/>
         <source>Chec&amp;k</source>
         <translation>&amp;Controlla</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4331"/>
+        <location filename="../Project/Project.py" line="4366"/>
         <source>&amp;Version Control</source>
         <translation>Controllo di &amp;Versione</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4337"/>
+        <location filename="../Project/Project.py" line="4372"/>
         <source>Sho&amp;w</source>
         <translation>&amp;Mostra</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4340"/>
+        <location filename="../Project/Project.py" line="4375"/>
         <source>Source &amp;Documentation</source>
         <translation>&amp;Documentazione sorgenti</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4704"/>
+        <location filename="../Project/Project.py" line="4739"/>
         <source>Search New Files</source>
         <translation>Cerca Nuovi File</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4704"/>
+        <location filename="../Project/Project.py" line="4739"/>
         <source>There were no new files found to be added.</source>
         <translation>Non sono stati trovati file da aggiungere.</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4850"/>
+        <location filename="../Project/Project.py" line="4885"/>
         <source>Version Control System</source>
         <translation>Version Control System</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4980"/>
+        <location filename="../Project/Project.py" line="5015"/>
         <source>Coverage Data</source>
         <translation>Dati Analisi</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5030"/>
+        <location filename="../Project/Project.py" line="5065"/>
         <source>There is no main script defined for the current project. Aborting</source>
         <translation>Non c&apos;è uno script principale definito per il progetto. Esco</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1964"/>
+        <location filename="../Project/Project.py" line="1976"/>
         <source>Rename file</source>
         <translation>Rinomina file</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1988"/>
+        <location filename="../Project/Project.py" line="2000"/>
         <source>Rename File</source>
         <translation>Rinomina File</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="2965"/>
+        <location filename="../Project/Project.py" line="2982"/>
         <source>New Project</source>
         <translation>Nuovo Progetto</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="2474"/>
+        <location filename="../Project/Project.py" line="2491"/>
         <source>Add existing files to the project?</source>
         <translation>Aggiungi file esistenti al progetto ?</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="2601"/>
+        <location filename="../Project/Project.py" line="2618"/>
         <source>Would you like to edit the VCS command options?</source>
         <translation>Vuoi modificare le opzioni del comando VCS ?</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="2544"/>
+        <location filename="../Project/Project.py" line="2561"/>
         <source>Shall the project file be added to the repository?</source>
         <translation>Il file progetto deve essere aggiunto al repository ?</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="2573"/>
+        <location filename="../Project/Project.py" line="2590"/>
         <source>Select version control system for the project</source>
         <translation>Seleziona il version control system per il progetto</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3913"/>
+        <location filename="../Project/Project.py" line="3948"/>
         <source>Add directory to project</source>
         <translation>Aggiungi directory al progetto</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3913"/>
+        <location filename="../Project/Project.py" line="3948"/>
         <source>Add directory...</source>
         <translation>Aggiungi directory...</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3918"/>
+        <location filename="../Project/Project.py" line="3953"/>
         <source>Add a directory to the current project</source>
         <translation>Aggiungi una directory al progetto corrente</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3920"/>
+        <location filename="../Project/Project.py" line="3955"/>
         <source>&lt;b&gt;Add directory...&lt;/b&gt;&lt;p&gt;This opens a dialog for adding a directory to the current project.&lt;/p&gt;</source>
         <translation>&lt;b&gt;Aggiungi directory...&lt;/b&gt;&lt;p&gt;Apre un dialogo per aggiungere una directory al progetto corrente.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5003"/>
+        <location filename="../Project/Project.py" line="5038"/>
         <source>Code Coverage</source>
         <translation>Analisi codice</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5003"/>
+        <location filename="../Project/Project.py" line="5038"/>
         <source>Please select a coverage file</source>
         <translation>Per favore seleziona un file per l&apos;analisi</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5053"/>
+        <location filename="../Project/Project.py" line="5088"/>
         <source>Please select a profile file</source>
         <translation>Per favore seleziona un file per la profilazione</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1091"/>
+        <location filename="../Project/Project.py" line="1103"/>
         <source>Delete project session</source>
         <translation>Cancella sessione di progetto</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4137"/>
+        <location filename="../Project/Project.py" line="4172"/>
         <source>Delete session</source>
         <translation>Cancella sessione</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4141"/>
+        <location filename="../Project/Project.py" line="4176"/>
         <source>Delete the projects session file.</source>
         <translation>Cancella il file di sessione del progetto.</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4142"/>
+        <location filename="../Project/Project.py" line="4177"/>
         <source>&lt;b&gt;Delete session&lt;/b&gt;&lt;p&gt;This deletes the projects session file&lt;/p&gt;</source>
         <translation>&lt;b&gt;Cancella sessione&lt;/b&gt;&lt;p&gt;Cancella la sessione del progetto.&lt;/p&gt;</translation>
     </message>
@@ -54648,242 +55243,242 @@
         <translation>Altro</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5107"/>
+        <location filename="../Project/Project.py" line="5142"/>
         <source>Include module names?</source>
         <translation>Includi i nomi dei moduli ?</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="2263"/>
+        <location filename="../Project/Project.py" line="2280"/>
         <source>Delete directory</source>
         <translation>Cancella directory</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1125"/>
+        <location filename="../Project/Project.py" line="1137"/>
         <source>Read tasks</source>
         <translation>Leggi tesk</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1145"/>
+        <location filename="../Project/Project.py" line="1157"/>
         <source>Save tasks</source>
         <translation>Salva task</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1204"/>
+        <location filename="../Project/Project.py" line="1216"/>
         <source>Read debugger properties</source>
         <translation>Leggi le proprietà del debugger</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1239"/>
+        <location filename="../Project/Project.py" line="1251"/>
         <source>Save debugger properties</source>
         <translation>Salva le proprietà del debugger</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1265"/>
+        <location filename="../Project/Project.py" line="1277"/>
         <source>Delete debugger properties</source>
         <translation>Cancella le proprietà del debugger</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4037"/>
+        <location filename="../Project/Project.py" line="4072"/>
         <source>Debugger Properties</source>
         <translation>Proprietà Debugger</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4037"/>
+        <location filename="../Project/Project.py" line="4072"/>
         <source>Debugger &amp;Properties...</source>
         <translation>&amp;Proprietà Debugger...</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4041"/>
+        <location filename="../Project/Project.py" line="4076"/>
         <source>Show the debugger properties</source>
         <translation>Mostra le proprietàd el debugger</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4042"/>
+        <location filename="../Project/Project.py" line="4077"/>
         <source>&lt;b&gt;Debugger Properties...&lt;/b&gt;&lt;p&gt;This shows a dialog to edit project specific debugger settings.&lt;/p&gt;</source>
         <translation>&lt;b&gt;Proprietà debugger...&lt;/b&gt;&lt;p&gt;Mostra un dialogo per modificare le impostazioni specifiche per il progetto del debugger.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4050"/>
+        <location filename="../Project/Project.py" line="4085"/>
         <source>Load</source>
         <translation>Carica</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4050"/>
+        <location filename="../Project/Project.py" line="4085"/>
         <source>&amp;Load</source>
         <translation>&amp;Carica</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4054"/>
+        <location filename="../Project/Project.py" line="4089"/>
         <source>Load the debugger properties</source>
         <translation>Carica le proprietàd el debugger</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4062"/>
+        <location filename="../Project/Project.py" line="4097"/>
         <source>Save</source>
         <translation>Salva</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4066"/>
+        <location filename="../Project/Project.py" line="4101"/>
         <source>Save the debugger properties</source>
         <translation>Salva le proprietà del debugger</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4074"/>
+        <location filename="../Project/Project.py" line="4109"/>
         <source>Delete</source>
         <translation>Cancella</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4074"/>
+        <location filename="../Project/Project.py" line="4109"/>
         <source>&amp;Delete</source>
         <translation>&amp;Cancella</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4078"/>
+        <location filename="../Project/Project.py" line="4113"/>
         <source>Delete the debugger properties</source>
         <translation>Cancella le proprietà del debugger</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4087"/>
+        <location filename="../Project/Project.py" line="4122"/>
         <source>Reset</source>
         <translation>Resetta</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4087"/>
+        <location filename="../Project/Project.py" line="4122"/>
         <source>&amp;Reset</source>
         <translation>&amp;Resetta</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4091"/>
+        <location filename="../Project/Project.py" line="4126"/>
         <source>Reset the debugger properties</source>
         <translation>Resetta le proprietà del debugger</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4328"/>
+        <location filename="../Project/Project.py" line="4363"/>
         <source>Debugger</source>
         <translation>Debugger</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4327"/>
+        <location filename="../Project/Project.py" line="4362"/>
         <source>Session</source>
         <translation>Sessione</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4055"/>
+        <location filename="../Project/Project.py" line="4090"/>
         <source>&lt;b&gt;Load Debugger Properties&lt;/b&gt;&lt;p&gt;This loads the project specific debugger settings.&lt;/p&gt;</source>
         <translation>&lt;b&gt;Carica le proprietà del debugger&lt;/b&gt;&lt;p&gt;Carica le proprietà del debugger specifiche per il progetto.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4067"/>
+        <location filename="../Project/Project.py" line="4102"/>
         <source>&lt;b&gt;Save Debugger Properties&lt;/b&gt;&lt;p&gt;This saves the project specific debugger settings.&lt;/p&gt;</source>
         <translation>&lt;b&gt;Salva le proprietà del debugger&lt;/b&gt;&lt;p&gt;Salva le proprietà del debugger specifiche per il progetto.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4079"/>
+        <location filename="../Project/Project.py" line="4114"/>
         <source>&lt;b&gt;Delete Debugger Properties&lt;/b&gt;&lt;p&gt;This deletes the file containing the project specific debugger settings.&lt;/p&gt;</source>
         <translation>&lt;b&gt;Cancella le proprietà del debugger&lt;/b&gt;&lt;p&gt;Cancella il file che contiene le proprietà del debugger specifiche per il progetto.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4092"/>
+        <location filename="../Project/Project.py" line="4127"/>
         <source>&lt;b&gt;Reset Debugger Properties&lt;/b&gt;&lt;p&gt;This resets the project specific debugger settings.&lt;/p&gt;</source>
         <translation>&lt;b&gt;Azzera le proprietà del debugger&lt;/b&gt;&lt;p&gt;Azzera le proprietà del debugger specifiche per il progetto.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4001"/>
+        <location filename="../Project/Project.py" line="4036"/>
         <source>Filetype Associations</source>
         <translation>Associazione tipi file</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4001"/>
+        <location filename="../Project/Project.py" line="4036"/>
         <source>Filetype Associations...</source>
         <translation>Associazione tipi file...</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4005"/>
+        <location filename="../Project/Project.py" line="4040"/>
         <source>Show the project filetype associations</source>
         <translation>Mostra le associazioni dei tipi di file del progetto</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4339"/>
+        <location filename="../Project/Project.py" line="4374"/>
         <source>Pac&amp;kagers</source>
         <translation>Pac&amp;kagers</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3897"/>
+        <location filename="../Project/Project.py" line="3932"/>
         <source>Add files to project</source>
         <translation>Aggiungi file al progetto</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3897"/>
+        <location filename="../Project/Project.py" line="3932"/>
         <source>Add &amp;files...</source>
         <translation>Aggiungi &amp;files...</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3902"/>
+        <location filename="../Project/Project.py" line="3937"/>
         <source>Add files to the current project</source>
         <translation>Aggiungi file al progetto corrente</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3904"/>
+        <location filename="../Project/Project.py" line="3939"/>
         <source>&lt;b&gt;Add files...&lt;/b&gt;&lt;p&gt;This opens a dialog for adding files to the current project. The place to add is determined by the file extension.&lt;/p&gt;</source>
         <translation>&lt;b&gt;Aggiungi files...&lt;/b&gt;&lt;p&gt;Apre un dialogo per aggiungere file al progetto corrente. Il posto dove aggiungerli è determinato dall&apos;estensione.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3115"/>
+        <location filename="../Project/Project.py" line="3132"/>
         <source>Project Files (*.e4p)</source>
         <translation>File progetto (*.e4p)</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4325"/>
+        <location filename="../Project/Project.py" line="4360"/>
         <source>&amp;Project</source>
         <translation>&amp;Progetto</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4465"/>
+        <location filename="../Project/Project.py" line="4500"/>
         <source>Project</source>
         <translation>Progetto</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4531"/>
+        <location filename="../Project/Project.py" line="4566"/>
         <source>&amp;Clear</source>
         <translation>Pulis&amp;ci</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="944"/>
+        <location filename="../Project/Project.py" line="956"/>
         <source>Read user project properties</source>
         <translation>Leggi le proprietà utente del progetto</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="968"/>
+        <location filename="../Project/Project.py" line="980"/>
         <source>Save user project properties</source>
         <translation>Salva le proprietà utente del progetto</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3986"/>
+        <location filename="../Project/Project.py" line="4021"/>
         <source>User project properties</source>
         <translation>Proprietà utente del progetto</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3986"/>
+        <location filename="../Project/Project.py" line="4021"/>
         <source>&amp;User Properties...</source>
         <translation>Proprietà &amp;utente...</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3991"/>
+        <location filename="../Project/Project.py" line="4026"/>
         <source>Show the user specific project properties</source>
         <translation>Mostra le proprietà del multiprogetto specifiche dell&apos;utente</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3993"/>
+        <location filename="../Project/Project.py" line="4028"/>
         <source>&lt;b&gt;User Properties...&lt;/b&gt;&lt;p&gt;This shows a dialog to edit the user specific project properties.&lt;/p&gt;</source>
         <translation>&lt;b&gt;Proprietà utente...&lt;/b&gt;&lt;p&gt;Mosta un dialogo per modificare le proprietà utente di un progetto.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3343"/>
+        <location filename="../Project/Project.py" line="3360"/>
         <source>Syntax errors detected</source>
         <translation>Errore di sintassi rilevato</translation>
     </message>
     <message numerus="yes">
-        <location filename="../Project/Project.py" line="3343"/>
+        <location filename="../Project/Project.py" line="3360"/>
         <source>The project contains %n file(s) with syntax errors.</source>
         <translation>
             <numerusform>Il progetto contiene %n file con errori di sintassi.</numerusform>
@@ -54891,42 +55486,42 @@
         </translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5300"/>
+        <location filename="../Project/Project.py" line="5335"/>
         <source>Create Package List</source>
         <translation>Crea lista del package</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4223"/>
+        <location filename="../Project/Project.py" line="4258"/>
         <source>Create &amp;Package List</source>
         <translation type="unfinished">Crea un &amp;archivio per il plugin</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5574"/>
+        <location filename="../Project/Project.py" line="5609"/>
         <source>Create Plugin Archive</source>
         <translation>Crea un archivio per il plugin</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5251"/>
+        <location filename="../Project/Project.py" line="5286"/>
         <source>&lt;p&gt;The file &lt;b&gt;PKGLIST&lt;/b&gt; already exists.&lt;/p&gt;&lt;p&gt;Overwrite it?&lt;/p&gt;</source>
         <translation>&lt;p&gt;Il file &lt;b&gt;PKGLIST&lt;/b&gt; esiste già.&lt;/p&gt;&lt;p&gt;Sovrascriverlo?&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5319"/>
+        <location filename="../Project/Project.py" line="5354"/>
         <source>The project does not have a main script defined. Aborting...</source>
         <translation>Non c&apos;è uno script principale definito per il progetto. Esco...</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1715"/>
+        <location filename="../Project/Project.py" line="1727"/>
         <source>&lt;p&gt;The source directory doesn&apos;t contain any files belonging to the selected category.&lt;/p&gt;</source>
         <translation>&lt;p&gt;La directory di partenza non contiene nessun file appartenente alla categoria selezionata.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="2965"/>
+        <location filename="../Project/Project.py" line="2982"/>
         <source>Select Version Control System</source>
         <translation>Selezione il Sistema di Controllo della Versione (VCS)</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="2580"/>
+        <location filename="../Project/Project.py" line="2597"/>
         <source>None</source>
         <translation>Nessuno</translation>
     </message>
@@ -54936,42 +55531,42 @@
         <translation>Registrazione tipo progetto</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4239"/>
+        <location filename="../Project/Project.py" line="4274"/>
         <source>Create Plugin &amp;Archives</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1393"/>
+        <location filename="../Project/Project.py" line="1405"/>
         <source>You have to specify a translation pattern first.</source>
         <translation>Devi prima specificare un pattern di traduzione.</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="2684"/>
+        <location filename="../Project/Project.py" line="2701"/>
         <source>Translation Pattern</source>
         <translation>Pattern di traduzione</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="2684"/>
+        <location filename="../Project/Project.py" line="2701"/>
         <source>Enter the path pattern for translation files (use &apos;%language%&apos; in place of the language code):</source>
         <translation>Inserisci il path per il file di traduzione (usa &apos;%language% al posto del codice lingua):</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4019"/>
+        <location filename="../Project/Project.py" line="4054"/>
         <source>Lexer Associations</source>
         <translation>Associazioni analizzatore lessicale</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4019"/>
+        <location filename="../Project/Project.py" line="4054"/>
         <source>Lexer Associations...</source>
         <translation>Associazioni analizzatore lessicale...</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4023"/>
+        <location filename="../Project/Project.py" line="4058"/>
         <source>Show the project lexer associations (overriding defaults)</source>
         <translation>Mostra le associazioni degli analizzatori lessicali del progetto (sovrascrivendo i default)</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4025"/>
+        <location filename="../Project/Project.py" line="4060"/>
         <source>&lt;b&gt;Lexer Associations...&lt;/b&gt;&lt;p&gt;This shows a dialog to edit the lexer associations of the project. These associations override the global lexer associations. Lexers are used to highlight the editor text.&lt;/p&gt;</source>
         <translation>&lt;b&gt;Associazioni analizzatore lessicale...&lt;/b&gt;&lt;p&gt;Mostra un dialogo per modificare le associazioni degli analizzatori lessicali dei progetti. Queste associazioni sovrascrivono the impostazioni globali. Gli analizzatori lessicali sono utilizzati per l&apos;evidenziazione del testo nell&apos;editor.&lt;/p&gt;</translation>
     </message>
@@ -54991,112 +55586,112 @@
         <translation>Python3 Files (*.py *.py3);;Python3 GUI Files (*.pyw *.pyw3);;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="805"/>
+        <location filename="../Project/Project.py" line="817"/>
         <source>&lt;p&gt;The project file &lt;b&gt;{0}&lt;/b&gt; could not be read.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Il file progetto &lt;b&gt;{0}&lt;/b&gt; non può essere letto.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="908"/>
+        <location filename="../Project/Project.py" line="920"/>
         <source>&lt;p&gt;The project file &lt;b&gt;{0}&lt;/b&gt; could not be written.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Il file progetto &lt;b{0}&lt;/b&gt; non può essere scritto.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="944"/>
+        <location filename="../Project/Project.py" line="956"/>
         <source>&lt;p&gt;The user specific project properties file &lt;b&gt;{0}&lt;/b&gt; could not be read.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Il file delle proprietà specifiche dell&apos;utente del progetto &lt;b&gt;{0}&lt;/b&gt; non può essere letto.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="968"/>
+        <location filename="../Project/Project.py" line="980"/>
         <source>&lt;p&gt;The user specific project properties file &lt;b&gt;{0}&lt;/b&gt; could not be written.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Il file delle proprietà specifiche dell&apos;utente del progetto &lt;b&gt;{0}&lt;/b&gt; non può essere scritto.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1026"/>
+        <location filename="../Project/Project.py" line="1038"/>
         <source>&lt;p&gt;The project session file &lt;b&gt;{0}&lt;/b&gt; could not be read.&lt;/p&gt;</source>
         <translation>&lt;p&gt;La sessione del progetto &lt;b&gt;{0}&lt;/b&gt; non può essere letta.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1062"/>
+        <location filename="../Project/Project.py" line="1074"/>
         <source>&lt;p&gt;The project session file &lt;b&gt;{0}&lt;/b&gt; could not be written.&lt;/p&gt;</source>
         <translation>&lt;p&gt;La sessione del progetto &lt;b&gt;{0}&lt;/b&gt; non può essere scritta.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1091"/>
+        <location filename="../Project/Project.py" line="1103"/>
         <source>&lt;p&gt;The project session file &lt;b&gt;{0}&lt;/b&gt; could not be deleted.&lt;/p&gt;</source>
         <translation>&lt;p&gt;La sessione del progetto &lt;b&gt;{0}&lt;/b&gt; non può essere cancellato.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1125"/>
+        <location filename="../Project/Project.py" line="1137"/>
         <source>&lt;p&gt;The tasks file &lt;b&gt;{0}&lt;/b&gt; could not be read.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Il file task &lt;b&gt;{0}&lt;/b&gt; non può essere letto.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1145"/>
+        <location filename="../Project/Project.py" line="1157"/>
         <source>&lt;p&gt;The tasks file &lt;b&gt;{0}&lt;/b&gt; could not be written.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Il file task &lt;b&gt;{0}&lt;/b&gt; non può essere scritto.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1204"/>
+        <location filename="../Project/Project.py" line="1216"/>
         <source>&lt;p&gt;The project debugger properties file &lt;b&gt;{0}&lt;/b&gt; could not be read.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Il file delle proprietà del debugger del progetto&lt;b&gt;{0}&lt;/b&gt; non può essere letto.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1239"/>
+        <location filename="../Project/Project.py" line="1251"/>
         <source>&lt;p&gt;The project debugger properties file &lt;b&gt;{0}&lt;/b&gt; could not be written.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Il file delle proprietà del debugger del progetto&lt;b&gt;{0}&lt;/b&gt; non può essere scritto.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1265"/>
+        <location filename="../Project/Project.py" line="1277"/>
         <source>&lt;p&gt;The project debugger properties file &lt;b&gt;{0}&lt;/b&gt; could not be deleted.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Il file delle proprietà del debugger del progetto&lt;b&gt;{0}&lt;/b&gt; non può essere cancellato.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1748"/>
+        <location filename="../Project/Project.py" line="1760"/>
         <source>&lt;p&gt;The file &lt;b&gt;{0}&lt;/b&gt; already exists.&lt;/p&gt;&lt;p&gt;Overwrite it?&lt;/p&gt;</source>
         <translation>&lt;p&gt;Il file &lt;b&gt;{0}&lt;/b&gt; esiste già.&lt;/p&gt;&lt;p&gt;Sovrascriverlo?&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3130"/>
+        <location filename="../Project/Project.py" line="3147"/>
         <source>&lt;p&gt;The file &lt;b&gt;{0}&lt;/b&gt; already exists. Overwrite it?&lt;/p&gt;</source>
         <translation>&lt;p&gt;Il file &lt;b&gt;{0}&lt;/b&gt; esiste già. Sovrascriverlo ?&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1988"/>
+        <location filename="../Project/Project.py" line="2000"/>
         <source>&lt;p&gt;The file &lt;b&gt;{0}&lt;/b&gt; could not be renamed.&lt;br /&gt;Reason: {1}&lt;/p&gt;</source>
         <translation>&lt;p&gt;Il file &lt;b&gt;{0}&lt;/b&gt; non può essere rinominato.&lt;br /&gt;Motivo: {1}&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="2358"/>
+        <location filename="../Project/Project.py" line="2375"/>
         <source>&lt;p&gt;The project directory &lt;b&gt;{0}&lt;/b&gt; could not be created.&lt;/p&gt;</source>
         <translation>&lt;p&gt;La directory del progetto &lt;b&gt;{0}&lt;/b&gt; non può essere creata.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4850"/>
+        <location filename="../Project/Project.py" line="4885"/>
         <source>&lt;p&gt;The selected VCS &lt;b&gt;{0}&lt;/b&gt; could not be found.&lt;br/&gt;Disabling version control.&lt;/p&gt;&lt;p&gt;{1}&lt;/p&gt;</source>
         <translation>&lt;p&gt;VCS selezionato &lt;b&gt;{0}&lt;/b&gt;non trovato.&lt;br&gt;Disabilito il controllo di versione.&lt;/p&gt;&lt;p&gt;{1}&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5300"/>
+        <location filename="../Project/Project.py" line="5335"/>
         <source>&lt;p&gt;The file &lt;b&gt;PKGLIST&lt;/b&gt; could not be created.&lt;/p&gt;&lt;p&gt;Reason: {0}&lt;/p&gt;</source>
         <translation>&lt;p&gt;Il file &lt;b&gt;PKGLIST&lt;/b&gt; non può essere creato.&lt;br /&gt;Motivo: {0}&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5460"/>
+        <location filename="../Project/Project.py" line="5495"/>
         <source>&lt;p&gt;The file &lt;b&gt;{0}&lt;/b&gt; could not be stored in the archive. Ignoring it.&lt;/p&gt;&lt;p&gt;Reason: {1}&lt;/p&gt;</source>
         <translation>&lt;p&gt;Il file &lt;b&gt;{0}&lt;/b&gt; non può essere aggiunto all&apos;archivio.Lo ignoro.&lt;/p&gt;&lt;p&gt;Motivo: {1}&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5533"/>
+        <location filename="../Project/Project.py" line="5568"/>
         <source>&lt;p&gt;The plugin file &lt;b&gt;{0}&lt;/b&gt; could not be read.&lt;/p&gt;&lt;p&gt;Reason: {1}&lt;/p&gt;</source>
         <translation>&lt;p&gt;Il file plugin &lt;b&gt;{0}&lt;/b&gt; non può essere salvato.&lt;br /&gt;Motivo: {1}&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1671"/>
+        <location filename="../Project/Project.py" line="1683"/>
         <source>&lt;p&gt;The selected file &lt;b&gt;{0}&lt;/b&gt; could not be added to &lt;b&gt;{1}&lt;/b&gt;.&lt;/p&gt;&lt;p&gt;Reason: {2}&lt;/p&gt;</source>
         <translation>&lt;p&gt;Il file selezionato &lt;b&gt;{0}&lt;/b&gt; non può essere aggiunto a &lt;b&gt;{1}&lt;/b&gt;.&lt;/p&gt;&lt;p&gt;Motivo: {2}&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1730"/>
+        <location filename="../Project/Project.py" line="1742"/>
         <source>&lt;p&gt;The target directory &lt;b&gt;{0}&lt;/b&gt; could not be created.&lt;/p&gt;&lt;p&gt;Reason: {1}&lt;/p&gt;</source>
         <translation>&lt;p&gt;La directory di destinazione&lt;b&gt;{0}&lt;/b&gt; non può essere creata.&lt;/p&gt;&lt;p&gt;Motivo: {1}&lt;/p&gt;</translation>
     </message>
@@ -55106,32 +55701,32 @@
         <translation>Python Files (*.py2);;Python GUI Files (*.pyw2);;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="2441"/>
+        <location filename="../Project/Project.py" line="2458"/>
         <source>Create main script</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="2441"/>
+        <location filename="../Project/Project.py" line="2458"/>
         <source>&lt;p&gt;The mainscript &lt;b&gt;{0}&lt;/b&gt; could not be created.&lt;br/&gt;Reason: {1}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4208"/>
+        <location filename="../Project/Project.py" line="4243"/>
         <source>Load Diagram</source>
         <translation type="unfinished">Carico Diagramma</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4208"/>
+        <location filename="../Project/Project.py" line="4243"/>
         <source>&amp;Load Diagram...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4212"/>
+        <location filename="../Project/Project.py" line="4247"/>
         <source>Load a diagram from file.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4214"/>
+        <location filename="../Project/Project.py" line="4249"/>
         <source>&lt;b&gt;Load Diagram...&lt;/b&gt;&lt;p&gt;This loads a diagram from file.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -55161,37 +55756,37 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4839"/>
+        <location filename="../Project/Project.py" line="4874"/>
         <source>&lt;p&gt;The selected VCS &lt;b&gt;{0}&lt;/b&gt; could not be found. &lt;br/&gt;Reverting override.&lt;/p&gt;&lt;p&gt;{1}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5574"/>
+        <location filename="../Project/Project.py" line="5609"/>
         <source>&lt;p&gt;The plugin file &lt;b&gt;{0}&lt;/b&gt; could not be read.&lt;/p&gt; &lt;p&gt;Reason: {1}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4228"/>
+        <location filename="../Project/Project.py" line="4263"/>
         <source>Create an initial PKGLIST file for an eric6 plugin.</source>
         <translation type="unfinished">Crea un file archivio per il plugin di eric6.</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4230"/>
+        <location filename="../Project/Project.py" line="4265"/>
         <source>&lt;b&gt;Create Package List&lt;/b&gt;&lt;p&gt;This creates an initial list of files to include in an eric6 plugin archive. The list is created from the project file.&lt;/p&gt;</source>
         <translation type="unfinished">&lt;b&gt;Crea Archivio Plugin&lt;/b&gt;&lt;p&gt;Crea un archivio per il plugin eric6 usando la lista dei file fornita nel file PKGLIST. Il nome dell&apos;archivio è costruito dal nome dello script.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4244"/>
+        <location filename="../Project/Project.py" line="4279"/>
         <source>Create eric6 plugin archive files.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4246"/>
+        <location filename="../Project/Project.py" line="4281"/>
         <source>&lt;b&gt;Create Plugin Archives&lt;/b&gt;&lt;p&gt;This creates eric6 plugin archive files using the list of files given in a PKGLIST* file. The archive name is built from the main script name if not designated in the package list file.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5424"/>
+        <location filename="../Project/Project.py" line="5459"/>
         <source>&lt;p&gt;The eric6 plugin archive file &lt;b&gt;{0}&lt;/b&gt; could not be created.&lt;/p&gt;&lt;p&gt;Reason: {1}&lt;/p&gt;</source>
         <translation type="unfinished">&lt;p&gt;Il file archivio del plugin di eric6&lt;b&gt;{0}&lt;/b&gt; non può essere creato.&lt;br /&gt;Motivo: {1}&lt;/p&gt;</translation>
     </message>
@@ -55201,213 +55796,213 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="2933"/>
+        <location filename="../Project/Project.py" line="2950"/>
         <source>Create project management directory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="2933"/>
+        <location filename="../Project/Project.py" line="2950"/>
         <source>&lt;p&gt;The project directory &lt;b&gt;{0}&lt;/b&gt; is not writable.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3958"/>
+        <location filename="../Project/Project.py" line="3993"/>
         <source>Alt+Ctrl+P</source>
         <comment>Project|Search Project File</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3964"/>
+        <location filename="../Project/Project.py" line="3999"/>
         <source>Search for a file in the project list of files.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3966"/>
+        <location filename="../Project/Project.py" line="4001"/>
         <source>&lt;b&gt;Search Project File&lt;/b&gt;&lt;p&gt;This searches for a file in the project list of files.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3958"/>
+        <location filename="../Project/Project.py" line="3993"/>
         <source>Search Project File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3958"/>
+        <location filename="../Project/Project.py" line="3993"/>
         <source>Search Project File...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5355"/>
+        <location filename="../Project/Project.py" line="5390"/>
         <source>Create Plugin Archives</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4256"/>
+        <location filename="../Project/Project.py" line="4291"/>
         <source>Create Plugin Archives (Snapshot)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4256"/>
+        <location filename="../Project/Project.py" line="4291"/>
         <source>Create Plugin Archives (&amp;Snapshot)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4261"/>
+        <location filename="../Project/Project.py" line="4296"/>
         <source>Create eric6 plugin archive files (snapshot releases).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4263"/>
+        <location filename="../Project/Project.py" line="4298"/>
         <source>&lt;b&gt;Create Plugin Archives (Snapshot)&lt;/b&gt;&lt;p&gt;This creates eric6 plugin archive files using the list of files given in the PKGLIST* file. The archive name is built from the main script name if not designated in the package list file. The version entry of the main script is modified to reflect a snapshot release.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5333"/>
-        <source>Select package lists:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="5351"/>
-        <source>Creating plugin archives...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="5351"/>
-        <source>Abort</source>
-        <translation type="unfinished">Termina</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="5351"/>
-        <source>%v/%m Archives</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Project/Project.py" line="5368"/>
+        <source>Select package lists:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="5386"/>
+        <source>Creating plugin archives...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="5386"/>
+        <source>Abort</source>
+        <translation type="unfinished">Termina</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="5386"/>
+        <source>%v/%m Archives</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="5403"/>
         <source>&lt;p&gt;The file &lt;b&gt;{0}&lt;/b&gt; could not be read.&lt;/p&gt;&lt;p&gt;Reason: {1}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5479"/>
+        <location filename="../Project/Project.py" line="5514"/>
         <source>&lt;p&gt;The eric6 plugin archive files were created with some errors.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5482"/>
+        <location filename="../Project/Project.py" line="5517"/>
         <source>&lt;p&gt;The eric6 plugin archive files were created successfully.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5344"/>
+        <location filename="../Project/Project.py" line="5379"/>
         <source>&lt;p&gt;No package list files (PKGLIST*) available or selected. Aborting...&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5396"/>
+        <location filename="../Project/Project.py" line="5431"/>
         <source>&lt;p&gt;The file &lt;b&gt;{0}&lt;/b&gt; is not ready yet.&lt;/p&gt;&lt;p&gt;Please rework it and delete the&apos;; initial_list&apos; line of the header.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3949"/>
+        <location filename="../Project/Project.py" line="3984"/>
         <source>&lt;b&gt;Search new files...&lt;/b&gt;&lt;p&gt;This searches for new files (sources, *.ui, *.idl, *.proto) in the project directory and registered subdirectories.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4007"/>
+        <location filename="../Project/Project.py" line="4042"/>
         <source>&lt;b&gt;Filetype Associations...&lt;/b&gt;&lt;p&gt;This shows a dialog to edit the file type associations of the project. These associations determine the type (source, form, interface, protocol or others) with a filename pattern. They are used when adding a file to the project and when performing a search for new files.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1519"/>
+        <location filename="../Project/Project.py" line="1531"/>
         <source>&lt;p&gt;The selected translation file &lt;b&gt;{0}&lt;/b&gt; could not be deleted.&lt;/p&gt;&lt;p&gt;Reason: {1}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="2233"/>
+        <location filename="../Project/Project.py" line="2250"/>
         <source>&lt;p&gt;The selected file &lt;b&gt;{0}&lt;/b&gt; could not be deleted.&lt;/p&gt;&lt;p&gt;Reason: {1}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="2263"/>
+        <location filename="../Project/Project.py" line="2280"/>
         <source>&lt;p&gt;The selected directory &lt;b&gt;{0}&lt;/b&gt; could not be deleted.&lt;/p&gt;&lt;p&gt;Reason: {1}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="2756"/>
+        <location filename="../Project/Project.py" line="2773"/>
         <source>Create Makefile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="2756"/>
+        <location filename="../Project/Project.py" line="2773"/>
         <source>&lt;p&gt;The makefile &lt;b&gt;{0}&lt;/b&gt; could not be created.&lt;br/&gt;Reason: {1}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5760"/>
+        <location filename="../Project/Project.py" line="5795"/>
         <source>Execute Make</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4277"/>
+        <location filename="../Project/Project.py" line="4312"/>
         <source>&amp;Execute Make</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4281"/>
+        <location filename="../Project/Project.py" line="4316"/>
         <source>Perform a &apos;make&apos; run.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4283"/>
+        <location filename="../Project/Project.py" line="4318"/>
         <source>&lt;b&gt;Execute Make&lt;/b&gt;&lt;p&gt;This performs a &apos;make&apos; run to rebuild the configured target.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5740"/>
+        <location filename="../Project/Project.py" line="5775"/>
         <source>Test for Changes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4291"/>
+        <location filename="../Project/Project.py" line="4326"/>
         <source>&amp;Test for Changes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4295"/>
+        <location filename="../Project/Project.py" line="4330"/>
         <source>Question &apos;make&apos;, if a rebuild is needed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4297"/>
+        <location filename="../Project/Project.py" line="4332"/>
         <source>&lt;b&gt;Test for Changes&lt;/b&gt;&lt;p&gt;This questions &apos;make&apos;, if a rebuild of the configured target is necessary.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4342"/>
+        <location filename="../Project/Project.py" line="4377"/>
         <source>Make</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5688"/>
+        <location filename="../Project/Project.py" line="5723"/>
         <source>The make process did not start.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5733"/>
+        <location filename="../Project/Project.py" line="5768"/>
         <source>The make process crashed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5743"/>
+        <location filename="../Project/Project.py" line="5778"/>
         <source>&lt;p&gt;There are changes that require the configured make target &lt;b&gt;{0}&lt;/b&gt; to be rebuilt.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5748"/>
+        <location filename="../Project/Project.py" line="5783"/>
         <source>&lt;p&gt;There are changes that require the default make target to be rebuilt.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5760"/>
+        <location filename="../Project/Project.py" line="5795"/>
         <source>The makefile contains errors.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -55422,7 +56017,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4330"/>
+        <location filename="../Project/Project.py" line="4365"/>
         <source>Project-T&amp;ools</source>
         <translation type="unfinished"></translation>
     </message>
@@ -55526,7 +56121,7 @@
         <translation>Stato VCS</translation>
     </message>
     <message>
-        <location filename="../Project/ProjectBrowserModel.py" line="782"/>
+        <location filename="../Project/ProjectBrowserModel.py" line="798"/>
         <source>local</source>
         <translation>locale</translation>
     </message>
@@ -55536,7 +56131,7 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/ProjectBrowserPage.ui" line="56"/>
         <source>Select the colour for highlighted entries in the Others viewer.</source>
-        <translation>Seleziona il colore per gli elementi selezionati nella vista Altri.</translation>
+        <translation type="obsolete">Seleziona il colore per gli elementi selezionati nella vista Altri.</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/ProjectBrowserPage.ui" line="43"/>
@@ -55551,7 +56146,7 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/ProjectBrowserPage.ui" line="37"/>
         <source>Colours</source>
-        <translation>Colori</translation>
+        <translation type="obsolete">Colori</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/ProjectBrowserPage.ui" line="219"/>
@@ -55678,6 +56273,16 @@
         <source>Protocols (protobuf) Browser</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/ProjectBrowserPage.ui" line="37"/>
+        <source>Colors</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/ProjectBrowserPage.ui" line="56"/>
+        <source>Select the color for highlighted entries in the Others viewer.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ProjectFormsBrowser</name>
@@ -65507,12 +66112,12 @@
         <translation>Pulisci</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="2157"/>
+        <location filename="../QScintilla/Shell.py" line="2161"/>
         <source>Drop Error</source>
         <translation>Drop Error</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="839"/>
+        <location filename="../QScintilla/Shell.py" line="843"/>
         <source>No.</source>
         <translation>No.</translation>
     </message>
@@ -65522,7 +66127,7 @@
         <translation>Inizia</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="835"/>
+        <location filename="../QScintilla/Shell.py" line="839"/>
         <source>Passive Debug Mode</source>
         <translation>Passive Debug Mode</translation>
     </message>
@@ -65542,17 +66147,17 @@
         <translation>Mostra</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="767"/>
+        <location filename="../QScintilla/Shell.py" line="771"/>
         <source>Select History</source>
         <translation>Selezione cronologia</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="767"/>
+        <location filename="../QScintilla/Shell.py" line="771"/>
         <source>Select the history entry to execute (most recent shown last).</source>
         <translation>Seleziona l&apos;elemento dalla cronologia da esegurie (i più recenti sono gli ultimi).</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="836"/>
+        <location filename="../QScintilla/Shell.py" line="840"/>
         <source>
 Not connected</source>
         <translation>
@@ -65569,22 +66174,22 @@
         <translation>Taglia</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="841"/>
+        <location filename="../QScintilla/Shell.py" line="845"/>
         <source>{0} on {1}, {2}</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="1030"/>
+        <location filename="../QScintilla/Shell.py" line="1034"/>
         <source>StdOut: {0}</source>
         <translation>StdOut: {0}</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="1038"/>
+        <location filename="../QScintilla/Shell.py" line="1042"/>
         <source>StdErr: {0}</source>
         <translation>StdErr: {0}</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="2157"/>
+        <location filename="../QScintilla/Shell.py" line="2161"/>
         <source>&lt;p&gt;&lt;b&gt;{0}&lt;/b&gt; is not a file.&lt;/p&gt;</source>
         <translation>&lt;p&gt;&lt;b&gt;{0}&lt;/b&gt; non è un file.&lt;/p&gt;</translation>
     </message>
@@ -65594,7 +66199,7 @@
         <translation>Trova</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="888"/>
+        <location filename="../QScintilla/Shell.py" line="892"/>
         <source>Exception &quot;{0}&quot;
 {1}
 File: {2}, Line: {3}
@@ -65602,32 +66207,32 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="923"/>
+        <location filename="../QScintilla/Shell.py" line="927"/>
         <source>Unspecified syntax error.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="898"/>
+        <location filename="../QScintilla/Shell.py" line="902"/>
         <source>Exception &quot;{0}&quot;
 {1}
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="925"/>
+        <location filename="../QScintilla/Shell.py" line="929"/>
         <source>Syntax error &quot;{1}&quot; in file {0} at line {2}, character {3}.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="948"/>
+        <location filename="../QScintilla/Shell.py" line="952"/>
         <source>Signal &quot;{0}&quot; generated in file {1} at line {2}.
 Function: {3}({4})</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="2015"/>
+        <location filename="../QScintilla/Shell.py" line="2019"/>
         <source>Project</source>
         <translation type="unfinished">Progetto</translation>
     </message>
@@ -65657,14 +66262,14 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="1835"/>
+        <location filename="../QScintilla/Shell.py" line="1839"/>
         <source>Available Virtual Environments:
 {0}
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="1876"/>
+        <location filename="../QScintilla/Shell.py" line="1880"/>
         <source>Current Virtual Environment: &apos;{0}&apos;
 </source>
         <translation type="unfinished"></translation>
@@ -73802,7 +74407,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/Sync/SyncCheckPage.py" line="56"/>
+        <location filename="../WebBrowser/Sync/SyncCheckPage.py" line="50"/>
         <source>Host:</source>
         <translation type="unfinished">Host:</translation>
     </message>
@@ -73832,22 +74437,22 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/Sync/SyncCheckPage.py" line="55"/>
+        <location filename="../WebBrowser/Sync/SyncCheckPage.py" line="49"/>
         <source>FTP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/Sync/SyncCheckPage.py" line="68"/>
+        <location filename="../WebBrowser/Sync/SyncCheckPage.py" line="62"/>
         <source>No Synchronization</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/Sync/SyncCheckPage.py" line="211"/>
+        <location filename="../WebBrowser/Sync/SyncCheckPage.py" line="204"/>
         <source>&lt;font color=&quot;#FF0000&quot;&gt;&lt;b&gt;Error:&lt;/b&gt; {0}&lt;/font&gt;</source>
         <translation type="unfinished">&lt;font color=&quot;#FF0000&quot;&gt;&lt;b&gt;Errore:&lt;/b&gt; {0}&lt;/font&gt;</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/Sync/SyncCheckPage.py" line="63"/>
+        <location filename="../WebBrowser/Sync/SyncCheckPage.py" line="57"/>
         <source>Shared Directory</source>
         <translation type="unfinished"></translation>
     </message>
@@ -73857,7 +74462,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/Sync/SyncCheckPage.py" line="64"/>
+        <location filename="../WebBrowser/Sync/SyncCheckPage.py" line="58"/>
         <source>Directory:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -75533,12 +76138,12 @@
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/TasksPage.ui" line="105"/>
-        <source>Tasks Background Colours</source>
+        <source>Tasks Background Colors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/TasksPage.ui" line="206"/>
-        <source>Select the background colour for these tasks.</source>
+        <source>Select the background color for these tasks.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -76600,27 +77205,27 @@
 <context>
     <name>Translator</name>
     <message>
-        <location filename="../Plugins/UiExtensionPlugins/Translator/Translator.py" line="52"/>
+        <location filename="../Plugins/UiExtensionPlugins/Translator/Translator.py" line="63"/>
         <source>Translator</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/UiExtensionPlugins/Translator/Translator.py" line="52"/>
+        <location filename="../Plugins/UiExtensionPlugins/Translator/Translator.py" line="63"/>
         <source>T&amp;ranslator</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/UiExtensionPlugins/Translator/Translator.py" line="52"/>
+        <location filename="../Plugins/UiExtensionPlugins/Translator/Translator.py" line="63"/>
         <source>Alt+Shift+R</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/UiExtensionPlugins/Translator/Translator.py" line="58"/>
+        <location filename="../Plugins/UiExtensionPlugins/Translator/Translator.py" line="69"/>
         <source>Switch the input focus to the Translator window.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/UiExtensionPlugins/Translator/Translator.py" line="60"/>
+        <location filename="../Plugins/UiExtensionPlugins/Translator/Translator.py" line="71"/>
         <source>&lt;b&gt;Activate Translator&lt;/b&gt;&lt;p&gt;This switches the input focus to the Translator window.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -76628,52 +77233,52 @@
 <context>
     <name>TranslatorEngines</name>
     <message>
-        <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorEngines/__init__.py" line="37"/>
+        <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorEngines/__init__.py" line="39"/>
         <source>Google V.1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorEngines/__init__.py" line="39"/>
-        <source>MyMemory</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorEngines/__init__.py" line="41"/>
-        <source>Glosbe</source>
+        <source>MyMemory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorEngines/__init__.py" line="43"/>
-        <source>PROMT</source>
+        <source>Glosbe</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorEngines/__init__.py" line="45"/>
-        <source>Yandex</source>
+        <source>PROMT</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorEngines/__init__.py" line="47"/>
-        <source>Google V.2</source>
+        <source>Yandex</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorEngines/__init__.py" line="49"/>
+        <source>Google V.2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorEngines/__init__.py" line="51"/>
         <source>Microsoft</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorEngines/__init__.py" line="57"/>
+        <source>Unknow translation service name ({0})</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorEngines/__init__.py" line="55"/>
-        <source>Unknow translation service name ({0})</source>
+        <source>IBM Watson</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorEngines/__init__.py" line="53"/>
-        <source>IBM Watson</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorEngines/__init__.py" line="51"/>
         <source>DeepL Pro</source>
         <translation type="unfinished"></translation>
     </message>
@@ -76922,12 +77527,12 @@
     </message>
     <message>
         <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorLanguagesDb.py" line="79"/>
-        <source>Chinese S</source>
+        <source>Chinese (China)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorLanguagesDb.py" line="80"/>
-        <source>Chinese T</source>
+        <source>Chinese (Taiwan)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -77107,7 +77712,7 @@
 <context>
     <name>TranslatorPlugin</name>
     <message>
-        <location filename="../Plugins/PluginTranslator.py" line="65"/>
+        <location filename="../Plugins/PluginTranslator.py" line="71"/>
         <source>Translator</source>
         <translation type="unfinished"></translation>
     </message>
@@ -78764,7 +79369,7 @@
         <translation>&lt;b&gt;Scorciatoie da tastiera&lt;/b&gt;&lt;p&gt;Imposta le scorciatoie da tastiera dell&apos;applicazione con i valori personalizzati.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="6329"/>
+        <location filename="../UI/UserInterface.py" line="6327"/>
         <source>Export Keyboard Shortcuts</source>
         <translation>Esporta scorciatoie da tastiera</translation>
     </message>
@@ -78784,7 +79389,7 @@
         <translation>&lt;b&gt;Esporta scorciatoie da tastiera&lt;/b&gt;&lt;p&gt;Esporta le scorciatoie da tastiera dell&apos;applicazione.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="6353"/>
+        <location filename="../UI/UserInterface.py" line="6351"/>
         <source>Import Keyboard Shortcuts</source>
         <translation>Importa scorciatoie da tastiera</translation>
     </message>
@@ -78959,7 +79564,7 @@
         <translation type="obsolete">Non c&apos;è uno script principale definito per il progetto. Esco</translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="6916"/>
+        <location filename="../UI/UserInterface.py" line="6914"/>
         <source>Drop Error</source>
         <translation>Errore Drop</translation>
     </message>
@@ -79094,12 +79699,12 @@
         <translation>Task-Viewer</translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="6523"/>
+        <location filename="../UI/UserInterface.py" line="6521"/>
         <source>Save tasks</source>
         <translation>Salva task</translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="6552"/>
+        <location filename="../UI/UserInterface.py" line="6550"/>
         <source>Read tasks</source>
         <translation>Leggi task</translation>
     </message>
@@ -79300,12 +79905,12 @@
         <translation type="unfinished">&lt;p&gt;L&apos;inizio della documentazione di PySide non è stato configurato.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="7287"/>
+        <location filename="../UI/UserInterface.py" line="7285"/>
         <source>Error during updates check</source>
         <translation>Errore nel controllo per gli update</translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="7268"/>
+        <location filename="../UI/UserInterface.py" line="7266"/>
         <source>Update available</source>
         <translation>Aggiornamento disponibile</translation>
     </message>
@@ -79315,7 +79920,7 @@
         <translation type="obsolete">&lt;h3&gt;Numeri di versione&lt;/h3&gt;&lt;table&gt;</translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="7326"/>
+        <location filename="../UI/UserInterface.py" line="7324"/>
         <source>&lt;/table&gt;</source>
         <translation>&lt;/table&gt;</translation>
     </message>
@@ -79340,17 +79945,17 @@
         <translation>Mostra toll &amp;esterni</translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="7101"/>
+        <location filename="../UI/UserInterface.py" line="7099"/>
         <source>&amp;Cancel</source>
         <translation>&amp;Cancella</translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="7287"/>
+        <location filename="../UI/UserInterface.py" line="7285"/>
         <source>Could not perform updates check.</source>
         <translation>Non posso controllare per gli update.</translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="7363"/>
+        <location filename="../UI/UserInterface.py" line="7361"/>
         <source>First time usage</source>
         <translation>Primo avvio</translation>
     </message>
@@ -79445,7 +80050,7 @@
         <translation>Mostra le versioni disponibili per il download</translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="7311"/>
+        <location filename="../UI/UserInterface.py" line="7309"/>
         <source>&lt;h3&gt;Available versions&lt;/h3&gt;&lt;table&gt;</source>
         <translation>&lt;h3&gt;Versioni disponibili&lt;/h3&gt;&lt;table&gt;</translation>
     </message>
@@ -79540,12 +80145,12 @@
         <translation>Tool esterni</translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="6648"/>
+        <location filename="../UI/UserInterface.py" line="6646"/>
         <source>Save session</source>
         <translation>Salva sessione</translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="6632"/>
+        <location filename="../UI/UserInterface.py" line="6630"/>
         <source>Read session</source>
         <translation>Leggi sessione</translation>
     </message>
@@ -79888,32 +80493,32 @@
         <translation>&lt;p&gt;L&apos;inizio della documentazione &quot;&lt;b&gt;{0}&lt;/b&gt;&quot; non viene trovato.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="6523"/>
+        <location filename="../UI/UserInterface.py" line="6521"/>
         <source>&lt;p&gt;The tasks file &lt;b&gt;{0}&lt;/b&gt; could not be written.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Il file task &lt;b&gt;{0}&lt;/b&gt; non può essere scritto.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="6552"/>
+        <location filename="../UI/UserInterface.py" line="6550"/>
         <source>&lt;p&gt;The tasks file &lt;b&gt;{0}&lt;/b&gt; could not be read.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Il file task &lt;b&gt;{0}&lt;/b&gt; non può essere letto.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="6586"/>
+        <location filename="../UI/UserInterface.py" line="6584"/>
         <source>&lt;p&gt;The session file &lt;b&gt;{0}&lt;/b&gt; could not be written.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Il file sessione &lt;b&gt;{0}&lt;/b&gt; non può essere scritto.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="6632"/>
+        <location filename="../UI/UserInterface.py" line="6630"/>
         <source>&lt;p&gt;The session file &lt;b&gt;{0}&lt;/b&gt; could not be read.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Il file sessione &lt;b&gt;{0}&lt;/b&gt; non può essere letto.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="6916"/>
+        <location filename="../UI/UserInterface.py" line="6914"/>
         <source>&lt;p&gt;&lt;b&gt;{0}&lt;/b&gt; is not a file.&lt;/p&gt;</source>
         <translation>&lt;p&gt;&lt;b&gt;{0}&lt;/b&gt; non è un file.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="7110"/>
+        <location filename="../UI/UserInterface.py" line="7108"/>
         <source>Trying host {0}</source>
         <translation>Tento su host {0}</translation>
     </message>
@@ -79948,7 +80553,7 @@
         <translation>Alt+Shift+B</translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="6353"/>
+        <location filename="../UI/UserInterface.py" line="6351"/>
         <source>Keyboard shortcut file (*.e4k)</source>
         <translation>File scorciatoi tastiera (*.e4k)</translation>
     </message>
@@ -79988,27 +80593,27 @@
         <translation>&lt;b&gt;Documentazione Python 2&lt;/b&gt;&lt;p&gt;Mostra la documentazione Python 2. Se non è configurata una directory per la documentazione, viene assunto che la posizione della documentazione sia nella directory doc nella locazione dell&apos;eseguibile Python 2 su Windows e &lt;i&gt;/usr/share/doc/packages/python/html&lt;/i&gt; su Unix. Imposta PYTHONDOCDIR2 nel tuo ambiente per sovrascrivere questi valori.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="7176"/>
+        <location filename="../UI/UserInterface.py" line="7174"/>
         <source>Error getting versions information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="7169"/>
+        <location filename="../UI/UserInterface.py" line="7167"/>
         <source>The versions information could not be downloaded. Please go online and try again.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="6121"/>
+        <location filename="../UI/UserInterface.py" line="6119"/>
         <source>Open Browser</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="6121"/>
+        <location filename="../UI/UserInterface.py" line="6119"/>
         <source>Could not start a web browser</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="7176"/>
+        <location filename="../UI/UserInterface.py" line="7174"/>
         <source>The versions information could not be downloaded for the last 7 days. Please go online and try again.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -80099,7 +80704,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="7382"/>
+        <location filename="../UI/UserInterface.py" line="7380"/>
         <source>Select Workspace Directory</source>
         <translation type="unfinished">Seleziona cartella di lavoro</translation>
     </message>
@@ -80474,7 +81079,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="7101"/>
+        <location filename="../UI/UserInterface.py" line="7099"/>
         <source>%v/%m</source>
         <translation type="unfinished"></translation>
     </message>
@@ -80494,7 +81099,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="7105"/>
+        <location filename="../UI/UserInterface.py" line="7103"/>
         <source>Version Check</source>
         <translation type="unfinished"></translation>
     </message>
@@ -80569,22 +81174,22 @@
         <translation type="unfinished">Le Qt v.3 non sono supportate da eric6.</translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="7268"/>
+        <location filename="../UI/UserInterface.py" line="7266"/>
         <source>The update to &lt;b&gt;{0}&lt;/b&gt; of eric6 is available at &lt;b&gt;{1}&lt;/b&gt;. Would you like to get it?</source>
         <translation type="unfinished">L&apos;update alla versione &lt;b&gt;{0}&lt;/b&gt; di eric6 è disponibile presso &lt;b&gt;{1}&lt;/b&gt;. Vuoi prenderlo?</translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="7280"/>
+        <location filename="../UI/UserInterface.py" line="7278"/>
         <source>Eric6 is up to date</source>
         <translation type="unfinished">Eric6 è aggiornato</translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="7280"/>
+        <location filename="../UI/UserInterface.py" line="7278"/>
         <source>You are using the latest version of eric6</source>
         <translation type="unfinished">Stai usando l&apos;ultima versione di eric6</translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="7363"/>
+        <location filename="../UI/UserInterface.py" line="7361"/>
         <source>eric6 has not been configured yet. The configuration dialog will be started.</source>
         <translation type="unfinished">eric6 non è ancora stato configurato. Il dialogo di configurazione verrà avviato.</translation>
     </message>
@@ -80604,7 +81209,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="7121"/>
+        <location filename="../UI/UserInterface.py" line="7119"/>
         <source>The versions information cannot not be downloaded because you are &lt;b&gt;offline&lt;/b&gt;. Please go online and try again.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -80649,7 +81254,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="6670"/>
+        <location filename="../UI/UserInterface.py" line="6668"/>
         <source>Load session</source>
         <translation type="unfinished">Carica sessione</translation>
     </message>
@@ -80664,17 +81269,17 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="6670"/>
+        <location filename="../UI/UserInterface.py" line="6668"/>
         <source>eric6 Session Files (*.e5s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="6721"/>
+        <location filename="../UI/UserInterface.py" line="6719"/>
         <source>Crash Session found!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="6721"/>
+        <location filename="../UI/UserInterface.py" line="6719"/>
         <source>A session file of a crashed session was found. Shall this session be restored?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -80689,17 +81294,17 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="7256"/>
+        <location filename="../UI/UserInterface.py" line="7254"/>
         <source>Update Check</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="7256"/>
+        <location filename="../UI/UserInterface.py" line="7254"/>
         <source>You installed eric directly from the source code. There is no possibility to check for the availability of an update.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="7246"/>
+        <location filename="../UI/UserInterface.py" line="7244"/>
         <source>You are using a snapshot release of eric6. A more up-to-date stable release might be available.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -81710,7 +82315,7 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="128"/>
         <source>Colours</source>
-        <translation>Colori</translation>
+        <translation type="obsolete">Colori</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="193"/>
@@ -81720,7 +82325,7 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="206"/>
         <source>Select the background colour for entries with VCS status &quot;modified&quot;.</source>
-        <translation>Seleziona il colore di sfondo per gli elementi del VCS in stato &quot;modificato&quot;.</translation>
+        <translation type="obsolete">Seleziona il colore di sfondo per gli elementi del VCS in stato &quot;modificato&quot;.</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="134"/>
@@ -81730,7 +82335,7 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="147"/>
         <source>Select the background colour for entries with VCS status &quot;added&quot;.</source>
-        <translation>Seleziona il colore di sfondo per gli elementi del VCS in stato &quot;aggiunto&quot;.</translation>
+        <translation type="obsolete">Seleziona il colore di sfondo per gli elementi del VCS in stato &quot;aggiunto&quot;.</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="239"/>
@@ -81740,7 +82345,7 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="252"/>
         <source>Select the background colour for entries with VCS status &quot;needs update&quot;.</source>
-        <translation>Seleziona il colore di sfondo per gli elementi del VCS in stato &quot;necessita aggiornament&quot;.</translation>
+        <translation type="obsolete">Seleziona il colore di sfondo per gli elementi del VCS in stato &quot;necessita aggiornament&quot;.</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="157"/>
@@ -81750,7 +82355,7 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="170"/>
         <source>Select the background colour for entries with VCS status &quot;conflict&quot;.</source>
-        <translation>Seleziona il colore di sfondo per gli elementi del VCS in stato &quot;conflitto&quot;.</translation>
+        <translation type="obsolete">Seleziona il colore di sfondo per gli elementi del VCS in stato &quot;conflitto&quot;.</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="216"/>
@@ -81760,7 +82365,7 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="229"/>
         <source>Select the background colour for entries with VCS status &quot;replaced&quot;.</source>
-        <translation>Seleziona il colore di sfondo per gli elementi del VCS in stato &quot;sostituito&quot;.</translation>
+        <translation type="obsolete">Seleziona il colore di sfondo per gli elementi del VCS in stato &quot;sostituito&quot;.</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="115"/>
@@ -81780,7 +82385,42 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="275"/>
         <source>Select the background colour for entries with VCS status &quot;removed&quot;.</source>
-        <translation>Seleziona il colore di sfondo per gli elementi del VCS in stato &quot;rimosso&quot;.</translation>
+        <translation type="obsolete">Seleziona il colore di sfondo per gli elementi del VCS in stato &quot;rimosso&quot;.</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="128"/>
+        <source>Colors</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="147"/>
+        <source>Select the background color for entries with VCS status &quot;added&quot;.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="170"/>
+        <source>Select the background color for entries with VCS status &quot;conflict&quot;.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="206"/>
+        <source>Select the background color for entries with VCS status &quot;modified&quot;.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="229"/>
+        <source>Select the background color for entries with VCS status &quot;replaced&quot;.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="252"/>
+        <source>Select the background color for entries with VCS status &quot;needs update&quot;.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="275"/>
+        <source>Select the background color for entries with VCS status &quot;removed&quot;.</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -86706,17 +87346,17 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="279"/>
         <source>Colours</source>
-        <translation type="unfinished">Colori</translation>
+        <translation type="obsolete">Colori</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="285"/>
         <source>Background colour of secure URLs:</source>
-        <translation type="unfinished">Colore di sfondo degli URS sicuri:</translation>
+        <translation type="obsolete">Colore di sfondo degli URS sicuri:</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="298"/>
         <source>Select the background colour for secure URLs.</source>
-        <translation type="unfinished">Seleziona lo sfondo per gli URL sicuri.</translation>
+        <translation type="obsolete">Seleziona lo sfondo per gli URL sicuri.</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="324"/>
@@ -86818,6 +87458,21 @@
         <source>Show Scrollbars</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="279"/>
+        <source>Colors</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="285"/>
+        <source>Background color of secure URLs:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="298"/>
+        <source>Select the background color for secure URLs.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>WebBrowserClearPrivateDataDialog</name>
@@ -87713,12 +88368,12 @@
         <translation type="unfinished"> s</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserPage.py" line="171"/>
+        <location filename="../WebBrowser/WebBrowserPage.py" line="172"/>
         <source>Suspicuous URL detected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserPage.py" line="171"/>
+        <location filename="../WebBrowser/WebBrowserPage.py" line="172"/>
         <source>&lt;p&gt;The URL &lt;b&gt;{0}&lt;/b&gt; was found in the Safe Browsing database.&lt;/p&gt;{1}</source>
         <translation type="unfinished"></translation>
     </message>
@@ -88003,112 +88658,112 @@
 <context>
     <name>WebBrowserTabWidget</name>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="124"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="122"/>
         <source>Show a navigation menu</source>
         <translation type="unfinished">Mostra un menù di navigazione</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="137"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="135"/>
         <source>Show a navigation menu for closed tabs</source>
         <translation type="unfinished">Mostra un menù di navigazione per le schede chiuse</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="151"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="149"/>
         <source>Open a new web browser tab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="165"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="163"/>
         <source>New Tab</source>
         <translation type="unfinished">Nuova scheda</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="169"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="167"/>
         <source>Move Left</source>
         <translation type="unfinished">Muovi a sinistra</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="172"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="170"/>
         <source>Move Right</source>
         <translation type="unfinished">Muovi a destra</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="176"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="174"/>
         <source>Duplicate Page</source>
         <translation type="unfinished">Duplica pagina</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="179"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="177"/>
         <source>Close</source>
         <translation type="unfinished">Chiudi</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="182"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="180"/>
         <source>Close Others</source>
         <translation type="unfinished">Chiudi altri</translation>
     </message>
     <message>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="211"/>
+        <source>Close All</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="186"/>
+        <source>Print Preview</source>
+        <translation type="unfinished">Anteprima Stampa</translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="189"/>
+        <source>Print</source>
+        <translation type="unfinished">Stampa</translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="192"/>
+        <source>Print as PDF</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../WebBrowser/WebBrowserTabWidget.py" line="213"/>
-        <source>Close All</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="188"/>
-        <source>Print Preview</source>
-        <translation type="unfinished">Anteprima Stampa</translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="191"/>
-        <source>Print</source>
-        <translation type="unfinished">Stampa</translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="194"/>
-        <source>Print as PDF</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="215"/>
         <source>Reload All</source>
         <translation type="unfinished">Ricarica tutto</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="218"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="216"/>
         <source>Bookmark All Tabs</source>
         <translation type="unfinished">Aggiungi ai segnalibri tutte le linguette</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="222"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="220"/>
         <source>Restore Closed Tab</source>
         <translation type="unfinished">Ricarica scheda chiusa</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="458"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="456"/>
         <source>...</source>
         <translation type="unfinished">...</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="898"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="892"/>
         <source>Loading...</source>
         <translation type="unfinished">Caricamento...</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="918"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="912"/>
         <source>Finished loading</source>
         <translation type="unfinished">Caricamento terminato</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="920"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="914"/>
         <source>Failed to load</source>
         <translation type="unfinished">Caricamento fallito</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="961"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="955"/>
         <source>Are you sure you want to close the window?</source>
         <translation type="unfinished">Sei sicuro di voler chiudere la finestra ?</translation>
     </message>
     <message numerus="yes">
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="961"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="955"/>
         <source>Are you sure you want to close the window?
 You have %n tab(s) open.</source>
         <translation type="unfinished">
@@ -88119,47 +88774,47 @@
         </translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="968"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="962"/>
         <source>&amp;Quit</source>
         <translation type="unfinished">&amp;Esci</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="971"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="965"/>
         <source>C&amp;lose Current Tab</source>
         <translation type="unfinished">C&amp;hiudi scheda corrente</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="1152"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="1146"/>
         <source>Restore All Closed Tabs</source>
         <translation type="unfinished">Ricarica tutte le schede chiuse</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="1154"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="1148"/>
         <source>Clear List</source>
         <translation type="unfinished">Pulisci lista</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="252"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="250"/>
         <source>Unmute Tab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="256"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="254"/>
         <source>Mute Tab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="755"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="753"/>
         <source>Print to PDF</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="705"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="703"/>
         <source>&lt;p&gt;The file &lt;b&gt;{0}&lt;/b&gt; exists already. Shall it be overwritten?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="755"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="753"/>
         <source>&lt;p&gt;The PDF could not be written to file &lt;b&gt;{0}&lt;/b&gt;.&lt;/p&gt;&lt;p&gt;&lt;b&gt;Error:&lt;/b&gt; {1}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
--- a/eric6/i18n/eric6_pt.ts	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/i18n/eric6_pt.ts	Sat May 02 13:51:07 2020 +0200
@@ -1231,12 +1231,12 @@
         <translation>&lt;&lt;Outros&gt;&gt;</translation>
     </message>
     <message>
-        <location filename="../Graphics/ApplicationDiagramBuilder.py" line="292"/>
+        <location filename="../Graphics/ApplicationDiagramBuilder.py" line="294"/>
         <source>Load Diagram</source>
         <translation>Carregar Diagrama</translation>
     </message>
     <message>
-        <location filename="../Graphics/ApplicationDiagramBuilder.py" line="292"/>
+        <location filename="../Graphics/ApplicationDiagramBuilder.py" line="294"/>
         <source>&lt;p&gt;The diagram belongs to the project &lt;b&gt;{0}&lt;/b&gt;. Shall this project be opened?&lt;/p&gt;</source>
         <translation>&lt;p&gt;O diagrama pertence ao projeto &lt;b&gt;{0}&lt;/b&gt;. Abrir este projeto?&lt;/p&gt;</translation>
     </message>
@@ -2407,32 +2407,32 @@
 <context>
     <name>BrowserModel</name>
     <message>
-        <location filename="../UI/BrowserModel.py" line="62"/>
+        <location filename="../UI/BrowserModel.py" line="63"/>
         <source>Name</source>
         <translation>Nome</translation>
     </message>
     <message>
-        <location filename="../UI/BrowserModel.py" line="654"/>
+        <location filename="../UI/BrowserModel.py" line="655"/>
         <source>Coding: {0}</source>
         <translation>Codificação: {0}</translation>
     </message>
     <message>
-        <location filename="../UI/BrowserModel.py" line="660"/>
+        <location filename="../UI/BrowserModel.py" line="661"/>
         <source>Globals</source>
         <translation>Globais</translation>
     </message>
     <message>
-        <location filename="../UI/BrowserModel.py" line="730"/>
+        <location filename="../UI/BrowserModel.py" line="731"/>
         <source>Attributes</source>
         <translation>Atributos</translation>
     </message>
     <message>
-        <location filename="../UI/BrowserModel.py" line="740"/>
+        <location filename="../UI/BrowserModel.py" line="741"/>
         <source>Class Attributes</source>
         <translation>Atributos da Classe</translation>
     </message>
     <message>
-        <location filename="../UI/BrowserModel.py" line="666"/>
+        <location filename="../UI/BrowserModel.py" line="667"/>
         <source>Imports</source>
         <translation>Importações</translation>
     </message>
@@ -3204,54 +3204,54 @@
 <context>
     <name>CodeDocumentationViewer</name>
     <message>
-        <location filename="../UI/CodeDocumentationViewer.py" line="175"/>
+        <location filename="../UI/CodeDocumentationViewer.py" line="211"/>
         <source>Code Info Provider:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/CodeDocumentationViewer.py" line="188"/>
+        <location filename="../UI/CodeDocumentationViewer.py" line="224"/>
         <source>Select the code info provider</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/CodeDocumentationViewer.py" line="190"/>
+        <location filename="../UI/CodeDocumentationViewer.py" line="226"/>
         <source>&lt;disabled&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/CodeDocumentationViewer.py" line="371"/>
+        <location filename="../UI/CodeDocumentationViewer.py" line="407"/>
         <source>No documentation available</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/CodeDocumentationViewer.py" line="392"/>
+        <location filename="../UI/CodeDocumentationViewer.py" line="428"/>
         <source>No source code documentation provider has been registered. This function has been disabled.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/CodeDocumentationViewer.py" line="397"/>
+        <location filename="../UI/CodeDocumentationViewer.py" line="433"/>
         <source>This function has been disabled.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/CodeDocumentationViewerTemplate.py" line="137"/>
+        <location filename="../UI/CodeDocumentationViewerTemplate.py" line="139"/>
         <source>No further documentation available</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/CodeDocumentationViewerTemplate.py" line="58"/>
+        <location filename="../UI/CodeDocumentationViewerTemplate.py" line="60"/>
         <source>&lt;p&gt;&lt;b&gt;Definition:&lt;/b&gt; &lt;span class=&quot;def&quot;&gt;@NAME@@ARGSPEC@&lt;/span&gt;&lt;/p&gt;</source>
         <comment>Just translate &apos;Definition:&apos; and leave the rest intact.</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/CodeDocumentationViewerTemplate.py" line="68"/>
+        <location filename="../UI/CodeDocumentationViewerTemplate.py" line="70"/>
         <source>&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; @NOTE@&lt;/p&gt;</source>
         <comment>Just translate &apos;Note:&apos; and leave the rest intact.</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/CodeDocumentationViewerTemplate.py" line="63"/>
+        <location filename="../UI/CodeDocumentationViewerTemplate.py" line="65"/>
         <source>&lt;p&gt;&lt;b&gt;Type:&lt;/b&gt; @TYPE@&lt;/p&gt;</source>
         <comment>Just translate &apos;Type:&apos; and leave the rest intact.</comment>
         <translation type="unfinished"></translation>
@@ -4341,7 +4341,7 @@
     <message>
         <location filename="../Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.ui" line="143"/>
         <source>Colour</source>
-        <translation>Cor</translation>
+        <translation type="obsolete">Cor</translation>
     </message>
     <message>
         <location filename="../Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.ui" line="42"/>
@@ -4366,7 +4366,7 @@
     <message>
         <location filename="../Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.ui" line="155"/>
         <source>Enter a variable name or a colour</source>
-        <translation>Introduzir o nome da variável ou uma cor</translation>
+        <translation type="obsolete">Introduzir o nome da variável ou uma cor</translation>
     </message>
     <message>
         <location filename="../Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.ui" line="167"/>
@@ -4526,7 +4526,7 @@
     <message>
         <location filename="../Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.py" line="72"/>
         <source>&lt;p&gt;The colour &lt;b&gt;{0}&lt;/b&gt; is not valid.&lt;/p&gt;</source>
-        <translation>&lt;p&gt;A cor &lt;b&gt;{0}&lt;/b&gt; não é válida.&lt;/p&gt;</translation>
+        <translation type="obsolete">&lt;p&gt;A cor &lt;b&gt;{0}&lt;/b&gt; não é válida.&lt;/p&gt;</translation>
     </message>
     <message>
         <location filename="../Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.ui" line="55"/>
@@ -4541,7 +4541,7 @@
     <message>
         <location filename="../Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.ui" line="292"/>
         <source>Colour Variable</source>
-        <translation>Variável de Cor</translation>
+        <translation type="obsolete">Variável de Cor</translation>
     </message>
     <message>
         <location filename="../Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.ui" line="87"/>
@@ -4583,6 +4583,26 @@
         <source>Enter the parent expression</source>
         <translation>Introduzir a expressão pai</translation>
     </message>
+    <message>
+        <location filename="../Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.ui" line="143"/>
+        <source>Color</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.ui" line="155"/>
+        <source>Enter a variable name or a color</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.ui" line="292"/>
+        <source>Color Variable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.py" line="72"/>
+        <source>&lt;p&gt;The color &lt;b&gt;{0}&lt;/b&gt; is not valid.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>CompareDialog</name>
@@ -6521,22 +6541,22 @@
         <translation>&lt;p&gt;Houve um erro ao carregar o form &lt;b&gt;{0}&lt;/b&gt;.&lt;/p&gt;&lt;p&gt;{1}&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/CreateDialogCodeDialog.py" line="577"/>
+        <location filename="../Project/CreateDialogCodeDialog.py" line="580"/>
         <source>Code Generation</source>
         <translation>Geração de Código</translation>
     </message>
     <message>
-        <location filename="../Project/CreateDialogCodeDialog.py" line="437"/>
+        <location filename="../Project/CreateDialogCodeDialog.py" line="440"/>
         <source>&lt;p&gt;Could not open the code template file &quot;{0}&quot;.&lt;/p&gt;&lt;p&gt;Reason: {1}&lt;/p&gt;</source>
         <translation>&lt;p&gt;Não se pode abrir o ficheiro modelo de código &quot;{0}&quot;&lt;/p&gt;&lt;p&gt;Motivo: {1}&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/CreateDialogCodeDialog.py" line="475"/>
+        <location filename="../Project/CreateDialogCodeDialog.py" line="478"/>
         <source>&lt;p&gt;Could not open the source file &quot;{0}&quot;.&lt;/p&gt;&lt;p&gt;Reason: {1}&lt;/p&gt;</source>
         <translation>&lt;p&gt;Não se pode abrir o ficheiro fonte &quot;{0}&quot;.&lt;/p&gt;&lt;p&gt;Motivo: {1}&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/CreateDialogCodeDialog.py" line="577"/>
+        <location filename="../Project/CreateDialogCodeDialog.py" line="580"/>
         <source>&lt;p&gt;Could not write the source file &quot;{0}&quot;.&lt;/p&gt;&lt;p&gt;Reason: {1}&lt;/p&gt;</source>
         <translation>&lt;p&gt;Não se pode escrever o ficheiro fonte &quot;{0}&quot;.&lt;/p&gt;&lt;p&gt;Motivo: {1}&lt;/p&gt;</translation>
     </message>
@@ -7755,21 +7775,6 @@
         <translation type="unfinished">Selecionar se o depurador deve executar-se remotamente</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="630"/>
-        <source>Background Colours</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="659"/>
-        <source>Select the background colour for changed items.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="695"/>
-        <source>Select the background colour for elements which are loaded for the first time.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="669"/>
         <source>Changed elements:</source>
         <translation type="unfinished"></translation>
@@ -7779,6 +7784,21 @@
         <source>First time opened elements:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="630"/>
+        <source>Background Colors</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="659"/>
+        <source>Select the background color for changed items.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="695"/>
+        <source>Select the background color for elements which are loaded for the first time.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DebuggerInterfacePython</name>
@@ -8264,110 +8284,110 @@
 <context>
     <name>DiffColoursPage</name>
     <message>
-        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="17"/>
-        <source>&lt;b&gt;Configure Diff colours&lt;/b&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="39"/>
-        <source>Select the background colour for header lines</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="42"/>
-        <source>Header Colour</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="52"/>
         <source>Header Line</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="65"/>
-        <source>Select the background colour for bad whitespace</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="68"/>
-        <source>Whitespace Colour</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="88"/>
-        <source>Select the text foreground colour</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="91"/>
-        <source>Text Colour</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="101"/>
         <source>Normal Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="114"/>
-        <source>Select the background colour for additions</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="117"/>
-        <source>Added Colour</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="127"/>
         <source>Added Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="140"/>
-        <source>Select the background colour for removed text</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="143"/>
-        <source>Removed Colour</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="153"/>
         <source>Removed Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="166"/>
-        <source>Select the background colour for replaced text</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="169"/>
-        <source>Replaced Colour</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="179"/>
         <source>Replaced Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="192"/>
-        <source>Select the background colour for context lines</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="195"/>
-        <source>Context Colour</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="205"/>
         <source>Context Line</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="17"/>
+        <source>&lt;b&gt;Configure Diff colors&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="39"/>
+        <source>Select the background color for header lines</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="42"/>
+        <source>Header Color</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="65"/>
+        <source>Select the background color for bad whitespace</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="68"/>
+        <source>Whitespace Color</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="88"/>
+        <source>Select the text foreground color</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="91"/>
+        <source>Text Color</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="114"/>
+        <source>Select the background color for additions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="117"/>
+        <source>Added Color</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="140"/>
+        <source>Select the background color for removed text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="143"/>
+        <source>Removed Color</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="166"/>
+        <source>Select the background color for replaced text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="169"/>
+        <source>Replaced Color</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="192"/>
+        <source>Select the background color for context lines</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="195"/>
+        <source>Context Color</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DiffDialog</name>
@@ -9608,7 +9628,7 @@
 <context>
     <name>E5GraphicsView</name>
     <message>
-        <location filename="../E5Graphics/E5GraphicsView.py" line="56"/>
+        <location filename="../E5Graphics/E5GraphicsView.py" line="58"/>
         <source>&lt;b&gt;Graphics View&lt;/b&gt;
 &lt;p&gt;This graphics view is used to show a diagram. 
 There are various actions available to manipulate the 
@@ -9640,7 +9660,7 @@
 </translation>
     </message>
     <message>
-        <location filename="../E5Graphics/E5GraphicsView.py" line="377"/>
+        <location filename="../E5Graphics/E5GraphicsView.py" line="416"/>
         <source>{0}, Page {1}</source>
         <translation>{0}, Página {1}</translation>
     </message>
@@ -11153,7 +11173,7 @@
 <context>
     <name>Editor</name>
     <message>
-        <location filename="../QScintilla/Editor.py" line="3106"/>
+        <location filename="../QScintilla/Editor.py" line="3107"/>
         <source>Open File</source>
         <translation>Abrir Ficheiro</translation>
     </message>
@@ -11243,7 +11263,7 @@
         <translation>Desselecionar tudo</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7834"/>
+        <location filename="../QScintilla/Editor.py" line="7847"/>
         <source>Check spelling...</source>
         <translation>Verificação ortográfica...</translation>
     </message>
@@ -11468,7 +11488,7 @@
         <translation>Editar ponto de interrupção...</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5607"/>
+        <location filename="../QScintilla/Editor.py" line="5615"/>
         <source>Enable breakpoint</source>
         <translation>Habilitar pontos de interrupção</translation>
     </message>
@@ -11573,332 +11593,332 @@
         <translation>Selecionar o analizador léxico Pygments a aplicar.</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="1955"/>
+        <location filename="../QScintilla/Editor.py" line="1956"/>
         <source>Modification of Read Only file</source>
         <translation>Modificação do ficheiro de Apenas Leitura</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="1955"/>
+        <location filename="../QScintilla/Editor.py" line="1956"/>
         <source>You are attempting to change a read only file. Please save to a different file first.</source>
         <translation>Tenta alterar um ficheiro de Apenas Leitura. Por favor guarde-o primeiro num ficheiro diferente. </translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="2663"/>
+        <location filename="../QScintilla/Editor.py" line="2664"/>
         <source>Printing...</source>
         <translation>A imprimir...</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="2680"/>
+        <location filename="../QScintilla/Editor.py" line="2681"/>
         <source>Printing completed</source>
         <translation>Impressão completa</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="2682"/>
+        <location filename="../QScintilla/Editor.py" line="2683"/>
         <source>Error while printing</source>
         <translation>Erro durante a impressão</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="2685"/>
+        <location filename="../QScintilla/Editor.py" line="2686"/>
         <source>Printing aborted</source>
         <translation>Impressão cancelada</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="3046"/>
+        <location filename="../QScintilla/Editor.py" line="3047"/>
         <source>File Modified</source>
         <translation>Ficheiro Modificado</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="3046"/>
+        <location filename="../QScintilla/Editor.py" line="3047"/>
         <source>&lt;p&gt;The file &lt;b&gt;{0}&lt;/b&gt; has unsaved changes.&lt;/p&gt;</source>
         <translation>&lt;p&gt;O ficheiro &lt;b&gt;{0}&lt;/b&gt; tem alterações por gravar.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="3106"/>
+        <location filename="../QScintilla/Editor.py" line="3107"/>
         <source>&lt;p&gt;The file &lt;b&gt;{0}&lt;/b&gt; could not be opened.&lt;/p&gt;&lt;p&gt;Reason: {1}&lt;/p&gt;</source>
         <translation>&lt;p&gt;Não se pôde abrir o ficheiro &lt;b&gt;{0}&lt;/b&gt;.&lt;/p&gt;&lt;p&gt; Motivo: {1}&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="3295"/>
+        <location filename="../QScintilla/Editor.py" line="3296"/>
         <source>Save File</source>
         <translation>Gravar Ficheiro</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="3232"/>
+        <location filename="../QScintilla/Editor.py" line="3233"/>
         <source>&lt;p&gt;The file &lt;b&gt;{0}&lt;/b&gt; could not be saved.&lt;br/&gt;Reason: {1}&lt;/p&gt;</source>
         <translation>&lt;p&gt;O ficheiro &lt;b&gt;{0}&lt;/b&gt; não se pôde gravar. &lt;br/&gt;Motivo: {1}&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="3295"/>
+        <location filename="../QScintilla/Editor.py" line="3296"/>
         <source>&lt;p&gt;The file &lt;b&gt;{0}&lt;/b&gt; already exists. Overwrite it?&lt;/p&gt;</source>
         <translation>&lt;p&gt;O ficheiro &lt;b&gt;{0}&lt;/b&gt; já existe. Sobreescrever?&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="4772"/>
+        <location filename="../QScintilla/Editor.py" line="4777"/>
         <source>Autocompletion</source>
         <translation>Autocompletar</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="4772"/>
+        <location filename="../QScintilla/Editor.py" line="4777"/>
         <source>Autocompletion is not available because there is no autocompletion source set.</source>
         <translation>Autocompletar não está disponivel porque a fonte de autocompletar não está definida.</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5610"/>
+        <location filename="../QScintilla/Editor.py" line="5618"/>
         <source>Disable breakpoint</source>
         <translation>Inabilitar ponto de interrupção</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5985"/>
+        <location filename="../QScintilla/Editor.py" line="5993"/>
         <source>Code Coverage</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5985"/>
+        <location filename="../QScintilla/Editor.py" line="5993"/>
         <source>Please select a coverage file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6048"/>
+        <location filename="../QScintilla/Editor.py" line="6056"/>
         <source>Show Code Coverage Annotations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6041"/>
+        <location filename="../QScintilla/Editor.py" line="6049"/>
         <source>All lines have been covered.</source>
         <translation>Foram cobertas as linhas todas.</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6048"/>
+        <location filename="../QScintilla/Editor.py" line="6056"/>
         <source>There is no coverage file available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6165"/>
+        <location filename="../QScintilla/Editor.py" line="6173"/>
         <source>Profile Data</source>
         <translation>Dados de Perfil</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6165"/>
+        <location filename="../QScintilla/Editor.py" line="6173"/>
         <source>Please select a profile file</source>
         <translation>Escolha um ficheiro de perfil por favor</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6327"/>
+        <location filename="../QScintilla/Editor.py" line="6335"/>
         <source>Syntax Error</source>
         <translation>Erro de Sintaxe</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6327"/>
+        <location filename="../QScintilla/Editor.py" line="6335"/>
         <source>No syntax error message available.</source>
         <translation>Não está disponível a mensagem de erro de sintaxe.</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6718"/>
+        <location filename="../QScintilla/Editor.py" line="6726"/>
         <source>Macro Name</source>
         <translation>Nome de Macro</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6718"/>
+        <location filename="../QScintilla/Editor.py" line="6726"/>
         <source>Select a macro name:</source>
         <translation>Selecionar um nome de macro:</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6746"/>
+        <location filename="../QScintilla/Editor.py" line="6754"/>
         <source>Load macro file</source>
         <translation>Carregar ficheiro macro</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6789"/>
+        <location filename="../QScintilla/Editor.py" line="6797"/>
         <source>Macro files (*.macro)</source>
         <translation>Ficheiros Macro (*.macro)</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6769"/>
+        <location filename="../QScintilla/Editor.py" line="6777"/>
         <source>Error loading macro</source>
         <translation>Erro ao carregar macro</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6760"/>
+        <location filename="../QScintilla/Editor.py" line="6768"/>
         <source>&lt;p&gt;The macro file &lt;b&gt;{0}&lt;/b&gt; could not be read.&lt;/p&gt;</source>
         <translation>&lt;p&gt;O ficheiro macro &lt;b&gt;{0}&lt;/b&gt; não se pode ler.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6769"/>
+        <location filename="../QScintilla/Editor.py" line="6777"/>
         <source>&lt;p&gt;The macro file &lt;b&gt;{0}&lt;/b&gt; is corrupt.&lt;/p&gt;</source>
         <translation>&lt;p&gt;O ficheiro macro &lt;b&gt;{0}&lt;/b&gt; está corrompido.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6789"/>
+        <location filename="../QScintilla/Editor.py" line="6797"/>
         <source>Save macro file</source>
         <translation>Gravar ficheiro macro</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6806"/>
+        <location filename="../QScintilla/Editor.py" line="6814"/>
         <source>Save macro</source>
         <translation>Gravar macro</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6806"/>
+        <location filename="../QScintilla/Editor.py" line="6814"/>
         <source>&lt;p&gt;The macro file &lt;b&gt;{0}&lt;/b&gt; already exists. Overwrite it?&lt;/p&gt;</source>
         <translation>&lt;p&gt;O ficheiro macro &lt;b&gt;{0}&lt;/b&gt; já existe. Sobreescrever-lo?&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6822"/>
+        <location filename="../QScintilla/Editor.py" line="6830"/>
         <source>Error saving macro</source>
         <translation>Erro ao gravar macro</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6822"/>
+        <location filename="../QScintilla/Editor.py" line="6830"/>
         <source>&lt;p&gt;The macro file &lt;b&gt;{0}&lt;/b&gt; could not be written.&lt;/p&gt;</source>
         <translation>&lt;p&gt;O ficheiro macro &lt;b&gt;{0}&lt;/b&gt; não pode ser escrito.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6835"/>
+        <location filename="../QScintilla/Editor.py" line="6843"/>
         <source>Start Macro Recording</source>
         <translation>Iniciar Registo de Macro</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6835"/>
+        <location filename="../QScintilla/Editor.py" line="6843"/>
         <source>Macro recording is already active. Start new?</source>
         <translation>A gravação de macro já está ativada. Começar nova?</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6861"/>
+        <location filename="../QScintilla/Editor.py" line="6869"/>
         <source>Macro Recording</source>
         <translation>Gravação de Macro</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6861"/>
+        <location filename="../QScintilla/Editor.py" line="6869"/>
         <source>Enter name of the macro:</source>
         <translation>Introduza o nome de macro:</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7001"/>
+        <location filename="../QScintilla/Editor.py" line="7009"/>
         <source>File changed</source>
         <translation>Ficheiro alterado</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7166"/>
+        <location filename="../QScintilla/Editor.py" line="7179"/>
         <source>{0} (ro)</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7307"/>
+        <location filename="../QScintilla/Editor.py" line="7320"/>
         <source>Drop Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7307"/>
+        <location filename="../QScintilla/Editor.py" line="7320"/>
         <source>&lt;p&gt;&lt;b&gt;{0}&lt;/b&gt; is not a file.&lt;/p&gt;</source>
         <translation>&lt;p&gt;&lt;b&gt;{0}&lt;/b&gt; não é um ficheiro.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7328"/>
-        <source>Resources</source>
-        <translation>Recursos</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="7330"/>
-        <source>Add file...</source>
-        <translation>Adicionar Ficheiro...</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="7332"/>
-        <source>Add files...</source>
-        <translation>Adicionar Ficheiros...</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="7334"/>
-        <source>Add aliased file...</source>
-        <translation>Adicionar ficheiro com pseudónimo...</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="7337"/>
-        <source>Add localized resource...</source>
-        <translation>Adicionar recursos localizado...</translation>
-    </message>
-    <message>
         <location filename="../QScintilla/Editor.py" line="7341"/>
+        <source>Resources</source>
+        <translation>Recursos</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="7343"/>
+        <source>Add file...</source>
+        <translation>Adicionar Ficheiro...</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="7345"/>
+        <source>Add files...</source>
+        <translation>Adicionar Ficheiros...</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="7347"/>
+        <source>Add aliased file...</source>
+        <translation>Adicionar ficheiro com pseudónimo...</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="7350"/>
+        <source>Add localized resource...</source>
+        <translation>Adicionar recursos localizado...</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="7354"/>
         <source>Add resource frame</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7360"/>
+        <location filename="../QScintilla/Editor.py" line="7373"/>
         <source>Add file resource</source>
         <translation>Adicionar recurso de ficheiro</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7376"/>
+        <location filename="../QScintilla/Editor.py" line="7389"/>
         <source>Add file resources</source>
         <translation>Adicionar recursos de ficheiro</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7403"/>
+        <location filename="../QScintilla/Editor.py" line="7416"/>
         <source>Add aliased file resource</source>
         <translation>Adicionar recurso de ficheiro com pseudónimo</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7403"/>
+        <location filename="../QScintilla/Editor.py" line="7416"/>
         <source>Alias for file &lt;b&gt;{0}&lt;/b&gt;:</source>
         <translation>Pseudónimo para o ficheiro &lt;b&gt;{0}&lt;/b&gt;:</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7469"/>
+        <location filename="../QScintilla/Editor.py" line="7482"/>
         <source>Package Diagram</source>
         <translation>Diagrama do Pacote</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7469"/>
+        <location filename="../QScintilla/Editor.py" line="7482"/>
         <source>Include class attributes?</source>
         <translation>Incluir atributos de classes?</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7491"/>
+        <location filename="../QScintilla/Editor.py" line="7504"/>
         <source>Imports Diagram</source>
         <translation>Diagrama de Imports</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7491"/>
+        <location filename="../QScintilla/Editor.py" line="7504"/>
         <source>Include imports from external modules?</source>
         <translation>Incluir imports de módulos externos?</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7505"/>
+        <location filename="../QScintilla/Editor.py" line="7518"/>
         <source>Application Diagram</source>
         <translation>Diagrama da Aplicação</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7505"/>
+        <location filename="../QScintilla/Editor.py" line="7518"/>
         <source>Include module names?</source>
         <translation>Incluir nome dos módulos?</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7837"/>
+        <location filename="../QScintilla/Editor.py" line="7850"/>
         <source>Add to dictionary</source>
         <translation>Adicionar dicionário</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7839"/>
+        <location filename="../QScintilla/Editor.py" line="7852"/>
         <source>Ignore All</source>
         <translation>Ignorar Tudo</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6606"/>
+        <location filename="../QScintilla/Editor.py" line="6614"/>
         <source>Warning: {0}</source>
         <translation>Aviso: {0}</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6613"/>
+        <location filename="../QScintilla/Editor.py" line="6621"/>
         <source>Error: {0}</source>
         <translation>Erro: {0}</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6997"/>
+        <location filename="../QScintilla/Editor.py" line="7005"/>
         <source>&lt;br&gt;&lt;b&gt;Warning:&lt;/b&gt; You will lose your changes upon reopening it.</source>
         <translation>&lt;br&gt;&lt;b&gt;Aviso:&lt;/b&gt; Perderá todas as alterações uma vez que o volte a abrir.</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5177"/>
+        <location filename="../QScintilla/Editor.py" line="5185"/>
         <source>Call-Tips Provider</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11923,27 +11943,27 @@
         <translation>Alteração anterior</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="8255"/>
+        <location filename="../QScintilla/Editor.py" line="8268"/>
         <source>Sort Lines</source>
         <translation>Ordenar Linhas</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="8255"/>
+        <location filename="../QScintilla/Editor.py" line="8268"/>
         <source>The selection contains illegal data for a numerical sort.</source>
         <translation>A seleção contém dados ilegais para uma ordenação numérica.</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6541"/>
+        <location filename="../QScintilla/Editor.py" line="6549"/>
         <source>Warning</source>
         <translation>Aviso</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6541"/>
+        <location filename="../QScintilla/Editor.py" line="6549"/>
         <source>No warning messages available.</source>
         <translation>Não estão disponíveis mensagens de aviso.</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6603"/>
+        <location filename="../QScintilla/Editor.py" line="6611"/>
         <source>Style: {0}</source>
         <translation>Estilo: {0}</translation>
     </message>
@@ -11968,7 +11988,7 @@
         <translation>Reabrir Com Codificação</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6991"/>
+        <location filename="../QScintilla/Editor.py" line="6999"/>
         <source>&lt;p&gt;The file &lt;b&gt;{0}&lt;/b&gt; has been changed while it was opened in eric6. Reread it?&lt;/p&gt;</source>
         <translation>&lt;p&gt;O ficheiro &lt;b&gt;{0}&lt;/b&gt; foi alterado enquanto estava aberto em eric6. Recarregar?&lt;/p&gt;</translation>
     </message>
@@ -11983,27 +12003,27 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="4902"/>
+        <location filename="../QScintilla/Editor.py" line="4907"/>
         <source>Auto-Completion Provider</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="4902"/>
+        <location filename="../QScintilla/Editor.py" line="4907"/>
         <source>The completion list provider &apos;{0}&apos; was already registered. Ignoring duplicate request.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5177"/>
+        <location filename="../QScintilla/Editor.py" line="5185"/>
         <source>The call-tips provider &apos;{0}&apos; was already registered. Ignoring duplicate request.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="8344"/>
+        <location filename="../QScintilla/Editor.py" line="8357"/>
         <source>Register Mouse Click Handler</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="8344"/>
+        <location filename="../QScintilla/Editor.py" line="8357"/>
         <source>A mouse click handler for &quot;{0}&quot; was already registered by &quot;{1}&quot;. Aborting request by &quot;{2}&quot;...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12033,12 +12053,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="8465"/>
+        <location filename="../QScintilla/Editor.py" line="8478"/>
         <source>EditorConfig Properties</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="8465"/>
+        <location filename="../QScintilla/Editor.py" line="8478"/>
         <source>&lt;p&gt;The EditorConfig properties for file &lt;b&gt;{0}&lt;/b&gt; could not be loaded.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12575,35 +12595,35 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="122"/>
         <source>Colours</source>
-        <translation>Cores</translation>
+        <translation type="obsolete">Cores</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="128"/>
         <source>Background colour:</source>
-        <translation>Cor de fundo:</translation>
+        <translation type="obsolete">Cor de fundo:</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="141"/>
         <source>Select the background colour for calltips.</source>
-        <translation>Selecionar a cor de fundo para as dicas.</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="167"/>
+        <translation type="obsolete">Selecionar a cor de fundo para as dicas.</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="213"/>
         <source>Plug-In Behavior</source>
         <translation>Comportamento do Complemento</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="173"/>
+        <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="219"/>
         <source>Select to show QScintilla provided calltips, if the selected plug-ins fail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="176"/>
+        <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="222"/>
         <source>Qscintilla provided calltips are shown, if this option is enabled and calltips shall be provided by plug-ins (see calltips sub-page of the plug-in) and the plugin-ins don&apos;t deliver any calltips.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="179"/>
+        <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="225"/>
         <source>Show QScintilla calltips, if plug-ins fail</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12632,6 +12652,41 @@
         <source>Above Text</source>
         <translation>Em Cima do Texto</translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="122"/>
+        <source>Colors</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="128"/>
+        <source>Background color:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="141"/>
+        <source>Select the background color for calltips.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="164"/>
+        <source>Foreground color:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="177"/>
+        <source>Select the foreground color for calltips.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="187"/>
+        <source>Highlight color:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="200"/>
+        <source>Select the highlight color for calltips.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>EditorCalltipsQScintillaPage</name>
@@ -13569,22 +13624,22 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="174"/>
         <source>Select the foreground colour.</source>
-        <translation>Selecionar a cor das letras.</translation>
+        <translation type="obsolete">Selecionar a cor das letras.</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="177"/>
         <source>Foreground Colour</source>
-        <translation>Cor das Letras</translation>
+        <translation type="obsolete">Cor das Letras</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="184"/>
         <source>Select the background colour.</source>
-        <translation>Selecionar a cor do fundo.</translation>
+        <translation type="obsolete">Selecionar a cor do fundo.</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="187"/>
         <source>Background Colour</source>
-        <translation>Cor do Fundo</translation>
+        <translation type="obsolete">Cor do Fundo</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="194"/>
@@ -13614,12 +13669,12 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="273"/>
         <source>Select the background colour for all styles</source>
-        <translation>Selecionar a cor de fundo para todos os estilos</translation>
+        <translation type="obsolete">Selecionar a cor de fundo para todos os estilos</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="276"/>
         <source>All Background Colours</source>
-        <translation>Cores para Todos os Fundos</translation>
+        <translation type="obsolete">Cores para Todos os Fundos</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="283"/>
@@ -13831,6 +13886,36 @@
         <source>Press to set all sub-styles to default values</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="174"/>
+        <source>Select the foreground color.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="177"/>
+        <source>Foreground Color</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="184"/>
+        <source>Select the background color.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="187"/>
+        <source>Background Color</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="273"/>
+        <source>Select the background color for all styles</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="276"/>
+        <source>All Background Colors</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>EditorKeywordsPage</name>
@@ -14667,12 +14752,12 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorSearchPage.ui" line="127"/>
         <source>Marker Colour:</source>
-        <translation>Cor de Marcador:</translation>
+        <translation type="obsolete">Cor de Marcador:</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorSearchPage.ui" line="140"/>
         <source>Select the colour for the search markers.</source>
-        <translation>Selecionar cor de marcadores de pesquisa.</translation>
+        <translation type="obsolete">Selecionar cor de marcadores de pesquisa.</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorSearchPage.ui" line="168"/>
@@ -14699,6 +14784,16 @@
         <source>QScintilla Extended  Mode (C++11)</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorSearchPage.ui" line="127"/>
+        <source>Marker Color:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorSearchPage.ui" line="140"/>
+        <source>Select the color for the search markers.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>EditorSpellCheckingPage</name>
@@ -14770,17 +14865,17 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorSpellCheckingPage.ui" line="215"/>
         <source>Colours</source>
-        <translation>Cores</translation>
+        <translation type="obsolete">Cores</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorSpellCheckingPage.ui" line="221"/>
         <source>Marker Colour:</source>
-        <translation>Cor de Marcador:</translation>
+        <translation type="obsolete">Cor de Marcador:</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorSpellCheckingPage.ui" line="234"/>
         <source>Select the colour for the spelling markers.</source>
-        <translation>Selecionar cor de marcadores de verificação ortográfica.</translation>
+        <translation type="obsolete">Selecionar cor de marcadores de verificação ortográfica.</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorSpellCheckingPage.ui" line="260"/>
@@ -14863,6 +14958,21 @@
 &lt;p&gt;Enter the file extension of pure text files. The complete contents of files with these extensions will be checked.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorSpellCheckingPage.ui" line="215"/>
+        <source>Colors</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorSpellCheckingPage.ui" line="221"/>
+        <source>Marker Color:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorSpellCheckingPage.ui" line="234"/>
+        <source>Select the color for the spelling markers.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>EditorStylesPage</name>
@@ -15019,7 +15129,7 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="351"/>
         <source>Select the foreground colour for the margins</source>
-        <translation>Selecionar a cor dos caracteres nas margens</translation>
+        <translation type="obsolete">Selecionar a cor dos caracteres nas margens</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="361"/>
@@ -15029,7 +15139,7 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="374"/>
         <source>Select the background colour for the margins</source>
-        <translation>Selecionar a cor de fundo nas margens</translation>
+        <translation type="obsolete">Selecionar a cor de fundo nas margens</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="384"/>
@@ -15039,7 +15149,7 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="397"/>
         <source>Select the background colour for the foldmargin</source>
-        <translation>Selecionar a cor de fundo da margem de dobrado</translation>
+        <translation type="obsolete">Selecionar a cor de fundo da margem de dobrado</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="407"/>
@@ -15049,7 +15159,7 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="420"/>
         <source>Select the foreground colour of the foldmarkers</source>
-        <translation>Selecionar a cor dos marcadores de dobrado</translation>
+        <translation type="obsolete">Selecionar a cor dos marcadores de dobrado</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="430"/>
@@ -15059,7 +15169,7 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="443"/>
         <source>Select the background colour of the foldmarkers</source>
-        <translation>Selecionar cor de fundo de marcadores de dobrado</translation>
+        <translation type="obsolete">Selecionar cor de fundo de marcadores de dobrado</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="457"/>
@@ -15084,27 +15194,27 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="515"/>
         <source>Select to use custom selection colours</source>
-        <translation>Selecionar para usar cores de seleção personalizadas</translation>
+        <translation type="obsolete">Selecionar para usar cores de seleção personalizadas</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="518"/>
         <source>&lt;b&gt;Use custom selection colours&lt;/b&gt;&lt;p&gt;Select this entry in order to use custom selection colours in the editor and shell windows. The colours for the selection foreground and background are defined on the colours page.&lt;/p&gt;</source>
-        <translation>&lt;b&gt;Usar cores de seleção personalizadas&lt;/b&gt;&lt;p&gt;Selecionar para usar para usar cores personalisadas no editor e nas janelas da linha de comandos. As cores de texto e fundo podem ser definidas na página de cores.&lt;/p&gt;</translation>
+        <translation type="obsolete">&lt;b&gt;Usar cores de seleção personalizadas&lt;/b&gt;&lt;p&gt;Selecionar para usar para usar cores personalisadas no editor e nas janelas da linha de comandos. As cores de texto e fundo podem ser definidas na página de cores.&lt;/p&gt;</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="521"/>
         <source>Use custom selection colours</source>
-        <translation>Usar cores de seleção personalizadas</translation>
+        <translation type="obsolete">Usar cores de seleção personalizadas</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="528"/>
         <source>Select, if selected text should be colourized by the lexer.</source>
-        <translation>Selecionar para o analisador léxico colorir o texto selecionado.</translation>
+        <translation type="obsolete">Selecionar para o analisador léxico colorir o texto selecionado.</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="531"/>
         <source>Colourize selected text</source>
-        <translation>Colorir texto selecionado</translation>
+        <translation type="obsolete">Colorir texto selecionado</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="538"/>
@@ -15124,7 +15234,7 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="565"/>
         <source>Select the foreground colour for the selection.</source>
-        <translation>Selecionar a cor do texto selecionado.</translation>
+        <translation type="obsolete">Selecionar a cor do texto selecionado.</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="575"/>
@@ -15134,7 +15244,7 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="588"/>
         <source>Select the background colour for the selection.</source>
-        <translation>Selecionar a cor de fundo da seleção.</translation>
+        <translation type="obsolete">Selecionar a cor de fundo da seleção.</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="609"/>
@@ -15159,7 +15269,7 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="648"/>
         <source>Select the colour for the caret.</source>
-        <translation>Selecionar a cor da tabulação.</translation>
+        <translation type="obsolete">Selecionar a cor da tabulação.</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="672"/>
@@ -15167,11 +15277,6 @@
         <translation type="obsolete">Fundo de Tabulação:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="761"/>
-        <source>Select the background colour for the line containing the caret.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="792"/>
         <source>Debugging Line Markers</source>
         <translation type="unfinished">Marcadores de Linha de Depurador</translation>
@@ -15184,7 +15289,7 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="821"/>
         <source>Select the colour for the current line marker.</source>
-        <translation type="unfinished">Selecionar a cor do marcador de linha atual.</translation>
+        <translation type="obsolete">Selecionar a cor do marcador de linha atual.</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="831"/>
@@ -15194,7 +15299,7 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="844"/>
         <source>Select the colour for the error line marker.</source>
-        <translation type="unfinished">Selecione a cor do marcador de linha de erro.</translation>
+        <translation type="obsolete">Selecione a cor do marcador de linha de erro.</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="857"/>
@@ -15219,7 +15324,7 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="886"/>
         <source>Select the colour for highlighting matching braces.</source>
-        <translation>Selecionar cor de realçado de parentesis pares.</translation>
+        <translation type="obsolete">Selecionar cor de realçado de parentesis pares.</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="896"/>
@@ -15227,31 +15332,16 @@
         <translation>Fundo de parentesis par:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="909"/>
-        <source>Select the background colour for highlighting matching braces.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="925"/>
         <source>Unmatched brace:</source>
         <translation>Parentesis sem par:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="932"/>
-        <source>Select the colour for  highlighting nonmatching braces.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="948"/>
         <source>Unmatched brace background:</source>
         <translation>Fundo de parentesis sem par:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="955"/>
-        <source>Select the background colour for  highlighting nonmatching braces.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="968"/>
         <source>End of Line</source>
         <translation>Fim de Linha</translation>
@@ -15277,14 +15367,9 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1124"/>
-        <source>Select the colour for the edge marker.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1134"/>
         <source>Background colour:</source>
-        <translation>Cor de fundo:</translation>
+        <translation type="obsolete">Cor de fundo:</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1147"/>
@@ -15319,7 +15404,7 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1222"/>
         <source>Change Background Colour</source>
-        <translation>Mudar Cor de Fundo</translation>
+        <translation type="obsolete">Mudar Cor de Fundo</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1236"/>
@@ -15394,7 +15479,7 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1402"/>
         <source>Press to select the foreground colour</source>
-        <translation>Pressionar para selecionar a cor do texto</translation>
+        <translation type="obsolete">Pressionar para selecionar a cor do texto</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1405"/>
@@ -15404,7 +15489,7 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1412"/>
         <source>Press to select the background colour</source>
-        <translation>Pressionar para selecionar a cor de fundo</translation>
+        <translation type="obsolete">Pressionar para selecionar a cor de fundo</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1415"/>
@@ -15437,29 +15522,14 @@
         <translation>Cor de Espaços:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1636"/>
-        <source>Select the foreground colour for visible whitespace</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1646"/>
         <source>Whitespace background:</source>
         <translation>Fundo de Espaços:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1659"/>
-        <source>Select the background colour for visible whitespace</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="53"/>
-        <source>Select to set the colour of the edit area different to the default style</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="56"/>
         <source>Override edit area colours</source>
-        <translation>Ignorar cores da área de edição</translation>
+        <translation type="obsolete">Ignorar cores da área de edição</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="68"/>
@@ -15467,24 +15537,14 @@
         <translation>Cor de texto na área de edição:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="81"/>
-        <source>Select the foreground colour for the edit area.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="91"/>
         <source>Edit area background:</source>
         <translation>Fundo de área de edição:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="104"/>
-        <source>Select the background colour for the edit area.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="47"/>
         <source>Colours</source>
-        <translation>Cores</translation>
+        <translation type="obsolete">Cores</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1444"/>
@@ -15519,22 +15579,12 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1514"/>
         <source>Unsaved changes colour:</source>
-        <translation>Cor de alterações por gravar:</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1527"/>
-        <source>Select the colour for the change marker for unsaved changes.</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Cor de alterações por gravar:</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1537"/>
         <source>Saved changes colour:</source>
-        <translation>Cor de alterações gravadas:</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1550"/>
-        <source>Select the colour for the change marker for saved changes.</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Cor de alterações gravadas:</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1003"/>
@@ -15622,11 +15672,6 @@
         <translation>Erros:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1782"/>
-        <source>Select the colour for error markers</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1792"/>
         <source>Warnings:</source>
         <translation>Avisos:</translation>
@@ -15634,7 +15679,7 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1805"/>
         <source>Select the colour for warning markers</source>
-        <translation>Selecionar cor de marcadores de aviso</translation>
+        <translation type="obsolete">Selecionar cor de marcadores de aviso</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1815"/>
@@ -15642,71 +15687,36 @@
         <translation>Marcadores:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1828"/>
-        <source>Select the colour for bookmark markers</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1838"/>
         <source>Breakpoints:</source>
         <translation>Pontos de Interrupção:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1851"/>
-        <source>Select the colour for breakpoint markers</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1861"/>
         <source>Tasks:</source>
         <translation>Tarefas:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1874"/>
-        <source>Select the colour for task markers</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1884"/>
         <source>Changes:</source>
         <translation>Alterações:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1897"/>
-        <source>Select the colour for change markers</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1907"/>
         <source>Coverage:</source>
         <translation>Cobertura:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1920"/>
-        <source>Select the colour for coverage markers</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1930"/>
         <source>Current Line:</source>
         <translation>Linha atual:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1943"/>
-        <source>Select the colour for the current line marker</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1999"/>
         <source>Background:</source>
         <translation>Fundo:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="2012"/>
-        <source>Select the background colour for the marker map</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1674"/>
         <source>Indentation Guides</source>
         <translation type="unfinished"></translation>
@@ -15727,31 +15737,16 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1705"/>
-        <source>Select the foreground colour for indentation guides</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1715"/>
         <source>Indentation Guides background:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1728"/>
-        <source>Select the background colour for indentation guides</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1953"/>
         <source>Search Markers:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1966"/>
-        <source>Select the colour for the search marker</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="2093"/>
         <source>Select to hide the Format Buttons bar when formatting is not supported</source>
         <translation type="unfinished"></translation>
@@ -15762,26 +15757,11 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="798"/>
-        <source>Select to indicate the debug markers using coloured line backgrounds, arrow indicators otherwise</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="801"/>
-        <source>Use background colours</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1976"/>
         <source>Conflict Marker Line:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1989"/>
-        <source>Select the colour for the conflict marker line marker</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1749"/>
         <source>Select to show the marker map right of the editor</source>
         <translation type="unfinished"></translation>
@@ -15928,8 +15908,263 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="47"/>
+        <source>Colors</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="53"/>
+        <source>Select to set the color of the edit area different to the default style</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="56"/>
+        <source>Override edit area colors</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="81"/>
+        <source>Select the foreground color for the edit area.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="104"/>
+        <source>Select the background color for the edit area.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="648"/>
+        <source>Select the color for the caret.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="351"/>
+        <source>Select the foreground color for the margins</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="374"/>
+        <source>Select the background color for the margins</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="397"/>
+        <source>Select the background color for the foldmargin</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="420"/>
+        <source>Select the foreground color of the foldmarkers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="443"/>
+        <source>Select the background color of the foldmarkers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="515"/>
+        <source>Select to use custom selection colors</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="518"/>
+        <source>&lt;b&gt;Use custom selection colors&lt;/b&gt;&lt;p&gt;Select this entry in order to use custom selection colors in the editor and shell windows. The colors for the selection foreground and background are defined on the colors page.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="521"/>
+        <source>Use custom selection colors</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="528"/>
+        <source>Select, if selected text should be colorized by the lexer.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="531"/>
+        <source>Colorize selected text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="565"/>
+        <source>Select the foreground color for the selection.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="588"/>
+        <source>Select the background color for the selection.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="761"/>
+        <source>Select the background color for the line containing the caret.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="798"/>
+        <source>Select to indicate the debug markers using colored line backgrounds, arrow indicators otherwise</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="801"/>
+        <source>Use background colors</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="821"/>
+        <source>Select the color for the current line marker.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="844"/>
+        <source>Select the color for the error line marker.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="886"/>
+        <source>Select the color for highlighting matching braces.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="909"/>
+        <source>Select the background color for highlighting matching braces.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="932"/>
+        <source>Select the color for  highlighting nonmatching braces.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="955"/>
+        <source>Select the background color for  highlighting nonmatching braces.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1124"/>
+        <source>Select the color for the edge marker.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1134"/>
+        <source>Background color:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1222"/>
+        <source>Change Background Color</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1402"/>
+        <source>Press to select the foreground color</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1412"/>
+        <source>Press to select the background color</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1514"/>
+        <source>Unsaved changes color:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1527"/>
+        <source>Select the color for the change marker for unsaved changes.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1537"/>
+        <source>Saved changes color:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1550"/>
+        <source>Select the color for the change marker for saved changes.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1636"/>
+        <source>Select the foreground color for visible whitespace</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1659"/>
+        <source>Select the background color for visible whitespace</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1705"/>
+        <source>Select the foreground color for indentation guides</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1728"/>
+        <source>Select the background color for indentation guides</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1763"/>
-        <source>Marker Colours</source>
+        <source>Marker Colors</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1782"/>
+        <source>Select the color for error markers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1805"/>
+        <source>Select the color for warning markers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1828"/>
+        <source>Select the color for bookmark markers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1851"/>
+        <source>Select the color for breakpoint markers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1874"/>
+        <source>Select the color for task markers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1897"/>
+        <source>Select the color for change markers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1920"/>
+        <source>Select the color for coverage markers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1943"/>
+        <source>Select the color for the current line marker</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1966"/>
+        <source>Select the color for the search marker</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1989"/>
+        <source>Select the color for the conflict marker line marker</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="2012"/>
+        <source>Select the background color for the marker map</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -17117,17 +17352,17 @@
     <message>
         <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="252"/>
         <source>Enter the filename of a CSS style sheet. Leave empty to use the colours defined below.</source>
-        <translation>Introduzir o nome do ficheiro da folha de estilo CSS. Deixe vazio para usar as cores definidas abaixo.</translation>
+        <translation type="obsolete">Introduzir o nome do ficheiro da folha de estilo CSS. Deixe vazio para usar as cores definidas abaixo.</translation>
     </message>
     <message>
         <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="262"/>
         <source>Colours</source>
-        <translation>Cores</translation>
+        <translation type="obsolete">Cores</translation>
     </message>
     <message>
         <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="268"/>
         <source>Press to select the class and function header background colour.</source>
-        <translation>Pressionar para selecionar a cor de fundo de cabeçalhos de classes ou funções.</translation>
+        <translation type="obsolete">Pressionar para selecionar a cor de fundo de cabeçalhos de classes ou funções.</translation>
     </message>
     <message>
         <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="271"/>
@@ -17137,7 +17372,7 @@
     <message>
         <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="278"/>
         <source>Press to select the class and function header foreground colour.</source>
-        <translation>Pressionar para selecionar a cor de texto dos cabeçalhos de classes ou funções.</translation>
+        <translation type="obsolete">Pressionar para selecionar a cor de texto dos cabeçalhos de classes ou funções.</translation>
     </message>
     <message>
         <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="281"/>
@@ -17147,7 +17382,7 @@
     <message>
         <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="288"/>
         <source>Press to select the level 2 header background colour.</source>
-        <translation>Pressionar para selecionar a cor de fundo de texto dos títulos de nível 2.</translation>
+        <translation type="obsolete">Pressionar para selecionar a cor de fundo de texto dos títulos de nível 2.</translation>
     </message>
     <message>
         <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="291"/>
@@ -17157,7 +17392,7 @@
     <message>
         <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="298"/>
         <source>Press to select the level 2 header foreground colour.</source>
-        <translation>Pressionar para selecionar a cor de texto dos títulos de nível 2.</translation>
+        <translation type="obsolete">Pressionar para selecionar a cor de texto dos títulos de nível 2.</translation>
     </message>
     <message>
         <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="301"/>
@@ -17167,7 +17402,7 @@
     <message>
         <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="308"/>
         <source>Press to select the level 1 header background colour.</source>
-        <translation>Pressionar para selecionar a cor de fundo de texto dos títulos de nível 1.</translation>
+        <translation type="obsolete">Pressionar para selecionar a cor de fundo de texto dos títulos de nível 1.</translation>
     </message>
     <message>
         <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="311"/>
@@ -17177,7 +17412,7 @@
     <message>
         <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="318"/>
         <source>Press to select the level 1 header foreground colour.</source>
-        <translation>Pressionar para selecionar a cor de texto dos títulos de nível 1.</translation>
+        <translation type="obsolete">Pressionar para selecionar a cor de texto dos títulos de nível 1.</translation>
     </message>
     <message>
         <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="321"/>
@@ -17187,7 +17422,7 @@
     <message>
         <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="328"/>
         <source>Press to select the body background colour.</source>
-        <translation>Pressionar para selecionar a cor de fundo do corpo.</translation>
+        <translation type="obsolete">Pressionar para selecionar a cor de fundo do corpo.</translation>
     </message>
     <message>
         <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="331"/>
@@ -17197,7 +17432,7 @@
     <message>
         <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="338"/>
         <source>Press to select the body foreground colour.</source>
-        <translation>Pressionar para escolher a cor de texto do corpo.</translation>
+        <translation type="obsolete">Pressionar para escolher a cor de texto do corpo.</translation>
     </message>
     <message>
         <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="341"/>
@@ -17207,7 +17442,7 @@
     <message>
         <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="348"/>
         <source>Press to select the foreground colour of links.</source>
-        <translation>Pressionar para selecionar a cor dos vínculos.</translation>
+        <translation type="obsolete">Pressionar para selecionar a cor dos vínculos.</translation>
     </message>
     <message>
         <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="351"/>
@@ -17217,7 +17452,7 @@
     <message>
         <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="358"/>
         <source>This shows an example of the selected colours.</source>
-        <translation>Mostra um exemplo das cores selecionadas.</translation>
+        <translation type="obsolete">Mostra um exemplo das cores selecionadas.</translation>
     </message>
     <message>
         <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="372"/>
@@ -17299,6 +17534,66 @@
         <source>Style sheet (*.css);;All files (*)</source>
         <translation>Folha de estilo (*.css);;Ficheiros todos (*)</translation>
     </message>
+    <message>
+        <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="252"/>
+        <source>Enter the filename of a CSS style sheet. Leave empty to use the colors defined below.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="262"/>
+        <source>Colors</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="268"/>
+        <source>Press to select the class and function header background color.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="278"/>
+        <source>Press to select the class and function header foreground color.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="288"/>
+        <source>Press to select the level 2 header background color.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="298"/>
+        <source>Press to select the level 2 header foreground color.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="308"/>
+        <source>Press to select the level 1 header background color.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="318"/>
+        <source>Press to select the level 1 header foreground color.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="328"/>
+        <source>Press to select the body background color.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="338"/>
+        <source>Press to select the body foreground color.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="348"/>
+        <source>Press to select the foreground color of links.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="358"/>
+        <source>This shows an example of the selected colors.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>EricdocExecDialog</name>
@@ -17789,30 +18084,50 @@
         <translation>Ficheiros HTML (*.html)</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="516"/>
+        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="537"/>
         <source>Export source</source>
         <translation>Exportar fonte</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="448"/>
+        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="466"/>
         <source>&lt;p&gt;The source could not be exported to &lt;b&gt;{0}&lt;/b&gt;.&lt;/p&gt;&lt;p&gt;Reason: {1}&lt;/p&gt;</source>
         <translation>&lt;p&gt;Não se pôde exportar a fonte para &lt;b&gt;{0}&lt;/b&gt;.&lt;/p&gt;&lt;p&gt;Razão: {1}&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="457"/>
+        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="475"/>
         <source>&lt;p&gt;The source could not be exported to &lt;b&gt;{0}&lt;/b&gt;.&lt;/p&gt;&lt;p&gt;Reason: No HTML code generated.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="516"/>
+        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="537"/>
         <source>&lt;p&gt;Markdown export requires the &lt;b&gt;python-markdown&lt;/b&gt; package.&lt;br/&gt;Install it with your package manager, &apos;pip install docutils&apos; or see &lt;a href=&quot;http://pythonhosted.org/Markdown/install.html&quot;&gt; installation instructions.&lt;/a&gt;&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="484"/>
+        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="502"/>
         <source>&lt;p&gt;ReStructuredText export requires the &lt;b&gt;python-docutils&lt;/b&gt; package.&lt;br/&gt;Install it with your package manager, &apos;pip install docutils&apos; or see &lt;a href=&quot;http://pypi.python.org/pypi/docutils&quot;&gt;this page.&lt;/a&gt;&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="412"/>
+        <source>Light Background Color</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="413"/>
+        <source>Dark Background Color</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="416"/>
+        <source>Markdown Export</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="416"/>
+        <source>Select color scheme:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ExporterODT</name>
@@ -21556,12 +21871,12 @@
         <translation type="unfinished">Gráfico</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="101"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="106"/>
         <source>Commit ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="102"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="107"/>
         <source>Author</source>
         <translation type="unfinished">Autor</translation>
     </message>
@@ -21571,7 +21886,7 @@
         <translation type="unfinished">Data</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="103"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="108"/>
         <source>Committer</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21581,7 +21896,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="104"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="109"/>
         <source>Subject</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21656,7 +21971,7 @@
         <translation type="unfinished">Copiar de</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2098"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2100"/>
         <source>Differences</source>
         <translation type="unfinished">Diferenças</translation>
     </message>
@@ -21716,328 +22031,328 @@
         <translation type="unfinished">Alt+P</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="88"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="93"/>
         <source>&amp;Refresh</source>
         <translation type="unfinished">Atualiza&amp;r</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="90"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="95"/>
         <source>Press to refresh the list of commits</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="98"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="103"/>
         <source>Find</source>
         <translation type="unfinished">Encontrar</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="99"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="104"/>
         <source>Filter</source>
         <translation type="unfinished">Filtro</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="105"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="110"/>
         <source>File</source>
         <translation type="unfinished">Ficheiro</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="122"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="128"/>
         <source>&lt;table&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Commit ID&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Date&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{1}&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Author&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{2} &amp;lt;{3}&amp;gt;&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Commit Date&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{4}&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Committer&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{5} &amp;lt;{6}&amp;gt;&lt;/td&gt;&lt;/tr&gt;{7}&lt;tr&gt;&lt;td&gt;&lt;b&gt;Subject&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{8}&lt;/td&gt;&lt;/tr&gt;{9}&lt;/table&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="134"/>
-        <source>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Parents&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</source>
-        <translation type="unfinished">&lt;tr&gt;&lt;td&gt;&lt;b&gt;Pais&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</translation>
-    </message>
-    <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="137"/>
-        <source>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Children&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="140"/>
-        <source>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Branches&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</source>
-        <translation type="unfinished">&lt;tr&gt;&lt;td&gt;&lt;b&gt;Ramos&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</translation>
+        <source>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Parents&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</source>
+        <translation type="unfinished">&lt;tr&gt;&lt;td&gt;&lt;b&gt;Pais&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</translation>
     </message>
     <message>
         <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="143"/>
-        <source>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Tags&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</source>
-        <translation type="unfinished">&lt;tr&gt;&lt;td&gt;&lt;b&gt;Etiquetas&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</translation>
+        <source>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Children&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="146"/>
+        <source>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Branches&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</source>
+        <translation type="unfinished">&lt;tr&gt;&lt;td&gt;&lt;b&gt;Ramos&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</translation>
+    </message>
+    <message>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="149"/>
+        <source>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Tags&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</source>
+        <translation type="unfinished">&lt;tr&gt;&lt;td&gt;&lt;b&gt;Etiquetas&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</translation>
+    </message>
+    <message>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="152"/>
         <source>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Message&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="197"/>
-        <source>Added</source>
-        <translation type="unfinished">Adicionado</translation>
-    </message>
-    <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="198"/>
-        <source>Deleted</source>
-        <translation type="unfinished">Apagado</translation>
-    </message>
-    <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="199"/>
-        <source>Modified</source>
-        <translation type="unfinished">Alterado</translation>
-    </message>
-    <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="200"/>
-        <source>Copied</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="201"/>
-        <source>Renamed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="202"/>
-        <source>Type changed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="203"/>
-        <source>Unmerged</source>
-        <translation type="unfinished"></translation>
+        <source>Added</source>
+        <translation type="unfinished">Adicionado</translation>
     </message>
     <message>
         <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="204"/>
+        <source>Deleted</source>
+        <translation type="unfinished">Apagado</translation>
+    </message>
+    <message>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="205"/>
+        <source>Modified</source>
+        <translation type="unfinished">Alterado</translation>
+    </message>
+    <message>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="206"/>
+        <source>Copied</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="207"/>
+        <source>Renamed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="208"/>
+        <source>Type changed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="209"/>
+        <source>Unmerged</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="210"/>
         <source>Unknown</source>
         <translation type="unfinished">Desconhecido</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="240"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="246"/>
         <source>Show Commit ID Column</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="242"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="248"/>
         <source>Press to show the commit ID column</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="250"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="256"/>
         <source>Show Author Columns</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="252"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="258"/>
         <source>Press to show the author columns</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="260"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="266"/>
         <source>Show Committer Columns</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="262"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="268"/>
         <source>Press to show the committer columns</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="270"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="276"/>
         <source>Show Branches Column</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="272"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="278"/>
         <source>Press to show the branches column</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="280"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="286"/>
         <source>Show Tags Column</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="282"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="288"/>
         <source>Press to show the Tags column</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="309"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="315"/>
         <source>Copy Commits</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="311"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="317"/>
         <source>Cherry-pick the selected commits to the current branch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="316"/>
-        <source>Tag</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="318"/>
-        <source>Tag the selected commit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1792"/>
-        <source>Branch</source>
-        <translation type="unfinished">Ramo</translation>
-    </message>
-    <message>
         <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="322"/>
-        <source>Create a new branch at the selected commit.</source>
+        <source>Tag</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="324"/>
+        <source>Tag the selected commit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1794"/>
+        <source>Branch</source>
+        <translation type="unfinished">Ramo</translation>
+    </message>
+    <message>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="328"/>
+        <source>Create a new branch at the selected commit.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="330"/>
         <source>Branch &amp;&amp; Switch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="326"/>
-        <source>Create a new branch at the selected commit and switch the work tree to it.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1844"/>
-        <source>Switch</source>
-        <translation type="unfinished">Mudar</translation>
-    </message>
-    <message>
         <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="332"/>
-        <source>Switch the working directory to the selected commit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1870"/>
-        <source>Show Short Log</source>
-        <translation type="unfinished"></translation>
+        <source>Create a new branch at the selected commit and switch the work tree to it.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1846"/>
+        <source>Switch</source>
+        <translation type="unfinished">Mudar</translation>
     </message>
     <message>
         <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="338"/>
+        <source>Switch the working directory to the selected commit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1872"/>
+        <source>Show Short Log</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="344"/>
         <source>Show a dialog with a log output for release notes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="341"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="347"/>
         <source>Describe</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="343"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="349"/>
         <source>Show the most recent tag reachable from a commit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="632"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="634"/>
         <source>The git process did not finish within 30s.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="635"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="637"/>
         <source>Could not start the git executable.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="638"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="640"/>
         <source>Git Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="754"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="756"/>
         <source>{0} ({1}%)</source>
         <comment>action, confidence</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="820"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="822"/>
         <source>Process Generation Error</source>
         <translation type="unfinished">Erro na Criação de Processo</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="820"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="822"/>
         <source>The process {0} could not be started. Ensure, that it is in the search path.</source>
         <translation type="unfinished">Não pôde iniciar {0}.&lt;br&gt;Certifique-se de que está na rota de pesquisa.</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1265"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1267"/>
         <source>Side-by-Side Diff to Parent {0}</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1277"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1279"/>
         <source>&lt;a href=&quot;sbsdiff:{0}_{1}&quot;&gt;Side-by-Side Compare&lt;/a&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1706"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1708"/>
         <source>Copy Changesets</source>
         <translation type="unfinished">Copiar Conjuntos de Alterações</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1844"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1846"/>
         <source>The project should be reread. Do this now?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1870"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1872"/>
         <source>Select a branch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1823"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1825"/>
         <source>Select a default branch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1823"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1825"/>
         <source>Branch &amp; Switch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2052"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2054"/>
         <source>Find Commit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2052"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2054"/>
         <source>&apos;{0}&apos; was not found.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2112"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2114"/>
         <source>Differences to Parent {0}</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2127"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2129"/>
         <source>Diff to Parent {0}</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2153"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2155"/>
         <source>There is no difference.</source>
         <translation type="unfinished">Não há diferenças.</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2316"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2318"/>
         <source>Save Diff</source>
         <translation type="unfinished">Gravar Diff</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2282"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2284"/>
         <source>Patch Files (*.diff)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2299"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2301"/>
         <source>&lt;p&gt;The patch file &lt;b&gt;{0}&lt;/b&gt; already exists. Overwrite it?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2316"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2318"/>
         <source>&lt;p&gt;The patch file &lt;b&gt;{0}&lt;/b&gt; could not be saved.&lt;br&gt;Reason: {1}&lt;/p&gt;</source>
         <translation type="unfinished">&lt;p&gt;O ficheiro remendo &lt;b&gt;{0}&lt;/b&gt; não se pôde gravar.&lt;br /&gt;Motivo: {1}&lt;/p&gt;</translation>
     </message>
@@ -26481,20 +26796,60 @@
 <context>
     <name>GraphicsPage</name>
     <message>
-        <location filename="../Preferences/ConfigurationPages/GraphicsPage.ui" line="16"/>
+        <location filename="../Preferences/ConfigurationPages/GraphicsPage.ui" line="17"/>
         <source>&lt;b&gt;Configure graphics settings&lt;/b&gt;</source>
         <translation>&lt;b&gt;Configurar definições gráficas&lt;/b&gt;</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/GraphicsPage.ui" line="38"/>
+        <location filename="../Preferences/ConfigurationPages/GraphicsPage.ui" line="43"/>
         <source>Press to select the font for the graphic items</source>
         <translation>Pressionar para selecionar o tipo de letra para os itens gráficos</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/GraphicsPage.ui" line="51"/>
+        <location filename="../Preferences/ConfigurationPages/GraphicsPage.ui" line="56"/>
         <source>Graphics Font</source>
         <translation>Tipo de Letra dos Gráficos</translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/GraphicsPage.ui" line="37"/>
+        <source>Font</source>
+        <translation type="unfinished">Tipo de Letra</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/GraphicsPage.ui" line="72"/>
+        <source>Drawing Mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/GraphicsPage.ui" line="78"/>
+        <source>Select to determine the drawing mode automatically</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/GraphicsPage.ui" line="81"/>
+        <source>Automatic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/GraphicsPage.ui" line="91"/>
+        <source>Select to draw black shapes on a white background</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/GraphicsPage.ui" line="94"/>
+        <source>Black On White</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/GraphicsPage.ui" line="101"/>
+        <source>Select to draw white shapes on a black background</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/GraphicsPage.ui" line="104"/>
+        <source>White On Black</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>GreaseMonkeyAddScriptDialog</name>
@@ -30713,21 +31068,11 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/HexEditorPage.ui" line="142"/>
-        <source>Select the foreground colour of the address area</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/HexEditorPage.ui" line="291"/>
         <source>Background:</source>
         <translation type="unfinished">Fundo:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/HexEditorPage.ui" line="165"/>
-        <source>Select the background colour of the address area</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/HexEditorPage.ui" line="178"/>
         <source>ASCII Area</source>
         <translation type="unfinished"></translation>
@@ -30758,31 +31103,11 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/HexEditorPage.ui" line="226"/>
-        <source>Select the foreground colour for highlighted data</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/HexEditorPage.ui" line="249"/>
-        <source>Select the background colour for highlighted data</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/HexEditorPage.ui" line="262"/>
         <source>Selection</source>
         <translation type="unfinished">Seleção</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/HexEditorPage.ui" line="281"/>
-        <source>Select the foreground colour of the selection</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/HexEditorPage.ui" line="304"/>
-        <source>Select the background colour of the selection</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/HexEditorPage.ui" line="317"/>
         <source>Font</source>
         <translation type="unfinished">Tipo de Letra</translation>
@@ -30812,6 +31137,36 @@
         <source>Enter the number of recent files to remember</source>
         <translation type="unfinished">Introduzir o número de ficheiros recentes a recordar</translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/HexEditorPage.ui" line="142"/>
+        <source>Select the foreground color of the address area</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/HexEditorPage.ui" line="165"/>
+        <source>Select the background color of the address area</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/HexEditorPage.ui" line="226"/>
+        <source>Select the foreground color for highlighted data</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/HexEditorPage.ui" line="249"/>
+        <source>Select the background color for highlighted data</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/HexEditorPage.ui" line="281"/>
+        <source>Select the foreground color of the selection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/HexEditorPage.ui" line="304"/>
+        <source>Select the background color of the selection</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Hg</name>
@@ -33627,7 +33982,7 @@
 <context>
     <name>HgLogBrowserDialog</name>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="92"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="98"/>
         <source>Mercurial Log</source>
         <translation>Registo de Mercurial</translation>
     </message>
@@ -33667,17 +34022,17 @@
         <translation>Selecionar o campo a filtrar</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="122"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="128"/>
         <source>Revision</source>
         <translation>Revisão</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="123"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="129"/>
         <source>Author</source>
         <translation>Autor</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="124"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="130"/>
         <source>Message</source>
         <translation>Mensagem</translation>
     </message>
@@ -33792,22 +34147,22 @@
         <translation type="obsolete">Alt+P</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="200"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="206"/>
         <source>Added</source>
         <translation>Adicionado</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="201"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="207"/>
         <source>Deleted</source>
         <translation>Apagado</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="202"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="208"/>
         <source>Modified</source>
         <translation>Alterado</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="182"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="188"/>
         <source>All</source>
         <translation>Tudo</translation>
     </message>
@@ -33822,7 +34177,7 @@
         <translation type="obsolete">Não se pôde iniciar o executável hg.</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="840"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="845"/>
         <source>Mercurial Error</source>
         <translation>Erro de Mercurial</translation>
     </message>
@@ -33837,59 +34192,59 @@
         <translation type="obsolete">Não pôde iniciar {0}.&lt;br&gt;Certifique-se de que está na rota de pesquisa.</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="94"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="100"/>
         <source>Mercurial Log (Incoming)</source>
         <translation>Registo de Mercurial (Entrante)</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="96"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="102"/>
         <source>Mercurial Log (Outgoing)</source>
         <translation>Registo de Mercurial (Sainte)</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="217"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="223"/>
         <source>Bookmarks</source>
         <translation>Marcadores</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="111"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="117"/>
         <source>Press to refresh the list of changesets</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="109"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="115"/>
         <source>&amp;Refresh</source>
         <translation>Atualiza&amp;r</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="126"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="132"/>
         <source>Phase</source>
         <translation>Fase</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="268"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="275"/>
         <source>Change the phase of the selected revisions</source>
         <translation>Alterar a fase das revisões selecionadas</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="270"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="277"/>
         <source>&lt;b&gt;Change Phase&lt;/b&gt;
 &lt;p&gt;This changes the phase of the selected revisions. The selected revisions have to have the same current phase.&lt;/p&gt;</source>
         <translation>&lt;b&gt;Mudar Fase&lt;/b&gt;
 &lt;p&gt;Muda a fase das revisões selecionadas. As revisões selecionadas devem ter a mesma fase atual.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="266"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="273"/>
         <source>Change Phase</source>
         <translation>Mudar Fase</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2000"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2005"/>
         <source>Copy Changesets</source>
         <translation type="unfinished">Copiar Conjuntos de Alterações</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2343"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2348"/>
         <source>The project should be reread. Do this now?</source>
         <translation>O projecto deve ser recarregado. Fazer-lo agora?</translation>
     </message>
@@ -33899,42 +34254,42 @@
         <translation>Selecionar ação do menu</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="257"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="264"/>
         <source>Copy the selected changesets to the current branch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="275"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="282"/>
         <source>Tag</source>
         <translation>Etiquetar</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="278"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="285"/>
         <source>Tag the selected revision</source>
         <translation>Etiqueta a revisão selecionada</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2072"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2077"/>
         <source>Switch</source>
         <translation type="unfinished">Mudar</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="288"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="295"/>
         <source>Switch the working directory to the selected revision</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="311"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="318"/>
         <source>Pull Large Files</source>
         <translation>Puxar Ficheiros Grandes</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="313"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="320"/>
         <source>Pull large files for selected revisions</source>
         <translation>Puxar os ficheiros grandes das revisões selecionadas</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1130"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1135"/>
         <source>{0} (large file)</source>
         <translation>{0} (ficheiro grande)</translation>
     </message>
@@ -33959,147 +34314,147 @@
         <translation>Pressionar para encontrar a ocurrência seguinte</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="119"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="125"/>
         <source>Find</source>
         <translation>Encontrar</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="120"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="126"/>
         <source>Filter</source>
         <translation>Filtro</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="125"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="131"/>
         <source>File</source>
         <translation>Ficheiro</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="164"/>
-        <source>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Tags&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</source>
-        <translation>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Etiquetas&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</translation>
-    </message>
-    <message>
         <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="170"/>
+        <source>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Tags&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</source>
+        <translation>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Etiquetas&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</translation>
+    </message>
+    <message>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="176"/>
         <source>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Bookmarks&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</source>
         <translation>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Marcadores&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2485"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2490"/>
         <source>Find Commit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2485"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2490"/>
         <source>&apos;{0}&apos; was not found.</source>
         <translation>&apos;{0}&apos; não foi encontrado.</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="206"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="212"/>
         <source>Draft</source>
         <translation type="unfinished">Rascunho</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="207"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="213"/>
         <source>Public</source>
         <translation type="unfinished">Público</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="208"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="214"/>
         <source>Secret</source>
         <translation type="unfinished">Secreto</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2205"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2210"/>
         <source>Pull Changes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="309"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="316"/>
         <source>Pull changes from a remote repository</source>
         <translation type="unfinished">Puxar alterações do repositorio remoto</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="322"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="329"/>
         <source>Push Selected Changes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="325"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="332"/>
         <source>Push changes of the selected changeset and its ancestors to a remote repository</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="328"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="335"/>
         <source>Push All Changes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="331"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="338"/>
         <source>Push all changes to a remote repository</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2170"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2175"/>
         <source>Fetch Changes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2251"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2256"/>
         <source>Strip Changesets</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="317"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="324"/>
         <source>Fetch changes from a remote repository</source>
         <translation type="unfinished">Trazer alterações de um repositório remoto</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="374"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="381"/>
         <source>Strip changesets from a repository</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="293"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="300"/>
         <source>Define Bookmark...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="296"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="303"/>
         <source>Bookmark the selected revision</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="298"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="305"/>
         <source>Move Bookmark...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="301"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="308"/>
         <source>Move bookmark to the selected revision</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2095"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2100"/>
         <source>Define Bookmark</source>
         <translation type="unfinished">Definir Marcador</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2095"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2100"/>
         <source>Enter bookmark name for changeset &quot;{0}&quot;:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2119"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2124"/>
         <source>Move Bookmark</source>
         <translation type="unfinished">Mover marcador</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2119"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2124"/>
         <source>Select the bookmark to be moved  to changeset &quot;{0}&quot;:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2058"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2063"/>
         <source>Select bookmark to switch to (leave empty to use revision):</source>
         <translation type="unfinished"></translation>
     </message>
@@ -34114,148 +34469,148 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="167"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="173"/>
         <source>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Latest Tag&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="148"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="154"/>
         <source>&lt;table&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Revision&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Date&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{1}&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Author&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{2}&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Branch&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{3}&lt;/td&gt;&lt;/tr&gt;{4}&lt;tr&gt;&lt;td&gt;&lt;b&gt;Message&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{5}&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="158"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="164"/>
         <source>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Parents&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</source>
         <translation type="unfinished">&lt;tr&gt;&lt;td&gt;&lt;b&gt;Pais&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="161"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="167"/>
         <source>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Children&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="260"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="267"/>
         <source>Merge with Changeset</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="263"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="270"/>
         <source>Merge the working directory with the selected changeset</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="336"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="343"/>
         <source>Create Changegroup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="339"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="346"/>
         <source>Create a changegroup file containing the selected changesets</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="341"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="348"/>
         <source>&lt;b&gt;Create Changegroup&lt;/b&gt;
 &lt;p&gt;This creates a changegroup file containing the selected revisions. If no revisions are selected, all changesets will be bundled. If one revision is selected, it will be interpreted as the base revision. Otherwise the lowest revision will be used as the base revision and all other revision will be bundled. If the dialog is showing outgoing changesets, all selected changesets will be bundled.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2343"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2348"/>
         <source>Apply Changegroup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="353"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="360"/>
         <source>Apply the currently viewed changegroup file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="358"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="365"/>
         <source>Sign Revisions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="361"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="368"/>
         <source>Add a signature for the selected revisions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="363"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="370"/>
         <source>Verify Signatures</source>
         <translation type="unfinished">Verificar Assinaturas</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="366"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="373"/>
         <source>Verify all signatures there may be for the selected revision</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="379"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="386"/>
         <source>Select All Entries</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="381"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="388"/>
         <source>Deselect All Entries</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1369"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1374"/>
         <source>Side-by-Side Diff to Parent {0}</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1380"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1385"/>
         <source>&lt;a href=&quot;sbsdiff:{0}_{1}&quot;&gt;Side-by-Side Compare&lt;/a&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1521"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1526"/>
         <source>Pull Selected Changes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1522"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1527"/>
         <source>Fetch Selected Changes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2529"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2534"/>
         <source>Differences</source>
         <translation type="unfinished">Diferenças</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2539"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2544"/>
         <source>Differences to Parent {0}</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2555"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2560"/>
         <source>Diff to Parent {0}{1}</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2580"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2585"/>
         <source>There is no difference.</source>
         <translation type="unfinished">Não há diferenças.</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2723"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2728"/>
         <source>Save Diff</source>
         <translation type="unfinished">Gravar Diff</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2690"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2695"/>
         <source>Patch Files (*.diff)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2707"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2712"/>
         <source>&lt;p&gt;The patch file &lt;b&gt;{0}&lt;/b&gt; already exists. Overwrite it?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2723"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2728"/>
         <source>&lt;p&gt;The patch file &lt;b&gt;{0}&lt;/b&gt; could not be saved.&lt;br&gt;Reason: {1}&lt;/p&gt;</source>
         <translation type="unfinished">&lt;p&gt;O ficheiro remendo &lt;b&gt;{0}&lt;/b&gt; não se pôde gravar.&lt;br /&gt;Motivo: {1}&lt;/p&gt;</translation>
     </message>
@@ -34265,22 +34620,22 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2528"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2533"/>
         <source>Generating differences ...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="98"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="104"/>
         <source>Mercurial Full Log</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="280"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="287"/>
         <source>Close Heads</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="283"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="290"/>
         <source>Close the selected heads</source>
         <translation type="unfinished"></translation>
     </message>
@@ -34657,7 +35012,7 @@
         <translation>Retirar do repositorio (e disco)</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="833"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="835"/>
         <source>Remove from repository only</source>
         <translation>Retirar apenas do repositorio</translation>
     </message>
@@ -34702,7 +35057,7 @@
         <translation>Selecionar todas as entradas de diretorios versionados</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="833"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="835"/>
         <source>Do you really want to remove these files from the repository?</source>
         <translation>Tem a certeza de que quer retirar estes ficheiros do repositorio?</translation>
     </message>
@@ -37318,52 +37673,52 @@
 <context>
     <name>HgServeDialog</name>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py" line="47"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py" line="50"/>
         <source>Mercurial Server</source>
         <translation>Servidor Mercurial</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py" line="49"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py" line="57"/>
         <source>Start Server</source>
         <translation>Iniciar Servidor</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py" line="55"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py" line="63"/>
         <source>Stop Server</source>
         <translation>Parar Servidor</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py" line="61"/>
-        <source>Start Browser</source>
-        <translation>Iniciar Navegador</translation>
-    </message>
-    <message>
         <location filename="../Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py" line="69"/>
+        <source>Start Browser</source>
+        <translation>Iniciar Navegador</translation>
+    </message>
+    <message>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py" line="77"/>
         <source>Enter the server port</source>
         <translation>Introduza o porto do servidor</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py" line="75"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py" line="83"/>
         <source>Select the style to use</source>
         <translation>Selecionar o estilo a usar</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py" line="79"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py" line="87"/>
         <source>Server</source>
         <translation>Servidor</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py" line="86"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py" line="94"/>
         <source>Browser</source>
         <translation>Navegador</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py" line="140"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py" line="148"/>
         <source>Process Generation Error</source>
         <translation>Erro na Criação de Processo</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py" line="140"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py" line="148"/>
         <source>The process {0} could not be started. Ensure, that it is in the search path.</source>
         <translation>Não pôde iniciar {0}.&lt;br&gt;Certifique-se de que está na rota de pesquisa.</translation>
     </message>
@@ -40827,53 +41182,138 @@
         <translation>&lt;font color=&quot;#FF0000&quot;&gt;&lt;b&gt;Nota:&lt;/b&gt; Estas definições estarão activadas a próxima vez que arranque a aplicação.&lt;/font&gt;</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="115"/>
+        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="217"/>
         <source>Press to delete the selected directory from the list</source>
         <translation>Pressionar para apagar o diretório selecionado da lista</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="118"/>
+        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="220"/>
         <source>Delete</source>
         <translation>Apagar</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="128"/>
+        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="230"/>
         <source>Press to add the entered directory to the list</source>
         <translation>Pressionar para adicionar à lista o diretório introduzido</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="131"/>
+        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="233"/>
         <source>Add</source>
         <translation>Adicionar</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="156"/>
+        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="258"/>
         <source>Show</source>
         <translation>Mostrar</translation>
     </message>
     <message>
+        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="177"/>
+        <source>Up</source>
+        <translation>Cima</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="187"/>
+        <source>Down</source>
+        <translation>Baixo</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="146"/>
+        <source>List of icon directories</source>
+        <translation>Lista de diretorios de ícones</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="44"/>
+        <source>Default Icons</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="52"/>
+        <source>Select to select between Breeze (dark) and Breeze (light) based on the window lightness</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="55"/>
+        <source>Automatic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="65"/>
+        <source>Select to use the Breeze vector icons for light window background</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="68"/>
+        <source>Breeze (light)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="75"/>
-        <source>Up</source>
-        <translation>Cima</translation>
+        <source>Select to use the Breeze vector icons for dark window background</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="78"/>
+        <source>Breeze (dark)</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="85"/>
-        <source>Down</source>
-        <translation>Baixo</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="44"/>
-        <source>List of icon directories</source>
-        <translation>Lista de diretorios de ícones</translation>
+        <source>Select to use the Oxygen pixmap icons</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="88"/>
+        <source>Oxygen</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="112"/>
+        <source>Press to show a dialog with a preview of the selected default icon set</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="140"/>
+        <source>Custom Icon Directories</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IconsPreviewDialog</name>
     <message>
-        <location filename="../Preferences/ConfigurationPages/IconsPreviewDialog.ui" line="13"/>
+        <location filename="../Preferences/ConfigurationPages/IconsPreviewDialog.ui" line="14"/>
         <source>Icons Preview</source>
         <translation>Antevisão dos Ícones</translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IconsPreviewDialog.ui" line="25"/>
+        <source>Directory:</source>
+        <translation type="unfinished">Diretório:</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IconsPreviewDialog.ui" line="38"/>
+        <source>Select the icons directory to be shown</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IconsPreviewDialog.ui" line="74"/>
+        <source>Invert Background</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IconsPreviewDialog.ui" line="87"/>
+        <source>Refresh</source>
+        <translation type="unfinished">Atualizar</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IconsPreviewDialog.ui" line="84"/>
+        <source>Select to refresh the icons display</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IconsPreviewDialog.ui" line="71"/>
+        <source>Select to invert the background color</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>IdlCompilerDefineNameDialog</name>
@@ -43035,7 +43475,7 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="102"/>
         <source>Colours</source>
-        <translation>Cores</translation>
+        <translation type="obsolete">Cores</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="108"/>
@@ -43045,7 +43485,7 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="121"/>
         <source>Select the colour for network messages</source>
-        <translation>Selecionar a cor para mensagens de rede</translation>
+        <translation type="obsolete">Selecionar a cor para mensagens de rede</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="131"/>
@@ -43053,11 +43493,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="144"/>
-        <source>Select the colour for nick names</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="154"/>
         <source>Server Messages:</source>
         <translation>Mensagens do Servidor:</translation>
@@ -43065,7 +43500,7 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="167"/>
         <source>Select the colour for server messages</source>
-        <translation>Selecionar a cor para mensagens de servidor</translation>
+        <translation type="obsolete">Selecionar a cor para mensagens de servidor</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="177"/>
@@ -43073,84 +43508,44 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="190"/>
-        <source>Select the colour for own nick name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="200"/>
         <source>Channel Messages:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="213"/>
-        <source>Select the colour for channel messages</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="223"/>
         <source>Join Channel:</source>
         <translation>Unir ao Canal:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="236"/>
-        <source>Select the colour for join channel messages</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="246"/>
         <source>Error Messages:</source>
         <translation>Mensagens de Erro:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="259"/>
-        <source>Select the colour for error messages</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="269"/>
         <source>Leave Channel:</source>
         <translation>Deixar Canal:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="282"/>
-        <source>Select the colour for leave channel messages</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="292"/>
         <source>Timestamp:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="305"/>
-        <source>Select the colour for timestamps</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="315"/>
         <source>Channel Info:</source>
         <translation>Informação do Canal:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="328"/>
-        <source>Select the colour for channel info messages</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="338"/>
         <source>Hyperlink:</source>
         <translation>Hipervínculo:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="351"/>
-        <source>Select the colour for hyperlinks</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="364"/>
         <source>Enable to allow coloured text in IRC messages</source>
-        <translation>Habilitar para permitir texto colorido nas mensagens IRC</translation>
+        <translation type="obsolete">Habilitar para permitir texto colorido nas mensagens IRC</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="367"/>
@@ -43258,21 +43653,11 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="824"/>
-        <source>Select the foreground colour for the marker</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="834"/>
         <source>Marker Background:</source>
         <translation>Cor de Fundo do Marcador:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="847"/>
-        <source>Select the background colour for the marker</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="862"/>
         <source>Shutdown</source>
         <translation>Desligar</translation>
@@ -43287,6 +43672,81 @@
         <source>Confirm Shutdown When Connected</source>
         <translation>Confirmar Desligar Quando Conetado</translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="102"/>
+        <source>Colors</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="121"/>
+        <source>Select the color for network messages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="144"/>
+        <source>Select the color for nick names</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="167"/>
+        <source>Select the color for server messages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="190"/>
+        <source>Select the color for own nick name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="213"/>
+        <source>Select the color for channel messages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="236"/>
+        <source>Select the color for join channel messages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="259"/>
+        <source>Select the color for error messages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="282"/>
+        <source>Select the color for leave channel messages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="305"/>
+        <source>Select the color for timestamps</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="328"/>
+        <source>Select the color for channel info messages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="351"/>
+        <source>Select the color for hyperlinks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="364"/>
+        <source>Enable to allow colored text in IRC messages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="824"/>
+        <source>Select the foreground color for the marker</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="847"/>
+        <source>Select the background color for the marker</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>IrcServerEditDialog</name>
@@ -44691,257 +45151,257 @@
 <context>
     <name>LexerPygments</name>
     <message>
-        <location filename="../QScintilla/Lexers/LexerPygments.py" line="180"/>
+        <location filename="../QScintilla/Lexers/LexerPygments.py" line="196"/>
         <source>Default</source>
         <translation>Padrão</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/LexerPygments.py" line="181"/>
-        <source>Comment</source>
-        <translation>Comentar</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/LexerPygments.py" line="182"/>
-        <source>Preprocessor</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/LexerPygments.py" line="183"/>
-        <source>Keyword</source>
-        <translation>Palavra Chave</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/LexerPygments.py" line="184"/>
-        <source>Pseudo Keyword</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/LexerPygments.py" line="185"/>
-        <source>Type Keyword</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/LexerPygments.py" line="186"/>
-        <source>Operator</source>
-        <translation>Operador</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/LexerPygments.py" line="187"/>
-        <source>Word</source>
-        <translation>Palavra</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/LexerPygments.py" line="188"/>
-        <source>Builtin</source>
-        <translation>Interno</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/LexerPygments.py" line="189"/>
-        <source>Function or method name</source>
-        <translation>Nome de função ou método</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/LexerPygments.py" line="190"/>
-        <source>Class name</source>
-        <translation>Nome de classe</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/LexerPygments.py" line="191"/>
-        <source>Namespace</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/LexerPygments.py" line="192"/>
-        <source>Exception</source>
-        <translation>Exceção</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/LexerPygments.py" line="193"/>
-        <source>Identifier</source>
-        <translation>Identificador</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/LexerPygments.py" line="194"/>
-        <source>Constant</source>
-        <translation>Constante</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/LexerPygments.py" line="195"/>
-        <source>Label</source>
-        <translation>Etiqueta</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/LexerPygments.py" line="196"/>
-        <source>Entity</source>
-        <translation>Entidade</translation>
-    </message>
-    <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="197"/>
-        <source>Attribute</source>
-        <translation>Atributo</translation>
+        <source>Comment</source>
+        <translation>Comentar</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="198"/>
-        <source>Tag</source>
-        <translation>Etiqueta</translation>
+        <source>Preprocessor</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="199"/>
-        <source>Decorator</source>
-        <translation>Decorador</translation>
+        <source>Keyword</source>
+        <translation>Palavra Chave</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="200"/>
-        <source>String</source>
-        <translation>String</translation>
+        <source>Pseudo Keyword</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="201"/>
-        <source>Documentation string</source>
-        <translation>String de documentação</translation>
+        <source>Type Keyword</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="202"/>
-        <source>Scalar</source>
-        <translation type="unfinished"></translation>
+        <source>Operator</source>
+        <translation>Operador</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="203"/>
-        <source>Escape</source>
-        <translation type="unfinished"></translation>
+        <source>Word</source>
+        <translation>Palavra</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="204"/>
-        <source>Regular expression</source>
-        <translation type="unfinished"></translation>
+        <source>Builtin</source>
+        <translation>Interno</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="205"/>
-        <source>Symbol</source>
-        <translation>Símbolo</translation>
+        <source>Function or method name</source>
+        <translation>Nome de função ou método</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="206"/>
-        <source>Other string</source>
-        <translation>Outra string</translation>
+        <source>Class name</source>
+        <translation>Nome de classe</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="207"/>
-        <source>Number</source>
-        <translation>Número</translation>
+        <source>Namespace</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="208"/>
-        <source>Heading</source>
-        <translation type="unfinished"></translation>
+        <source>Exception</source>
+        <translation>Exceção</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="209"/>
-        <source>Subheading</source>
-        <translation type="unfinished"></translation>
+        <source>Identifier</source>
+        <translation>Identificador</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="210"/>
-        <source>Deleted</source>
-        <translation>Apagado</translation>
+        <source>Constant</source>
+        <translation>Constante</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="211"/>
-        <source>Inserted</source>
-        <translation>Inserido</translation>
+        <source>Label</source>
+        <translation>Etiqueta</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="212"/>
-        <source>Generic error</source>
-        <translation>Erro Genérico</translation>
+        <source>Entity</source>
+        <translation>Entidade</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="213"/>
-        <source>Emphasized text</source>
-        <translation>Texto destacado</translation>
+        <source>Attribute</source>
+        <translation>Atributo</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="214"/>
-        <source>Strong text</source>
-        <translation type="unfinished"></translation>
+        <source>Tag</source>
+        <translation>Etiqueta</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="215"/>
-        <source>Prompt</source>
-        <translation type="unfinished"></translation>
+        <source>Decorator</source>
+        <translation>Decorador</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="216"/>
-        <source>Output</source>
-        <translation>Saída</translation>
+        <source>String</source>
+        <translation>String</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="217"/>
-        <source>Traceback</source>
-        <translation type="unfinished"></translation>
+        <source>Documentation string</source>
+        <translation>String de documentação</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="218"/>
-        <source>Error</source>
-        <translation>Erro</translation>
+        <source>Scalar</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="219"/>
-        <source>Comment block</source>
+        <source>Escape</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="220"/>
-        <source>Property</source>
-        <translation>Propriedade</translation>
+        <source>Regular expression</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="221"/>
-        <source>Character</source>
-        <translation type="unfinished"></translation>
+        <source>Symbol</source>
+        <translation>Símbolo</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="222"/>
-        <source>Here document</source>
-        <translation type="unfinished"></translation>
+        <source>Other string</source>
+        <translation>Outra string</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="223"/>
-        <source>Punctuation</source>
-        <translation>Pontuação</translation>
+        <source>Number</source>
+        <translation>Número</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="224"/>
-        <source>Hashbang</source>
+        <source>Heading</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="225"/>
-        <source>Reserved Keyword</source>
+        <source>Subheading</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="226"/>
-        <source>Literal</source>
-        <translation type="unfinished"></translation>
+        <source>Deleted</source>
+        <translation>Apagado</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="227"/>
-        <source>Double quoted string</source>
-        <translation type="unfinished"></translation>
+        <source>Inserted</source>
+        <translation>Inserido</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="228"/>
-        <source>Single quoted string</source>
-        <translation type="unfinished"></translation>
+        <source>Generic error</source>
+        <translation>Erro Genérico</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="229"/>
-        <source>Backtick string</source>
-        <translation type="unfinished"></translation>
+        <source>Emphasized text</source>
+        <translation>Texto destacado</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="230"/>
+        <source>Strong text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/LexerPygments.py" line="231"/>
+        <source>Prompt</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/LexerPygments.py" line="232"/>
+        <source>Output</source>
+        <translation>Saída</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/LexerPygments.py" line="233"/>
+        <source>Traceback</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/LexerPygments.py" line="234"/>
+        <source>Error</source>
+        <translation>Erro</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/LexerPygments.py" line="235"/>
+        <source>Comment block</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/LexerPygments.py" line="236"/>
+        <source>Property</source>
+        <translation>Propriedade</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/LexerPygments.py" line="237"/>
+        <source>Character</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/LexerPygments.py" line="238"/>
+        <source>Here document</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/LexerPygments.py" line="239"/>
+        <source>Punctuation</source>
+        <translation>Pontuação</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/LexerPygments.py" line="240"/>
+        <source>Hashbang</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/LexerPygments.py" line="241"/>
+        <source>Reserved Keyword</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/LexerPygments.py" line="242"/>
+        <source>Literal</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/LexerPygments.py" line="243"/>
+        <source>Double quoted string</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/LexerPygments.py" line="244"/>
+        <source>Single quoted string</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/LexerPygments.py" line="245"/>
+        <source>Backtick string</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/LexerPygments.py" line="246"/>
         <source>Whitespace</source>
         <translation type="unfinished">Espaços</translation>
     </message>
@@ -46006,16 +46466,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/LogViewerPage.ui" line="49"/>
-        <source>Error Colour:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/LogViewerPage.ui" line="62"/>
-        <source>Select the colour for text sent to stderr</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/LogViewerPage.ui" line="87"/>
         <source>Message Filters:</source>
         <translation type="unfinished"></translation>
@@ -46050,6 +46500,16 @@
         <source>&lt;b&gt;Message Filters for both&lt;/b&gt;&lt;p&gt;This list shows the configured message filters used to suppress messages received via stdout or stderr.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/LogViewerPage.ui" line="49"/>
+        <source>Error Color:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/LogViewerPage.ui" line="62"/>
+        <source>Select the color for text sent to stderr</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MakePropertiesDialog</name>
@@ -46836,27 +47296,27 @@
 <context>
     <name>MicroPythonDevice</name>
     <message>
-        <location filename="../MicroPython/MicroPythonDevices.py" line="207"/>
+        <location filename="../MicroPython/MicroPythonDevices.py" line="214"/>
         <source>Unsupported Device</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonDevices.py" line="217"/>
+        <location filename="../MicroPython/MicroPythonDevices.py" line="224"/>
         <source>REPL is not supported by this device.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonDevices.py" line="236"/>
+        <location filename="../MicroPython/MicroPythonDevices.py" line="243"/>
         <source>Plotter is not supported by this device.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonDevices.py" line="255"/>
+        <location filename="../MicroPython/MicroPythonDevices.py" line="262"/>
         <source>Running scripts is not supported by this device.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonDevices.py" line="275"/>
+        <location filename="../MicroPython/MicroPythonDevices.py" line="282"/>
         <source>File Manager is not supported by this device.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -47120,27 +47580,27 @@
 <context>
     <name>MicroPythonGraphWidget</name>
     <message>
-        <location filename="../MicroPython/MicroPythonGraphWidget.py" line="63"/>
+        <location filename="../MicroPython/MicroPythonGraphWidget.py" line="64"/>
         <source>Press to save the raw data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonGraphWidget.py" line="72"/>
+        <location filename="../MicroPython/MicroPythonGraphWidget.py" line="73"/>
         <source>max. X:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonGraphWidget.py" line="81"/>
+        <location filename="../MicroPython/MicroPythonGraphWidget.py" line="82"/>
         <source>Enter the maximum number of data points to be plotted.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonGraphWidget.py" line="311"/>
+        <location filename="../MicroPython/MicroPythonGraphWidget.py" line="329"/>
         <source>Save Chart Data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonGraphWidget.py" line="311"/>
+        <location filename="../MicroPython/MicroPythonGraphWidget.py" line="329"/>
         <source>&lt;p&gt;The chart data could not be saved into file &lt;b&gt;{0}&lt;/b&gt;.&lt;/p&gt;&lt;p&gt;Reason: {1}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -47208,93 +47668,168 @@
         <translation type="unfinished">Enrolar linhas compridas</translation>
     </message>
     <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="169"/>
+        <source>MPY Cross Compiler</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="175"/>
+        <source>Program:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="191"/>
+        <source>Enter the path of the cross compiler executable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.py" line="67"/>
+        <source>All Files (*)</source>
+        <translation type="unfinished">Ficheiros Todos (*)</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="298"/>
+        <source>Documentation</source>
+        <translation type="unfinished">Documentação</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="304"/>
+        <source>MicroPython:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="311"/>
+        <source>Enter the URL for the MicroPython documentation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="318"/>
+        <source>CircuitPython:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="325"/>
+        <source>Enter the URL for the CircuitPython documentation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="332"/>
+        <source>BBC micro:bit:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="339"/>
+        <source>Enter the URL for the BBC micro:bit MicroPython documentation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="201"/>
+        <source>PyBoard</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="207"/>
+        <source>dfu-util Path:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="223"/>
+        <source>Enter the path of the dfu-util flashing executable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="233"/>
+        <source>Firmware</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="246"/>
+        <source>Enter the URL for the MicroPython firmware for PyBoard, ESP8266 and ESP32</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="260"/>
+        <source>Enter the URL for the CircuitPython firmware</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="274"/>
+        <source>Enter the URL for the BBC micro:bit Firmware</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="140"/>
-        <source>MPY Cross Compiler</source>
+        <source>Chart Pane</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="146"/>
-        <source>Program:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="162"/>
-        <source>Enter the path of the cross compiler executable</source>
+        <source>Color Theme:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="159"/>
+        <source>Select the color scheme of the chart</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/MicroPythonPage.py" line="42"/>
-        <source>All Files (*)</source>
-        <translation type="unfinished">Ficheiros Todos (*)</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="255"/>
-        <source>Documentation</source>
-        <translation type="unfinished">Documentação</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="261"/>
-        <source>MicroPython:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="268"/>
-        <source>Enter the URL for the MicroPython documentation</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="275"/>
-        <source>CircuitPython:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="282"/>
-        <source>Enter the URL for the CircuitPython documentation</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="289"/>
-        <source>BBC micro:bit:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="296"/>
-        <source>Enter the URL for the BBC micro:bit MicroPython documentation</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="172"/>
-        <source>PyBoard</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="178"/>
-        <source>dfu-util Path:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="194"/>
-        <source>Enter the path of the dfu-util flashing executable</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="204"/>
-        <source>Firmware</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="217"/>
-        <source>Enter the URL for the MicroPython firmware for PyBoard, ESP8266 and ESP32</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="231"/>
-        <source>Enter the URL for the CircuitPython firmware</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="245"/>
-        <source>Enter the URL for the BBC micro:bit Firmware</source>
+        <source>Automatic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.py" line="44"/>
+        <source>Light</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.py" line="46"/>
+        <source>Dark</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.py" line="48"/>
+        <source>Blue Cerulean</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.py" line="50"/>
+        <source>Brown Sand</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.py" line="52"/>
+        <source>Blue NCS</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.py" line="54"/>
+        <source>High Contrast</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.py" line="56"/>
+        <source>Blue Icy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.py" line="58"/>
+        <source>Qt</source>
+        <translation type="unfinished">Qt</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="346"/>
+        <source>Calliope mini:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="288"/>
+        <source>Enter the URL for the Callope mini Firmware</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="353"/>
+        <source>Enter the URL for the Calliope mini MicroPython documentation</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -47339,17 +47874,17 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="420"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="460"/>
         <source>Press to connect the selected device</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="226"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="263"/>
         <source>&lt;h3&gt;The QtSerialPort package is not available.&lt;br/&gt;MicroPython support is deactivated.&lt;/h3&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message numerus="yes">
-        <location filename="../MicroPython/MicroPythonWidget.py" line="263"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="300"/>
         <source>%n supported device(s) detected.</source>
         <translation type="unfinished">
             <numerusform></numerusform>
@@ -47357,42 +47892,42 @@
         </translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="269"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="306"/>
         <source>{0} at {1}</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="277"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="314"/>
         <source>No supported devices detected.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="390"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="430"/>
         <source>Clear</source>
         <translation type="unfinished">Limpar</translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="392"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="432"/>
         <source>Copy</source>
         <translation type="unfinished">Copiar</translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="393"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="433"/>
         <source>Paste</source>
         <translation type="unfinished">Colar</translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="415"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="455"/>
         <source>Press to disconnect the current device</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="436"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="476"/>
         <source>No device attached</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="436"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="476"/>
         <source>Please ensure the device is plugged into your computer and selected.
 
 It must have a version of MicroPython (or CircuitPython) flashed onto it before anything will work.
@@ -47401,217 +47936,217 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="463"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="503"/>
         <source>Start REPL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="463"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="503"/>
         <source>&lt;p&gt;The REPL cannot be started.&lt;/p&gt;&lt;p&gt;Reason: {0}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="853"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="893"/>
         <source>Serial Device Connect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="853"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="893"/>
         <source>&lt;p&gt;Cannot connect to device at serial port &lt;b&gt;{0}&lt;/b&gt;.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="898"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="938"/>
         <source>Run Script</source>
         <translation type="unfinished">Executar Script</translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="881"/>
-        <source>There is no editor open. Abort...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="889"/>
-        <source>The current editor does not contain a script. Abort...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="898"/>
-        <source>&lt;p&gt;Cannot run script.&lt;/p&gt;&lt;p&gt;Reason: {0}&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="921"/>
-        <source>Open Python File</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../MicroPython/MicroPythonWidget.py" line="921"/>
+        <source>There is no editor open. Abort...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="929"/>
+        <source>The current editor does not contain a script. Abort...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="938"/>
+        <source>&lt;p&gt;Cannot run script.&lt;/p&gt;&lt;p&gt;Reason: {0}&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="961"/>
+        <source>Open Python File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="961"/>
         <source>Python3 Files (*.py);;All Files (*)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="965"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1005"/>
         <source>Start Chart</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="965"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1005"/>
         <source>&lt;p&gt;The Chart cannot be started.&lt;/p&gt;&lt;p&gt;Reason: {0}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="994"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1034"/>
         <source>Unsaved Chart Data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="994"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1034"/>
         <source>The chart contains unsaved data.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1045"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1085"/>
         <source>Start File Manager</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1045"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1085"/>
         <source>&lt;p&gt;The File Manager cannot be started.&lt;/p&gt;&lt;p&gt;Reason: {0}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1096"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1136"/>
         <source>Show Version</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1099"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1139"/>
         <source>Show Implementation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1210"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1250"/>
         <source>Synchronize Time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1107"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1147"/>
         <source>Show Device Time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1110"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1150"/>
         <source>Show Local Time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1421"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1461"/>
         <source>Compile Python File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1481"/>
+        <source>Compile Current Editor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1188"/>
+        <source>&lt;h3&gt;Device Version Information&lt;/h3&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1197"/>
+        <source>No version information available.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1199"/>
+        <source>Device Version Information</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1222"/>
+        <source>unknown</source>
+        <translation type="unfinished">desconhecido</translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1226"/>
+        <source>Device Implementation Information</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1226"/>
+        <source>&lt;h3&gt;Device Implementation Information&lt;/h3&gt;&lt;p&gt;This device contains &lt;b&gt;{0} {1}&lt;/b&gt;.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1250"/>
+        <source>&lt;p&gt;The time of the connected device was synchronized with the local time.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1272"/>
+        <source>&lt;h3&gt;Device Date and Time&lt;/h3&gt;&lt;table&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Date&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Time&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{1}&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1280"/>
+        <source>&lt;h3&gt;Device Date and Time&lt;/h3&gt;&lt;p&gt;{0}&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1294"/>
+        <source>Device Date and Time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1307"/>
+        <source>Local Date and Time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1307"/>
+        <source>&lt;h3&gt;Local Date and Time&lt;/h3&gt;&lt;table&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Date&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Time&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{1}&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1374"/>
+        <source>Error handling device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1374"/>
+        <source>&lt;p&gt;There was an error communicating with the connected device.&lt;/p&gt;&lt;p&gt;Method: {0}&lt;/p&gt;&lt;p&gt;Message: {1}&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1413"/>
+        <source>The MicroPython cross compiler &lt;b&gt;mpy-cross&lt;/b&gt; cannot be found. Ensure it is in the search path or configure it on the MicroPython configuration page.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1431"/>
+        <source>Python Files (*.py);;All Files (*)</source>
+        <translation type="unfinished">Ficheiros Python (*.py);;Ficheiros Todos (*)</translation>
+    </message>
+    <message>
         <location filename="../MicroPython/MicroPythonWidget.py" line="1441"/>
-        <source>Compile Current Editor</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1148"/>
-        <source>&lt;h3&gt;Device Version Information&lt;/h3&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1157"/>
-        <source>No version information available.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1159"/>
-        <source>Device Version Information</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1182"/>
-        <source>unknown</source>
-        <translation type="unfinished">desconhecido</translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1186"/>
-        <source>Device Implementation Information</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1186"/>
-        <source>&lt;h3&gt;Device Implementation Information&lt;/h3&gt;&lt;p&gt;This device contains &lt;b&gt;{0} {1}&lt;/b&gt;.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1210"/>
-        <source>&lt;p&gt;The time of the connected device was synchronized with the local time.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1232"/>
-        <source>&lt;h3&gt;Device Date and Time&lt;/h3&gt;&lt;table&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Date&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Time&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{1}&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1240"/>
-        <source>&lt;h3&gt;Device Date and Time&lt;/h3&gt;&lt;p&gt;{0}&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1254"/>
-        <source>Device Date and Time</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1267"/>
-        <source>Local Date and Time</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1267"/>
-        <source>&lt;h3&gt;Local Date and Time&lt;/h3&gt;&lt;table&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Date&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Time&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{1}&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1334"/>
-        <source>Error handling device</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1334"/>
-        <source>&lt;p&gt;There was an error communicating with the connected device.&lt;/p&gt;&lt;p&gt;Method: {0}&lt;/p&gt;&lt;p&gt;Message: {1}&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1373"/>
-        <source>The MicroPython cross compiler &lt;b&gt;mpy-cross&lt;/b&gt; cannot be found. Ensure it is in the search path or configure it on the MicroPython configuration page.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1391"/>
-        <source>Python Files (*.py);;All Files (*)</source>
-        <translation type="unfinished">Ficheiros Python (*.py);;Ficheiros Todos (*)</translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1401"/>
         <source>The Python file &lt;b&gt;{0}&lt;/b&gt; does not exist. Aborting...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1411"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1451"/>
         <source>&apos;mpy-cross&apos; Output</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1434"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1474"/>
         <source>The current editor does not contain a Python file. Aborting...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="175"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="211"/>
         <source>MicroPython Menu</source>
         <translation type="unfinished"></translation>
     </message>
@@ -47621,47 +48156,47 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="978"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1018"/>
         <source>&#xc2;&#xb5;Py Chart</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1058"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1098"/>
         <source>&#xc2;&#xb5;Py Files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1134"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1174"/>
         <source>Show Documentation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1138"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1178"/>
         <source>Configure</source>
         <translation type="unfinished">Configurar</translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1113"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1153"/>
         <source>Show Time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1130"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1170"/>
         <source>Download Firmware</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1310"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1350"/>
         <source>Date and Time</source>
         <translation type="unfinished">Data e Hora</translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1293"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1333"/>
         <source>&lt;table&gt;&lt;tr&gt;&lt;th&gt;&lt;/th&gt;&lt;th&gt;Local Date and Time&lt;/th&gt;&lt;th&gt;Device Date and Time&lt;/th&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Date&lt;/b&gt;&lt;/td&gt;&lt;td align=&apos;center&apos;&gt;{0}&lt;/td&gt;&lt;td align=&apos;center&apos;&gt;{2}&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Time&lt;/b&gt;&lt;/td&gt;&lt;td align=&apos;center&apos;&gt;{1}&lt;/td&gt;&lt;td align=&apos;center&apos;&gt;{3}&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1310"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1350"/>
         <source>&lt;table&gt;&lt;tr&gt;&lt;th&gt;Local Date and Time&lt;/th&gt;&lt;th&gt;Device Date and Time&lt;/th&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td align=&apos;center&apos;&gt;{0} {1}&lt;/td&gt;&lt;td align=&apos;center&apos;&gt;{2}&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -47669,85 +48204,90 @@
 <context>
     <name>MicrobitDevice</name>
     <message>
-        <location filename="../MicroPython/MicrobitDevices.py" line="67"/>
+        <location filename="../MicroPython/MicrobitDevices.py" line="74"/>
         <source>BBC micro:bit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicrobitDevices.py" line="134"/>
+        <location filename="../MicroPython/MicrobitDevices.py" line="149"/>
         <source>Workspace Directory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicrobitDevices.py" line="134"/>
-        <source>Could not find an attached BBC micro:bit.
+        <location filename="../MicroPython/MicrobitDevices.py" line="186"/>
+        <source>Save Script as &apos;main.py&apos;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicrobitDevices.py" line="188"/>
+        <source>Save the current script as &apos;main.py&apos; on the connected device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicrobitDevices.py" line="241"/>
+        <source>MicroPython Firmware Files (*.hex);;All Files (*)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicrobitDevices.py" line="286"/>
+        <source>The script is empty. Aborting.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicrobitDevices.py" line="276"/>
+        <source>The current editor does not contain a Python script. Write it anyway?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicrobitDevices.py" line="314"/>
+        <source>&lt;p&gt;The script could not be saved to the device.&lt;/p&gt;&lt;p&gt;Reason: {0}&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicrobitDevices.py" line="241"/>
+        <source>Flash MicroPython Firmware</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicrobitDevices.py" line="273"/>
+        <source>Save Script</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicrobitDevices.py" line="303"/>
+        <source>Save Script as &apos;{0}&apos;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicrobitDevices.py" line="294"/>
+        <source>Enter a file name on the device:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicrobitDevices.py" line="183"/>
+        <source>Save the current script to the selected device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicrobitDevices.py" line="77"/>
+        <source>Calliope mini</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicrobitDevices.py" line="232"/>
+        <source>Could not find an attached {0}.
 
 Please make sure the device is plugged into this computer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicrobitDevices.py" line="171"/>
-        <source>Save Script as &apos;main.py&apos;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicrobitDevices.py" line="173"/>
-        <source>Save the current script as &apos;main.py&apos; on the connected device</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicrobitDevices.py" line="177"/>
-        <source>Reset micro:bit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicrobitDevices.py" line="201"/>
-        <source>MicroPython Firmware Files (*.hex);;All Files (*)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicrobitDevices.py" line="246"/>
-        <source>The script is empty. Aborting.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicrobitDevices.py" line="236"/>
-        <source>The current editor does not contain a Python script. Write it anyway?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicrobitDevices.py" line="274"/>
-        <source>&lt;p&gt;The script could not be saved to the device.&lt;/p&gt;&lt;p&gt;Reason: {0}&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicrobitDevices.py" line="201"/>
-        <source>Flash MicroPython Firmware</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicrobitDevices.py" line="233"/>
-        <source>Save Script</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicrobitDevices.py" line="190"/>
-        <source>The BBC micro:bit is not ready for flashing. See the &lt;a href=&quot;https://microbit.org/guide/firmware/&quot;&gt;micro:bit web site&lt;/a&gt; for details.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicrobitDevices.py" line="263"/>
-        <source>Save Script as &apos;{0}&apos;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicrobitDevices.py" line="254"/>
-        <source>Enter a file name on the device:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicrobitDevices.py" line="168"/>
-        <source>Save the current script to the selected device</source>
+        <location filename="../MicroPython/MicrobitDevices.py" line="192"/>
+        <source>Reset {0}</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicrobitDevices.py" line="213"/>
+        <source>&lt;p&gt;The BBC micro:bit is not ready for flashing. Follow these instructions.&lt;/p&gt;&lt;ul&gt;&lt;li&gt;unplug USB cable and any batteries&lt;/li&gt;&lt;li&gt;keep RESET button pressed an plug USB cable back in&lt;/li&gt;&lt;li&gt;a drive called MAINTENANCE should be available&lt;/li&gt;&lt;/ul&gt;&lt;p&gt;See the &lt;a href=&quot;https://microbit.org/guide/firmware/&quot;&gt;micro:bit web site&lt;/a&gt; for details.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -51645,7 +52185,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message numerus="yes">
-        <location filename="../PipInterface/PipPackagesWidget.py" line="635"/>
+        <location filename="../PipInterface/PipPackagesWidget.py" line="645"/>
         <source>%n package(s) found.</source>
         <translation type="unfinished">
             <numerusform></numerusform>
@@ -51653,102 +52193,102 @@
         </translation>
     </message>
     <message>
-        <location filename="../PipInterface/PipPackagesWidget.py" line="888"/>
+        <location filename="../PipInterface/PipPackagesWidget.py" line="898"/>
         <source>Search PyPI</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../PipInterface/PipPackagesWidget.py" line="673"/>
+        <location filename="../PipInterface/PipPackagesWidget.py" line="683"/>
         <source>&lt;p&gt;The package search did not return anything.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../PipInterface/PipPackagesWidget.py" line="710"/>
+        <location filename="../PipInterface/PipPackagesWidget.py" line="720"/>
         <source>&lt;p&gt;The package search failed.&lt;/p&gt;&lt;p&gt;Reason: {0}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../PipInterface/PipPackagesWidget.py" line="715"/>
+        <location filename="../PipInterface/PipPackagesWidget.py" line="725"/>
         <source>Error: {0}</source>
         <translation type="unfinished">Erro: {0}</translation>
     </message>
     <message>
-        <location filename="../PipInterface/PipPackagesWidget.py" line="848"/>
+        <location filename="../PipInterface/PipPackagesWidget.py" line="858"/>
         <source>Show Package Details</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../PipInterface/PipPackagesWidget.py" line="848"/>
+        <location filename="../PipInterface/PipPackagesWidget.py" line="858"/>
         <source>Select the package version:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../PipInterface/PipPackagesWidget.py" line="888"/>
+        <location filename="../PipInterface/PipPackagesWidget.py" line="898"/>
         <source>&lt;p&gt;No package details info for &lt;b&gt;{0}&lt;/b&gt; available.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../PipInterface/PipPackagesWidget.py" line="904"/>
+        <location filename="../PipInterface/PipPackagesWidget.py" line="914"/>
         <source>Install Pip</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../PipInterface/PipPackagesWidget.py" line="907"/>
-        <source>Install Pip to User-Site</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../PipInterface/PipPackagesWidget.py" line="910"/>
-        <source>Repair Pip</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../PipInterface/PipPackagesWidget.py" line="1005"/>
-        <source>Install Packages</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../PipInterface/PipPackagesWidget.py" line="917"/>
-        <source>Install Local Package</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../PipInterface/PipPackagesWidget.py" line="921"/>
-        <source>Install Requirements</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../PipInterface/PipPackagesWidget.py" line="924"/>
-        <source>Uninstall Requirements</source>
+        <source>Install Pip to User-Site</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../PipInterface/PipPackagesWidget.py" line="920"/>
+        <source>Repair Pip</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../PipInterface/PipPackagesWidget.py" line="1015"/>
+        <source>Install Packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../PipInterface/PipPackagesWidget.py" line="927"/>
+        <source>Install Local Package</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../PipInterface/PipPackagesWidget.py" line="931"/>
+        <source>Install Requirements</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../PipInterface/PipPackagesWidget.py" line="934"/>
+        <source>Uninstall Requirements</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../PipInterface/PipPackagesWidget.py" line="937"/>
         <source>Generate Requirements...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../PipInterface/PipPackagesWidget.py" line="932"/>
+        <location filename="../PipInterface/PipPackagesWidget.py" line="942"/>
         <source>Edit User Configuration...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../PipInterface/PipPackagesWidget.py" line="935"/>
+        <location filename="../PipInterface/PipPackagesWidget.py" line="945"/>
         <source>Edit Environment Configuration...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../PipInterface/PipPackagesWidget.py" line="940"/>
+        <location filename="../PipInterface/PipPackagesWidget.py" line="950"/>
         <source>Configure...</source>
         <translation type="unfinished">Configurar...</translation>
     </message>
     <message>
-        <location filename="../PipInterface/PipPackagesWidget.py" line="1118"/>
+        <location filename="../PipInterface/PipPackagesWidget.py" line="1128"/>
         <source>Edit Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../PipInterface/PipPackagesWidget.py" line="1118"/>
+        <location filename="../PipInterface/PipPackagesWidget.py" line="1128"/>
         <source>No valid configuration path determined. Aborting</source>
         <translation type="unfinished"></translation>
     </message>
@@ -53043,17 +53583,17 @@
 <context>
     <name>Preferences</name>
     <message>
-        <location filename="../Preferences/__init__.py" line="1624"/>
+        <location filename="../Preferences/__init__.py" line="1640"/>
         <source>Export Preferences</source>
         <translation>Exportar Preferências</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1652"/>
+        <location filename="../Preferences/__init__.py" line="1668"/>
         <source>Import Preferences</source>
         <translation>Importar Preferências</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1652"/>
+        <location filename="../Preferences/__init__.py" line="1668"/>
         <source>Properties File (*.ini);;All Files (*)</source>
         <translation>Ficheiro de Propriedades (*.ini);;Ficheiros Todos (*)</translation>
     </message>
@@ -53260,7 +53800,7 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/PrinterPage.ui" line="77"/>
         <source>Colour</source>
-        <translation>Cor</translation>
+        <translation type="obsolete">Cor</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/PrinterPage.ui" line="84"/>
@@ -53300,7 +53840,7 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/PrinterPage.ui" line="49"/>
         <source>Colour Mode:</source>
-        <translation>Modo de Cor:</translation>
+        <translation type="obsolete">Modo de Cor:</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/PrinterPage.ui" line="94"/>
@@ -53352,6 +53892,16 @@
         <source> DPI</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/PrinterPage.ui" line="49"/>
+        <source>Color Mode:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/PrinterPage.ui" line="77"/>
+        <source>Color</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ProgramsDialog</name>
@@ -53604,312 +54154,312 @@
         <translation>A registar Tipo de Projeto</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="805"/>
+        <location filename="../Project/Project.py" line="817"/>
         <source>Read project file</source>
         <translation>Ler ficheiro de projeto</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="805"/>
+        <location filename="../Project/Project.py" line="817"/>
         <source>&lt;p&gt;The project file &lt;b&gt;{0}&lt;/b&gt; could not be read.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Não se pôde ler o ficheiro de projeto &lt;b&gt;{0}&lt;/b&gt;.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="908"/>
+        <location filename="../Project/Project.py" line="920"/>
         <source>Save project file</source>
         <translation>Gravar ficheiro de projeto</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="908"/>
+        <location filename="../Project/Project.py" line="920"/>
         <source>&lt;p&gt;The project file &lt;b&gt;{0}&lt;/b&gt; could not be written.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Não se pôde escrever o ficheiro de projeto &lt;b&gt;{0}&lt;/b&gt;.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="944"/>
+        <location filename="../Project/Project.py" line="956"/>
         <source>Read user project properties</source>
         <translation>Ler propriedades de projeto do usuário</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="944"/>
+        <location filename="../Project/Project.py" line="956"/>
         <source>&lt;p&gt;The user specific project properties file &lt;b&gt;{0}&lt;/b&gt; could not be read.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="968"/>
+        <location filename="../Project/Project.py" line="980"/>
         <source>Save user project properties</source>
         <translation>Gravar propriedades de projeto do usuário</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="968"/>
+        <location filename="../Project/Project.py" line="980"/>
         <source>&lt;p&gt;The user specific project properties file &lt;b&gt;{0}&lt;/b&gt; could not be written.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1026"/>
+        <location filename="../Project/Project.py" line="1038"/>
         <source>Read project session</source>
         <translation>Ler sessão de projeto</translation>
     </message>
     <message>
+        <location filename="../Project/Project.py" line="1263"/>
+        <source>Please save the project first.</source>
+        <translation>Guarde primeiro o projeto por favor.</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="1038"/>
+        <source>&lt;p&gt;The project session file &lt;b&gt;{0}&lt;/b&gt; could not be read.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="1074"/>
+        <source>Save project session</source>
+        <translation>Gravar a sessão do projeto</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="1074"/>
+        <source>&lt;p&gt;The project session file &lt;b&gt;{0}&lt;/b&gt; could not be written.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="1103"/>
+        <source>Delete project session</source>
+        <translation>Apagar a sessão do projeto</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="1103"/>
+        <source>&lt;p&gt;The project session file &lt;b&gt;{0}&lt;/b&gt; could not be deleted.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="1137"/>
+        <source>Read tasks</source>
+        <translation>Ler tarefas</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="1137"/>
+        <source>&lt;p&gt;The tasks file &lt;b&gt;{0}&lt;/b&gt; could not be read.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="1157"/>
+        <source>Save tasks</source>
+        <translation>Gravar tarefas</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="1157"/>
+        <source>&lt;p&gt;The tasks file &lt;b&gt;{0}&lt;/b&gt; could not be written.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="1216"/>
+        <source>Read debugger properties</source>
+        <translation>Ler propriedades do depurador</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="1216"/>
+        <source>&lt;p&gt;The project debugger properties file &lt;b&gt;{0}&lt;/b&gt; could not be read.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="1251"/>
+        <source>Save debugger properties</source>
+        <translation>Gravar propriedades do depurador</translation>
+    </message>
+    <message>
         <location filename="../Project/Project.py" line="1251"/>
-        <source>Please save the project first.</source>
-        <translation>Guarde primeiro o projeto por favor.</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="1026"/>
-        <source>&lt;p&gt;The project session file &lt;b&gt;{0}&lt;/b&gt; could not be read.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="1062"/>
-        <source>Save project session</source>
-        <translation>Gravar a sessão do projeto</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="1062"/>
-        <source>&lt;p&gt;The project session file &lt;b&gt;{0}&lt;/b&gt; could not be written.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="1091"/>
-        <source>Delete project session</source>
-        <translation>Apagar a sessão do projeto</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="1091"/>
-        <source>&lt;p&gt;The project session file &lt;b&gt;{0}&lt;/b&gt; could not be deleted.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="1125"/>
-        <source>Read tasks</source>
-        <translation>Ler tarefas</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="1125"/>
-        <source>&lt;p&gt;The tasks file &lt;b&gt;{0}&lt;/b&gt; could not be read.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="1145"/>
-        <source>Save tasks</source>
-        <translation>Gravar tarefas</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="1145"/>
-        <source>&lt;p&gt;The tasks file &lt;b&gt;{0}&lt;/b&gt; could not be written.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="1204"/>
-        <source>Read debugger properties</source>
-        <translation>Ler propriedades do depurador</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="1204"/>
-        <source>&lt;p&gt;The project debugger properties file &lt;b&gt;{0}&lt;/b&gt; could not be read.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="1239"/>
-        <source>Save debugger properties</source>
-        <translation>Gravar propriedades do depurador</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="1239"/>
         <source>&lt;p&gt;The project debugger properties file &lt;b&gt;{0}&lt;/b&gt; could not be written.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1265"/>
+        <location filename="../Project/Project.py" line="1277"/>
         <source>Delete debugger properties</source>
         <translation>Apagar propriedades do depurador</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1265"/>
+        <location filename="../Project/Project.py" line="1277"/>
         <source>&lt;p&gt;The project debugger properties file &lt;b&gt;{0}&lt;/b&gt; could not be deleted.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1393"/>
+        <location filename="../Project/Project.py" line="1405"/>
         <source>Add Language</source>
         <translation>Adicionar Idioma</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1393"/>
+        <location filename="../Project/Project.py" line="1405"/>
         <source>You have to specify a translation pattern first.</source>
         <translation>Primeiro tem que especificar um padrão de tradução.</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1519"/>
+        <location filename="../Project/Project.py" line="1531"/>
         <source>Delete translation</source>
         <translation>Apagar a Tradução</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1684"/>
+        <location filename="../Project/Project.py" line="1696"/>
         <source>Add file</source>
         <translation>Adicionar ficheiro</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1748"/>
+        <location filename="../Project/Project.py" line="1760"/>
         <source>&lt;p&gt;The file &lt;b&gt;{0}&lt;/b&gt; already exists.&lt;/p&gt;&lt;p&gt;Overwrite it?&lt;/p&gt;</source>
         <translation>&lt;p&gt;O ficheiro &lt;b&gt;{0}&lt;/b&gt; já existe. &lt;/p&gt;&lt;p&gt;Sobreescrever?&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1671"/>
+        <location filename="../Project/Project.py" line="1683"/>
         <source>&lt;p&gt;The selected file &lt;b&gt;{0}&lt;/b&gt; could not be added to &lt;b&gt;{1}&lt;/b&gt;.&lt;/p&gt;&lt;p&gt;Reason: {2}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1816"/>
+        <location filename="../Project/Project.py" line="1828"/>
         <source>The target directory must not be empty.</source>
         <translation>O diretório de destino não pode estar vazio.</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1827"/>
+        <location filename="../Project/Project.py" line="1839"/>
         <source>Add directory</source>
         <translation>Adicionar diretório</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1715"/>
+        <location filename="../Project/Project.py" line="1727"/>
         <source>&lt;p&gt;The source directory doesn&apos;t contain any files belonging to the selected category.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1730"/>
+        <location filename="../Project/Project.py" line="1742"/>
         <source>&lt;p&gt;The target directory &lt;b&gt;{0}&lt;/b&gt; could not be created.&lt;/p&gt;&lt;p&gt;Reason: {1}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1827"/>
+        <location filename="../Project/Project.py" line="1839"/>
         <source>The source directory must not be empty.</source>
         <translation>O diretório fonte não pode estar vazio.</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1964"/>
+        <location filename="../Project/Project.py" line="1976"/>
         <source>Rename file</source>
         <translation>Renomear ficheiro</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1988"/>
+        <location filename="../Project/Project.py" line="2000"/>
         <source>Rename File</source>
         <translation>Renomear Ficheiro</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3130"/>
+        <location filename="../Project/Project.py" line="3147"/>
         <source>&lt;p&gt;The file &lt;b&gt;{0}&lt;/b&gt; already exists. Overwrite it?&lt;/p&gt;</source>
         <translation>&lt;p&gt;O ficheiro &lt;b&gt;{0}&lt;/b&gt; já existe. Sobreescrever?&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1988"/>
+        <location filename="../Project/Project.py" line="2000"/>
         <source>&lt;p&gt;The file &lt;b&gt;{0}&lt;/b&gt; could not be renamed.&lt;br /&gt;Reason: {1}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="2233"/>
+        <location filename="../Project/Project.py" line="2250"/>
         <source>Delete file</source>
         <translation>Apagar ficheiro</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="2263"/>
+        <location filename="../Project/Project.py" line="2280"/>
         <source>Delete directory</source>
         <translation>Apagar diretório</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="2358"/>
+        <location filename="../Project/Project.py" line="2375"/>
         <source>Create project directory</source>
         <translation>Criar diretório de projeto</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="2358"/>
+        <location filename="../Project/Project.py" line="2375"/>
         <source>&lt;p&gt;The project directory &lt;b&gt;{0}&lt;/b&gt; could not be created.&lt;/p&gt;</source>
         <translation>&lt;p&gt;O diretorio do projeto &lt;b&gt;{0}&lt;/b&gt; não se pôde criar.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="2965"/>
+        <location filename="../Project/Project.py" line="2982"/>
         <source>New Project</source>
         <translation>Projeto Novo</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="2474"/>
+        <location filename="../Project/Project.py" line="2491"/>
         <source>Add existing files to the project?</source>
         <translation>Adicionar os ficheiros existentes ao projeto?</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="2965"/>
+        <location filename="../Project/Project.py" line="2982"/>
         <source>Select Version Control System</source>
         <translation>Selecionar o Sistema de Control de Versão</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="2601"/>
+        <location filename="../Project/Project.py" line="2618"/>
         <source>Would you like to edit the VCS command options?</source>
         <translation>Quer editar as opções de commandos VCS?</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3831"/>
+        <location filename="../Project/Project.py" line="3866"/>
         <source>New project</source>
         <translation>Projeto novo</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="2544"/>
+        <location filename="../Project/Project.py" line="2561"/>
         <source>Shall the project file be added to the repository?</source>
         <translation>Deve adicionar-se o ficheiro de projeto ao repositório?</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="2580"/>
+        <location filename="../Project/Project.py" line="2597"/>
         <source>None</source>
         <translation>Nenhum</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="2573"/>
+        <location filename="../Project/Project.py" line="2590"/>
         <source>Select version control system for the project</source>
         <translation>Selecionar o sistema de control de versão para o projeto</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="2684"/>
+        <location filename="../Project/Project.py" line="2701"/>
         <source>Translation Pattern</source>
         <translation>Padrão de Tradução</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="2684"/>
+        <location filename="../Project/Project.py" line="2701"/>
         <source>Enter the path pattern for translation files (use &apos;%language%&apos; in place of the language code):</source>
         <translation>Introduzir o padrão para os ficheiros de tradução (usar &apos;%language%&apos; em lugar do código de idioma):</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3845"/>
+        <location filename="../Project/Project.py" line="3880"/>
         <source>Open project</source>
         <translation>Abrir projeto</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3115"/>
+        <location filename="../Project/Project.py" line="3132"/>
         <source>Project Files (*.e4p)</source>
         <translation>Ficheiros de Projeto (*.e4p)</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3882"/>
+        <location filename="../Project/Project.py" line="3917"/>
         <source>Save project as</source>
         <translation>Gravar projeto como</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3130"/>
+        <location filename="../Project/Project.py" line="3147"/>
         <source>Save File</source>
         <translation>Gravar Ficheiro</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3166"/>
+        <location filename="../Project/Project.py" line="3183"/>
         <source>Close Project</source>
         <translation>Fechar Projeto</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3166"/>
+        <location filename="../Project/Project.py" line="3183"/>
         <source>The current project has unsaved changes.</source>
         <translation>O projeto atual tem alterações por gravar.</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3343"/>
+        <location filename="../Project/Project.py" line="3360"/>
         <source>Syntax errors detected</source>
         <translation>Detetados erros de sintaxe</translation>
     </message>
     <message numerus="yes">
-        <location filename="../Project/Project.py" line="3343"/>
+        <location filename="../Project/Project.py" line="3360"/>
         <source>The project contains %n file(s) with syntax errors.</source>
         <translation>
             <numerusform>O projeto tem um ficheiro com erros de síntaxe.</numerusform>
@@ -53917,607 +54467,607 @@
         </translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3831"/>
+        <location filename="../Project/Project.py" line="3866"/>
         <source>&amp;New...</source>
         <translation>&amp;Novo...</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3836"/>
+        <location filename="../Project/Project.py" line="3871"/>
         <source>Generate a new project</source>
         <translation>Criar um projeto novo</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3837"/>
+        <location filename="../Project/Project.py" line="3872"/>
         <source>&lt;b&gt;New...&lt;/b&gt;&lt;p&gt;This opens a dialog for entering the info for a new project.&lt;/p&gt;</source>
         <translation>&lt;b&gt;Novo...&lt;/b&gt;&lt;p&gt;Abre uma caixa de diálogo para introduzir a informação para um projeto novo.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3845"/>
+        <location filename="../Project/Project.py" line="3880"/>
         <source>&amp;Open...</source>
         <translation>&amp;Abrir...</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3850"/>
+        <location filename="../Project/Project.py" line="3885"/>
         <source>Open an existing project</source>
         <translation>Abrir um projeto existente</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3851"/>
-        <source>&lt;b&gt;Open...&lt;/b&gt;&lt;p&gt;This opens an existing project.&lt;/p&gt;</source>
-        <translation>&lt;b&gt;Abrir...&lt;/b&gt;&lt;p&gt;Isto abre um projeto existente.&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="3858"/>
-        <source>Close project</source>
-        <translation>Fechar projeto</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="3858"/>
-        <source>&amp;Close</source>
-        <translation>&amp;Fechar</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="3862"/>
-        <source>Close the current project</source>
-        <translation>Fechar o projeto atual</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="3863"/>
-        <source>&lt;b&gt;Close&lt;/b&gt;&lt;p&gt;This closes the current project.&lt;/p&gt;</source>
-        <translation>&lt;b&gt;Fechar&lt;/b&gt;&lt;p&gt;Fecha o projeto atual&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="3870"/>
-        <source>Save project</source>
-        <translation>Gravar projeto</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4062"/>
-        <source>&amp;Save</source>
-        <translation>&amp;Gravar</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="3874"/>
-        <source>Save the current project</source>
-        <translation>Gravar o projeto actual</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="3875"/>
-        <source>&lt;b&gt;Save&lt;/b&gt;&lt;p&gt;This saves the current project.&lt;/p&gt;</source>
-        <translation>&lt;b&gt;Gravar&lt;/b&gt;&lt;p&gt;Guarda o projeto atual.&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="3882"/>
-        <source>Save &amp;as...</source>
-        <translation>Gravar &amp;como...</translation>
-    </message>
-    <message>
         <location filename="../Project/Project.py" line="3886"/>
-        <source>Save the current project to a new file</source>
-        <translation>Gravar o projeto atual para um ficheiro novo</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="3888"/>
-        <source>&lt;b&gt;Save as&lt;/b&gt;&lt;p&gt;This saves the current project to a new file.&lt;/p&gt;</source>
-        <translation>&lt;b&gt;Gravar como&lt;/b&gt;&lt;p&gt;Guarda o projeto atual para um ficheiro novo.&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="3897"/>
-        <source>Add files to project</source>
-        <translation>Adicionar ficheiros ao projeto</translation>
+        <source>&lt;b&gt;Open...&lt;/b&gt;&lt;p&gt;This opens an existing project.&lt;/p&gt;</source>
+        <translation>&lt;b&gt;Abrir...&lt;/b&gt;&lt;p&gt;Isto abre um projeto existente.&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="3893"/>
+        <source>Close project</source>
+        <translation>Fechar projeto</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="3893"/>
+        <source>&amp;Close</source>
+        <translation>&amp;Fechar</translation>
     </message>
     <message>
         <location filename="../Project/Project.py" line="3897"/>
+        <source>Close the current project</source>
+        <translation>Fechar o projeto atual</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="3898"/>
+        <source>&lt;b&gt;Close&lt;/b&gt;&lt;p&gt;This closes the current project.&lt;/p&gt;</source>
+        <translation>&lt;b&gt;Fechar&lt;/b&gt;&lt;p&gt;Fecha o projeto atual&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="3905"/>
+        <source>Save project</source>
+        <translation>Gravar projeto</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4097"/>
+        <source>&amp;Save</source>
+        <translation>&amp;Gravar</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="3909"/>
+        <source>Save the current project</source>
+        <translation>Gravar o projeto actual</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="3910"/>
+        <source>&lt;b&gt;Save&lt;/b&gt;&lt;p&gt;This saves the current project.&lt;/p&gt;</source>
+        <translation>&lt;b&gt;Gravar&lt;/b&gt;&lt;p&gt;Guarda o projeto atual.&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="3917"/>
+        <source>Save &amp;as...</source>
+        <translation>Gravar &amp;como...</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="3921"/>
+        <source>Save the current project to a new file</source>
+        <translation>Gravar o projeto atual para um ficheiro novo</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="3923"/>
+        <source>&lt;b&gt;Save as&lt;/b&gt;&lt;p&gt;This saves the current project to a new file.&lt;/p&gt;</source>
+        <translation>&lt;b&gt;Gravar como&lt;/b&gt;&lt;p&gt;Guarda o projeto atual para um ficheiro novo.&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="3932"/>
+        <source>Add files to project</source>
+        <translation>Adicionar ficheiros ao projeto</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="3932"/>
         <source>Add &amp;files...</source>
         <translation>Adicionar &amp;ficheiros...</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3902"/>
+        <location filename="../Project/Project.py" line="3937"/>
         <source>Add files to the current project</source>
         <translation>Adicionar ficheiros ao projeto atual</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3904"/>
+        <location filename="../Project/Project.py" line="3939"/>
         <source>&lt;b&gt;Add files...&lt;/b&gt;&lt;p&gt;This opens a dialog for adding files to the current project. The place to add is determined by the file extension.&lt;/p&gt;</source>
         <translation>&lt;b&gt;Adicionar ficheiros...&lt;/b&gt;&lt;p&gt;Abre uma caixa de diálogo para adicionar ficheiros ao projeto atual. O lugar para adicionar determina-se pela extensão de ficheiro.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3913"/>
+        <location filename="../Project/Project.py" line="3948"/>
         <source>Add directory to project</source>
         <translation>Adicionar diretório ao projeto</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3913"/>
+        <location filename="../Project/Project.py" line="3948"/>
         <source>Add directory...</source>
         <translation>Adicionar diretório...</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3918"/>
+        <location filename="../Project/Project.py" line="3953"/>
         <source>Add a directory to the current project</source>
         <translation>Adicionar um diretório ao projeto atual</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3920"/>
+        <location filename="../Project/Project.py" line="3955"/>
         <source>&lt;b&gt;Add directory...&lt;/b&gt;&lt;p&gt;This opens a dialog for adding a directory to the current project.&lt;/p&gt;</source>
         <translation>&lt;b&gt;Adicionar diretório&lt;/b&gt;&lt;p&gt;Abre uma caixa de diálogo para adicionar um diretório ao projeto atual.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3928"/>
+        <location filename="../Project/Project.py" line="3963"/>
         <source>Add translation to project</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3928"/>
+        <location filename="../Project/Project.py" line="3963"/>
         <source>Add &amp;translation...</source>
         <translation>Adicionar &amp;tradução...</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3933"/>
+        <location filename="../Project/Project.py" line="3968"/>
         <source>Add a translation to the current project</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3935"/>
+        <location filename="../Project/Project.py" line="3970"/>
         <source>&lt;b&gt;Add translation...&lt;/b&gt;&lt;p&gt;This opens a dialog for add a translation to the current project.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3943"/>
-        <source>Search new files</source>
-        <translation>Procurar ficheiros novos</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="3943"/>
-        <source>Searc&amp;h new files...</source>
-        <translation>&amp;Procurar ficheiros novos...</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="3947"/>
-        <source>Search new files in the project directory.</source>
-        <translation>Procurar ficheiros novos no diretório do projeto.</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="3973"/>
-        <source>Project properties</source>
-        <translation>Propriedades do projeto</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="3973"/>
-        <source>&amp;Properties...</source>
-        <translation>&amp;Propriedades...</translation>
-    </message>
-    <message>
         <location filename="../Project/Project.py" line="3978"/>
+        <source>Search new files</source>
+        <translation>Procurar ficheiros novos</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="3978"/>
+        <source>Searc&amp;h new files...</source>
+        <translation>&amp;Procurar ficheiros novos...</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="3982"/>
+        <source>Search new files in the project directory.</source>
+        <translation>Procurar ficheiros novos no diretório do projeto.</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4008"/>
+        <source>Project properties</source>
+        <translation>Propriedades do projeto</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4008"/>
+        <source>&amp;Properties...</source>
+        <translation>&amp;Propriedades...</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4013"/>
         <source>Show the project properties</source>
         <translation>Mostrar as propriedades do projeto</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3979"/>
+        <location filename="../Project/Project.py" line="4014"/>
         <source>&lt;b&gt;Properties...&lt;/b&gt;&lt;p&gt;This shows a dialog to edit the project properties.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3986"/>
+        <location filename="../Project/Project.py" line="4021"/>
         <source>User project properties</source>
         <translation>Propriedades de projecto do usuário</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3986"/>
+        <location filename="../Project/Project.py" line="4021"/>
         <source>&amp;User Properties...</source>
         <translation>Propriedades de &amp;Usuário...</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3991"/>
+        <location filename="../Project/Project.py" line="4026"/>
         <source>Show the user specific project properties</source>
         <translation>Mostrar as propriedades do projeto específicas do usuário</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3993"/>
+        <location filename="../Project/Project.py" line="4028"/>
         <source>&lt;b&gt;User Properties...&lt;/b&gt;&lt;p&gt;This shows a dialog to edit the user specific project properties.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4001"/>
+        <location filename="../Project/Project.py" line="4036"/>
         <source>Filetype Associations</source>
         <translation>Associações de Tipos de Ficheiros</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4001"/>
+        <location filename="../Project/Project.py" line="4036"/>
         <source>Filetype Associations...</source>
         <translation>Associações de Tipos de Ficheiros...</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4005"/>
+        <location filename="../Project/Project.py" line="4040"/>
         <source>Show the project filetype associations</source>
         <translation>Mostrar as associações de tipos de ficheiros do projeto</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4019"/>
+        <location filename="../Project/Project.py" line="4054"/>
         <source>Lexer Associations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4019"/>
-        <source>Lexer Associations...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4023"/>
-        <source>Show the project lexer associations (overriding defaults)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4025"/>
-        <source>&lt;b&gt;Lexer Associations...&lt;/b&gt;&lt;p&gt;This shows a dialog to edit the lexer associations of the project. These associations override the global lexer associations. Lexers are used to highlight the editor text.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4037"/>
-        <source>Debugger Properties</source>
-        <translation>Propriedades do Depurador</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4037"/>
-        <source>Debugger &amp;Properties...</source>
-        <translation>&amp;Propriedades do Depurador...</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4041"/>
-        <source>Show the debugger properties</source>
-        <translation>Mostrar as propriedades do depurador</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4042"/>
-        <source>&lt;b&gt;Debugger Properties...&lt;/b&gt;&lt;p&gt;This shows a dialog to edit project specific debugger settings.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4050"/>
-        <source>Load</source>
-        <translation>Carregar</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4050"/>
-        <source>&amp;Load</source>
-        <translation>&amp;Carregar</translation>
-    </message>
-    <message>
         <location filename="../Project/Project.py" line="4054"/>
+        <source>Lexer Associations...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4058"/>
+        <source>Show the project lexer associations (overriding defaults)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4060"/>
+        <source>&lt;b&gt;Lexer Associations...&lt;/b&gt;&lt;p&gt;This shows a dialog to edit the lexer associations of the project. These associations override the global lexer associations. Lexers are used to highlight the editor text.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4072"/>
+        <source>Debugger Properties</source>
+        <translation>Propriedades do Depurador</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4072"/>
+        <source>Debugger &amp;Properties...</source>
+        <translation>&amp;Propriedades do Depurador...</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4076"/>
+        <source>Show the debugger properties</source>
+        <translation>Mostrar as propriedades do depurador</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4077"/>
+        <source>&lt;b&gt;Debugger Properties...&lt;/b&gt;&lt;p&gt;This shows a dialog to edit project specific debugger settings.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4085"/>
+        <source>Load</source>
+        <translation>Carregar</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4085"/>
+        <source>&amp;Load</source>
+        <translation>&amp;Carregar</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4089"/>
         <source>Load the debugger properties</source>
         <translation>Carregar propriedades do depurador</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4055"/>
+        <location filename="../Project/Project.py" line="4090"/>
         <source>&lt;b&gt;Load Debugger Properties&lt;/b&gt;&lt;p&gt;This loads the project specific debugger settings.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4062"/>
+        <location filename="../Project/Project.py" line="4097"/>
         <source>Save</source>
         <translation>Gravar</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4066"/>
-        <source>Save the debugger properties</source>
-        <translation>Gravar propriedades do depurador</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4067"/>
-        <source>&lt;b&gt;Save Debugger Properties&lt;/b&gt;&lt;p&gt;This saves the project specific debugger settings.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4074"/>
-        <source>Delete</source>
-        <translation>Apagar</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4074"/>
-        <source>&amp;Delete</source>
-        <translation>&amp;Apagar</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4078"/>
-        <source>Delete the debugger properties</source>
-        <translation>Apagar as propriedades do depurador</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4079"/>
-        <source>&lt;b&gt;Delete Debugger Properties&lt;/b&gt;&lt;p&gt;This deletes the file containing the project specific debugger settings.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4087"/>
-        <source>Reset</source>
-        <translation>Reinicializar</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4087"/>
-        <source>&amp;Reset</source>
-        <translation>&amp;Reinicializar</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4091"/>
-        <source>Reset the debugger properties</source>
-        <translation>Reinicializar as propriedades do depurador</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4092"/>
-        <source>&lt;b&gt;Reset Debugger Properties&lt;/b&gt;&lt;p&gt;This resets the project specific debugger settings.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Project/Project.py" line="4101"/>
+        <source>Save the debugger properties</source>
+        <translation>Gravar propriedades do depurador</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4102"/>
+        <source>&lt;b&gt;Save Debugger Properties&lt;/b&gt;&lt;p&gt;This saves the project specific debugger settings.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4109"/>
+        <source>Delete</source>
+        <translation>Apagar</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4109"/>
+        <source>&amp;Delete</source>
+        <translation>&amp;Apagar</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4113"/>
+        <source>Delete the debugger properties</source>
+        <translation>Apagar as propriedades do depurador</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4114"/>
+        <source>&lt;b&gt;Delete Debugger Properties&lt;/b&gt;&lt;p&gt;This deletes the file containing the project specific debugger settings.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4122"/>
+        <source>Reset</source>
+        <translation>Reinicializar</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4122"/>
+        <source>&amp;Reset</source>
+        <translation>&amp;Reinicializar</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4126"/>
+        <source>Reset the debugger properties</source>
+        <translation>Reinicializar as propriedades do depurador</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4127"/>
+        <source>&lt;b&gt;Reset Debugger Properties&lt;/b&gt;&lt;p&gt;This resets the project specific debugger settings.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4136"/>
         <source>Load session</source>
         <translation>Carregar sessão</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4105"/>
+        <location filename="../Project/Project.py" line="4140"/>
         <source>Load the projects session file.</source>
         <translation>Carregar o ficheiro de sessão do projeto.</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4106"/>
-        <source>&lt;b&gt;Load session&lt;/b&gt;&lt;p&gt;This loads the projects session file. The session consists of the following data.&lt;br&gt;- all open source files&lt;br&gt;- all breakpoint&lt;br&gt;- the commandline arguments&lt;br&gt;- the working directory&lt;br&gt;- the exception reporting flag&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4119"/>
-        <source>Save session</source>
-        <translation>Guargar sessão</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4123"/>
-        <source>Save the projects session file.</source>
-        <translation>Gravar ficheiro de sessão do projeto.</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4124"/>
-        <source>&lt;b&gt;Save session&lt;/b&gt;&lt;p&gt;This saves the projects session file. The session consists of the following data.&lt;br&gt;- all open source files&lt;br&gt;- all breakpoint&lt;br&gt;- the commandline arguments&lt;br&gt;- the working directory&lt;br&gt;- the exception reporting flag&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4137"/>
-        <source>Delete session</source>
-        <translation>Apagar sessão</translation>
-    </message>
-    <message>
         <location filename="../Project/Project.py" line="4141"/>
+        <source>&lt;b&gt;Load session&lt;/b&gt;&lt;p&gt;This loads the projects session file. The session consists of the following data.&lt;br&gt;- all open source files&lt;br&gt;- all breakpoint&lt;br&gt;- the commandline arguments&lt;br&gt;- the working directory&lt;br&gt;- the exception reporting flag&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4154"/>
+        <source>Save session</source>
+        <translation>Guargar sessão</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4158"/>
+        <source>Save the projects session file.</source>
+        <translation>Gravar ficheiro de sessão do projeto.</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4159"/>
+        <source>&lt;b&gt;Save session&lt;/b&gt;&lt;p&gt;This saves the projects session file. The session consists of the following data.&lt;br&gt;- all open source files&lt;br&gt;- all breakpoint&lt;br&gt;- the commandline arguments&lt;br&gt;- the working directory&lt;br&gt;- the exception reporting flag&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4172"/>
+        <source>Delete session</source>
+        <translation>Apagar sessão</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4176"/>
         <source>Delete the projects session file.</source>
         <translation>Apagar o ficheiro de sessão do projeto.</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4142"/>
+        <location filename="../Project/Project.py" line="4177"/>
         <source>&lt;b&gt;Delete session&lt;/b&gt;&lt;p&gt;This deletes the projects session file&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4151"/>
+        <location filename="../Project/Project.py" line="4186"/>
         <source>Code Metrics</source>
         <translation type="unfinished">Métricas de Código</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4151"/>
+        <location filename="../Project/Project.py" line="4186"/>
         <source>&amp;Code Metrics...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4155"/>
+        <location filename="../Project/Project.py" line="4190"/>
         <source>Show some code metrics for the project.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4157"/>
+        <location filename="../Project/Project.py" line="4192"/>
         <source>&lt;b&gt;Code Metrics...&lt;/b&gt;&lt;p&gt;This shows some code metrics for all Python files in the project.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4165"/>
+        <location filename="../Project/Project.py" line="4200"/>
         <source>Python Code Coverage</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4165"/>
-        <source>Code Co&amp;verage...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4169"/>
-        <source>Show code coverage information for the project.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4171"/>
-        <source>&lt;b&gt;Code Coverage...&lt;/b&gt;&lt;p&gt;This shows the code coverage information for all Python files in the project.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="5053"/>
-        <source>Profile Data</source>
-        <translation type="unfinished">Dados de Perfil</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4179"/>
-        <source>&amp;Profile Data...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4183"/>
-        <source>Show profiling data for the project.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4185"/>
-        <source>&lt;b&gt;Profile Data...&lt;/b&gt;&lt;p&gt;This shows the profiling data for the project.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="5107"/>
-        <source>Application Diagram</source>
-        <translation>Diagrama da Aplicação</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4194"/>
-        <source>&amp;Application Diagram...</source>
-        <translation>Diagrama da &amp;Aplicação...</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4198"/>
-        <source>Show a diagram of the project.</source>
-        <translation>Mostrar o diagrama do projeto.</translation>
-    </message>
-    <message>
         <location filename="../Project/Project.py" line="4200"/>
+        <source>Code Co&amp;verage...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4204"/>
+        <source>Show code coverage information for the project.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4206"/>
+        <source>&lt;b&gt;Code Coverage...&lt;/b&gt;&lt;p&gt;This shows the code coverage information for all Python files in the project.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="5088"/>
+        <source>Profile Data</source>
+        <translation type="unfinished">Dados de Perfil</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4214"/>
+        <source>&amp;Profile Data...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4218"/>
+        <source>Show profiling data for the project.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4220"/>
+        <source>&lt;b&gt;Profile Data...&lt;/b&gt;&lt;p&gt;This shows the profiling data for the project.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="5142"/>
+        <source>Application Diagram</source>
+        <translation>Diagrama da Aplicação</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4229"/>
+        <source>&amp;Application Diagram...</source>
+        <translation>Diagrama da &amp;Aplicação...</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4233"/>
+        <source>Show a diagram of the project.</source>
+        <translation>Mostrar o diagrama do projeto.</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4235"/>
         <source>&lt;b&gt;Application Diagram...&lt;/b&gt;&lt;p&gt;This shows a diagram of the project.&lt;/p&gt;</source>
         <translation>&lt;b&gt;Diagrama da Aplicação...&lt;/b&gt;&lt;p&gt;Mostra um diagrama do projeto.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5300"/>
+        <location filename="../Project/Project.py" line="5335"/>
         <source>Create Package List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4223"/>
+        <location filename="../Project/Project.py" line="4258"/>
         <source>Create &amp;Package List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5574"/>
+        <location filename="../Project/Project.py" line="5609"/>
         <source>Create Plugin Archive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4325"/>
+        <location filename="../Project/Project.py" line="4360"/>
         <source>&amp;Project</source>
         <translation>&amp;Projeto</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4326"/>
+        <location filename="../Project/Project.py" line="4361"/>
         <source>Open &amp;Recent Projects</source>
         <translation>Abrir Projetos &amp;Recentes</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4331"/>
+        <location filename="../Project/Project.py" line="4366"/>
         <source>&amp;Version Control</source>
         <translation>Contro&amp;l de Versão</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4335"/>
+        <location filename="../Project/Project.py" line="4370"/>
         <source>Chec&amp;k</source>
         <translation>&amp;Verificar</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4337"/>
+        <location filename="../Project/Project.py" line="4372"/>
         <source>Sho&amp;w</source>
         <translation>&amp;Mostrar</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4338"/>
+        <location filename="../Project/Project.py" line="4373"/>
         <source>&amp;Diagrams</source>
         <translation>&amp;Diagramas</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4327"/>
+        <location filename="../Project/Project.py" line="4362"/>
         <source>Session</source>
         <translation>Sessão</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4340"/>
+        <location filename="../Project/Project.py" line="4375"/>
         <source>Source &amp;Documentation</source>
         <translation>&amp;Documentação Fonte</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4328"/>
+        <location filename="../Project/Project.py" line="4363"/>
         <source>Debugger</source>
         <translation>Depurador</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4339"/>
+        <location filename="../Project/Project.py" line="4374"/>
         <source>Pac&amp;kagers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4465"/>
+        <location filename="../Project/Project.py" line="4500"/>
         <source>Project</source>
         <translation>Projeto</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4531"/>
+        <location filename="../Project/Project.py" line="4566"/>
         <source>&amp;Clear</source>
         <translation>&amp;Limpar</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4704"/>
+        <location filename="../Project/Project.py" line="4739"/>
         <source>Search New Files</source>
         <translation>Procurar Ficheiros Novos</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4704"/>
+        <location filename="../Project/Project.py" line="4739"/>
         <source>There were no new files found to be added.</source>
         <translation>Não se encontraram ficheiros novos para adicionar.</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4850"/>
+        <location filename="../Project/Project.py" line="4885"/>
         <source>Version Control System</source>
         <translation>Sistema de Control de Versão</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4850"/>
+        <location filename="../Project/Project.py" line="4885"/>
         <source>&lt;p&gt;The selected VCS &lt;b&gt;{0}&lt;/b&gt; could not be found.&lt;br/&gt;Disabling version control.&lt;/p&gt;&lt;p&gt;{1}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4980"/>
+        <location filename="../Project/Project.py" line="5015"/>
         <source>Coverage Data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5030"/>
+        <location filename="../Project/Project.py" line="5065"/>
         <source>There is no main script defined for the current project. Aborting</source>
         <translation>O projeto atual não tem um script principal definido. A cancelar</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5003"/>
+        <location filename="../Project/Project.py" line="5038"/>
         <source>Code Coverage</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5003"/>
+        <location filename="../Project/Project.py" line="5038"/>
         <source>Please select a coverage file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5053"/>
+        <location filename="../Project/Project.py" line="5088"/>
         <source>Please select a profile file</source>
         <translation>Escolha um ficheiro de perfil por favor</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5107"/>
+        <location filename="../Project/Project.py" line="5142"/>
         <source>Include module names?</source>
         <translation>Incluir nomes de módulos?</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5251"/>
+        <location filename="../Project/Project.py" line="5286"/>
         <source>&lt;p&gt;The file &lt;b&gt;PKGLIST&lt;/b&gt; already exists.&lt;/p&gt;&lt;p&gt;Overwrite it?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5300"/>
+        <location filename="../Project/Project.py" line="5335"/>
         <source>&lt;p&gt;The file &lt;b&gt;PKGLIST&lt;/b&gt; could not be created.&lt;/p&gt;&lt;p&gt;Reason: {0}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5319"/>
+        <location filename="../Project/Project.py" line="5354"/>
         <source>The project does not have a main script defined. Aborting...</source>
         <translation>O projeto atual não tem um script principal definido. A cancelar...</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5460"/>
+        <location filename="../Project/Project.py" line="5495"/>
         <source>&lt;p&gt;The file &lt;b&gt;{0}&lt;/b&gt; could not be stored in the archive. Ignoring it.&lt;/p&gt;&lt;p&gt;Reason: {1}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5533"/>
+        <location filename="../Project/Project.py" line="5568"/>
         <source>&lt;p&gt;The plugin file &lt;b&gt;{0}&lt;/b&gt; could not be read.&lt;/p&gt;&lt;p&gt;Reason: {1}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -54527,32 +55077,32 @@
         <translation>Ficheiros Python2 (*.py2);;Ficheiros GUI Python2 (*.pyw2);;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="2441"/>
+        <location filename="../Project/Project.py" line="2458"/>
         <source>Create main script</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="2441"/>
+        <location filename="../Project/Project.py" line="2458"/>
         <source>&lt;p&gt;The mainscript &lt;b&gt;{0}&lt;/b&gt; could not be created.&lt;br/&gt;Reason: {1}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4208"/>
+        <location filename="../Project/Project.py" line="4243"/>
         <source>Load Diagram</source>
         <translation>Carregar Diagrama</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4208"/>
+        <location filename="../Project/Project.py" line="4243"/>
         <source>&amp;Load Diagram...</source>
         <translation>&amp;Carregar Diagrama...</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4212"/>
+        <location filename="../Project/Project.py" line="4247"/>
         <source>Load a diagram from file.</source>
         <translation>Carregar um diagrama desde um ficheiro.</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4214"/>
+        <location filename="../Project/Project.py" line="4249"/>
         <source>&lt;b&gt;Load Diagram...&lt;/b&gt;&lt;p&gt;This loads a diagram from file.&lt;/p&gt;</source>
         <translation>&lt;b&gt;Carregar Diagrama...&lt;/b&gt;&lt;p&gt;Carga um diagrama desde um ficheiro.&lt;/p&gt;</translation>
     </message>
@@ -54582,12 +55132,12 @@
         <translation>Consola de PyQt5</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4839"/>
+        <location filename="../Project/Project.py" line="4874"/>
         <source>&lt;p&gt;The selected VCS &lt;b&gt;{0}&lt;/b&gt; could not be found. &lt;br/&gt;Reverting override.&lt;/p&gt;&lt;p&gt;{1}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5574"/>
+        <location filename="../Project/Project.py" line="5609"/>
         <source>&lt;p&gt;The plugin file &lt;b&gt;{0}&lt;/b&gt; could not be read.&lt;/p&gt; &lt;p&gt;Reason: {1}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -54607,243 +55157,243 @@
         <translation>Complemento de Eric6</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4228"/>
+        <location filename="../Project/Project.py" line="4263"/>
         <source>Create an initial PKGLIST file for an eric6 plugin.</source>
         <translation>Criar um ficheiro PKGLIST inicial para complemento eric6.</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4230"/>
+        <location filename="../Project/Project.py" line="4265"/>
         <source>&lt;b&gt;Create Package List&lt;/b&gt;&lt;p&gt;This creates an initial list of files to include in an eric6 plugin archive. The list is created from the project file.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5424"/>
+        <location filename="../Project/Project.py" line="5459"/>
         <source>&lt;p&gt;The eric6 plugin archive file &lt;b&gt;{0}&lt;/b&gt; could not be created.&lt;/p&gt;&lt;p&gt;Reason: {1}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="2933"/>
+        <location filename="../Project/Project.py" line="2950"/>
         <source>Create project management directory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="2933"/>
+        <location filename="../Project/Project.py" line="2950"/>
         <source>&lt;p&gt;The project directory &lt;b&gt;{0}&lt;/b&gt; is not writable.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3958"/>
+        <location filename="../Project/Project.py" line="3993"/>
         <source>Alt+Ctrl+P</source>
         <comment>Project|Search Project File</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3964"/>
+        <location filename="../Project/Project.py" line="3999"/>
         <source>Search for a file in the project list of files.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3966"/>
+        <location filename="../Project/Project.py" line="4001"/>
         <source>&lt;b&gt;Search Project File&lt;/b&gt;&lt;p&gt;This searches for a file in the project list of files.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3958"/>
+        <location filename="../Project/Project.py" line="3993"/>
         <source>Search Project File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3958"/>
+        <location filename="../Project/Project.py" line="3993"/>
         <source>Search Project File...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5355"/>
+        <location filename="../Project/Project.py" line="5390"/>
         <source>Create Plugin Archives</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4239"/>
+        <location filename="../Project/Project.py" line="4274"/>
         <source>Create Plugin &amp;Archives</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4244"/>
+        <location filename="../Project/Project.py" line="4279"/>
         <source>Create eric6 plugin archive files.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4246"/>
+        <location filename="../Project/Project.py" line="4281"/>
         <source>&lt;b&gt;Create Plugin Archives&lt;/b&gt;&lt;p&gt;This creates eric6 plugin archive files using the list of files given in a PKGLIST* file. The archive name is built from the main script name if not designated in the package list file.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4256"/>
+        <location filename="../Project/Project.py" line="4291"/>
         <source>Create Plugin Archives (Snapshot)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4256"/>
+        <location filename="../Project/Project.py" line="4291"/>
         <source>Create Plugin Archives (&amp;Snapshot)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4261"/>
+        <location filename="../Project/Project.py" line="4296"/>
         <source>Create eric6 plugin archive files (snapshot releases).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4263"/>
+        <location filename="../Project/Project.py" line="4298"/>
         <source>&lt;b&gt;Create Plugin Archives (Snapshot)&lt;/b&gt;&lt;p&gt;This creates eric6 plugin archive files using the list of files given in the PKGLIST* file. The archive name is built from the main script name if not designated in the package list file. The version entry of the main script is modified to reflect a snapshot release.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5333"/>
-        <source>Select package lists:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="5351"/>
-        <source>Creating plugin archives...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="5351"/>
-        <source>Abort</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="5351"/>
-        <source>%v/%m Archives</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Project/Project.py" line="5368"/>
+        <source>Select package lists:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="5386"/>
+        <source>Creating plugin archives...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="5386"/>
+        <source>Abort</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="5386"/>
+        <source>%v/%m Archives</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="5403"/>
         <source>&lt;p&gt;The file &lt;b&gt;{0}&lt;/b&gt; could not be read.&lt;/p&gt;&lt;p&gt;Reason: {1}&lt;/p&gt;</source>
         <translation type="unfinished">&lt;p&gt;O ficheiro &lt;b&gt;{0}&lt;/b&gt; não se pôde ler. &lt;/p&gt;&lt;p&gt;Motivo: {1}&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5479"/>
+        <location filename="../Project/Project.py" line="5514"/>
         <source>&lt;p&gt;The eric6 plugin archive files were created with some errors.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5482"/>
+        <location filename="../Project/Project.py" line="5517"/>
         <source>&lt;p&gt;The eric6 plugin archive files were created successfully.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5344"/>
+        <location filename="../Project/Project.py" line="5379"/>
         <source>&lt;p&gt;No package list files (PKGLIST*) available or selected. Aborting...&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5396"/>
+        <location filename="../Project/Project.py" line="5431"/>
         <source>&lt;p&gt;The file &lt;b&gt;{0}&lt;/b&gt; is not ready yet.&lt;/p&gt;&lt;p&gt;Please rework it and delete the&apos;; initial_list&apos; line of the header.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3949"/>
+        <location filename="../Project/Project.py" line="3984"/>
         <source>&lt;b&gt;Search new files...&lt;/b&gt;&lt;p&gt;This searches for new files (sources, *.ui, *.idl, *.proto) in the project directory and registered subdirectories.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4007"/>
+        <location filename="../Project/Project.py" line="4042"/>
         <source>&lt;b&gt;Filetype Associations...&lt;/b&gt;&lt;p&gt;This shows a dialog to edit the file type associations of the project. These associations determine the type (source, form, interface, protocol or others) with a filename pattern. They are used when adding a file to the project and when performing a search for new files.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1519"/>
+        <location filename="../Project/Project.py" line="1531"/>
         <source>&lt;p&gt;The selected translation file &lt;b&gt;{0}&lt;/b&gt; could not be deleted.&lt;/p&gt;&lt;p&gt;Reason: {1}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="2233"/>
+        <location filename="../Project/Project.py" line="2250"/>
         <source>&lt;p&gt;The selected file &lt;b&gt;{0}&lt;/b&gt; could not be deleted.&lt;/p&gt;&lt;p&gt;Reason: {1}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="2263"/>
+        <location filename="../Project/Project.py" line="2280"/>
         <source>&lt;p&gt;The selected directory &lt;b&gt;{0}&lt;/b&gt; could not be deleted.&lt;/p&gt;&lt;p&gt;Reason: {1}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="2756"/>
+        <location filename="../Project/Project.py" line="2773"/>
         <source>Create Makefile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="2756"/>
+        <location filename="../Project/Project.py" line="2773"/>
         <source>&lt;p&gt;The makefile &lt;b&gt;{0}&lt;/b&gt; could not be created.&lt;br/&gt;Reason: {1}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5760"/>
+        <location filename="../Project/Project.py" line="5795"/>
         <source>Execute Make</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4277"/>
+        <location filename="../Project/Project.py" line="4312"/>
         <source>&amp;Execute Make</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4281"/>
+        <location filename="../Project/Project.py" line="4316"/>
         <source>Perform a &apos;make&apos; run.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4283"/>
+        <location filename="../Project/Project.py" line="4318"/>
         <source>&lt;b&gt;Execute Make&lt;/b&gt;&lt;p&gt;This performs a &apos;make&apos; run to rebuild the configured target.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5740"/>
+        <location filename="../Project/Project.py" line="5775"/>
         <source>Test for Changes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4291"/>
+        <location filename="../Project/Project.py" line="4326"/>
         <source>&amp;Test for Changes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4295"/>
+        <location filename="../Project/Project.py" line="4330"/>
         <source>Question &apos;make&apos;, if a rebuild is needed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4297"/>
+        <location filename="../Project/Project.py" line="4332"/>
         <source>&lt;b&gt;Test for Changes&lt;/b&gt;&lt;p&gt;This questions &apos;make&apos;, if a rebuild of the configured target is necessary.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4342"/>
+        <location filename="../Project/Project.py" line="4377"/>
         <source>Make</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5688"/>
+        <location filename="../Project/Project.py" line="5723"/>
         <source>The make process did not start.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5733"/>
+        <location filename="../Project/Project.py" line="5768"/>
         <source>The make process crashed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5743"/>
+        <location filename="../Project/Project.py" line="5778"/>
         <source>&lt;p&gt;There are changes that require the configured make target &lt;b&gt;{0}&lt;/b&gt; to be rebuilt.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5748"/>
+        <location filename="../Project/Project.py" line="5783"/>
         <source>&lt;p&gt;There are changes that require the default make target to be rebuilt.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5760"/>
+        <location filename="../Project/Project.py" line="5795"/>
         <source>The makefile contains errors.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -54858,7 +55408,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4330"/>
+        <location filename="../Project/Project.py" line="4365"/>
         <source>Project-T&amp;ools</source>
         <translation type="unfinished"></translation>
     </message>
@@ -54962,7 +55512,7 @@
         <translation>Estado VCS</translation>
     </message>
     <message>
-        <location filename="../Project/ProjectBrowserModel.py" line="782"/>
+        <location filename="../Project/ProjectBrowserModel.py" line="798"/>
         <source>local</source>
         <translation></translation>
     </message>
@@ -54977,7 +55527,7 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/ProjectBrowserPage.ui" line="37"/>
         <source>Colours</source>
-        <translation>Cores</translation>
+        <translation type="obsolete">Cores</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/ProjectBrowserPage.ui" line="43"/>
@@ -54987,7 +55537,7 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/ProjectBrowserPage.ui" line="56"/>
         <source>Select the colour for highlighted entries in the Others viewer.</source>
-        <translation>Selecionar cor de entradas realçadas no visor Outros.</translation>
+        <translation type="obsolete">Selecionar cor de entradas realçadas no visor Outros.</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/ProjectBrowserPage.ui" line="82"/>
@@ -55114,6 +55664,16 @@
         <source>Protocols (protobuf) Browser</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/ProjectBrowserPage.ui" line="37"/>
+        <source>Colors</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/ProjectBrowserPage.ui" line="56"/>
+        <source>Select the color for highlighted entries in the Others viewer.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ProjectFormsBrowser</name>
@@ -64815,53 +65375,53 @@
         <translation>Configurar...</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="767"/>
+        <location filename="../QScintilla/Shell.py" line="771"/>
         <source>Select History</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="767"/>
+        <location filename="../QScintilla/Shell.py" line="771"/>
         <source>Select the history entry to execute (most recent shown last).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="835"/>
-        <source>Passive Debug Mode</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Shell.py" line="836"/>
-        <source>
-Not connected</source>
-        <translation>Desconetado</translation>
-    </message>
-    <message>
         <location filename="../QScintilla/Shell.py" line="839"/>
+        <source>Passive Debug Mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Shell.py" line="840"/>
+        <source>
+Not connected</source>
+        <translation>Desconetado</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Shell.py" line="843"/>
         <source>No.</source>
         <translation>Nº</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="841"/>
+        <location filename="../QScintilla/Shell.py" line="845"/>
         <source>{0} on {1}, {2}</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="1030"/>
+        <location filename="../QScintilla/Shell.py" line="1034"/>
         <source>StdOut: {0}</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="1038"/>
+        <location filename="../QScintilla/Shell.py" line="1042"/>
         <source>StdErr: {0}</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="2157"/>
+        <location filename="../QScintilla/Shell.py" line="2161"/>
         <source>Drop Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="2157"/>
+        <location filename="../QScintilla/Shell.py" line="2161"/>
         <source>&lt;p&gt;&lt;b&gt;{0}&lt;/b&gt; is not a file.&lt;/p&gt;</source>
         <translation type="unfinished">&lt;p&gt;&lt;b&gt;{0}&lt;/b&gt; não é um ficheiro.&lt;/p&gt;</translation>
     </message>
@@ -64871,7 +65431,7 @@
         <translation>Encontrar</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="888"/>
+        <location filename="../QScintilla/Shell.py" line="892"/>
         <source>Exception &quot;{0}&quot;
 {1}
 File: {2}, Line: {3}
@@ -64879,32 +65439,32 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="923"/>
+        <location filename="../QScintilla/Shell.py" line="927"/>
         <source>Unspecified syntax error.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="898"/>
+        <location filename="../QScintilla/Shell.py" line="902"/>
         <source>Exception &quot;{0}&quot;
 {1}
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="925"/>
+        <location filename="../QScintilla/Shell.py" line="929"/>
         <source>Syntax error &quot;{1}&quot; in file {0} at line {2}, character {3}.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="948"/>
+        <location filename="../QScintilla/Shell.py" line="952"/>
         <source>Signal &quot;{0}&quot; generated in file {1} at line {2}.
 Function: {3}({4})</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="2015"/>
+        <location filename="../QScintilla/Shell.py" line="2019"/>
         <source>Project</source>
         <translation type="unfinished">Projeto</translation>
     </message>
@@ -64934,14 +65494,14 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="1835"/>
+        <location filename="../QScintilla/Shell.py" line="1839"/>
         <source>Available Virtual Environments:
 {0}
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="1876"/>
+        <location filename="../QScintilla/Shell.py" line="1880"/>
         <source>Current Virtual Environment: &apos;{0}&apos;
 </source>
         <translation type="unfinished"></translation>
@@ -73014,7 +73574,7 @@
         <translation>Processador de Sync:</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/Sync/SyncCheckPage.py" line="56"/>
+        <location filename="../WebBrowser/Sync/SyncCheckPage.py" line="50"/>
         <source>Host:</source>
         <translation>Anfitrião:</translation>
     </message>
@@ -73044,22 +73604,22 @@
         <translation>Definições de Agente de Usuário:</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/Sync/SyncCheckPage.py" line="55"/>
+        <location filename="../WebBrowser/Sync/SyncCheckPage.py" line="49"/>
         <source>FTP</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/Sync/SyncCheckPage.py" line="68"/>
+        <location filename="../WebBrowser/Sync/SyncCheckPage.py" line="62"/>
         <source>No Synchronization</source>
         <translation>Sem Sincronização</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/Sync/SyncCheckPage.py" line="211"/>
+        <location filename="../WebBrowser/Sync/SyncCheckPage.py" line="204"/>
         <source>&lt;font color=&quot;#FF0000&quot;&gt;&lt;b&gt;Error:&lt;/b&gt; {0}&lt;/font&gt;</source>
         <translation>&lt;font color=&quot;#FF0000&quot;&gt;&lt;b&gt;Error:&lt;/b&gt; {0}&lt;/font&gt;</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/Sync/SyncCheckPage.py" line="63"/>
+        <location filename="../WebBrowser/Sync/SyncCheckPage.py" line="57"/>
         <source>Shared Directory</source>
         <translation>Diretório Partilhado</translation>
     </message>
@@ -73069,7 +73629,7 @@
         <translation>Definições de Marcação Rápida:</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/Sync/SyncCheckPage.py" line="64"/>
+        <location filename="../WebBrowser/Sync/SyncCheckPage.py" line="58"/>
         <source>Directory:</source>
         <translation>Diretório:</translation>
     </message>
@@ -74736,12 +75296,12 @@
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/TasksPage.ui" line="105"/>
-        <source>Tasks Background Colours</source>
+        <source>Tasks Background Colors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/TasksPage.ui" line="206"/>
-        <source>Select the background colour for these tasks.</source>
+        <source>Select the background color for these tasks.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -75786,27 +76346,27 @@
 <context>
     <name>Translator</name>
     <message>
-        <location filename="../Plugins/UiExtensionPlugins/Translator/Translator.py" line="52"/>
+        <location filename="../Plugins/UiExtensionPlugins/Translator/Translator.py" line="63"/>
         <source>Translator</source>
         <translation>Tradutor</translation>
     </message>
     <message>
-        <location filename="../Plugins/UiExtensionPlugins/Translator/Translator.py" line="52"/>
+        <location filename="../Plugins/UiExtensionPlugins/Translator/Translator.py" line="63"/>
         <source>T&amp;ranslator</source>
         <translation>T&amp;radutor</translation>
     </message>
     <message>
-        <location filename="../Plugins/UiExtensionPlugins/Translator/Translator.py" line="52"/>
+        <location filename="../Plugins/UiExtensionPlugins/Translator/Translator.py" line="63"/>
         <source>Alt+Shift+R</source>
         <translation>Alt+Shift+R</translation>
     </message>
     <message>
-        <location filename="../Plugins/UiExtensionPlugins/Translator/Translator.py" line="58"/>
+        <location filename="../Plugins/UiExtensionPlugins/Translator/Translator.py" line="69"/>
         <source>Switch the input focus to the Translator window.</source>
         <translation>Mudar o foco de entrada à janela do Tradutor.</translation>
     </message>
     <message>
-        <location filename="../Plugins/UiExtensionPlugins/Translator/Translator.py" line="60"/>
+        <location filename="../Plugins/UiExtensionPlugins/Translator/Translator.py" line="71"/>
         <source>&lt;b&gt;Activate Translator&lt;/b&gt;&lt;p&gt;This switches the input focus to the Translator window.&lt;/p&gt;</source>
         <translation>&lt;b&gt;Ativar Tradutor&lt;/b&gt;&lt;p&gt;Muda o foco de entrada à janela do Tradutor.&lt;/p&gt;</translation>
     </message>
@@ -75814,52 +76374,52 @@
 <context>
     <name>TranslatorEngines</name>
     <message>
-        <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorEngines/__init__.py" line="37"/>
+        <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorEngines/__init__.py" line="39"/>
         <source>Google V.1</source>
         <translation>Google V.1</translation>
     </message>
     <message>
-        <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorEngines/__init__.py" line="39"/>
-        <source>MyMemory</source>
-        <translation>MyMemory</translation>
-    </message>
-    <message>
         <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorEngines/__init__.py" line="41"/>
-        <source>Glosbe</source>
-        <translation>Glosbe</translation>
+        <source>MyMemory</source>
+        <translation>MyMemory</translation>
     </message>
     <message>
         <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorEngines/__init__.py" line="43"/>
-        <source>PROMT</source>
-        <translation>PROMT</translation>
+        <source>Glosbe</source>
+        <translation>Glosbe</translation>
     </message>
     <message>
         <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorEngines/__init__.py" line="45"/>
-        <source>Yandex</source>
-        <translation>Yandex</translation>
-    </message>
-    <message>
-        <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorEngines/__init__.py" line="55"/>
-        <source>Unknow translation service name ({0})</source>
-        <translation>Nome de serviço de tradução desconhecido ({0})</translation>
+        <source>PROMT</source>
+        <translation>PROMT</translation>
     </message>
     <message>
         <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorEngines/__init__.py" line="47"/>
-        <source>Google V.2</source>
-        <translation>Google V.2</translation>
+        <source>Yandex</source>
+        <translation>Yandex</translation>
+    </message>
+    <message>
+        <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorEngines/__init__.py" line="57"/>
+        <source>Unknow translation service name ({0})</source>
+        <translation>Nome de serviço de tradução desconhecido ({0})</translation>
     </message>
     <message>
         <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorEngines/__init__.py" line="49"/>
-        <source>Microsoft</source>
-        <translation>Microsoft</translation>
+        <source>Google V.2</source>
+        <translation>Google V.2</translation>
     </message>
     <message>
         <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorEngines/__init__.py" line="51"/>
-        <source>DeepL Pro</source>
-        <translation type="unfinished">DeepL</translation>
+        <source>Microsoft</source>
+        <translation>Microsoft</translation>
     </message>
     <message>
         <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorEngines/__init__.py" line="53"/>
+        <source>DeepL Pro</source>
+        <translation type="unfinished">DeepL</translation>
+    </message>
+    <message>
+        <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorEngines/__init__.py" line="55"/>
         <source>IBM Watson</source>
         <translation type="unfinished"></translation>
     </message>
@@ -76089,12 +76649,12 @@
     <message>
         <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorLanguagesDb.py" line="79"/>
         <source>Chinese S</source>
-        <translation>Chinês S</translation>
+        <translation type="obsolete">Chinês S</translation>
     </message>
     <message>
         <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorLanguagesDb.py" line="80"/>
         <source>Chinese T</source>
-        <translation>Chinês T</translation>
+        <translation type="obsolete">Chinês T</translation>
     </message>
     <message>
         <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorLanguagesDb.py" line="31"/>
@@ -76116,6 +76676,16 @@
         <source>Hebrew (iw)</source>
         <translation>Hebreu (iw)</translation>
     </message>
+    <message>
+        <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorLanguagesDb.py" line="79"/>
+        <source>Chinese (China)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorLanguagesDb.py" line="80"/>
+        <source>Chinese (Taiwan)</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TranslatorPage</name>
@@ -76293,7 +76863,7 @@
 <context>
     <name>TranslatorPlugin</name>
     <message>
-        <location filename="../Plugins/PluginTranslator.py" line="65"/>
+        <location filename="../Plugins/PluginTranslator.py" line="71"/>
         <source>Translator</source>
         <translation>Tradutor</translation>
     </message>
@@ -78555,7 +79125,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="6329"/>
+        <location filename="../UI/UserInterface.py" line="6327"/>
         <source>Export Keyboard Shortcuts</source>
         <translation>Exportar Atalhos de Teclado</translation>
     </message>
@@ -78575,7 +79145,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="6353"/>
+        <location filename="../UI/UserInterface.py" line="6351"/>
         <source>Import Keyboard Shortcuts</source>
         <translation>Importar Atalhos de Teclado</translation>
     </message>
@@ -78875,7 +79445,7 @@
         <translation type="obsolete">&lt;h3&gt;Números de Versão&lt;/h3&gt;&lt;table&gt;</translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="7326"/>
+        <location filename="../UI/UserInterface.py" line="7324"/>
         <source>&lt;/table&gt;</source>
         <translation></translation>
     </message>
@@ -79048,92 +79618,92 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="6353"/>
+        <location filename="../UI/UserInterface.py" line="6351"/>
         <source>Keyboard shortcut file (*.e4k)</source>
         <translation>Ficheiro de atalhos de teclado (*.e4k)</translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="6523"/>
+        <location filename="../UI/UserInterface.py" line="6521"/>
         <source>Save tasks</source>
         <translation>Gravar tarefas</translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="6523"/>
+        <location filename="../UI/UserInterface.py" line="6521"/>
         <source>&lt;p&gt;The tasks file &lt;b&gt;{0}&lt;/b&gt; could not be written.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="6552"/>
+        <location filename="../UI/UserInterface.py" line="6550"/>
         <source>Read tasks</source>
         <translation>Ler tarefas</translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="6552"/>
+        <location filename="../UI/UserInterface.py" line="6550"/>
         <source>&lt;p&gt;The tasks file &lt;b&gt;{0}&lt;/b&gt; could not be read.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="6648"/>
+        <location filename="../UI/UserInterface.py" line="6646"/>
         <source>Save session</source>
         <translation>Guargar sessão</translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="6586"/>
+        <location filename="../UI/UserInterface.py" line="6584"/>
         <source>&lt;p&gt;The session file &lt;b&gt;{0}&lt;/b&gt; could not be written.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="6632"/>
+        <location filename="../UI/UserInterface.py" line="6630"/>
         <source>Read session</source>
         <translation>Sessão de leitura</translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="6632"/>
+        <location filename="../UI/UserInterface.py" line="6630"/>
         <source>&lt;p&gt;The session file &lt;b&gt;{0}&lt;/b&gt; could not be read.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="6916"/>
+        <location filename="../UI/UserInterface.py" line="6914"/>
         <source>Drop Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="6916"/>
+        <location filename="../UI/UserInterface.py" line="6914"/>
         <source>&lt;p&gt;&lt;b&gt;{0}&lt;/b&gt; is not a file.&lt;/p&gt;</source>
         <translation>&lt;p&gt;&lt;b&gt;{0}&lt;/b&gt; não é um ficheiro.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="7101"/>
+        <location filename="../UI/UserInterface.py" line="7099"/>
         <source>&amp;Cancel</source>
         <translation>&amp;Cancelar</translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="7110"/>
+        <location filename="../UI/UserInterface.py" line="7108"/>
         <source>Trying host {0}</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="7268"/>
+        <location filename="../UI/UserInterface.py" line="7266"/>
         <source>Update available</source>
         <translation>Atualização disponível</translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="7287"/>
+        <location filename="../UI/UserInterface.py" line="7285"/>
         <source>Error during updates check</source>
         <translation>Erro na verificação de atualizações</translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="7287"/>
+        <location filename="../UI/UserInterface.py" line="7285"/>
         <source>Could not perform updates check.</source>
         <translation>Não procurar atualizações.</translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="7311"/>
+        <location filename="../UI/UserInterface.py" line="7309"/>
         <source>&lt;h3&gt;Available versions&lt;/h3&gt;&lt;table&gt;</source>
         <translation>&lt;h3&gt;Versões Disponíveis&lt;/h3&gt;&lt;table&gt;</translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="7363"/>
+        <location filename="../UI/UserInterface.py" line="7361"/>
         <source>First time usage</source>
         <translation>Usado a primeira vez</translation>
     </message>
@@ -79173,27 +79743,27 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="7176"/>
+        <location filename="../UI/UserInterface.py" line="7174"/>
         <source>Error getting versions information</source>
         <translation>Erro na obtenção da informação de versões</translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="7169"/>
+        <location filename="../UI/UserInterface.py" line="7167"/>
         <source>The versions information could not be downloaded. Please go online and try again.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="6121"/>
+        <location filename="../UI/UserInterface.py" line="6119"/>
         <source>Open Browser</source>
         <translation>Abrir Navegador</translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="6121"/>
+        <location filename="../UI/UserInterface.py" line="6119"/>
         <source>Could not start a web browser</source>
         <translation>Não se pôde iniciar um navegador web</translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="7176"/>
+        <location filename="../UI/UserInterface.py" line="7174"/>
         <source>The versions information could not be downloaded for the last 7 days. Please go online and try again.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -79284,7 +79854,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="7382"/>
+        <location filename="../UI/UserInterface.py" line="7380"/>
         <source>Select Workspace Directory</source>
         <translation>Selecionar o Diretório de Trabalho</translation>
     </message>
@@ -79659,7 +80229,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="7101"/>
+        <location filename="../UI/UserInterface.py" line="7099"/>
         <source>%v/%m</source>
         <translation></translation>
     </message>
@@ -79749,27 +80319,27 @@
         <translation>Qt v.3 não está suportado por eric6.</translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="7105"/>
+        <location filename="../UI/UserInterface.py" line="7103"/>
         <source>Version Check</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="7268"/>
+        <location filename="../UI/UserInterface.py" line="7266"/>
         <source>The update to &lt;b&gt;{0}&lt;/b&gt; of eric6 is available at &lt;b&gt;{1}&lt;/b&gt;. Would you like to get it?</source>
         <translation>Atualização a &lt;b&gt;{0}&lt;/b&gt; de eric6 já está disponível em &lt;b&gt;{1}&lt;/b&gt;. Quere-a descarregar?</translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="7280"/>
+        <location filename="../UI/UserInterface.py" line="7278"/>
         <source>Eric6 is up to date</source>
         <translation>Eric6 está atualizado</translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="7280"/>
+        <location filename="../UI/UserInterface.py" line="7278"/>
         <source>You are using the latest version of eric6</source>
         <translation>Utiliza a última versão do eric6</translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="7363"/>
+        <location filename="../UI/UserInterface.py" line="7361"/>
         <source>eric6 has not been configured yet. The configuration dialog will be started.</source>
         <translation>eric6 ainda não foi configurado. A caixa de diálogo de configuração vai iniciar-se.</translation>
     </message>
@@ -79789,7 +80359,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="7121"/>
+        <location filename="../UI/UserInterface.py" line="7119"/>
         <source>The versions information cannot not be downloaded because you are &lt;b&gt;offline&lt;/b&gt;. Please go online and try again.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -79834,7 +80404,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="6670"/>
+        <location filename="../UI/UserInterface.py" line="6668"/>
         <source>Load session</source>
         <translation type="unfinished">Carregar sessão</translation>
     </message>
@@ -79849,17 +80419,17 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="6670"/>
+        <location filename="../UI/UserInterface.py" line="6668"/>
         <source>eric6 Session Files (*.e5s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="6721"/>
+        <location filename="../UI/UserInterface.py" line="6719"/>
         <source>Crash Session found!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="6721"/>
+        <location filename="../UI/UserInterface.py" line="6719"/>
         <source>A session file of a crashed session was found. Shall this session be restored?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -79874,17 +80444,17 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="7256"/>
+        <location filename="../UI/UserInterface.py" line="7254"/>
         <source>Update Check</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="7256"/>
+        <location filename="../UI/UserInterface.py" line="7254"/>
         <source>You installed eric directly from the source code. There is no possibility to check for the availability of an update.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="7246"/>
+        <location filename="../UI/UserInterface.py" line="7244"/>
         <source>You are using a snapshot release of eric6. A more up-to-date stable release might be available.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -80889,7 +81459,7 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="128"/>
         <source>Colours</source>
-        <translation>Cores</translation>
+        <translation type="obsolete">Cores</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="134"/>
@@ -80897,58 +81467,63 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="147"/>
-        <source>Select the background colour for entries with VCS status &quot;added&quot;.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="157"/>
         <source>VCS status &quot;conflict&quot;:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="170"/>
-        <source>Select the background colour for entries with VCS status &quot;conflict&quot;.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="193"/>
         <source>VCS status &quot;modified&quot;:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="206"/>
-        <source>Select the background colour for entries with VCS status &quot;modified&quot;.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="216"/>
         <source>VCS status &quot;replaced&quot;:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="229"/>
-        <source>Select the background colour for entries with VCS status &quot;replaced&quot;.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="239"/>
         <source>VCS status &quot;needs update&quot;:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="252"/>
-        <source>Select the background colour for entries with VCS status &quot;needs update&quot;.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="262"/>
         <source>VCS status &quot;removed&quot;:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="128"/>
+        <source>Colors</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="147"/>
+        <source>Select the background color for entries with VCS status &quot;added&quot;.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="170"/>
+        <source>Select the background color for entries with VCS status &quot;conflict&quot;.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="206"/>
+        <source>Select the background color for entries with VCS status &quot;modified&quot;.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="229"/>
+        <source>Select the background color for entries with VCS status &quot;replaced&quot;.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="252"/>
+        <source>Select the background color for entries with VCS status &quot;needs update&quot;.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="275"/>
-        <source>Select the background colour for entries with VCS status &quot;removed&quot;.</source>
+        <source>Select the background color for entries with VCS status &quot;removed&quot;.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -85875,17 +86450,17 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="279"/>
         <source>Colours</source>
-        <translation type="unfinished">Cores</translation>
+        <translation type="obsolete">Cores</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="285"/>
         <source>Background colour of secure URLs:</source>
-        <translation type="unfinished">Cor de Fundo das URL seguras:</translation>
+        <translation type="obsolete">Cor de Fundo das URL seguras:</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="298"/>
         <source>Select the background colour for secure URLs.</source>
-        <translation type="unfinished">Selecionar a cor de fundo para as URL seguras.</translation>
+        <translation type="obsolete">Selecionar a cor de fundo para as URL seguras.</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="324"/>
@@ -85987,6 +86562,21 @@
         <source>Show Scrollbars</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="279"/>
+        <source>Colors</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="285"/>
+        <source>Background color of secure URLs:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="298"/>
+        <source>Select the background color for secure URLs.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>WebBrowserClearPrivateDataDialog</name>
@@ -86882,12 +87472,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserPage.py" line="171"/>
+        <location filename="../WebBrowser/WebBrowserPage.py" line="172"/>
         <source>Suspicuous URL detected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserPage.py" line="171"/>
+        <location filename="../WebBrowser/WebBrowserPage.py" line="172"/>
         <source>&lt;p&gt;The URL &lt;b&gt;{0}&lt;/b&gt; was found in the Safe Browsing database.&lt;/p&gt;{1}</source>
         <translation type="unfinished"></translation>
     </message>
@@ -87172,112 +87762,112 @@
 <context>
     <name>WebBrowserTabWidget</name>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="124"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="122"/>
         <source>Show a navigation menu</source>
         <translation type="unfinished">Mostrar um menú de navegação</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="137"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="135"/>
         <source>Show a navigation menu for closed tabs</source>
         <translation type="unfinished">Mostrar um menú de navegação para os separadores fechados</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="151"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="149"/>
         <source>Open a new web browser tab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="165"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="163"/>
         <source>New Tab</source>
         <translation type="unfinished">Separador Novo</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="169"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="167"/>
         <source>Move Left</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="172"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="170"/>
         <source>Move Right</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="176"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="174"/>
         <source>Duplicate Page</source>
         <translation type="unfinished">Duplicar Página</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="179"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="177"/>
         <source>Close</source>
         <translation type="unfinished">Fechar</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="182"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="180"/>
         <source>Close Others</source>
         <translation type="unfinished">Fechar Outros</translation>
     </message>
     <message>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="211"/>
+        <source>Close All</source>
+        <translation type="unfinished">Fechar Tudo</translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="186"/>
+        <source>Print Preview</source>
+        <translation type="unfinished">Antevisão da Impressão</translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="189"/>
+        <source>Print</source>
+        <translation type="unfinished">Imprimir</translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="192"/>
+        <source>Print as PDF</source>
+        <translation type="unfinished">Imprimir como PDF</translation>
+    </message>
+    <message>
         <location filename="../WebBrowser/WebBrowserTabWidget.py" line="213"/>
-        <source>Close All</source>
-        <translation type="unfinished">Fechar Tudo</translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="188"/>
-        <source>Print Preview</source>
-        <translation type="unfinished">Antevisão da Impressão</translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="191"/>
-        <source>Print</source>
-        <translation type="unfinished">Imprimir</translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="194"/>
-        <source>Print as PDF</source>
-        <translation type="unfinished">Imprimir como PDF</translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="215"/>
         <source>Reload All</source>
         <translation type="unfinished">Recarregar Tudo</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="218"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="216"/>
         <source>Bookmark All Tabs</source>
         <translation type="unfinished">Marcar Todos os Separadores</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="222"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="220"/>
         <source>Restore Closed Tab</source>
         <translation type="unfinished">Restaurar o Separador Fechado</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="458"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="456"/>
         <source>...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="898"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="892"/>
         <source>Loading...</source>
         <translation type="unfinished">Carregando...</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="918"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="912"/>
         <source>Finished loading</source>
         <translation type="unfinished">Acabou de carregar</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="920"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="914"/>
         <source>Failed to load</source>
         <translation type="unfinished">Falhou ao carregar</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="961"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="955"/>
         <source>Are you sure you want to close the window?</source>
         <translation type="unfinished">Tem a certeza de que quer fechar a janela?</translation>
     </message>
     <message numerus="yes">
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="961"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="955"/>
         <source>Are you sure you want to close the window?
 You have %n tab(s) open.</source>
         <translation type="unfinished">
@@ -87288,47 +87878,47 @@
         </translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="968"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="962"/>
         <source>&amp;Quit</source>
         <translation type="unfinished">Sai&amp;r</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="971"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="965"/>
         <source>C&amp;lose Current Tab</source>
         <translation type="unfinished">F&amp;echar o Separador Atual</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="1152"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="1146"/>
         <source>Restore All Closed Tabs</source>
         <translation type="unfinished">Restaurar Todos os Separadores Fechados</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="1154"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="1148"/>
         <source>Clear List</source>
         <translation type="unfinished">Limpar Lista</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="252"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="250"/>
         <source>Unmute Tab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="256"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="254"/>
         <source>Mute Tab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="755"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="753"/>
         <source>Print to PDF</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="705"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="703"/>
         <source>&lt;p&gt;The file &lt;b&gt;{0}&lt;/b&gt; exists already. Shall it be overwritten?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="755"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="753"/>
         <source>&lt;p&gt;The PDF could not be written to file &lt;b&gt;{0}&lt;/b&gt;.&lt;/p&gt;&lt;p&gt;&lt;b&gt;Error:&lt;/b&gt; {1}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
Binary file eric6/i18n/eric6_ru.qm has changed
--- a/eric6/i18n/eric6_ru.ts	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/i18n/eric6_ru.ts	Sat May 02 13:51:07 2020 +0200
@@ -1194,12 +1194,12 @@
         <translation>&lt;&lt;Другие&gt;&gt;</translation>
     </message>
     <message>
-        <location filename="../Graphics/ApplicationDiagramBuilder.py" line="292"/>
+        <location filename="../Graphics/ApplicationDiagramBuilder.py" line="294"/>
         <source>Load Diagram</source>
         <translation>Загрузить диаграмму</translation>
     </message>
     <message>
-        <location filename="../Graphics/ApplicationDiagramBuilder.py" line="292"/>
+        <location filename="../Graphics/ApplicationDiagramBuilder.py" line="294"/>
         <source>&lt;p&gt;The diagram belongs to the project &lt;b&gt;{0}&lt;/b&gt;. Shall this project be opened?&lt;/p&gt;</source>
         <translation>&lt;p&gt;Диаграмма относится к проекту&lt;b&gt;{0}&lt;/b&gt;.Хотите открыть этот проект?&lt;/p&gt;</translation>
     </message>
@@ -2310,7 +2310,7 @@
         <location filename="../UI/Browser.py" line="109"/>
         <source>&lt;b&gt;The Browser Window&lt;/b&gt;&lt;p&gt;This allows you to easily navigate the hierarchy of directories and files on your system, identify the Python programs and open them up in a Source Viewer window. The window displays several separate hierarchies.&lt;/p&gt;&lt;p&gt;The first hierarchy is only shown if you have opened a program for debugging and its root is the directory containing that program. Usually all of the separate files that make up a Python application are held in the same directory, so this hierarchy gives you easy access to most of what you will need.&lt;/p&gt;&lt;p&gt;The next hierarchy is used to easily navigate the directories that are specified in the Python &lt;tt&gt;sys.path&lt;/tt&gt; variable.&lt;/p&gt;&lt;p&gt;The remaining hierarchies allow you navigate your system as a whole. On a UNIX system there will be a hierarchy with &lt;tt&gt;/&lt;/tt&gt; at its root and another with the user home directory. On a Windows system there will be a hierarchy for each drive on the system.&lt;/p&gt;&lt;p&gt;Python programs (i.e. those with a &lt;tt&gt;.py&lt;/tt&gt; file name suffix) are identified in the hierarchies with a Python icon. The right mouse button will popup a menu which lets you open the file in a Source Viewer window, open the file for debugging or use it for a unittest run.&lt;/p&gt;&lt;p&gt;The context menu of a class, function or method allows you to open the file defining this class, function or method and will ensure, that the correct source line is visible.&lt;/p&gt;&lt;p&gt;Qt-Designer files (i.e. those with a &lt;tt&gt;.ui&lt;/tt&gt; file name suffix) are shown with a Designer icon. The context menu of these files allows you to start Qt-Designer with that file.&lt;/p&gt;&lt;p&gt;Qt-Linguist files (i.e. those with a &lt;tt&gt;.ts&lt;/tt&gt; file name suffix) are shown with a Linguist icon. The context menu of these files allows you to start Qt-Linguist with that file.&lt;/p&gt;</source>
         <translation>&lt;b&gt;Окно браузера&lt;/b&gt;&lt;p&gt;Помогает легко перемещаться по по иерархии директорий и файлов вашей системы, находить программы на Python и открывать их в окне исходных текстов. Окно показывает несколько разных деревьев&lt;/p&gt;
-&lt;p&gt;Первое дерево показывается только тогда, когда вы отлаживаете программу и root-директория дерева является директорией, содержащей программу. Обычно все файлы, составляющие приложение на Python, находятся в одной директории, так что это дерево даёт почти всю необходимую информацию.&lt;/p&gt;&lt;p&gt;Следующее дерево используется для лёгкого перемещения по директориям, перечисленным в переменной Python &lt;tt&gt;sys.path&lt;/tt&gt;&lt;p&gt;Оставшиеся деревья позволяют перемещаться по системе в целом. В системах UNIX будут показаны 2 дерева: дерево с вершиной в root-директории (&lt;tt&gt;/&lt;/tt&gt;) и домашней директории пользователя. В Windows для каждого диска будет показано своё дерево.&lt;/p&gt;&lt;p&gt;Программы на Python (с расширением &lt;tt&gt;.py&lt;/tt&gt;) показываются с пиктограммой Python. Доступно контекстное меню, позволяющее открыть программу в редакторе, запустить её на отладку или протестировать с помощью unittest.&lt;/p&gt;&lt;p&gt;Контекстное меню на классе, функции или методе откроет файл и перейдёт на нужное место&lt;/p&gt;&lt;p&gt;Файлы описания интерфейса ( &lt;tt&gt;.ui&lt;/tt&gt;, отмеченные пиктограммой Designer) могут быть открыты Designer&apos;ом через контекстное меню или по двойному щелчку&lt;/p&gt;&lt;p&gt;Файлы перевода (&lt;tt&gt;.ts&lt;/tt&gt;, отмеченные пиктограммой Linguist) могут быть отредактированы с помощью Linguist&apos;а&lt;/p&gt;</translation>
+&lt;p&gt;Первое дерево показывается только тогда, когда вы отлаживаете программу и root-директория дерева является директорией, содержащей программу. Обычно все файлы, составляющие приложение на Python, находятся в одной директории, так что это дерево даёт почти всю необходимую информацию.&lt;/p&gt;&lt;p&gt;Следующее дерево используется для лёгкого перемещения по директориям, перечисленным в переменной Python &lt;tt&gt;sys.path&lt;/tt&gt;&lt;p&gt;Оставшиеся деревья позволяют перемещаться по системе в целом. В системах UNIX будут показаны 2 дерева: дерево с вершиной в root-директории (&lt;tt&gt;/&lt;/tt&gt;) и домашней директории пользователя. В Windows для каждого диска будет показано своё дерево.&lt;/p&gt;&lt;p&gt;Программы на Python (с расширением &lt;tt&gt;.py&lt;/tt&gt;) показываются с иконкой Python. Доступно контекстное меню, позволяющее открыть программу в редакторе, запустить её на отладку или протестировать с помощью unittest.&lt;/p&gt;&lt;p&gt;Контекстное меню на классе, функции или методе откроет файл и перейдёт на нужное место&lt;/p&gt;&lt;p&gt;Файлы описания интерфейса ( &lt;tt&gt;.ui&lt;/tt&gt;, отмеченные иконкой Designer) могут быть открыты Designer&apos;ом через контекстное меню или по двойному щелчку&lt;/p&gt;&lt;p&gt;Файлы перевода (&lt;tt&gt;.ts&lt;/tt&gt;, отмеченные иконкой Linguist) могут быть отредактированы с помощью Linguist&apos;а&lt;/p&gt;</translation>
     </message>
     <message>
         <location filename="../UI/Browser.py" line="503"/>
@@ -2346,32 +2346,32 @@
 <context>
     <name>BrowserModel</name>
     <message>
-        <location filename="../UI/BrowserModel.py" line="62"/>
+        <location filename="../UI/BrowserModel.py" line="63"/>
         <source>Name</source>
         <translation>Имя</translation>
     </message>
     <message>
-        <location filename="../UI/BrowserModel.py" line="654"/>
+        <location filename="../UI/BrowserModel.py" line="655"/>
         <source>Coding: {0}</source>
         <translation>Кодировка: {0}</translation>
     </message>
     <message>
-        <location filename="../UI/BrowserModel.py" line="660"/>
+        <location filename="../UI/BrowserModel.py" line="661"/>
         <source>Globals</source>
         <translation>Глобальные переменные</translation>
     </message>
     <message>
-        <location filename="../UI/BrowserModel.py" line="730"/>
+        <location filename="../UI/BrowserModel.py" line="731"/>
         <source>Attributes</source>
         <translation>Атрибуты</translation>
     </message>
     <message>
-        <location filename="../UI/BrowserModel.py" line="740"/>
+        <location filename="../UI/BrowserModel.py" line="741"/>
         <source>Class Attributes</source>
         <translation>Атрибуты класса</translation>
     </message>
     <message>
-        <location filename="../UI/BrowserModel.py" line="666"/>
+        <location filename="../UI/BrowserModel.py" line="667"/>
         <source>Imports</source>
         <translation>Импорт</translation>
     </message>
@@ -3038,54 +3038,54 @@
 <context>
     <name>CodeDocumentationViewer</name>
     <message>
-        <location filename="../UI/CodeDocumentationViewer.py" line="175"/>
+        <location filename="../UI/CodeDocumentationViewer.py" line="211"/>
         <source>Code Info Provider:</source>
         <translation>Источник инфо для кода:</translation>
     </message>
     <message>
-        <location filename="../UI/CodeDocumentationViewer.py" line="188"/>
+        <location filename="../UI/CodeDocumentationViewer.py" line="224"/>
         <source>Select the code info provider</source>
         <translation>Выберите источник инфо для кода</translation>
     </message>
     <message>
-        <location filename="../UI/CodeDocumentationViewer.py" line="190"/>
+        <location filename="../UI/CodeDocumentationViewer.py" line="226"/>
         <source>&lt;disabled&gt;</source>
         <translation>&lt;disabled&gt;</translation>
     </message>
     <message>
-        <location filename="../UI/CodeDocumentationViewer.py" line="371"/>
+        <location filename="../UI/CodeDocumentationViewer.py" line="407"/>
         <source>No documentation available</source>
         <translation>Документация недоступна</translation>
     </message>
     <message>
-        <location filename="../UI/CodeDocumentationViewer.py" line="392"/>
+        <location filename="../UI/CodeDocumentationViewer.py" line="428"/>
         <source>No source code documentation provider has been registered. This function has been disabled.</source>
         <translation>Поставщик документации для исходного кода не зарегистрирован. Эта функция отключена.</translation>
     </message>
     <message>
-        <location filename="../UI/CodeDocumentationViewer.py" line="397"/>
+        <location filename="../UI/CodeDocumentationViewer.py" line="433"/>
         <source>This function has been disabled.</source>
         <translation>Эта функция отключена.</translation>
     </message>
     <message>
-        <location filename="../UI/CodeDocumentationViewerTemplate.py" line="137"/>
+        <location filename="../UI/CodeDocumentationViewerTemplate.py" line="139"/>
         <source>No further documentation available</source>
         <translation>Нет дополнительной документации</translation>
     </message>
     <message>
-        <location filename="../UI/CodeDocumentationViewerTemplate.py" line="58"/>
+        <location filename="../UI/CodeDocumentationViewerTemplate.py" line="60"/>
         <source>&lt;p&gt;&lt;b&gt;Definition:&lt;/b&gt; &lt;span class=&quot;def&quot;&gt;@NAME@@ARGSPEC@&lt;/span&gt;&lt;/p&gt;</source>
         <comment>Just translate &apos;Definition:&apos; and leave the rest intact.</comment>
         <translation>&lt;p&gt;&lt;b&gt;Определение:&lt;/b&gt; &lt;span class=&quot;def&quot;&gt;@NAME@@ARGSPEC@&lt;/span&gt;&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../UI/CodeDocumentationViewerTemplate.py" line="68"/>
+        <location filename="../UI/CodeDocumentationViewerTemplate.py" line="70"/>
         <source>&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; @NOTE@&lt;/p&gt;</source>
         <comment>Just translate &apos;Note:&apos; and leave the rest intact.</comment>
         <translation>&lt;p&gt;&lt;b&gt;Примечание:&lt;/b&gt; @NOTE@&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../UI/CodeDocumentationViewerTemplate.py" line="63"/>
+        <location filename="../UI/CodeDocumentationViewerTemplate.py" line="65"/>
         <source>&lt;p&gt;&lt;b&gt;Type:&lt;/b&gt; @TYPE@&lt;/p&gt;</source>
         <comment>Just translate &apos;Type:&apos; and leave the rest intact.</comment>
         <translation>&lt;p&gt;&lt;b&gt;Тип:&lt;/b&gt; @TYPE@&lt;/p&gt;</translation>
@@ -4180,11 +4180,6 @@
         <translation>Создать диалог QColorDialog.getColor</translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.ui" line="143"/>
-        <source>Colour</source>
-        <translation>Предопределенные цвета</translation>
-    </message>
-    <message>
         <location filename="../Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.ui" line="42"/>
         <source>Select to generate a QColorDialog.getRgba dialog</source>
         <translation>Создать диалог QColorDialog.getRgba</translation>
@@ -4205,11 +4200,6 @@
         <translation>Введите заголовок диалога</translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.ui" line="155"/>
-        <source>Enter a variable name or a colour</source>
-        <translation>Задайте имя переменной или цвет</translation>
-    </message>
-    <message>
         <location filename="../Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.ui" line="167"/>
         <source>Qt.red</source>
         <translation>Qt.red</translation>
@@ -4365,11 +4355,6 @@
         <translation>Ошибка мастера QColorDialog</translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.py" line="72"/>
-        <source>&lt;p&gt;The colour &lt;b&gt;{0}&lt;/b&gt; is not valid.&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Некорректный цвет: &lt;b&gt;{0}&lt;/b&gt;.&lt;/p&gt;</translation>
-    </message>
-    <message>
         <location filename="../Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.ui" line="55"/>
         <source>Result</source>
         <translation>Результат</translation>
@@ -4380,11 +4365,6 @@
         <translation>Задайте имя результирующей переменной</translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.ui" line="292"/>
-        <source>Colour Variable</source>
-        <translation>Имя переменной, содержащей цвет</translation>
-    </message>
-    <message>
         <location filename="../Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.ui" line="87"/>
         <source>Parent</source>
         <translation>Родительский компонент</translation>
@@ -4424,6 +4404,26 @@
         <source>Enter the parent expression</source>
         <translation>Задайте родительский компонент</translation>
     </message>
+    <message>
+        <location filename="../Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.ui" line="143"/>
+        <source>Color</source>
+        <translation>Цвет</translation>
+    </message>
+    <message>
+        <location filename="../Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.ui" line="155"/>
+        <source>Enter a variable name or a color</source>
+        <translation>Задайте имя переменной или цвет</translation>
+    </message>
+    <message>
+        <location filename="../Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.ui" line="292"/>
+        <source>Color Variable</source>
+        <translation>Имя переменной, содержащей цвет</translation>
+    </message>
+    <message>
+        <location filename="../Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.py" line="72"/>
+        <source>&lt;p&gt;The color &lt;b&gt;{0}&lt;/b&gt; is not valid.&lt;/p&gt;</source>
+        <translation>&lt;p&gt;Некорректный цвет: &lt;b&gt;{0}&lt;/b&gt;.&lt;/p&gt;</translation>
+    </message>
 </context>
 <context>
     <name>CompareDialog</name>
@@ -5363,7 +5363,7 @@
     <message>
         <location filename="../Preferences/ConfigurationDialog.py" line="167"/>
         <source>Icons</source>
-        <translation>Пиктограммы</translation>
+        <translation>Иконки</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationDialog.py" line="391"/>
@@ -6295,22 +6295,22 @@
         <translation>&lt;p&gt;При загрузке формы &lt;b&gt;{0}&lt;/b&gt; произошла ошибка:&lt;/p&gt;&lt;p&gt;{1}&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/CreateDialogCodeDialog.py" line="577"/>
+        <location filename="../Project/CreateDialogCodeDialog.py" line="580"/>
         <source>Code Generation</source>
         <translation>Генерация кода</translation>
     </message>
     <message>
-        <location filename="../Project/CreateDialogCodeDialog.py" line="437"/>
+        <location filename="../Project/CreateDialogCodeDialog.py" line="440"/>
         <source>&lt;p&gt;Could not open the code template file &quot;{0}&quot;.&lt;/p&gt;&lt;p&gt;Reason: {1}&lt;/p&gt;</source>
         <translation>&lt;p&gt;Невозможно открыть файл с шаблоном кода &lt;b&gt;{0}&lt;/b&gt;:&lt;br&gt;Причина: {1}.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/CreateDialogCodeDialog.py" line="475"/>
+        <location filename="../Project/CreateDialogCodeDialog.py" line="478"/>
         <source>&lt;p&gt;Could not open the source file &quot;{0}&quot;.&lt;/p&gt;&lt;p&gt;Reason: {1}&lt;/p&gt;</source>
         <translation>&lt;p&gt;Невозможно открыть файл с исходными текстами &lt;b&gt;{0}&lt;/b&gt;:&lt;br&gt;Причина: {1}.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/CreateDialogCodeDialog.py" line="577"/>
+        <location filename="../Project/CreateDialogCodeDialog.py" line="580"/>
         <source>&lt;p&gt;Could not write the source file &quot;{0}&quot;.&lt;/p&gt;&lt;p&gt;Reason: {1}&lt;/p&gt;</source>
         <translation>&lt;p&gt;Невозможно записать файл с исходными текстами &lt;b&gt;{0}&lt;/b&gt;:&lt;br&gt;Причина: {1}.&lt;/p&gt;</translation>
     </message>
@@ -7551,21 +7551,6 @@
         <translation>Разрешить удаленный запуск отладчика</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="630"/>
-        <source>Background Colours</source>
-        <translation>Цвета фона</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="659"/>
-        <source>Select the background colour for changed items.</source>
-        <translation>Выберите цвет фона для измененных элементов.</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="695"/>
-        <source>Select the background colour for elements which are loaded for the first time.</source>
-        <translation>Выберите цвет фона для элементов, которые загружаются впервые.</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="669"/>
         <source>Changed elements:</source>
         <translation>Измененные элементы:</translation>
@@ -7575,6 +7560,21 @@
         <source>First time opened elements:</source>
         <translation>Элементы, загружаемые первый раз:</translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="630"/>
+        <source>Background Colors</source>
+        <translation>Цвет фона</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="659"/>
+        <source>Select the background color for changed items.</source>
+        <translation>Выберите цвет фона для измененных элементов.</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="695"/>
+        <source>Select the background color for elements which are loaded for the first time.</source>
+        <translation>Выберите цвет фона для элементов, которые загружаются впервые.</translation>
+    </message>
 </context>
 <context>
     <name>DebuggerInterfacePython</name>
@@ -8062,110 +8062,110 @@
 <context>
     <name>DiffColoursPage</name>
     <message>
-        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="17"/>
-        <source>&lt;b&gt;Configure Diff colours&lt;/b&gt;</source>
-        <translation>&lt;b&gt;Настройка цветов Diff&lt;/b&gt;</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="39"/>
-        <source>Select the background colour for header lines</source>
-        <translation>Выберите цвет фона строк заголовка</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="42"/>
-        <source>Header Colour</source>
-        <translation>Цвет заголовка</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="52"/>
         <source>Header Line</source>
         <translation>Строка заголовка</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="65"/>
-        <source>Select the background colour for bad whitespace</source>
-        <translation>Выберите цвет фона плохих пробельных символов</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="68"/>
-        <source>Whitespace Colour</source>
-        <translation>Цвет пробельных символов</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="88"/>
-        <source>Select the text foreground colour</source>
-        <translation>Выберите цвет текста</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="91"/>
-        <source>Text Colour</source>
-        <translation>Цвет текста</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="101"/>
         <source>Normal Text</source>
         <translation>Обычный текст</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="114"/>
-        <source>Select the background colour for additions</source>
-        <translation>Выберите цвет фона добавлений</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="117"/>
-        <source>Added Colour</source>
-        <translation>Цвет добавлений</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="127"/>
         <source>Added Text</source>
         <translation>Добавленый текст</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="140"/>
-        <source>Select the background colour for removed text</source>
-        <translation>Выберите цвет фона удаленного текста</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="143"/>
-        <source>Removed Colour</source>
-        <translation>Цвет удалений</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="153"/>
         <source>Removed Text</source>
         <translation>Удаленный текст</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="166"/>
-        <source>Select the background colour for replaced text</source>
-        <translation>Выберите цвет фона замененного текста</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="169"/>
-        <source>Replaced Colour</source>
-        <translation>Цвет замененого</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="179"/>
         <source>Replaced Text</source>
         <translation>Замененный текст</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="192"/>
-        <source>Select the background colour for context lines</source>
-        <translation>Выберите цвет фона строк контекста</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="195"/>
-        <source>Context Colour</source>
-        <translation>Цвет контекста</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="205"/>
         <source>Context Line</source>
         <translation>Строка контекста</translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="17"/>
+        <source>&lt;b&gt;Configure Diff colors&lt;/b&gt;</source>
+        <translation>&lt;b&gt;Настройка цветов Diff&lt;/b&gt;</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="39"/>
+        <source>Select the background color for header lines</source>
+        <translation>Выберите цвет фона строк заголовка</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="42"/>
+        <source>Header Color</source>
+        <translation>Цвет заголовка</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="65"/>
+        <source>Select the background color for bad whitespace</source>
+        <translation>Выберите цвет фона плохих пробельных символов</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="68"/>
+        <source>Whitespace Color</source>
+        <translation>Цвет пробельных символов</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="88"/>
+        <source>Select the text foreground color</source>
+        <translation>Выберите цвет текста</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="91"/>
+        <source>Text Color</source>
+        <translation>Цвет текста</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="114"/>
+        <source>Select the background color for additions</source>
+        <translation>Выберите цвет фона добавлений</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="117"/>
+        <source>Added Color</source>
+        <translation>Цвет добавлений</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="140"/>
+        <source>Select the background color for removed text</source>
+        <translation>Выберите цвет фона удаленного текста</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="143"/>
+        <source>Removed Color</source>
+        <translation>Цвет удалений</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="166"/>
+        <source>Select the background color for replaced text</source>
+        <translation>Выберите цвет фона замененного текста</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="169"/>
+        <source>Replaced Color</source>
+        <translation>Цвет замененого</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="192"/>
+        <source>Select the background color for context lines</source>
+        <translation>Выберите цвет фона строк контекста</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="195"/>
+        <source>Context Color</source>
+        <translation>Цвет контекста</translation>
+    </message>
 </context>
 <context>
     <name>DiffDialog</name>
@@ -9337,7 +9337,7 @@
 <context>
     <name>E5GraphicsView</name>
     <message>
-        <location filename="../E5Graphics/E5GraphicsView.py" line="56"/>
+        <location filename="../E5Graphics/E5GraphicsView.py" line="58"/>
         <source>&lt;b&gt;Graphics View&lt;/b&gt;
 &lt;p&gt;This graphics view is used to show a diagram. 
 There are various actions available to manipulate the 
@@ -9368,7 +9368,7 @@
 </translation>
     </message>
     <message>
-        <location filename="../E5Graphics/E5GraphicsView.py" line="377"/>
+        <location filename="../E5Graphics/E5GraphicsView.py" line="416"/>
         <source>{0}, Page {1}</source>
         <translation>{0}, лист {1}</translation>
     </message>
@@ -10781,7 +10781,7 @@
 <context>
     <name>Editor</name>
     <message>
-        <location filename="../QScintilla/Editor.py" line="3106"/>
+        <location filename="../QScintilla/Editor.py" line="3107"/>
         <source>Open File</source>
         <translation>Открыть файл</translation>
     </message>
@@ -10871,7 +10871,7 @@
         <translation>Снять выделение</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7834"/>
+        <location filename="../QScintilla/Editor.py" line="7847"/>
         <source>Check spelling...</source>
         <translation>Проверка орфографии...</translation>
     </message>
@@ -11096,7 +11096,7 @@
         <translation>Редактировать точку останова...</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5607"/>
+        <location filename="../QScintilla/Editor.py" line="5615"/>
         <source>Enable breakpoint</source>
         <translation>Разрешить точку останова</translation>
     </message>
@@ -11201,327 +11201,327 @@
         <translation>Выберите для использования лексер Pygments.</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="1955"/>
+        <location filename="../QScintilla/Editor.py" line="1956"/>
         <source>Modification of Read Only file</source>
         <translation>Редактирование файла, открытого только на чтение</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="1955"/>
+        <location filename="../QScintilla/Editor.py" line="1956"/>
         <source>You are attempting to change a read only file. Please save to a different file first.</source>
         <translation>Попытка редактирования файла, открытого только на чтение. Пожалуйста, сначала сохраните изменения в другой файл.</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="2663"/>
+        <location filename="../QScintilla/Editor.py" line="2664"/>
         <source>Printing...</source>
         <translation>Печать...</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="2680"/>
+        <location filename="../QScintilla/Editor.py" line="2681"/>
         <source>Printing completed</source>
         <translation>Печать завершена</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="2682"/>
+        <location filename="../QScintilla/Editor.py" line="2683"/>
         <source>Error while printing</source>
         <translation>Ошибка печати</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="2685"/>
+        <location filename="../QScintilla/Editor.py" line="2686"/>
         <source>Printing aborted</source>
         <translation>Печать прервана</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="3046"/>
+        <location filename="../QScintilla/Editor.py" line="3047"/>
         <source>File Modified</source>
         <translation>Файл изменён</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="3046"/>
+        <location filename="../QScintilla/Editor.py" line="3047"/>
         <source>&lt;p&gt;The file &lt;b&gt;{0}&lt;/b&gt; has unsaved changes.&lt;/p&gt;</source>
         <translation>&lt;p&gt;В файле &lt;b&gt;{0}&lt;/b&gt; есть несохранённые изменения.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="3106"/>
+        <location filename="../QScintilla/Editor.py" line="3107"/>
         <source>&lt;p&gt;The file &lt;b&gt;{0}&lt;/b&gt; could not be opened.&lt;/p&gt;&lt;p&gt;Reason: {1}&lt;/p&gt;</source>
         <translation>&lt;p&gt;Невозможно прочитать файл &lt;b&gt;{0}&lt;/b&gt;.&lt;/p&gt;&lt;p&gt;Причина: {1}&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="3295"/>
+        <location filename="../QScintilla/Editor.py" line="3296"/>
         <source>Save File</source>
         <translation>Сохранить файл</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="3232"/>
+        <location filename="../QScintilla/Editor.py" line="3233"/>
         <source>&lt;p&gt;The file &lt;b&gt;{0}&lt;/b&gt; could not be saved.&lt;br/&gt;Reason: {1}&lt;/p&gt;</source>
         <translation>&lt;p&gt;Невозможно сохранить файл &lt;b&gt;{0}&lt;/b&gt;:&lt;br&gt;Причина: {1}.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="3295"/>
+        <location filename="../QScintilla/Editor.py" line="3296"/>
         <source>&lt;p&gt;The file &lt;b&gt;{0}&lt;/b&gt; already exists. Overwrite it?&lt;/p&gt;</source>
         <translation>&lt;p&gt;Файл &lt;b&gt;{0}&lt;/b&gt; уже существует. Переписать?&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="4772"/>
+        <location filename="../QScintilla/Editor.py" line="4777"/>
         <source>Autocompletion</source>
         <translation>Автодополнение</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="4772"/>
+        <location filename="../QScintilla/Editor.py" line="4777"/>
         <source>Autocompletion is not available because there is no autocompletion source set.</source>
         <translation>Автодополнение недоступно, так как не задан источник автодополнения.</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5610"/>
+        <location filename="../QScintilla/Editor.py" line="5618"/>
         <source>Disable breakpoint</source>
         <translation>Запретить точку останова</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5985"/>
+        <location filename="../QScintilla/Editor.py" line="5993"/>
         <source>Code Coverage</source>
         <translation>Покрытие кода</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5985"/>
+        <location filename="../QScintilla/Editor.py" line="5993"/>
         <source>Please select a coverage file</source>
         <translation>Пожалуйста, выберите файл покрытия</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6048"/>
+        <location filename="../QScintilla/Editor.py" line="6056"/>
         <source>Show Code Coverage Annotations</source>
         <translation>Показать аннотации по покрытию кода</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6041"/>
+        <location filename="../QScintilla/Editor.py" line="6049"/>
         <source>All lines have been covered.</source>
         <translation>Все строки были охвачены.</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6048"/>
+        <location filename="../QScintilla/Editor.py" line="6056"/>
         <source>There is no coverage file available.</source>
         <translation>Нет доступного файла покрытия.</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6165"/>
+        <location filename="../QScintilla/Editor.py" line="6173"/>
         <source>Profile Data</source>
         <translation>Данные профайлера</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6165"/>
+        <location filename="../QScintilla/Editor.py" line="6173"/>
         <source>Please select a profile file</source>
         <translation>Пожалуйста, выберите файл профиля</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6327"/>
+        <location filename="../QScintilla/Editor.py" line="6335"/>
         <source>Syntax Error</source>
         <translation>Синтаксическая ошибка</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6327"/>
+        <location filename="../QScintilla/Editor.py" line="6335"/>
         <source>No syntax error message available.</source>
         <translation>Нет сообщения о синтаксической ошибке.</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6718"/>
+        <location filename="../QScintilla/Editor.py" line="6726"/>
         <source>Macro Name</source>
         <translation>Имя макроса</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6718"/>
+        <location filename="../QScintilla/Editor.py" line="6726"/>
         <source>Select a macro name:</source>
         <translation>Задайте имя макроса:</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6746"/>
+        <location filename="../QScintilla/Editor.py" line="6754"/>
         <source>Load macro file</source>
         <translation>Загрузить макрос</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6789"/>
+        <location filename="../QScintilla/Editor.py" line="6797"/>
         <source>Macro files (*.macro)</source>
         <translation>Макросы (*.macro)</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6769"/>
+        <location filename="../QScintilla/Editor.py" line="6777"/>
         <source>Error loading macro</source>
         <translation>Ошибка при загрузке макроса</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6760"/>
+        <location filename="../QScintilla/Editor.py" line="6768"/>
         <source>&lt;p&gt;The macro file &lt;b&gt;{0}&lt;/b&gt; could not be read.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Невозможно прочитать файл с макросами: &lt;b&gt;{0}&lt;/b&gt;.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6769"/>
+        <location filename="../QScintilla/Editor.py" line="6777"/>
         <source>&lt;p&gt;The macro file &lt;b&gt;{0}&lt;/b&gt; is corrupt.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Файл с макросами &lt;b&gt;{0}&lt;/b&gt; повреждён.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6789"/>
+        <location filename="../QScintilla/Editor.py" line="6797"/>
         <source>Save macro file</source>
         <translation>Сохранить файл с макросами</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6806"/>
+        <location filename="../QScintilla/Editor.py" line="6814"/>
         <source>Save macro</source>
         <translation>Сохранить макрос</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6806"/>
+        <location filename="../QScintilla/Editor.py" line="6814"/>
         <source>&lt;p&gt;The macro file &lt;b&gt;{0}&lt;/b&gt; already exists. Overwrite it?&lt;/p&gt;</source>
         <translation>&lt;p&gt;Макро &lt;b&gt;{0}&lt;/b&gt; уже существует. Переписать?&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6822"/>
+        <location filename="../QScintilla/Editor.py" line="6830"/>
         <source>Error saving macro</source>
         <translation>Ошибка при сохранении макроса</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6822"/>
+        <location filename="../QScintilla/Editor.py" line="6830"/>
         <source>&lt;p&gt;The macro file &lt;b&gt;{0}&lt;/b&gt; could not be written.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Невозможно сохранить файл с макросами: &lt;b&gt;{0}&lt;/b&gt;.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6835"/>
+        <location filename="../QScintilla/Editor.py" line="6843"/>
         <source>Start Macro Recording</source>
         <translation>Начать запись макроса</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6835"/>
+        <location filename="../QScintilla/Editor.py" line="6843"/>
         <source>Macro recording is already active. Start new?</source>
         <translation>Запись макроса уже идёт. Начать новую запись?</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6861"/>
+        <location filename="../QScintilla/Editor.py" line="6869"/>
         <source>Macro Recording</source>
         <translation>Запись макроса</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6861"/>
+        <location filename="../QScintilla/Editor.py" line="6869"/>
         <source>Enter name of the macro:</source>
         <translation>Задайте имя макроса:</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7001"/>
+        <location filename="../QScintilla/Editor.py" line="7009"/>
         <source>File changed</source>
         <translation>Файл изменен</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7166"/>
+        <location filename="../QScintilla/Editor.py" line="7179"/>
         <source>{0} (ro)</source>
         <translation>{0} (только чтение)</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7307"/>
+        <location filename="../QScintilla/Editor.py" line="7320"/>
         <source>Drop Error</source>
         <translation>Ошибка Drag&amp;&amp;Drop</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7307"/>
+        <location filename="../QScintilla/Editor.py" line="7320"/>
         <source>&lt;p&gt;&lt;b&gt;{0}&lt;/b&gt; is not a file.&lt;/p&gt;</source>
         <translation>&lt;p&gt;&lt;b&gt;{0}&lt;/b&gt; не является файлом.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7328"/>
-        <source>Resources</source>
-        <translation>Ресурсы</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="7330"/>
-        <source>Add file...</source>
-        <translation>Добавить файл...</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="7332"/>
-        <source>Add files...</source>
-        <translation>Добавить файлы...</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="7334"/>
-        <source>Add aliased file...</source>
-        <translation>Добавить файл под другим именем...</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="7337"/>
-        <source>Add localized resource...</source>
-        <translation>Добавить локализованный ресурс...</translation>
-    </message>
-    <message>
         <location filename="../QScintilla/Editor.py" line="7341"/>
+        <source>Resources</source>
+        <translation>Ресурсы</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="7343"/>
+        <source>Add file...</source>
+        <translation>Добавить файл...</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="7345"/>
+        <source>Add files...</source>
+        <translation>Добавить файлы...</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="7347"/>
+        <source>Add aliased file...</source>
+        <translation>Добавить файл под другим именем...</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="7350"/>
+        <source>Add localized resource...</source>
+        <translation>Добавить локализованный ресурс...</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="7354"/>
         <source>Add resource frame</source>
         <translation>Добавить фрагмент ресурсов</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7360"/>
+        <location filename="../QScintilla/Editor.py" line="7373"/>
         <source>Add file resource</source>
         <translation>Добавить файл ресурсов</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7376"/>
+        <location filename="../QScintilla/Editor.py" line="7389"/>
         <source>Add file resources</source>
         <translation>Добавить файлы ресурсов</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7403"/>
+        <location filename="../QScintilla/Editor.py" line="7416"/>
         <source>Add aliased file resource</source>
         <translation>Добавить файл ресурсов под другим именем</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7403"/>
+        <location filename="../QScintilla/Editor.py" line="7416"/>
         <source>Alias for file &lt;b&gt;{0}&lt;/b&gt;:</source>
         <translation>Другое имя для файла &lt;b&gt;{0}&lt;/b&gt;:</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7469"/>
+        <location filename="../QScintilla/Editor.py" line="7482"/>
         <source>Package Diagram</source>
         <translation>Диаграмма пакетов</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7469"/>
+        <location filename="../QScintilla/Editor.py" line="7482"/>
         <source>Include class attributes?</source>
         <translation>Включать атрибуты класса?</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7491"/>
+        <location filename="../QScintilla/Editor.py" line="7504"/>
         <source>Imports Diagram</source>
         <translation>Диаграмма импортов</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7491"/>
+        <location filename="../QScintilla/Editor.py" line="7504"/>
         <source>Include imports from external modules?</source>
         <translation>Включать импорты из внешних модулей?</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7505"/>
+        <location filename="../QScintilla/Editor.py" line="7518"/>
         <source>Application Diagram</source>
         <translation>Диаграмма приложения</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7505"/>
+        <location filename="../QScintilla/Editor.py" line="7518"/>
         <source>Include module names?</source>
         <translation>Включать имена модулей?</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7837"/>
+        <location filename="../QScintilla/Editor.py" line="7850"/>
         <source>Add to dictionary</source>
         <translation>Добавить в словарь</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7839"/>
+        <location filename="../QScintilla/Editor.py" line="7852"/>
         <source>Ignore All</source>
         <translation>Игнорировать всё</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6606"/>
+        <location filename="../QScintilla/Editor.py" line="6614"/>
         <source>Warning: {0}</source>
         <translation>Предупреждение: {0}</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6613"/>
+        <location filename="../QScintilla/Editor.py" line="6621"/>
         <source>Error: {0}</source>
         <translation>Ошибка: {0}</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6997"/>
+        <location filename="../QScintilla/Editor.py" line="7005"/>
         <source>&lt;br&gt;&lt;b&gt;Warning:&lt;/b&gt; You will lose your changes upon reopening it.</source>
         <translation>&lt;br&gt;&lt;b&gt;Предупреждение:&lt;/b&gt; При переоткрытии все изменения будут потеряны.</translation>
     </message>
@@ -11546,27 +11546,27 @@
         <translation>Предыдущее изменение</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="8255"/>
+        <location filename="../QScintilla/Editor.py" line="8268"/>
         <source>Sort Lines</source>
         <translation>Сортировать строки</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="8255"/>
+        <location filename="../QScintilla/Editor.py" line="8268"/>
         <source>The selection contains illegal data for a numerical sort.</source>
         <translation>Выборка содержит данные неподходящие для сортировки как числа.</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6541"/>
+        <location filename="../QScintilla/Editor.py" line="6549"/>
         <source>Warning</source>
         <translation>Предупреждение</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6541"/>
+        <location filename="../QScintilla/Editor.py" line="6549"/>
         <source>No warning messages available.</source>
         <translation>Нет предупреждающего сообщения.</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6603"/>
+        <location filename="../QScintilla/Editor.py" line="6611"/>
         <source>Style: {0}</source>
         <translation>Стиль: {0}</translation>
     </message>
@@ -11591,7 +11591,7 @@
         <translation>Открыть заново с кодировкой</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6991"/>
+        <location filename="../QScintilla/Editor.py" line="6999"/>
         <source>&lt;p&gt;The file &lt;b&gt;{0}&lt;/b&gt; has been changed while it was opened in eric6. Reread it?&lt;/p&gt;</source>
         <translation>&lt;p&gt;Файл &lt;b&gt;{0}&lt;/b&gt; был изменён, будучи открытым в eric6. Перепрочесть?&lt;/p&gt;</translation>
     </message>
@@ -11606,32 +11606,32 @@
         <translation>Дополнить</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="4902"/>
+        <location filename="../QScintilla/Editor.py" line="4907"/>
         <source>Auto-Completion Provider</source>
         <translation>Источник автодополнений</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="4902"/>
+        <location filename="../QScintilla/Editor.py" line="4907"/>
         <source>The completion list provider &apos;{0}&apos; was already registered. Ignoring duplicate request.</source>
         <translation>Список дополнений источника &apos;{0}&apos; уже зарегистрирован. Повторный запрос проигнорирован.</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5177"/>
+        <location filename="../QScintilla/Editor.py" line="5185"/>
         <source>Call-Tips Provider</source>
         <translation>Источник всплывающих подсказок</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5177"/>
+        <location filename="../QScintilla/Editor.py" line="5185"/>
         <source>The call-tips provider &apos;{0}&apos; was already registered. Ignoring duplicate request.</source>
         <translation>Источник всплывающих подсказок &apos;{0}&apos; уже зарегистрирован. Повторный запрос проигнорирован.</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="8344"/>
+        <location filename="../QScintilla/Editor.py" line="8357"/>
         <source>Register Mouse Click Handler</source>
         <translation>Регистрация обработчика кликов мышки</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="8344"/>
+        <location filename="../QScintilla/Editor.py" line="8357"/>
         <source>A mouse click handler for &quot;{0}&quot; was already registered by &quot;{1}&quot;. Aborting request by &quot;{2}&quot;...</source>
         <translation>Обработчик кликов мышки для &quot;{0}&quot; уже зарегистрирован &quot;{1}&quot;. Запрос прерван &quot;{2}&quot;...</translation>
     </message>
@@ -11661,12 +11661,12 @@
         <translation>Выполнить выбор в консоли</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="8465"/>
+        <location filename="../QScintilla/Editor.py" line="8478"/>
         <source>EditorConfig Properties</source>
         <translation>Свойства EditorConfig</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="8465"/>
+        <location filename="../QScintilla/Editor.py" line="8478"/>
         <source>&lt;p&gt;The EditorConfig properties for file &lt;b&gt;{0}&lt;/b&gt; could not be loaded.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Не удается загрузить свойства EditorConfig для файла &lt;b&gt;{0}&lt;/b&gt;.&lt;/p&gt;</translation>
     </message>
@@ -11716,7 +11716,7 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.ui" line="37"/>
         <source>Select to compile the APIs automatically upon loading</source>
-        <translation>Разрешить автоматически компилировать файлы API при запуске</translation>
+        <translation>Разрешить автоматически компилировать API при запуске</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.ui" line="40"/>
@@ -11741,7 +11741,7 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.ui" line="100"/>
         <source>List of API files</source>
-        <translation>Список файлов с API</translation>
+        <translation>Список файлов API</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.ui" line="110"/>
@@ -11776,17 +11776,17 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="260"/>
         <source>Add from installed APIs</source>
-        <translation>Добавить из списка установленных файлов API</translation>
+        <translation>Добавить из списка установленных API</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.ui" line="153"/>
         <source>Press to select an API file from the list of API files installed by plugins</source>
-        <translation>Выбор API-файла из списка API-файлов установленных плагинов</translation>
+        <translation>Выбор файл API из списка файлов API установленных плагинов</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="279"/>
         <source>Add from Plugin APIs</source>
-        <translation>Добавить из списка файлов API, установленных с помощью плагинов</translation>
+        <translation>Добавить из списка API, установленных с помощью плагинов</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.ui" line="170"/>
@@ -11811,7 +11811,7 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="279"/>
         <source>Select from the list of API files installed by plugins</source>
-        <translation>Выбрать из списка API-файлов, установленных с помощью плагинов</translation>
+        <translation>Выбрать из списка файлов API, установленных с помощью плагинов</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="327"/>
@@ -11821,7 +11821,7 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="260"/>
         <source>There are no APIs installed yet. Selection is not available.</source>
-        <translation>API не установлено. Выбор невозможен.</translation>
+        <translation>API не установлены. Выбор невозможен.</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.ui" line="75"/>
@@ -12068,7 +12068,7 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorAutocompletionQScintillaPage.ui" line="76"/>
         <source>Select this to get autocompletion from installed APIs</source>
-        <translation>Искать автодополнения в файлах установленного API</translation>
+        <translation>Искать автодополнения в файлах установленных API</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorAutocompletionQScintillaPage.ui" line="79"/>
@@ -12078,7 +12078,7 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorAutocompletionQScintillaPage.ui" line="86"/>
         <source>Select this to get autocompletion from current document and installed APIs</source>
-        <translation>Искать автодополнения в текущем документе и файлах установленного API</translation>
+        <translation>Искать автодополнения в текущем документе и файлах установленных API</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorAutocompletionQScintillaPage.ui" line="89"/>
@@ -12197,22 +12197,7 @@
         <translation>Максимальное количество отображаемых подсказок</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="122"/>
-        <source>Colours</source>
-        <translation>Цвета</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="128"/>
-        <source>Background colour:</source>
-        <translation>Цвет фона:</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="141"/>
-        <source>Select the background colour for calltips.</source>
-        <translation>Выбор цвета фона подсказок.</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="167"/>
+        <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="213"/>
         <source>Plug-In Behavior</source>
         <translation>Режим работы плагинов</translation>
     </message>
@@ -12247,20 +12232,55 @@
         <translation>Автоматические подсказки</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="176"/>
+        <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="222"/>
         <source>Qscintilla provided calltips are shown, if this option is enabled and calltips shall be provided by plug-ins (see calltips sub-page of the plug-in) and the plugin-ins don&apos;t deliver any calltips.</source>
         <translation>Отображать предоставленные подсказки Qscintilla, если эта опция влючена и подсказки предоставлены плагинами (см. соответствующие страницы настройки плагинов с подсказками) и плагины не содержат каких-либо подсказок.</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="179"/>
+        <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="225"/>
         <source>Show QScintilla calltips, if plug-ins fail</source>
         <translation>Показывать подсказки QScintilla если плагины не срабатывают</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="173"/>
+        <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="219"/>
         <source>Select to show QScintilla provided calltips, if the selected plug-ins fail</source>
         <translation>Разрешить отображение предоставленных подсказок QScintilla, если выбранные плагины не срабатывают</translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="122"/>
+        <source>Colors</source>
+        <translation>Цвет</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="128"/>
+        <source>Background color:</source>
+        <translation>Цвет фона:</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="141"/>
+        <source>Select the background color for calltips.</source>
+        <translation>Выберите цвет фона подсказок.</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="164"/>
+        <source>Foreground color:</source>
+        <translation>Цвет подсказок:</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="177"/>
+        <source>Select the foreground color for calltips.</source>
+        <translation>Выберите цвет текста подсказок.</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="187"/>
+        <source>Highlight color:</source>
+        <translation>Цвет подсветки:</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="200"/>
+        <source>Select the highlight color for calltips.</source>
+        <translation>Выберите цвет подсветки текстаподсказок.</translation>
+    </message>
 </context>
 <context>
     <name>EditorCalltipsQScintillaPage</name>
@@ -13197,26 +13217,6 @@
         <translation>Элементы стиля</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="174"/>
-        <source>Select the foreground colour.</source>
-        <translation>Выберите цвет шрифта.</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="177"/>
-        <source>Foreground Colour</source>
-        <translation>Цвет шрифта</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="184"/>
-        <source>Select the background colour.</source>
-        <translation>Выберите цвет фона.</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="187"/>
-        <source>Background Colour</source>
-        <translation>Цвет фона</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="194"/>
         <source>Select the font.</source>
         <translation>Выберите шрифт.</translation>
@@ -13242,16 +13242,6 @@
         <translation>По умолчанию</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="273"/>
-        <source>Select the background colour for all styles</source>
-        <translation>Выберите цвет фона для всех стилей</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="276"/>
-        <source>All Background Colours</source>
-        <translation>Все цвета фона</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="283"/>
         <source>Select the font for all styles.</source>
         <translation>Выберите шрифт для всех стилей.</translation>
@@ -13456,6 +13446,36 @@
         <source>Press to set all sub-styles to default values</source>
         <translation>Установить для всех подстилей значения по умолчанию</translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="174"/>
+        <source>Select the foreground color.</source>
+        <translation>Выберите цвет шрифта.</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="177"/>
+        <source>Foreground Color</source>
+        <translation>Цвет шрифта</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="184"/>
+        <source>Select the background color.</source>
+        <translation>Выберите цвет фона.</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="187"/>
+        <source>Background Color</source>
+        <translation>Цвет фона</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="273"/>
+        <source>Select the background color for all styles</source>
+        <translation>Выберите цвет фона для всех стилей</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="276"/>
+        <source>All Background Colors</source>
+        <translation>Цвет любого фона</translation>
+    </message>
 </context>
 <context>
     <name>EditorKeywordsPage</name>
@@ -14290,16 +14310,6 @@
         <translation> мсек</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorSearchPage.ui" line="127"/>
-        <source>Marker Colour:</source>
-        <translation>Цвет маркера:</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorSearchPage.ui" line="140"/>
-        <source>Select the colour for the search markers.</source>
-        <translation>Выбор цвета для выделения найденных фрагментов.</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorSearchPage.ui" line="168"/>
         <source>Regular Expression Type</source>
         <translation>Тип регулярных выражений</translation>
@@ -14324,6 +14334,16 @@
         <source>QScintilla Extended  Mode (C++11)</source>
         <translation>Расширенный режим QScintilla (C++11)</translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorSearchPage.ui" line="127"/>
+        <source>Marker Color:</source>
+        <translation>Цвет маркера:</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorSearchPage.ui" line="140"/>
+        <source>Select the color for the search markers.</source>
+        <translation>Выберите цвет выделения найденных фрагментов.</translation>
+    </message>
 </context>
 <context>
     <name>EditorSpellCheckingPage</name>
@@ -14393,21 +14413,6 @@
         <translation>Минимальный размер проверяемых слов</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorSpellCheckingPage.ui" line="215"/>
-        <source>Colours</source>
-        <translation>Цвета</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorSpellCheckingPage.ui" line="221"/>
-        <source>Marker Colour:</source>
-        <translation>Цвет маркера:</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorSpellCheckingPage.ui" line="234"/>
-        <source>Select the colour for the spelling markers.</source>
-        <translation>Выбор цвета подсветки орфографических ошибок.</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorSpellCheckingPage.ui" line="260"/>
         <source>Personal lists</source>
         <translation>Персональные словари</translation>
@@ -14489,6 +14494,21 @@
         <translation>&lt;b&gt;Текстовые файлы&lt;/b&gt;
 &lt;p&gt;Задайте расширения для &apos;чисто&apos; текстовых файлов. Для файлов с такими расширениями будет проводиться полная проверка содержимого.&lt;/p&gt;</translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorSpellCheckingPage.ui" line="215"/>
+        <source>Colors</source>
+        <translation>Цвет</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorSpellCheckingPage.ui" line="221"/>
+        <source>Marker Color:</source>
+        <translation>Цвет маркера:</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorSpellCheckingPage.ui" line="234"/>
+        <source>Select the color for the spelling markers.</source>
+        <translation>Выберите цвет маркеров проверки орфографии.</translation>
+    </message>
 </context>
 <context>
     <name>EditorStylesPage</name>
@@ -14643,51 +14663,26 @@
         <translation>Цвет панелей:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="351"/>
-        <source>Select the foreground colour for the margins</source>
-        <translation>Выберите цвет боковых панелей</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="361"/>
         <source>Margins background:</source>
         <translation>Цвет фона панелей:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="374"/>
-        <source>Select the background colour for the margins</source>
-        <translation>Выберите цвет фона боковых панелей</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="384"/>
         <source>Foldmargin background:</source>
         <translation>Цвет фона панели свертки:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="397"/>
-        <source>Select the background colour for the foldmargin</source>
-        <translation>Выберите цвет фона панели свертки</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="407"/>
         <source>Foldmarkers foreground:</source>
         <translation>Цвет маркеров свертки:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="420"/>
-        <source>Select the foreground colour of the foldmarkers</source>
-        <translation>Выберите цвет маркеров свертки</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="430"/>
         <source>Foldmarkers background:</source>
         <translation>Цвет фона маркеров свертки:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="443"/>
-        <source>Select the background colour of the foldmarkers</source>
-        <translation>Выберите цвет фона маркеров свертки</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="457"/>
         <source>Press to select the font for the editor line numbers</source>
         <translation>Задайте шрифт номеров строк редактора</translation>
@@ -14708,31 +14703,6 @@
         <translation>Выделение</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="515"/>
-        <source>Select to use custom selection colours</source>
-        <translation>Разрешить использовать свои цвета выделения</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="518"/>
-        <source>&lt;b&gt;Use custom selection colours&lt;/b&gt;&lt;p&gt;Select this entry in order to use custom selection colours in the editor and shell windows. The colours for the selection foreground and background are defined on the colours page.&lt;/p&gt;</source>
-        <translation>&lt;b&gt;Использовать свои цвета выделения&lt;/b&gt;&lt;p&gt;Выберите этот пункт, чтобы использовать пользовательские цвета выбора в редакторе и в окнах оболочки. Цвета для выбора переднего плана и фона определены на странице цветов.&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="521"/>
-        <source>Use custom selection colours</source>
-        <translation>Использовать свои цвета выделения</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="528"/>
-        <source>Select, if selected text should be colourized by the lexer.</source>
-        <translation>Разрешить лексическому анализатору рассвечивать выделенный текст своими цветами.</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="531"/>
-        <source>Colourize selected text</source>
-        <translation>Выделять выбранный текст цветом</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="538"/>
         <source>Select to extend selection to end of line</source>
         <translation>Разрешить распространять выделения до конца строки</translation>
@@ -14748,21 +14718,11 @@
         <translation>Цвет выделения:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="565"/>
-        <source>Select the foreground colour for the selection.</source>
-        <translation>Выберите цвет переднего плана выделения.</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="575"/>
         <source>Selection background:</source>
         <translation>Фон выделения:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="588"/>
-        <source>Select the background colour for the selection.</source>
-        <translation>Выберите цвет фона выделения.</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="609"/>
         <source>Caret</source>
         <translation>Курсор</translation>
@@ -14778,16 +14738,6 @@
         <translation>Каретка видима</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="648"/>
-        <source>Select the colour for the caret.</source>
-        <translation>Выберите цвет курсора.</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="761"/>
-        <source>Select the background colour for the line containing the caret.</source>
-        <translation>Выберите цвет фона строки, содержащей курсор.</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="857"/>
         <source>Braces</source>
         <translation>Фигурные скобки</translation>
@@ -14808,41 +14758,21 @@
         <translation>Парные скобки:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="886"/>
-        <source>Select the colour for highlighting matching braces.</source>
-        <translation>Выберите цвет подсветки парных скобок.</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="896"/>
         <source>Matched braces background:</source>
         <translation>Цвет фона парных скобок:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="909"/>
-        <source>Select the background colour for highlighting matching braces.</source>
-        <translation>Выберите цвет фона подсветки парных скобок.</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="925"/>
         <source>Unmatched brace:</source>
         <translation>Непарная скобка:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="932"/>
-        <source>Select the colour for  highlighting nonmatching braces.</source>
-        <translation>Выберите цвет подсветки непарных скобок.</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="948"/>
         <source>Unmatched brace background:</source>
         <translation>Цвет фона непарных скобок:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="955"/>
-        <source>Select the background colour for  highlighting nonmatching braces.</source>
-        <translation>Выберите цвет фона для подсветки непарных скобок.</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="968"/>
         <source>End of Line</source>
         <translation>Окончания строк</translation>
@@ -14868,16 +14798,6 @@
         <translation>Правая граница текста</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1124"/>
-        <source>Select the colour for the edge marker.</source>
-        <translation>Выберите цвет для отображения правой границы текста.</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1134"/>
-        <source>Background colour:</source>
-        <translation>Цвет фона:</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1147"/>
         <source>Move to set the edge column.</source>
         <translation>Задайте положение правой границы текста.</translation>
@@ -14908,11 +14828,6 @@
         <translation>Отрисовка линии</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1222"/>
-        <source>Change Background Colour</source>
-        <translation>Изменение цвета фона</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1236"/>
         <source>Zoom</source>
         <translation>Масштаб</translation>
@@ -14983,21 +14898,11 @@
         <translation>Предупреждения</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1402"/>
-        <source>Press to select the foreground colour</source>
-        <translation>Задайте цвет переднего плана</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1405"/>
         <source>Foreground</source>
         <translation>Цвет</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1412"/>
-        <source>Press to select the background colour</source>
-        <translation>Задайте цвет заднего фона</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1415"/>
         <source>Background</source>
         <translation>Цвет фона</translation>
@@ -15028,56 +14933,21 @@
         <translation>Цвет символа пропуска:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1636"/>
-        <source>Select the foreground colour for visible whitespace</source>
-        <translation>Выберите цвет видимого символа пропуска</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1646"/>
         <source>Whitespace background:</source>
         <translation>Цвет фона символа пропуска:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1659"/>
-        <source>Select the background colour for visible whitespace</source>
-        <translation>Выберите цвет фона для видимого символа пропуска</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="53"/>
-        <source>Select to set the colour of the edit area different to the default style</source>
-        <translation>Разрешить выбирать цвета области редактирования отличными от стиля по умолчанию</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="56"/>
-        <source>Override edit area colours</source>
-        <translation>Переопределение цветов области редактирования</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="68"/>
         <source>Edit area foreground:</source>
         <translation>Цвет области редактирования:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="81"/>
-        <source>Select the foreground colour for the edit area.</source>
-        <translation>Выберите цвет области редактирования.</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="91"/>
         <source>Edit area background:</source>
         <translation>Цвет фона области редактирования:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="104"/>
-        <source>Select the background colour for the edit area.</source>
-        <translation>Выберите цвет фона области редактирования.</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="47"/>
-        <source>Colours</source>
-        <translation>Цвет</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1444"/>
         <source>Change Tracing</source>
         <translation>Трассировка изменений</translation>
@@ -15108,26 +14978,6 @@
         <translation> мсек</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1514"/>
-        <source>Unsaved changes colour:</source>
-        <translation>Цвет несохраненных изменений:</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1527"/>
-        <source>Select the colour for the change marker for unsaved changes.</source>
-        <translation>Выберите цвет пометок для несохраненных изменений.</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1537"/>
-        <source>Saved changes colour:</source>
-        <translation>Цвет сохраненных изменений:</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1550"/>
-        <source>Select the colour for the change marker for saved changes.</source>
-        <translation>Выберите цвет пометок для сохраненных изменений.</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1003"/>
         <source>Select the wrap mode for long lines</source>
         <translation>Выбор режима переноса длинных строк</translation>
@@ -15203,91 +15053,46 @@
         <translation>Ошибки:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1782"/>
-        <source>Select the colour for error markers</source>
-        <translation>Выберите цвет маркеров ошибок</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1792"/>
         <source>Warnings:</source>
         <translation>Предупреждения:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1805"/>
-        <source>Select the colour for warning markers</source>
-        <translation>Выберите цвет маркеров предупреждений</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1815"/>
         <source>Bookmarks:</source>
         <translation>Закладки:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1828"/>
-        <source>Select the colour for bookmark markers</source>
-        <translation>Выберите цвет маркеров закладок</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1838"/>
         <source>Breakpoints:</source>
         <translation>Точки останова:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1851"/>
-        <source>Select the colour for breakpoint markers</source>
-        <translation>Выберите цвет маркеров точек останова</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1861"/>
         <source>Tasks:</source>
         <translation>Задачи:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1874"/>
-        <source>Select the colour for task markers</source>
-        <translation>Выберите цвет маркеров задач</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1884"/>
         <source>Changes:</source>
         <translation>Изменения:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1897"/>
-        <source>Select the colour for change markers</source>
-        <translation>Выберите цвет маркеров изменений</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1907"/>
         <source>Coverage:</source>
         <translation>Покрытия:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1920"/>
-        <source>Select the colour for coverage markers</source>
-        <translation>Выберите цвет маркеров покрытия</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1930"/>
         <source>Current Line:</source>
         <translation>Текущей строки:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1943"/>
-        <source>Select the colour for the current line marker</source>
-        <translation>Выберите цвет маркеров текущей строки</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1999"/>
         <source>Background:</source>
         <translation>Фона:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="2012"/>
-        <source>Select the background colour for the marker map</source>
-        <translation>Выберите цвет фона карты маркеров</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1674"/>
         <source>Indentation Guides</source>
         <translation>Индикаторы отступа</translation>
@@ -15308,31 +15113,16 @@
         <translation>Цвет индикаторов отступа:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1705"/>
-        <source>Select the foreground colour for indentation guides</source>
-        <translation>Выберите цвет индикаторов отступа</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1715"/>
         <source>Indentation Guides background:</source>
         <translation>Фон для индикаторов отступа:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1728"/>
-        <source>Select the background colour for indentation guides</source>
-        <translation>Выберите цвет фона для индикаторов отступа</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1953"/>
         <source>Search Markers:</source>
         <translation>Поиска:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1966"/>
-        <source>Select the colour for the search marker</source>
-        <translation>Выберите цвет маркера поиска</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="2093"/>
         <source>Select to hide the Format Buttons bar when formatting is not supported</source>
         <translation>Разрешить скрывать панель кнопок форматирования, если форматирование не поддерживается</translation>
@@ -15348,11 +15138,6 @@
         <translation>Маркеры отлаживаемых строк</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="801"/>
-        <source>Use background colours</source>
-        <translation>Использовать цвета фона</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="808"/>
         <source>Current line marker:</source>
         <translation>Маркер текущей строки:</translation>
@@ -15363,31 +15148,11 @@
         <translation>Маркер строки ошибки:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="798"/>
-        <source>Select to indicate the debug markers using coloured line backgrounds, arrow indicators otherwise</source>
-        <translation>Разрешить показывать маркеры отладки, используя цвета фона строки, в противном случае использовать стрелочные индикаторы</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="821"/>
-        <source>Select the colour for the current line marker.</source>
-        <translation>Выберите цвет маркера текущей строки.</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="844"/>
-        <source>Select the colour for the error line marker.</source>
-        <translation>Выберите цвет маркера строки ошибки.</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1976"/>
         <source>Conflict Marker Line:</source>
         <translation>Строки конфликта:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1989"/>
-        <source>Select the colour for the conflict marker line marker</source>
-        <translation>Выберите цвет маркера строки конфликта</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1749"/>
         <source>Select to show the marker map right of the editor</source>
         <translation>Разрешить отображать карту маркеров с правой стороны редактора</translation>
@@ -15535,10 +15300,265 @@
         <translation>Подсветка:</translation>
     </message>
     <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="47"/>
+        <source>Colors</source>
+        <translation>Цвет</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="53"/>
+        <source>Select to set the color of the edit area different to the default style</source>
+        <translation>Разрешить выбирать цвет области редактирования отличным от стиля по умолчанию</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="56"/>
+        <source>Override edit area colors</source>
+        <translation>Переопределение цветов области редактирования</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="81"/>
+        <source>Select the foreground color for the edit area.</source>
+        <translation>Выберите цвет области редактирования.</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="104"/>
+        <source>Select the background color for the edit area.</source>
+        <translation>Выберите цвет фона области редактирования.</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="648"/>
+        <source>Select the color for the caret.</source>
+        <translation>Выберите цвет курсора.</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="351"/>
+        <source>Select the foreground color for the margins</source>
+        <translation>Выберите цвет боковых панелей</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="374"/>
+        <source>Select the background color for the margins</source>
+        <translation>Выберите цвет фона боковых панелей</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="397"/>
+        <source>Select the background color for the foldmargin</source>
+        <translation>Выберите цвет фона панели свертки</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="420"/>
+        <source>Select the foreground color of the foldmarkers</source>
+        <translation>Выберите цвет маркеров свертки</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="443"/>
+        <source>Select the background color of the foldmarkers</source>
+        <translation>Выберите цвет фона маркеров свертки</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="515"/>
+        <source>Select to use custom selection colors</source>
+        <translation>Разрешить использовать свои цвета выделения</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="518"/>
+        <source>&lt;b&gt;Use custom selection colors&lt;/b&gt;&lt;p&gt;Select this entry in order to use custom selection colors in the editor and shell windows. The colors for the selection foreground and background are defined on the colors page.&lt;/p&gt;</source>
+        <translation>&lt;b&gt;Использовать свои цвета выделения&lt;/b&gt;&lt;p&gt;Выберите этот пункт чтобы использовать пользовательские цвета выбора в окнах редактора и оболочки. Цвета переднего плана и фона выделения определяются на странице цветов.&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="521"/>
+        <source>Use custom selection colors</source>
+        <translation>Использовать пользовательские цвета выделения</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="528"/>
+        <source>Select, if selected text should be colorized by the lexer.</source>
+        <translation>Разрешить лексическому анализатору расцвечивать выделенный текст своими цветами.</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="531"/>
+        <source>Colorize selected text</source>
+        <translation>Расцвечивать выделенный текст</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="565"/>
+        <source>Select the foreground color for the selection.</source>
+        <translation>Выберите цвет текста выделения.</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="588"/>
+        <source>Select the background color for the selection.</source>
+        <translation>Выберите цвет фона выделения.</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="761"/>
+        <source>Select the background color for the line containing the caret.</source>
+        <translation>Выберите цвет фона строки, содержащей курсор.</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="798"/>
+        <source>Select to indicate the debug markers using colored line backgrounds, arrow indicators otherwise</source>
+        <translation>Разрешить показывать маркеры отладки, используя цвета фона строки, в противном случае использовать стрелочные индикаторы</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="801"/>
+        <source>Use background colors</source>
+        <translation>Использовать цвета фона</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="821"/>
+        <source>Select the color for the current line marker.</source>
+        <translation>Выберите цвет маркера текущей строки.</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="844"/>
+        <source>Select the color for the error line marker.</source>
+        <translation>Выберите цвет маркера строки ошибки.</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="886"/>
+        <source>Select the color for highlighting matching braces.</source>
+        <translation>Выберите цвет подсветки парных скобок.</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="909"/>
+        <source>Select the background color for highlighting matching braces.</source>
+        <translation>Выберите цвет фона подсветки парных скобок.</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="932"/>
+        <source>Select the color for  highlighting nonmatching braces.</source>
+        <translation>Выберите цвет подсветки непарных скобок.</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="955"/>
+        <source>Select the background color for  highlighting nonmatching braces.</source>
+        <translation>Выберите цвет фона для подсветки непарных скобок.</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1124"/>
+        <source>Select the color for the edge marker.</source>
+        <translation>Выберите цвет маркера правой границы текста.</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1134"/>
+        <source>Background color:</source>
+        <translation>Цвет фона:</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1222"/>
+        <source>Change Background Color</source>
+        <translation>Изменение цвета фона</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1402"/>
+        <source>Press to select the foreground color</source>
+        <translation>Задайте цвет текста</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1412"/>
+        <source>Press to select the background color</source>
+        <translation>Задайте цвет фона</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1514"/>
+        <source>Unsaved changes color:</source>
+        <translation>Цвет несохраненных изменений:</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1527"/>
+        <source>Select the color for the change marker for unsaved changes.</source>
+        <translation>Выберите цвет для маркера изменений для несохраненных изменений.</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1537"/>
+        <source>Saved changes color:</source>
+        <translation>Цвет сохраненных изменений:</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1550"/>
+        <source>Select the color for the change marker for saved changes.</source>
+        <translation>Выберите цвет для маркера изменений для сохраненных изменений.</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1636"/>
+        <source>Select the foreground color for visible whitespace</source>
+        <translation>Выберите цвет видимого символа пропуска</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1659"/>
+        <source>Select the background color for visible whitespace</source>
+        <translation>Выберите цвет фона для видимого символа пропуска</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1705"/>
+        <source>Select the foreground color for indentation guides</source>
+        <translation>Выберите цвет индикаторов отступа</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1728"/>
+        <source>Select the background color for indentation guides</source>
+        <translation>Выберите цвет фона для индикаторов отступа</translation>
+    </message>
+    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1763"/>
-        <source>Marker Colours</source>
+        <source>Marker Colors</source>
         <translation>Цвет маркера</translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1782"/>
+        <source>Select the color for error markers</source>
+        <translation>Выберите цвет маркеров ошибок</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1805"/>
+        <source>Select the color for warning markers</source>
+        <translation>Выберите цвет маркеров предупреждений</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1828"/>
+        <source>Select the color for bookmark markers</source>
+        <translation>Выберите цвет маркеров закладок</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1851"/>
+        <source>Select the color for breakpoint markers</source>
+        <translation>Выберите цвет маркеров точек останова</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1874"/>
+        <source>Select the color for task markers</source>
+        <translation>Выберите цвет маркеров задач</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1897"/>
+        <source>Select the color for change markers</source>
+        <translation>Выберите цвет маркеров изменений</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1920"/>
+        <source>Select the color for coverage markers</source>
+        <translation>Выберите цвет маркеров покрытия</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1943"/>
+        <source>Select the color for the current line marker</source>
+        <translation>Выберите цвет маркеров текущей строки</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1966"/>
+        <source>Select the color for the search marker</source>
+        <translation>Выберите цвет маркера поиска</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1989"/>
+        <source>Select the color for the conflict marker line marker</source>
+        <translation>Выберите цвет маркера строки конфликта</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="2012"/>
+        <source>Select the background color for the marker map</source>
+        <translation>Выберите цвет фона карты маркеров</translation>
+    </message>
 </context>
 <context>
     <name>EditorSyntaxPage</name>
@@ -16365,7 +16385,7 @@
     <message>
         <location filename="../Plugins/DocumentationPlugins/Ericapi/EricapiConfigDialog.ui" line="124"/>
         <source>Select to include private classes, methods and functions in the API file</source>
-        <translation>Включать приватные классы, методы и функции в файлы API</translation>
+        <translation>Разрешить включать приватные классы, методы и функции в файлы API</translation>
     </message>
     <message>
         <location filename="../Plugins/DocumentationPlugins/Ericapi/EricapiConfigDialog.ui" line="127"/>
@@ -16493,7 +16513,7 @@
     <message>
         <location filename="../Plugins/PluginEricapi.py" line="62"/>
         <source>Eric6 API File Generator</source>
-        <translation>Генератор файлов eric6 API</translation>
+        <translation>Генератор файлов API eric6</translation>
     </message>
     <message>
         <location filename="../Plugins/PluginEricapi.py" line="103"/>
@@ -16508,7 +16528,7 @@
     <message>
         <location filename="../Plugins/PluginEricapi.py" line="107"/>
         <source>Generate an API file using eric6_api</source>
-        <translation>Создать API с помощью eric6_api</translation>
+        <translation>Создать файл API с помощью eric6_api</translation>
     </message>
     <message>
         <location filename="../Plugins/PluginEricapi.py" line="109"/>
@@ -16634,111 +16654,51 @@
         <translation>Страница стилей</translation>
     </message>
     <message>
-        <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="252"/>
-        <source>Enter the filename of a CSS style sheet. Leave empty to use the colours defined below.</source>
-        <translation>Задайте имя файла с описанием стиля CSS. Оставьте пустым, чтобы использовать цвета, определённые ниже.</translation>
-    </message>
-    <message>
-        <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="262"/>
-        <source>Colours</source>
-        <translation>Цвета</translation>
-    </message>
-    <message>
-        <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="268"/>
-        <source>Press to select the class and function header background colour.</source>
-        <translation>Задать цвет фона для класса и заголовка функции.</translation>
-    </message>
-    <message>
         <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="271"/>
         <source>Class/Function Header Background</source>
         <translation>Фон класса/заголовка функции</translation>
     </message>
     <message>
-        <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="278"/>
-        <source>Press to select the class and function header foreground colour.</source>
-        <translation>Задать цвет текста для класса и заголовка функции.</translation>
-    </message>
-    <message>
         <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="281"/>
         <source>Class/Function Header Foreground</source>
         <translation>Цвет класса/заголовка функции</translation>
     </message>
     <message>
-        <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="288"/>
-        <source>Press to select the level 2 header background colour.</source>
-        <translation>Задать цвет фона для заголовка второго уровня.</translation>
-    </message>
-    <message>
         <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="291"/>
         <source>Level 2 Header Background</source>
         <translation>Фон заголовка 2 уровня</translation>
     </message>
     <message>
-        <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="298"/>
-        <source>Press to select the level 2 header foreground colour.</source>
-        <translation>Задать цвет текста для заголовка второго уровня.</translation>
-    </message>
-    <message>
         <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="301"/>
         <source>Level 2 Header Foreground</source>
         <translation>Цвет заголовка 2 уровня</translation>
     </message>
     <message>
-        <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="308"/>
-        <source>Press to select the level 1 header background colour.</source>
-        <translation>Задать цвет фона для заголовка первого уровня.</translation>
-    </message>
-    <message>
         <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="311"/>
         <source>Level 1 Header Background</source>
         <translation>Фон заголовка 1 уровня</translation>
     </message>
     <message>
-        <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="318"/>
-        <source>Press to select the level 1 header foreground colour.</source>
-        <translation>Задать цвет текста для заголовка 1 уровня.</translation>
-    </message>
-    <message>
         <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="321"/>
         <source>Level 1 Header Foreground</source>
         <translation>Цвет заголовка 1 уровня</translation>
     </message>
     <message>
-        <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="328"/>
-        <source>Press to select the body background colour.</source>
-        <translation>Задать цвет фона для содержимого.</translation>
-    </message>
-    <message>
         <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="331"/>
         <source>Body Background</source>
         <translation>Фон содержимиго</translation>
     </message>
     <message>
-        <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="338"/>
-        <source>Press to select the body foreground colour.</source>
-        <translation>Задать цвет текста для содержимого.</translation>
-    </message>
-    <message>
         <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="341"/>
         <source>Body Foreground</source>
         <translation>Цвет текста для содержимого</translation>
     </message>
     <message>
-        <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="348"/>
-        <source>Press to select the foreground colour of links.</source>
-        <translation>Задать цвет текста для ссылок.</translation>
-    </message>
-    <message>
         <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="351"/>
         <source>Links</source>
         <translation>Ссылки</translation>
     </message>
     <message>
-        <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="358"/>
-        <source>This shows an example of the selected colours.</source>
-        <translation>Пример выбранных цветов.</translation>
-    </message>
-    <message>
         <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="372"/>
         <source>QtHelp</source>
         <translation>QtHelp</translation>
@@ -16818,6 +16778,66 @@
         <source>Style sheet (*.css);;All files (*)</source>
         <translation>Таблица стиля (*.css);;Все файлы (*)</translation>
     </message>
+    <message>
+        <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="252"/>
+        <source>Enter the filename of a CSS style sheet. Leave empty to use the colors defined below.</source>
+        <translation>Задайте имя файла с описанием стиля CSS. Оставьте пустым, чтобы использовать цвета, определённые ниже.</translation>
+    </message>
+    <message>
+        <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="262"/>
+        <source>Colors</source>
+        <translation>Цвет</translation>
+    </message>
+    <message>
+        <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="268"/>
+        <source>Press to select the class and function header background color.</source>
+        <translation>Задать цвет фона для класса и заголовка функции.</translation>
+    </message>
+    <message>
+        <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="278"/>
+        <source>Press to select the class and function header foreground color.</source>
+        <translation>Задать цвет текста для класса и заголовка функции.</translation>
+    </message>
+    <message>
+        <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="288"/>
+        <source>Press to select the level 2 header background color.</source>
+        <translation>Задать цвет фона для заголовка второго уровня.</translation>
+    </message>
+    <message>
+        <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="298"/>
+        <source>Press to select the level 2 header foreground color.</source>
+        <translation>Задать цвет текста для заголовка второго уровня.</translation>
+    </message>
+    <message>
+        <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="308"/>
+        <source>Press to select the level 1 header background color.</source>
+        <translation>Задать цвет фона для заголовка первого уровня.</translation>
+    </message>
+    <message>
+        <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="318"/>
+        <source>Press to select the level 1 header foreground color.</source>
+        <translation>Задать цвет текста для заголовка 1 уровня.</translation>
+    </message>
+    <message>
+        <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="328"/>
+        <source>Press to select the body background color.</source>
+        <translation>Задать цвет фона для содержимого.</translation>
+    </message>
+    <message>
+        <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="338"/>
+        <source>Press to select the body foreground color.</source>
+        <translation>Задать цвет текста для содержимого.</translation>
+    </message>
+    <message>
+        <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="348"/>
+        <source>Press to select the foreground color of links.</source>
+        <translation>Задать цвет текста для ссылок.</translation>
+    </message>
+    <message>
+        <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="358"/>
+        <source>This shows an example of the selected colors.</source>
+        <translation>Пример выбранных цветов.</translation>
+    </message>
 </context>
 <context>
     <name>EricdocExecDialog</name>
@@ -17307,29 +17327,49 @@
         <translation>HTML файлы (*.html)</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="516"/>
+        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="537"/>
         <source>Export source</source>
         <translation>Экспортировать исходник</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="448"/>
+        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="466"/>
         <source>&lt;p&gt;The source could not be exported to &lt;b&gt;{0}&lt;/b&gt;.&lt;/p&gt;&lt;p&gt;Reason: {1}&lt;/p&gt;</source>
         <translation>&lt;p&gt;Исходный код не может быть экспортирован в &lt;b&gt;{0}&lt;/b&gt;:&lt;br&gt;Причина: {1}.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="457"/>
+        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="475"/>
         <source>&lt;p&gt;The source could not be exported to &lt;b&gt;{0}&lt;/b&gt;.&lt;/p&gt;&lt;p&gt;Reason: No HTML code generated.&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Исходный код не может быть экспортирован в &lt;b&gt;{0}&lt;/b&gt;.&lt;/p&gt;&lt;p&gt;Причина: HTML-код не создан.&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="516"/>
+        <translation>&lt;p&gt;Исходный код не может быть экспортирован в &lt;b&gt;{0}&lt;/b&gt;.&lt;/p&gt;&lt;p&gt;Причина: HTML код не создан.&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="537"/>
         <source>&lt;p&gt;Markdown export requires the &lt;b&gt;python-markdown&lt;/b&gt; package.&lt;br/&gt;Install it with your package manager, &apos;pip install docutils&apos; or see &lt;a href=&quot;http://pythonhosted.org/Markdown/install.html&quot;&gt; installation instructions.&lt;/a&gt;&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Для Markdown экспорта необходим &lt;b&gt;python-markdown&lt;/b&gt; пакет.&lt;br/&gt;Установите его с помощью менеджера пакетов, командой &apos;pip install docutils&apos; или смотрите инструкции по инсталяции на &lt;a href=&quot;http://pythonhosted.org/Markdown/install.html&quot;&gt;.&lt;/a&gt;&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="484"/>
+        <translation>&lt;p&gt;Для экспорта Markdown необходим &lt;b&gt;python-markdown&lt;/b&gt; пакет.&lt;br/&gt;Установите его с помощью менеджера пакетов, командой &apos;pip install docutils&apos; или смотрите инструкции по инсталяции на &lt;a href=&quot;http://pythonhosted.org/Markdown/install.html&quot;&gt;.&lt;/a&gt;&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="502"/>
         <source>&lt;p&gt;ReStructuredText export requires the &lt;b&gt;python-docutils&lt;/b&gt; package.&lt;br/&gt;Install it with your package manager, &apos;pip install docutils&apos; or see &lt;a href=&quot;http://pypi.python.org/pypi/docutils&quot;&gt;this page.&lt;/a&gt;&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Для ReStructuredText экспорта необходим пакет &lt;b&gt;python-docutils&lt;/b&gt;.&lt;br/&gt;Установите его с помощью менеджера пакетов, командой &apos;pip install docutils&apos; или ознакомьтесь со страницей &lt;a href=&quot;http://pypi.python.org/pypi/docutils&quot;&gt;.&lt;/a&gt;&lt;/p&gt;</translation>
+        <translation>&lt;p&gt;Для экспорта ReStructuredText необходим пакет &lt;b&gt;python-docutils&lt;/b&gt;.&lt;br/&gt;Установите его с помощью менеджера пакетов, командой &apos;pip install docutils&apos; или ознакомьтесь со страницей &lt;a href=&quot;http://pypi.python.org/pypi/docutils&quot;&gt;.&lt;/a&gt;&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="412"/>
+        <source>Light Background Color</source>
+        <translation>Светлый цвет фона</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="413"/>
+        <source>Dark Background Color</source>
+        <translation>Темный цвет фона</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="416"/>
+        <source>Markdown Export</source>
+        <translation>Экспорт Markdown</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="416"/>
+        <source>Select color scheme:</source>
+        <translation>Выберите цветовую схему:</translation>
     </message>
 </context>
 <context>
@@ -21059,7 +21099,7 @@
         <translation>Коммиттер</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1796"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1794"/>
         <source>Branch</source>
         <translation>Ветвь</translation>
     </message>
@@ -21144,168 +21184,168 @@
         <translation>Освежить список коммитов</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="205"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="203"/>
         <source>Added</source>
         <translation>Добавлен</translation>
     </message>
     <message>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="204"/>
+        <source>Deleted</source>
+        <translation>Удален</translation>
+    </message>
+    <message>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="205"/>
+        <source>Modified</source>
+        <translation>Модифицирован</translation>
+    </message>
+    <message>
         <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="206"/>
-        <source>Deleted</source>
-        <translation>Удален</translation>
+        <source>Copied</source>
+        <translation>Скопирован</translation>
     </message>
     <message>
         <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="207"/>
-        <source>Modified</source>
-        <translation>Модифицирован</translation>
+        <source>Renamed</source>
+        <translation>Переименован</translation>
     </message>
     <message>
         <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="208"/>
-        <source>Copied</source>
-        <translation>Скопирован</translation>
+        <source>Type changed</source>
+        <translation>Изменен тип</translation>
     </message>
     <message>
         <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="209"/>
-        <source>Renamed</source>
-        <translation>Переименован</translation>
+        <source>Unmerged</source>
+        <translation>Не слито</translation>
     </message>
     <message>
         <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="210"/>
-        <source>Type changed</source>
-        <translation>Изменен тип</translation>
-    </message>
-    <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="211"/>
-        <source>Unmerged</source>
-        <translation>Не слито</translation>
-    </message>
-    <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="212"/>
         <source>Unknown</source>
         <translation>Неизвестно</translation>
     </message>
     <message>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="256"/>
+        <source>Show Author Columns</source>
+        <translation>Показать колонки автора</translation>
+    </message>
+    <message>
         <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="258"/>
-        <source>Show Author Columns</source>
-        <translation>Показать колонки автора</translation>
-    </message>
-    <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="260"/>
         <source>Press to show the author columns</source>
         <translation>Показать колонки автора</translation>
     </message>
     <message>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="266"/>
+        <source>Show Committer Columns</source>
+        <translation>Показать колонки коммиттера</translation>
+    </message>
+    <message>
         <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="268"/>
-        <source>Show Committer Columns</source>
-        <translation>Показать колонки коммиттера</translation>
-    </message>
-    <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="270"/>
         <source>Press to show the committer columns</source>
         <translation>Показать колонки коммиттера</translation>
     </message>
     <message>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="315"/>
+        <source>Copy Commits</source>
+        <translation>Копировать коммиты</translation>
+    </message>
+    <message>
         <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="317"/>
-        <source>Copy Commits</source>
-        <translation>Копировать коммиты</translation>
-    </message>
-    <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="319"/>
         <source>Cherry-pick the selected commits to the current branch</source>
         <translation>Скопировать выборку коммитов в текущую ветвь</translation>
     </message>
     <message>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="322"/>
+        <source>Tag</source>
+        <translation>Тег</translation>
+    </message>
+    <message>
         <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="324"/>
-        <source>Tag</source>
-        <translation>Тег</translation>
-    </message>
-    <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="326"/>
         <source>Tag the selected commit</source>
         <translation>Тег выбранного коммита</translation>
     </message>
     <message>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="328"/>
+        <source>Create a new branch at the selected commit.</source>
+        <translation>Ветвь на выбранном коммите.</translation>
+    </message>
+    <message>
         <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="330"/>
-        <source>Create a new branch at the selected commit.</source>
-        <translation>Ветвь на выбранном коммите.</translation>
+        <source>Branch &amp;&amp; Switch</source>
+        <translation>Создать ветвь &amp;&amp; Переключиться</translation>
     </message>
     <message>
         <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="332"/>
-        <source>Branch &amp;&amp; Switch</source>
-        <translation>Создать ветвь &amp;&amp; Переключиться</translation>
-    </message>
-    <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="334"/>
         <source>Create a new branch at the selected commit and switch the work tree to it.</source>
         <translation>Создать новую ветвь на выбранном коммите и переключиться на нее.</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1848"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1846"/>
         <source>Switch</source>
         <translation>Переключиться</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="340"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="338"/>
         <source>Switch the working directory to the selected commit</source>
         <translation>Переключить рабочую директорию на выбранный коммит</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1874"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1872"/>
         <source>Show Short Log</source>
         <translation>Показать краткую сводку</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="346"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="344"/>
         <source>Show a dialog with a log output for release notes</source>
         <translation>Показать краткую сводку примечаний для релиза</translation>
     </message>
     <message>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="347"/>
+        <source>Describe</source>
+        <translation>Генерация номера релиза</translation>
+    </message>
+    <message>
         <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="349"/>
-        <source>Describe</source>
-        <translation>Генерация номера релиза</translation>
-    </message>
-    <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="351"/>
         <source>Show the most recent tag reachable from a commit</source>
         <translation>Показать имя ближайшего тега, дополненное данными из коммита</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="636"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="634"/>
         <source>The git process did not finish within 30s.</source>
         <translation>Процесс Git не завершился в течении 30 сек.</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="639"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="637"/>
         <source>Could not start the git executable.</source>
         <translation>Невозможно запустить Git.</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="642"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="640"/>
         <source>Git Error</source>
         <translation>Ошибка Git</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="758"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="756"/>
         <source>{0} ({1}%)</source>
         <comment>action, confidence</comment>
         <translation>{0} ({1}%)</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="824"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="822"/>
         <source>Process Generation Error</source>
         <translation>Ошибка при запуске процесса</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="824"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="822"/>
         <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/GitLogBrowserDialog.py" line="1710"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1708"/>
         <source>Copy Changesets</source>
         <translation>Копировать набор изменений</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1848"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1846"/>
         <source>The project should be reread. Do this now?</source>
         <translation>Проект должен быть перепрочитан. Сделать это сейчас?</translation>
     </message>
@@ -21315,17 +21355,17 @@
         <translation>Ветви</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1874"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1872"/>
         <source>Select a branch</source>
         <translation>Выберите ветвь</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1827"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1825"/>
         <source>Select a default branch</source>
         <translation>Выберите ветвь по умолчанию</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1827"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1825"/>
         <source>Branch &amp; Switch</source>
         <translation>Создать ветвь &amp;&amp; Переключиться на нее</translation>
     </message>
@@ -21360,22 +21400,22 @@
         <translation>Фильтр</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="148"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="146"/>
         <source>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Branches&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</source>
         <translation>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Ветви&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="151"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="149"/>
         <source>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Tags&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</source>
         <translation>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Теги&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2056"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2054"/>
         <source>&apos;{0}&apos; was not found.</source>
         <translation>&apos;{0}&apos; не найдено.</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2056"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2054"/>
         <source>Find Commit</source>
         <translation>Поиск коммита</translation>
     </message>
@@ -21410,7 +21450,7 @@
         <translation>Удалений</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2102"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2100"/>
         <source>Differences</source>
         <translation>Различия</translation>
     </message>
@@ -21420,97 +21460,97 @@
         <translation>&lt;a href=&quot;save:me&quot;&gt;Сохранить&lt;/a&gt;</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="130"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="128"/>
         <source>&lt;table&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Commit ID&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Date&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{1}&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Author&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{2} &amp;lt;{3}&amp;gt;&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Commit Date&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{4}&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Committer&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{5} &amp;lt;{6}&amp;gt;&lt;/td&gt;&lt;/tr&gt;{7}&lt;tr&gt;&lt;td&gt;&lt;b&gt;Subject&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{8}&lt;/td&gt;&lt;/tr&gt;{9}&lt;/table&gt;</source>
         <translation>&lt;table&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;ID коммита&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Дата&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{1}&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Автор&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{2} &amp;lt;{3}&amp;gt;&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Дата подачи&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{4}&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Коммиттер&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{5} &amp;lt;{6}&amp;gt;&lt;/td&gt;&lt;/tr&gt;{7}&lt;tr&gt;&lt;td&gt;&lt;b&gt;Сообщение&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{8}&lt;/td&gt;&lt;/tr&gt;{9}&lt;/table&gt;</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="142"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="140"/>
         <source>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Parents&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</source>
         <translation>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Предки&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="145"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="143"/>
         <source>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Children&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</source>
         <translation>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Потомки&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="154"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="152"/>
         <source>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Message&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</source>
         <translation>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Сообщения&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1269"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1267"/>
         <source>Side-by-Side Diff to Parent {0}</source>
         <translation>Построчные различия с предком {0}</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1281"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1279"/>
         <source>&lt;a href=&quot;sbsdiff:{0}_{1}&quot;&gt;Side-by-Side Compare&lt;/a&gt;</source>
         <translation>&lt;a href=&quot;sbsdiff:{0}_{1}&quot;&gt;Построчное сравнение&lt;/a&gt;</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2116"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2114"/>
         <source>Differences to Parent {0}</source>
         <translation>Различия с предком {0}</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2131"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2129"/>
         <source>Diff to Parent {0}</source>
         <translation>Различия с предком {0}</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2157"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2155"/>
         <source>There is no difference.</source>
         <translation>Различий нет.</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2320"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2318"/>
         <source>Save Diff</source>
         <translation>Сохранить различия</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2286"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2284"/>
         <source>Patch Files (*.diff)</source>
         <translation>Файлы патчей (*.diff)</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2303"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2301"/>
         <source>&lt;p&gt;The patch file &lt;b&gt;{0}&lt;/b&gt; already exists. Overwrite it?&lt;/p&gt;</source>
         <translation>&lt;p&gt;Файл патча &lt;b&gt;{0}&lt;/b&gt; уже существует. Переписать?&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2320"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2318"/>
         <source>&lt;p&gt;The patch file &lt;b&gt;{0}&lt;/b&gt; could not be saved.&lt;br&gt;Reason: {1}&lt;/p&gt;</source>
         <translation>&lt;p&gt;Невозможно сохранить файл патча &lt;b&gt;{0}&lt;/b&gt;.&lt;br&gt;Причина: {1}&lt;/p&gt;</translation>
     </message>
     <message>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="246"/>
+        <source>Show Commit ID Column</source>
+        <translation>Показать колонку ID коммита</translation>
+    </message>
+    <message>
         <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="248"/>
-        <source>Show Commit ID Column</source>
-        <translation>Показать колонку ID коммита</translation>
-    </message>
-    <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="250"/>
         <source>Press to show the commit ID column</source>
         <translation>Показать колонку ID коммита</translation>
     </message>
     <message>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="276"/>
+        <source>Show Branches Column</source>
+        <translation>Показать колонку ветвей</translation>
+    </message>
+    <message>
         <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="278"/>
-        <source>Show Branches Column</source>
-        <translation>Показать колонку ветвей</translation>
-    </message>
-    <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="280"/>
         <source>Press to show the branches column</source>
         <translation>Показать колонку ветвей</translation>
     </message>
     <message>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="286"/>
+        <source>Show Tags Column</source>
+        <translation>Показать колонку тегов</translation>
+    </message>
+    <message>
         <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="288"/>
-        <source>Show Tags Column</source>
-        <translation>Показать колонку тегов</translation>
-    </message>
-    <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="290"/>
         <source>Press to show the Tags column</source>
         <translation>Показать колонку тегов</translation>
     </message>
@@ -25964,20 +26004,60 @@
 <context>
     <name>GraphicsPage</name>
     <message>
-        <location filename="../Preferences/ConfigurationPages/GraphicsPage.ui" line="16"/>
+        <location filename="../Preferences/ConfigurationPages/GraphicsPage.ui" line="17"/>
         <source>&lt;b&gt;Configure graphics settings&lt;/b&gt;</source>
         <translation>&lt;b&gt;Настройка графики&lt;/b&gt;</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/GraphicsPage.ui" line="38"/>
+        <location filename="../Preferences/ConfigurationPages/GraphicsPage.ui" line="43"/>
         <source>Press to select the font for the graphic items</source>
         <translation>Выберите шрифт для графических элементов</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/GraphicsPage.ui" line="51"/>
+        <location filename="../Preferences/ConfigurationPages/GraphicsPage.ui" line="56"/>
         <source>Graphics Font</source>
         <translation>Шрифт графики</translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/GraphicsPage.ui" line="37"/>
+        <source>Font</source>
+        <translation>Шрифт</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/GraphicsPage.ui" line="72"/>
+        <source>Drawing Mode</source>
+        <translation>Режим рисования</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/GraphicsPage.ui" line="78"/>
+        <source>Select to determine the drawing mode automatically</source>
+        <translation>Разрешить автоматическое определение режима рисования</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/GraphicsPage.ui" line="81"/>
+        <source>Automatic</source>
+        <translation>Автоматическое определение</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/GraphicsPage.ui" line="91"/>
+        <source>Select to draw black shapes on a white background</source>
+        <translation>Разрешить рисовать черные фигуры на белом фоне</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/GraphicsPage.ui" line="94"/>
+        <source>Black On White</source>
+        <translation>Черные на белом</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/GraphicsPage.ui" line="101"/>
+        <source>Select to draw white shapes on a black background</source>
+        <translation>Разрешить рисовать белые фигуры на черном фоне</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/GraphicsPage.ui" line="104"/>
+        <source>White On Black</source>
+        <translation>Белые на черном</translation>
+    </message>
 </context>
 <context>
     <name>GreaseMonkeyAddScriptDialog</name>
@@ -26284,7 +26364,7 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/HelpDocumentationPage.ui" line="37"/>
         <source>eric API Documentation</source>
-        <translation>Документация eric API</translation>
+        <translation>Документация API eric</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/HelpDocumentationPage.ui" line="52"/>
@@ -27710,21 +27790,11 @@
         <translation>Цвет:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/HexEditorPage.ui" line="142"/>
-        <source>Select the foreground colour of the address area</source>
-        <translation>Выберите цвет области адреса</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/HexEditorPage.ui" line="291"/>
         <source>Background:</source>
         <translation>Фон:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/HexEditorPage.ui" line="165"/>
-        <source>Select the background colour of the address area</source>
-        <translation>Выберите цвет фона для области адреса</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/HexEditorPage.ui" line="178"/>
         <source>ASCII Area</source>
         <translation>Область ASCII</translation>
@@ -27755,31 +27825,11 @@
         <translation>Выделять измененные данные</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/HexEditorPage.ui" line="226"/>
-        <source>Select the foreground colour for highlighted data</source>
-        <translation>Выберите цвет выделяемых данных</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/HexEditorPage.ui" line="249"/>
-        <source>Select the background colour for highlighted data</source>
-        <translation>Выберите цвет фона для выделяемых данных</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/HexEditorPage.ui" line="262"/>
         <source>Selection</source>
         <translation>Выделение</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/HexEditorPage.ui" line="281"/>
-        <source>Select the foreground colour of the selection</source>
-        <translation>Выберите цвет выделения</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/HexEditorPage.ui" line="304"/>
-        <source>Select the background colour of the selection</source>
-        <translation>Выберите цвет фона выделения</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/HexEditorPage.ui" line="317"/>
         <source>Font</source>
         <translation>Шрифт</translation>
@@ -27809,6 +27859,36 @@
         <source>Enter the number of recent files to remember</source>
         <translation>Сколько запоминать недавних файлов</translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/HexEditorPage.ui" line="142"/>
+        <source>Select the foreground color of the address area</source>
+        <translation>Выберите цвет области адреса</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/HexEditorPage.ui" line="165"/>
+        <source>Select the background color of the address area</source>
+        <translation>Выберите цвет фона для области адреса</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/HexEditorPage.ui" line="226"/>
+        <source>Select the foreground color for highlighted data</source>
+        <translation>Выберите цвет выделяемых данных</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/HexEditorPage.ui" line="249"/>
+        <source>Select the background color for highlighted data</source>
+        <translation>Выберите цвет фона для выделяемых данных</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/HexEditorPage.ui" line="281"/>
+        <source>Select the foreground color of the selection</source>
+        <translation>Выберите цвет выделения</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/HexEditorPage.ui" line="304"/>
+        <source>Select the background color of the selection</source>
+        <translation>Выберите цвет фона выделения</translation>
+    </message>
 </context>
 <context>
     <name>Hg</name>
@@ -30492,7 +30572,7 @@
         <translation>Все</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="847"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="845"/>
         <source>Mercurial Error</source>
         <translation>Mercurial: Ошибка</translation>
     </message>
@@ -30527,29 +30607,29 @@
         <translation>Фаза</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="277"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="275"/>
         <source>Change the phase of the selected revisions</source>
         <translation>Изменить фазу выбранных ревизий</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="279"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="277"/>
         <source>&lt;b&gt;Change Phase&lt;/b&gt;
 &lt;p&gt;This changes the phase of the selected revisions. The selected revisions have to have the same current phase.&lt;/p&gt;</source>
         <translation>&lt;b&gt;Изменить фазу&lt;/b&gt;
 &lt;p&gt;Изменение фазы выбранных ревизий. Выбранные ревизии должны иметь одинаковую фазу.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="275"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="273"/>
         <source>Change Phase</source>
         <translation>Изменить фазу</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2007"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2005"/>
         <source>Copy Changesets</source>
         <translation>Копировать набор изменений</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2350"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2348"/>
         <source>The project should be reread. Do this now?</source>
         <translation>Проект должен быть перепрочитан. Сделать это сейчас?</translation>
     </message>
@@ -30559,42 +30639,42 @@
         <translation>Выберите действие из меню</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="266"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="264"/>
         <source>Copy the selected changesets to the current branch</source>
         <translation>Копировать выбранные наборы изменения в текущую ветвь</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="284"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="282"/>
         <source>Tag</source>
         <translation>Тег</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="287"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="285"/>
         <source>Tag the selected revision</source>
         <translation>Тег выбранной ревизии</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2079"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2077"/>
         <source>Switch</source>
         <translation>Переключиться</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="297"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="295"/>
         <source>Switch the working directory to the selected revision</source>
         <translation>Переключить рабочую директорию в выбранную ревизию</translation>
     </message>
     <message>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="318"/>
+        <source>Pull Large Files</source>
+        <translation>Загрузить большие файлы</translation>
+    </message>
+    <message>
         <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="320"/>
-        <source>Pull Large Files</source>
-        <translation>Загрузить большие файлы</translation>
-    </message>
-    <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="322"/>
         <source>Pull large files for selected revisions</source>
         <translation>Загрузить (затянуть) большие файлы для выбранных ревизий</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1137"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1135"/>
         <source>{0} (large file)</source>
         <translation>{0} большой файл</translation>
     </message>
@@ -30639,12 +30719,12 @@
         <translation>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Закладки&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2492"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2490"/>
         <source>Find Commit</source>
         <translation>Поиск фиксации</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2492"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2490"/>
         <source>&apos;{0}&apos; was not found.</source>
         <translation>&apos;{0}&apos; не найдено.</translation>
     </message>
@@ -30669,97 +30749,97 @@
         <translation>Secret</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2212"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2210"/>
         <source>Pull Changes</source>
         <translation>Затянуть изменения</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="318"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="316"/>
         <source>Pull changes from a remote repository</source>
         <translation>Затянуть изменения из удалённого репозитория</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="331"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="329"/>
         <source>Push Selected Changes</source>
         <translation>Протолкнуть выбранные изменения</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="334"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="332"/>
         <source>Push changes of the selected changeset and its ancestors to a remote repository</source>
         <translation>Протолкнуть выбранные наборы изменений и их предков в удаленный репозиторий</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="337"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="335"/>
         <source>Push All Changes</source>
         <translation>Протолкнуть все изменения</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="340"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="338"/>
         <source>Push all changes to a remote repository</source>
         <translation>Протолкнуть все изменения в удаленный репозиторий</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2177"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2175"/>
         <source>Fetch Changes</source>
         <translation>Получить изменения (fetch)</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2258"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2256"/>
         <source>Strip Changesets</source>
         <translation>Срезать наборы изменений (strip)</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="326"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="324"/>
         <source>Fetch changes from a remote repository</source>
         <translation>Получить изменения из удалённого репозитория</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="383"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="381"/>
         <source>Strip changesets from a repository</source>
         <translation>Срезать наборы изменений из репозитория</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="302"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="300"/>
         <source>Define Bookmark...</source>
         <translation>Определить закладку...</translation>
     </message>
     <message>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="303"/>
+        <source>Bookmark the selected revision</source>
+        <translation>Закладка для выбранной ревизии</translation>
+    </message>
+    <message>
         <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="305"/>
-        <source>Bookmark the selected revision</source>
-        <translation>Закладка для выбранной ревизии</translation>
-    </message>
-    <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="307"/>
         <source>Move Bookmark...</source>
         <translation>Переместить закладку...</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="310"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="308"/>
         <source>Move bookmark to the selected revision</source>
         <translation>Переместить закладку в выбранную ревизию</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2102"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2100"/>
         <source>Define Bookmark</source>
         <translation>Определить закладку</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2102"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2100"/>
         <source>Enter bookmark name for changeset &quot;{0}&quot;:</source>
         <translation>Введите имя закладки для набора изменений &quot;{0}&quot;:</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2126"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2124"/>
         <source>Move Bookmark</source>
         <translation>Переместить закладку</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2126"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2124"/>
         <source>Select the bookmark to be moved  to changeset &quot;{0}&quot;:</source>
         <translation>Выберите закладку для перемещения в набор изменений &quot;{0}&quot;:</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2065"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2063"/>
         <source>Select bookmark to switch to (leave empty to use revision):</source>
         <translation>Выберите закладку для переключения (оставьте поле пустым для использования ревизии):</translation>
     </message>
@@ -30794,129 +30874,129 @@
         <translation>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Потомки&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="269"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="267"/>
         <source>Merge with Changeset</source>
         <translation>Слить с набором изменений</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="272"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="270"/>
         <source>Merge the working directory with the selected changeset</source>
         <translation>Слияние рабочей директории с выбранными наборами изменений</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="345"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="343"/>
         <source>Create Changegroup</source>
         <translation>Создать группу изменений</translation>
     </message>
     <message>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="346"/>
+        <source>Create a changegroup file containing the selected changesets</source>
+        <translation>Создать файл группы изменений, содержащий выбранные наборы изменений</translation>
+    </message>
+    <message>
         <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="348"/>
-        <source>Create a changegroup file containing the selected changesets</source>
-        <translation>Создать файл группы изменений, содержащий выбранные наборы изменений</translation>
-    </message>
-    <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="350"/>
         <source>&lt;b&gt;Create Changegroup&lt;/b&gt;
 &lt;p&gt;This creates a changegroup file containing the selected revisions. If no revisions are selected, all changesets will be bundled. If one revision is selected, it will be interpreted as the base revision. Otherwise the lowest revision will be used as the base revision and all other revision will be bundled. If the dialog is showing outgoing changesets, all selected changesets will be bundled.&lt;/p&gt;</source>
         <translation>&lt;b&gt;Создать группу изменений&lt;/b&gt;
 &lt;p&gt;Создание файла группы изменений, содержащего выбранные ревизии. Если не выбрано ни одного изменения, будут скомплектованы все наборы изменений. Если выбрана одна ревизия, то она будет интерпретирована как базовая ревизия. В противном случае самая младшая ревизия будет использована как базовая ревизия а все остальные изменения будут скомплектованы. Если диалог отображает исходящие наборы изменений, все помеченные наборы изменений будут собраны в комплект.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2350"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2348"/>
         <source>Apply Changegroup</source>
         <translation>Применить группу изменений</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="362"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="360"/>
         <source>Apply the currently viewed changegroup file</source>
         <translation>Применить просматриваемый в настоящее время файл группы изменений</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="367"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="365"/>
         <source>Sign Revisions</source>
         <translation>Подписать ревизию</translation>
     </message>
     <message>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="368"/>
+        <source>Add a signature for the selected revisions</source>
+        <translation>Добавить подпись для выбранной ревизии</translation>
+    </message>
+    <message>
         <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="370"/>
-        <source>Add a signature for the selected revisions</source>
-        <translation>Добавить подпись для выбранной ревизии</translation>
-    </message>
-    <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="372"/>
         <source>Verify Signatures</source>
         <translation>Проверить подписи</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="375"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="373"/>
         <source>Verify all signatures there may be for the selected revision</source>
         <translation>Проверить все подписи, которые могут быть для отмеченных ревизий</translation>
     </message>
     <message>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="386"/>
+        <source>Select All Entries</source>
+        <translation>Выбрать все записи</translation>
+    </message>
+    <message>
         <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="388"/>
-        <source>Select All Entries</source>
-        <translation>Выбрать все записи</translation>
-    </message>
-    <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="390"/>
         <source>Deselect All Entries</source>
         <translation>Снять выделение всех записей</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1376"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1374"/>
         <source>Side-by-Side Diff to Parent {0}</source>
         <translation>Построчные различия с предком {0}</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1387"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1385"/>
         <source>&lt;a href=&quot;sbsdiff:{0}_{1}&quot;&gt;Side-by-Side Compare&lt;/a&gt;</source>
         <translation>&lt;a href=&quot;sbsdiff:{0}_{1}&quot;&gt;Построчное сравнение&lt;/a&gt;</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1528"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1526"/>
         <source>Pull Selected Changes</source>
         <translation>Затянуть помеченные изменения</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1529"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1527"/>
         <source>Fetch Selected Changes</source>
         <translation>Получить помеченные изменения</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2536"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2534"/>
         <source>Differences</source>
         <translation>Различия</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2546"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2544"/>
         <source>Differences to Parent {0}</source>
         <translation>Различия с предком {0}</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2562"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2560"/>
         <source>Diff to Parent {0}{1}</source>
         <translation>Различия с предком {0}{1}</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2587"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2585"/>
         <source>There is no difference.</source>
         <translation>Различий нет.</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2730"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2728"/>
         <source>Save Diff</source>
         <translation>Сохранить различия</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2697"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2695"/>
         <source>Patch Files (*.diff)</source>
         <translation>Файлы патчей (*.diff)</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2714"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2712"/>
         <source>&lt;p&gt;The patch file &lt;b&gt;{0}&lt;/b&gt; already exists. Overwrite it?&lt;/p&gt;</source>
         <translation>&lt;p&gt;Файл патча &lt;b&gt;{0}&lt;/b&gt; уже существует. Переписать?&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2730"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2728"/>
         <source>&lt;p&gt;The patch file &lt;b&gt;{0}&lt;/b&gt; could not be saved.&lt;br&gt;Reason: {1}&lt;/p&gt;</source>
         <translation>&lt;p&gt;Невозможно сохранить файл патча &lt;b&gt;{0}&lt;/b&gt;.&lt;br&gt;Причина: {1}&lt;/p&gt;</translation>
     </message>
@@ -30926,7 +31006,7 @@
         <translation>&lt;a href=&quot;save:me&quot;&gt;Сохранить&lt;/a&gt;</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2535"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2533"/>
         <source>Generating differences ...</source>
         <translation>Генерация различий...</translation>
     </message>
@@ -30936,12 +31016,12 @@
         <translation>Mercurial: Полный журнал</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="289"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="287"/>
         <source>Close Heads</source>
         <translation>Закрыть головные ревизии</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="292"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="290"/>
         <source>Close the selected heads</source>
         <translation>Закрыть выбранные головные ревизии</translation>
     </message>
@@ -31320,7 +31400,7 @@
         <translation>Удалить из репозитория (и с диска)</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="833"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="835"/>
         <source>Remove from repository only</source>
         <translation>Удалить только из репозитория</translation>
     </message>
@@ -31365,7 +31445,7 @@
         <translation>Выделить все версированные записи директории</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="833"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="835"/>
         <source>Do you really want to remove these files from the repository?</source>
         <translation>Вы действительно хотите удалить эти файлы из репозитория?</translation>
     </message>
@@ -33923,52 +34003,52 @@
 <context>
     <name>HgServeDialog</name>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py" line="47"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py" line="50"/>
         <source>Mercurial Server</source>
         <translation>Mercurial: Сервер</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py" line="49"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py" line="57"/>
         <source>Start Server</source>
         <translation>Запустить сервер</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py" line="55"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py" line="63"/>
         <source>Stop Server</source>
         <translation>Остановить сервер</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py" line="61"/>
-        <source>Start Browser</source>
-        <translation>Запустить браузер</translation>
-    </message>
-    <message>
         <location filename="../Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py" line="69"/>
+        <source>Start Browser</source>
+        <translation>Запустить браузер</translation>
+    </message>
+    <message>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py" line="77"/>
         <source>Enter the server port</source>
         <translation>Введите номер порта сервера</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py" line="75"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py" line="83"/>
         <source>Select the style to use</source>
         <translation>Выберите стиль</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py" line="79"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py" line="87"/>
         <source>Server</source>
         <translation>Сервер</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py" line="86"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py" line="94"/>
         <source>Browser</source>
         <translation>Браузер</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py" line="140"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py" line="148"/>
         <source>Process Generation Error</source>
         <translation>Ошибка при запуске процесса</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py" line="140"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py" line="148"/>
         <source>The process {0} could not be started. Ensure, that it is in the search path.</source>
         <translation>Невозможно запустить процесс {0}. Убедитесь, что он находится в путях поиска.</translation>
     </message>
@@ -37283,7 +37363,7 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="17"/>
         <source>&lt;b&gt;Configure icon directories&lt;/b&gt;</source>
-        <translation>&lt;b&gt;Настройка директорий пиктограмм&lt;/b&gt;</translation>
+        <translation>&lt;b&gt;Настройка директорий иконок&lt;/b&gt;</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="37"/>
@@ -37291,52 +37371,137 @@
         <translation>&lt;font color=&quot;#FF0000&quot;&gt;&lt;b&gt;Примечание:&lt;/b&gt; Эти изменения вступят в силу при следующем запуске приложения.&lt;/font&gt;</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="115"/>
+        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="217"/>
         <source>Press to delete the selected directory from the list</source>
         <translation>Удалить выбранную директорию из списка</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="118"/>
+        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="220"/>
         <source>Delete</source>
         <translation>Удалить</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="128"/>
+        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="230"/>
         <source>Press to add the entered directory to the list</source>
         <translation>Добавить заданную директорию в список</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="131"/>
+        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="233"/>
         <source>Add</source>
         <translation>Добавить</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="156"/>
+        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="258"/>
         <source>Show</source>
         <translation>Показать</translation>
     </message>
     <message>
+        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="177"/>
+        <source>Up</source>
+        <translation>Вверх</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="187"/>
+        <source>Down</source>
+        <translation>Вниз</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="146"/>
+        <source>List of icon directories</source>
+        <translation>Список каталогов с иконками</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="44"/>
+        <source>Default Icons</source>
+        <translation>Стандартные иконки</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="52"/>
+        <source>Select to select between Breeze (dark) and Breeze (light) based on the window lightness</source>
+        <translation>Разрешить, в зависимости от яркости окна, автоматический выбор иконок Breeze (темные) или Breeze (светлые)</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="55"/>
+        <source>Automatic</source>
+        <translation>Автоматический выбор</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="65"/>
+        <source>Select to use the Breeze vector icons for light window background</source>
+        <translation>Разрешить использовать векторные иконки Breeze для окна со светлым фоном</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="68"/>
+        <source>Breeze (light)</source>
+        <translation>Breeze (светлый фон)</translation>
+    </message>
+    <message>
         <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="75"/>
-        <source>Up</source>
-        <translation>Вверх</translation>
+        <source>Select to use the Breeze vector icons for dark window background</source>
+        <translation>Разрешить использовать векторные иконки Breeze для окна с темным фоном</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="78"/>
+        <source>Breeze (dark)</source>
+        <translation>Breeze (темный фон)</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="85"/>
-        <source>Down</source>
-        <translation>Вниз</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="44"/>
-        <source>List of icon directories</source>
-        <translation>Список каталогов пиктограмм</translation>
+        <source>Select to use the Oxygen pixmap icons</source>
+        <translation>Разрешить использовать растровые иконки Oxygen</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="88"/>
+        <source>Oxygen</source>
+        <translation>Oxygen</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="112"/>
+        <source>Press to show a dialog with a preview of the selected default icon set</source>
+        <translation>Открыть диалог просмотра выбранного стандартного набора иконок</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="140"/>
+        <source>Custom Icon Directories</source>
+        <translation>Директории пользовательских иконок</translation>
     </message>
 </context>
 <context>
     <name>IconsPreviewDialog</name>
     <message>
-        <location filename="../Preferences/ConfigurationPages/IconsPreviewDialog.ui" line="13"/>
+        <location filename="../Preferences/ConfigurationPages/IconsPreviewDialog.ui" line="14"/>
         <source>Icons Preview</source>
-        <translation>Предпросмотр пиктограмм</translation>
+        <translation>Предпросмотр иконок</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IconsPreviewDialog.ui" line="25"/>
+        <source>Directory:</source>
+        <translation>Директория:</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IconsPreviewDialog.ui" line="38"/>
+        <source>Select the icons directory to be shown</source>
+        <translation>Выберите директорию иконок для показа в окне</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IconsPreviewDialog.ui" line="74"/>
+        <source>Invert Background</source>
+        <translation>Инвертировать фон</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IconsPreviewDialog.ui" line="87"/>
+        <source>Refresh</source>
+        <translation>Освежить</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IconsPreviewDialog.ui" line="84"/>
+        <source>Select to refresh the icons display</source>
+        <translation>Разрешить обновление отображений иконок</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IconsPreviewDialog.ui" line="71"/>
+        <source>Select to invert the background color</source>
+        <translation>Разрешить инвертировать цвет фона</translation>
     </message>
 </context>
 <context>
@@ -39475,126 +39640,61 @@
         <translation>Показывать дату</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="102"/>
-        <source>Colours</source>
-        <translation>Цвета</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="108"/>
         <source>Network Messages:</source>
         <translation>Сетевые сообщения:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="121"/>
-        <source>Select the colour for network messages</source>
-        <translation>Выберите цвет для отображения сетевых сообщений</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="131"/>
         <source>Nick Names:</source>
         <translation>Псевдоним:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="144"/>
-        <source>Select the colour for nick names</source>
-        <translation>Выберите цвет для отображения псевдонима</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="154"/>
         <source>Server Messages:</source>
         <translation>Серверные сообщения:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="167"/>
-        <source>Select the colour for server messages</source>
-        <translation>Выберите цвет для отображения серверных сообщений</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="177"/>
         <source>Own Nick Name:</source>
         <translation>Свой псевдоним:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="190"/>
-        <source>Select the colour for own nick name</source>
-        <translation>Выберите цвет для отображения своего псевдонима</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="200"/>
         <source>Channel Messages:</source>
         <translation>Сообщение в канале:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="213"/>
-        <source>Select the colour for channel messages</source>
-        <translation>Задайте цвет для отображения сообщений в канале</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="223"/>
         <source>Join Channel:</source>
         <translation>Зайти на канал:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="236"/>
-        <source>Select the colour for join channel messages</source>
-        <translation>Задайте цвет для отображения сообщений о подсоединении к каналу</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="246"/>
         <source>Error Messages:</source>
         <translation>Сообщение об ошибке:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="259"/>
-        <source>Select the colour for error messages</source>
-        <translation>Выберите цвет для отображения сообщений об ошибке</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="269"/>
         <source>Leave Channel:</source>
         <translation>Уйти с канала:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="282"/>
-        <source>Select the colour for leave channel messages</source>
-        <translation>Задайте цвет для отображения сообщений об отсоединении от канала</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="292"/>
         <source>Timestamp:</source>
         <translation>Timestamp:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="305"/>
-        <source>Select the colour for timestamps</source>
-        <translation>Выберите цвет для временных меток</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="315"/>
         <source>Channel Info:</source>
         <translation>Информация о канале:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="328"/>
-        <source>Select the colour for channel info messages</source>
-        <translation>Задайте цвет для отображения информационных сообщений в канале</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="338"/>
         <source>Hyperlink:</source>
         <translation>Гиперссылка:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="351"/>
-        <source>Select the colour for hyperlinks</source>
-        <translation>Выберите цвет для отображения гиперссылок</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="364"/>
-        <source>Enable to allow coloured text in IRC messages</source>
-        <translation>Разрешить использование цвета в сообщениях</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="367"/>
         <source>Allow Colored Text in IRC Messages</source>
         <translation>Разрешить цвет</translation>
@@ -39700,21 +39800,11 @@
         <translation>Цвет маркера:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="824"/>
-        <source>Select the foreground colour for the marker</source>
-        <translation>Выберите цвет маркера</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="834"/>
         <source>Marker Background:</source>
         <translation>Фон маркера:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="847"/>
-        <source>Select the background colour for the marker</source>
-        <translation>Задайте фоновый цвет маркера</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="862"/>
         <source>Shutdown</source>
         <translation>Выключение</translation>
@@ -39729,6 +39819,81 @@
         <source>Confirm Shutdown When Connected</source>
         <translation>Подтверждать выключение компьютера</translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="102"/>
+        <source>Colors</source>
+        <translation>Цвет</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="121"/>
+        <source>Select the color for network messages</source>
+        <translation>Выберите цвет для отображения сетевых сообщений</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="144"/>
+        <source>Select the color for nick names</source>
+        <translation>Выберите цвет для отображения псевдонима</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="167"/>
+        <source>Select the color for server messages</source>
+        <translation>Выберите цвет для отображения сообщений сервера</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="190"/>
+        <source>Select the color for own nick name</source>
+        <translation>Выберите цвет для отображения собственного псевдонима</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="213"/>
+        <source>Select the color for channel messages</source>
+        <translation>Задайте цвет для отображения сообщений в канале</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="236"/>
+        <source>Select the color for join channel messages</source>
+        <translation>Выберите цвет для отображения сообщений о присоединении канала</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="259"/>
+        <source>Select the color for error messages</source>
+        <translation>Выберите цвет для отображения сообщений об ошибке</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="282"/>
+        <source>Select the color for leave channel messages</source>
+        <translation>Выберите цвет для отображения сообщений об отключении канала</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="305"/>
+        <source>Select the color for timestamps</source>
+        <translation>Выберите цвет для временных меток</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="328"/>
+        <source>Select the color for channel info messages</source>
+        <translation>Задайте цвет для отображения информационных сообщений в канале</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="351"/>
+        <source>Select the color for hyperlinks</source>
+        <translation>Выберите цвет для отображения гиперссылок</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="364"/>
+        <source>Enable to allow colored text in IRC messages</source>
+        <translation>Разрешить использование цветного текста в IRC сообщениях</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="824"/>
+        <source>Select the foreground color for the marker</source>
+        <translation>Выберите цвет маркера</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="847"/>
+        <source>Select the background color for the marker</source>
+        <translation>Задайте цвет фона маркера</translation>
+    </message>
 </context>
 <context>
     <name>IrcServerEditDialog</name>
@@ -41105,257 +41270,257 @@
 <context>
     <name>LexerPygments</name>
     <message>
-        <location filename="../QScintilla/Lexers/LexerPygments.py" line="180"/>
+        <location filename="../QScintilla/Lexers/LexerPygments.py" line="196"/>
         <source>Default</source>
         <translation>По умолчанию</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/LexerPygments.py" line="181"/>
-        <source>Comment</source>
-        <translation>Закомментировать</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/LexerPygments.py" line="182"/>
-        <source>Preprocessor</source>
-        <translation>Препроцессор</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/LexerPygments.py" line="183"/>
-        <source>Keyword</source>
-        <translation>Ключевое слово</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/LexerPygments.py" line="184"/>
-        <source>Pseudo Keyword</source>
-        <translation>Псевдоключевое слово</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/LexerPygments.py" line="185"/>
-        <source>Type Keyword</source>
-        <translation>Ключевое слово типа</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/LexerPygments.py" line="186"/>
-        <source>Operator</source>
-        <translation>Оператор</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/LexerPygments.py" line="187"/>
-        <source>Word</source>
-        <translation>Слово</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/LexerPygments.py" line="188"/>
-        <source>Builtin</source>
-        <translation>Встроенная функция</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/LexerPygments.py" line="189"/>
-        <source>Function or method name</source>
-        <translation>Имя функции или метода</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/LexerPygments.py" line="190"/>
-        <source>Class name</source>
-        <translation>Имя класса</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/LexerPygments.py" line="191"/>
-        <source>Namespace</source>
-        <translation>Пространство имен</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/LexerPygments.py" line="192"/>
-        <source>Exception</source>
-        <translation>Исключение</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/LexerPygments.py" line="193"/>
-        <source>Identifier</source>
-        <translation>Идентификатор</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/LexerPygments.py" line="194"/>
-        <source>Constant</source>
-        <translation>Константа</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/LexerPygments.py" line="195"/>
-        <source>Label</source>
-        <translation>Надпись</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/LexerPygments.py" line="196"/>
-        <source>Entity</source>
-        <translation>Объект</translation>
-    </message>
-    <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="197"/>
-        <source>Attribute</source>
-        <translation>Атрибут</translation>
+        <source>Comment</source>
+        <translation>Закомментировать</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="198"/>
-        <source>Tag</source>
-        <translation>Тег</translation>
+        <source>Preprocessor</source>
+        <translation>Препроцессор</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="199"/>
-        <source>Decorator</source>
-        <translation>Декоратор</translation>
+        <source>Keyword</source>
+        <translation>Ключевое слово</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="200"/>
-        <source>String</source>
-        <translation>Строка</translation>
+        <source>Pseudo Keyword</source>
+        <translation>Псевдоключевое слово</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="201"/>
-        <source>Documentation string</source>
-        <translation>Строка документации</translation>
+        <source>Type Keyword</source>
+        <translation>Ключевое слово типа</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="202"/>
-        <source>Scalar</source>
-        <translation>Скаляр</translation>
+        <source>Operator</source>
+        <translation>Оператор</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="203"/>
-        <source>Escape</source>
-        <translation>Escape</translation>
+        <source>Word</source>
+        <translation>Слово</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="204"/>
-        <source>Regular expression</source>
-        <translation>Регулярное выражение</translation>
+        <source>Builtin</source>
+        <translation>Встроенная функция</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="205"/>
-        <source>Symbol</source>
-        <translation>Символ</translation>
+        <source>Function or method name</source>
+        <translation>Имя функции или метода</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="206"/>
-        <source>Other string</source>
-        <translation>Другие строки</translation>
+        <source>Class name</source>
+        <translation>Имя класса</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="207"/>
-        <source>Number</source>
-        <translation>Номер</translation>
+        <source>Namespace</source>
+        <translation>Пространство имен</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="208"/>
-        <source>Heading</source>
-        <translation>Заголовок</translation>
+        <source>Exception</source>
+        <translation>Исключение</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="209"/>
-        <source>Subheading</source>
-        <translation>Подзаголовок</translation>
+        <source>Identifier</source>
+        <translation>Идентификатор</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="210"/>
-        <source>Deleted</source>
-        <translation>Удалено</translation>
+        <source>Constant</source>
+        <translation>Константа</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="211"/>
-        <source>Inserted</source>
-        <translation>Вставлено</translation>
+        <source>Label</source>
+        <translation>Надпись</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="212"/>
-        <source>Generic error</source>
-        <translation>Общая ошибка</translation>
+        <source>Entity</source>
+        <translation>Объект</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="213"/>
-        <source>Emphasized text</source>
-        <translation>Emphasized текст</translation>
+        <source>Attribute</source>
+        <translation>Атрибут</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="214"/>
-        <source>Strong text</source>
-        <translation>Strong текст</translation>
+        <source>Tag</source>
+        <translation>Тег</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="215"/>
-        <source>Prompt</source>
-        <translation>Подсказка</translation>
+        <source>Decorator</source>
+        <translation>Декоратор</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="216"/>
-        <source>Output</source>
-        <translation>Вывод</translation>
+        <source>String</source>
+        <translation>Строка</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="217"/>
-        <source>Traceback</source>
-        <translation>Обратная трассировка</translation>
+        <source>Documentation string</source>
+        <translation>Строка документации</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="218"/>
-        <source>Error</source>
-        <translation>Ошибка</translation>
+        <source>Scalar</source>
+        <translation>Скаляр</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="219"/>
-        <source>Comment block</source>
-        <translation>Блок комментариев</translation>
+        <source>Escape</source>
+        <translation>Escape</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="220"/>
-        <source>Property</source>
-        <translation>Свойство</translation>
+        <source>Regular expression</source>
+        <translation>Регулярное выражение</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="221"/>
-        <source>Character</source>
+        <source>Symbol</source>
         <translation>Символ</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="222"/>
-        <source>Here document</source>
-        <translation>Here document</translation>
+        <source>Other string</source>
+        <translation>Другие строки</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="223"/>
-        <source>Punctuation</source>
-        <translation>Пунктуация</translation>
+        <source>Number</source>
+        <translation>Номер</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="224"/>
-        <source>Hashbang</source>
-        <translation>Hashbang</translation>
+        <source>Heading</source>
+        <translation>Заголовок</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="225"/>
-        <source>Reserved Keyword</source>
-        <translation>Зарезервированное ключевое слово</translation>
+        <source>Subheading</source>
+        <translation>Подзаголовок</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="226"/>
-        <source>Literal</source>
-        <translation>Литерал</translation>
+        <source>Deleted</source>
+        <translation>Удалено</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="227"/>
-        <source>Double quoted string</source>
-        <translation>Строка в двойных кавычках</translation>
+        <source>Inserted</source>
+        <translation>Вставлено</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="228"/>
-        <source>Single quoted string</source>
-        <translation>Строка в одиночных кавычках</translation>
+        <source>Generic error</source>
+        <translation>Общая ошибка</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="229"/>
-        <source>Backtick string</source>
-        <translation>Строка в обратных кавычках</translation>
+        <source>Emphasized text</source>
+        <translation>Emphasized текст</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="230"/>
+        <source>Strong text</source>
+        <translation>Strong текст</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/LexerPygments.py" line="231"/>
+        <source>Prompt</source>
+        <translation>Подсказка</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/LexerPygments.py" line="232"/>
+        <source>Output</source>
+        <translation>Вывод</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/LexerPygments.py" line="233"/>
+        <source>Traceback</source>
+        <translation>Обратная трассировка</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/LexerPygments.py" line="234"/>
+        <source>Error</source>
+        <translation>Ошибка</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/LexerPygments.py" line="235"/>
+        <source>Comment block</source>
+        <translation>Блок комментариев</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/LexerPygments.py" line="236"/>
+        <source>Property</source>
+        <translation>Свойство</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/LexerPygments.py" line="237"/>
+        <source>Character</source>
+        <translation>Символ</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/LexerPygments.py" line="238"/>
+        <source>Here document</source>
+        <translation>Here document</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/LexerPygments.py" line="239"/>
+        <source>Punctuation</source>
+        <translation>Пунктуация</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/LexerPygments.py" line="240"/>
+        <source>Hashbang</source>
+        <translation>Hashbang</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/LexerPygments.py" line="241"/>
+        <source>Reserved Keyword</source>
+        <translation>Зарезервированное ключевое слово</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/LexerPygments.py" line="242"/>
+        <source>Literal</source>
+        <translation>Литерал</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/LexerPygments.py" line="243"/>
+        <source>Double quoted string</source>
+        <translation>Строка в двойных кавычках</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/LexerPygments.py" line="244"/>
+        <source>Single quoted string</source>
+        <translation>Строка в одиночных кавычках</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/LexerPygments.py" line="245"/>
+        <source>Backtick string</source>
+        <translation>Строка в обратных кавычках</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/LexerPygments.py" line="246"/>
         <source>Whitespace</source>
         <translation>Символы пропуска</translation>
     </message>
@@ -42420,16 +42585,6 @@
         <translation>Показывать при появлении новых записей</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/LogViewerPage.ui" line="49"/>
-        <source>Error Colour:</source>
-        <translation>Цвет ошибки:</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/LogViewerPage.ui" line="62"/>
-        <source>Select the colour for text sent to stderr</source>
-        <translation>Выберите цвет текста в stderr</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/LogViewerPage.ui" line="87"/>
         <source>Message Filters:</source>
         <translation>Фильтры сообщений:</translation>
@@ -42464,6 +42619,16 @@
         <source>&lt;b&gt;Message Filters for both&lt;/b&gt;&lt;p&gt;This list shows the configured message filters used to suppress messages received via stdout or stderr.&lt;/p&gt;</source>
         <translation>&lt;b&gt;Фильтры сообщений для обоих&lt;/b&gt;&lt;p&gt;Этот список отображает настроенные фильтры сообщений, используемые для подавления сообщений, полученные через stdout или stderr.&lt;/p&gt;</translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/LogViewerPage.ui" line="49"/>
+        <source>Error Color:</source>
+        <translation>Цвет ошибки:</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/LogViewerPage.ui" line="62"/>
+        <source>Select the color for text sent to stderr</source>
+        <translation>Выберите цвет текста отправляемого в stderr</translation>
+    </message>
 </context>
 <context>
     <name>MakePropertiesDialog</name>
@@ -43252,27 +43417,27 @@
 <context>
     <name>MicroPythonDevice</name>
     <message>
-        <location filename="../MicroPython/MicroPythonDevices.py" line="207"/>
+        <location filename="../MicroPython/MicroPythonDevices.py" line="214"/>
         <source>Unsupported Device</source>
         <translation>Неподдерживаемое устройство</translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonDevices.py" line="217"/>
+        <location filename="../MicroPython/MicroPythonDevices.py" line="224"/>
         <source>REPL is not supported by this device.</source>
         <translation>REPL не поддерживается этим устройством.</translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonDevices.py" line="236"/>
+        <location filename="../MicroPython/MicroPythonDevices.py" line="243"/>
         <source>Plotter is not supported by this device.</source>
         <translation>Плоттер не поддерживается этим устройством.</translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonDevices.py" line="255"/>
+        <location filename="../MicroPython/MicroPythonDevices.py" line="262"/>
         <source>Running scripts is not supported by this device.</source>
         <translation>Выполнение скриптов не поддерживается этим устройством.</translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonDevices.py" line="275"/>
+        <location filename="../MicroPython/MicroPythonDevices.py" line="282"/>
         <source>File Manager is not supported by this device.</source>
         <translation>Менеджер файлов не поддерживается этим устройством.</translation>
     </message>
@@ -43536,27 +43701,27 @@
 <context>
     <name>MicroPythonGraphWidget</name>
     <message>
-        <location filename="../MicroPython/MicroPythonGraphWidget.py" line="63"/>
+        <location filename="../MicroPython/MicroPythonGraphWidget.py" line="64"/>
         <source>Press to save the raw data</source>
         <translation>Сохранить raw-данные</translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonGraphWidget.py" line="72"/>
+        <location filename="../MicroPython/MicroPythonGraphWidget.py" line="73"/>
         <source>max. X:</source>
         <translation>макс. X:</translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonGraphWidget.py" line="81"/>
+        <location filename="../MicroPython/MicroPythonGraphWidget.py" line="82"/>
         <source>Enter the maximum number of data points to be plotted.</source>
         <translation>Задайте максимальное количество точек для построения диаграммы.</translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonGraphWidget.py" line="311"/>
+        <location filename="../MicroPython/MicroPythonGraphWidget.py" line="329"/>
         <source>Save Chart Data</source>
         <translation>Сохранить данные диаграммы</translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonGraphWidget.py" line="311"/>
+        <location filename="../MicroPython/MicroPythonGraphWidget.py" line="329"/>
         <source>&lt;p&gt;The chart data could not be saved into file &lt;b&gt;{0}&lt;/b&gt;.&lt;/p&gt;&lt;p&gt;Reason: {1}&lt;/p&gt;</source>
         <translation>&lt;p&gt;Не удалось сохранить данные диаграммы в файл &lt;b&gt;{0}&lt;/b&gt;.&lt;/p&gt;&lt;p&gt;.Причина: {1}&lt;/p&gt;</translation>
     </message>
@@ -43624,94 +43789,169 @@
         <translation>Переносить длинные строки</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="140"/>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="169"/>
         <source>MPY Cross Compiler</source>
         <translation>Кросс-компилятор MPY</translation>
     </message>
     <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="175"/>
+        <source>Program:</source>
+        <translation>Программа:</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="191"/>
+        <source>Enter the path of the cross compiler executable</source>
+        <translation>Введите путь к исполняемому файлу кросс-компилятора</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.py" line="67"/>
+        <source>All Files (*)</source>
+        <translation>Все файлы (*)</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="298"/>
+        <source>Documentation</source>
+        <translation>Документация</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="304"/>
+        <source>MicroPython:</source>
+        <translation>MicroPython:</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="311"/>
+        <source>Enter the URL for the MicroPython documentation</source>
+        <translation>Введите URL для документации по MicroPython</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="318"/>
+        <source>CircuitPython:</source>
+        <translation>CircuitPython:</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="325"/>
+        <source>Enter the URL for the CircuitPython documentation</source>
+        <translation>Введите URL для документации по CircuitPython</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="332"/>
+        <source>BBC micro:bit:</source>
+        <translation>BBC micro:bit:</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="339"/>
+        <source>Enter the URL for the BBC micro:bit MicroPython documentation</source>
+        <translation>Введите URL для документации по BBC micro:bit MicroPython</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="201"/>
+        <source>PyBoard</source>
+        <translation>PyBoard</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="207"/>
+        <source>dfu-util Path:</source>
+        <translation>Путь к dfu-util:</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="223"/>
+        <source>Enter the path of the dfu-util flashing executable</source>
+        <translation>Введите путь к исполняемому файлу утилиты dfu-util</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="233"/>
+        <source>Firmware</source>
+        <translation>Прошивка</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="246"/>
+        <source>Enter the URL for the MicroPython firmware for PyBoard, ESP8266 and ESP32</source>
+        <translation>Введите URL прошивки MicroPython для PyBoard, ESP8266 и ESP32</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="260"/>
+        <source>Enter the URL for the CircuitPython firmware</source>
+        <translation>Введите URL прошивки для CircuitPython</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="274"/>
+        <source>Enter the URL for the BBC micro:bit Firmware</source>
+        <translation>Введите URL прошивки для BBC micro:bit</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="140"/>
+        <source>Chart Pane</source>
+        <translation>Панель диаграммы</translation>
+    </message>
+    <message>
         <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="146"/>
-        <source>Program:</source>
-        <translation>Программа:</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="162"/>
-        <source>Enter the path of the cross compiler executable</source>
-        <translation>Введите путь к исполняемому файлу кросс-компилятора</translation>
+        <source>Color Theme:</source>
+        <translation>Цветовая тема:</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="159"/>
+        <source>Select the color scheme of the chart</source>
+        <translation>Выберите цветовую схему диаграммы</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/MicroPythonPage.py" line="42"/>
-        <source>All Files (*)</source>
-        <translation>Все файлы (*)</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="255"/>
-        <source>Documentation</source>
-        <translation>Документация</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="261"/>
-        <source>MicroPython:</source>
-        <translation>MicroPython:</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="268"/>
-        <source>Enter the URL for the MicroPython documentation</source>
-        <translation>Введите URL для документации по MicroPython</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="275"/>
-        <source>CircuitPython:</source>
-        <translation>CircuitPython:</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="282"/>
-        <source>Enter the URL for the CircuitPython documentation</source>
-        <translation>Введите URL для документации по CircuitPython</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="289"/>
-        <source>BBC micro:bit:</source>
-        <translation>BBC micro:bit:</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="296"/>
-        <source>Enter the URL for the BBC micro:bit MicroPython documentation</source>
-        <translation>Введите URL для документации по BBC micro:bit MicroPython</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="172"/>
-        <source>PyBoard</source>
-        <translation>PyBoard</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="178"/>
-        <source>dfu-util Path:</source>
-        <translation>Путь к dfu-util:</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="194"/>
-        <source>Enter the path of the dfu-util flashing executable</source>
-        <translation>Введите путь к исполняемому файлу утилиты dfu-util</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="204"/>
-        <source>Firmware</source>
-        <translation>Прошивка</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="217"/>
-        <source>Enter the URL for the MicroPython firmware for PyBoard, ESP8266 and ESP32</source>
-        <translation>Введите URL прошивки MicroPython для PyBoard, ESP8266 and ESP32</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="231"/>
-        <source>Enter the URL for the CircuitPython firmware</source>
-        <translation>Введите URL прошивки для CircuitPython</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="245"/>
-        <source>Enter the URL for the BBC micro:bit Firmware</source>
-        <translation>Введите URL прошивки для BBC micro:bit</translation>
+        <source>Automatic</source>
+        <translation>Автоматический выбор</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.py" line="44"/>
+        <source>Light</source>
+        <translation>Light</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.py" line="46"/>
+        <source>Dark</source>
+        <translation>Dark</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.py" line="48"/>
+        <source>Blue Cerulean</source>
+        <translation>Blue Cerulean</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.py" line="50"/>
+        <source>Brown Sand</source>
+        <translation>Blue Cerulean</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.py" line="52"/>
+        <source>Blue NCS</source>
+        <translation>Blue NCS</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.py" line="54"/>
+        <source>High Contrast</source>
+        <translation>High Contrast</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.py" line="56"/>
+        <source>Blue Icy</source>
+        <translation>Blue Icy</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.py" line="58"/>
+        <source>Qt</source>
+        <translation>Qt</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="346"/>
+        <source>Calliope mini:</source>
+        <translation>Calliope mini:</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="288"/>
+        <source>Enter the URL for the Callope mini Firmware</source>
+        <translation>Введите URL прошивки для BBC Callope mini</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="353"/>
+        <source>Enter the URL for the Calliope mini MicroPython documentation</source>
+        <translation>Введите URL для документации по Calliope mini MicroPython</translation>
     </message>
 </context>
 <context>
@@ -43755,17 +43995,17 @@
         <translation>Открыть окно для отображения данных, полученных с выбранного устройства</translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="420"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="460"/>
         <source>Press to connect the selected device</source>
         <translation>Подключить выбранное устройство</translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="226"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="263"/>
         <source>&lt;h3&gt;The QtSerialPort package is not available.&lt;br/&gt;MicroPython support is deactivated.&lt;/h3&gt;</source>
         <translation>&lt;h3&gt;Пакет QtSerialPort недоступен.&lt;br//&gt;Поддержка MicroPython деактивирована.&lt;/h3&gt;</translation>
     </message>
     <message numerus="yes">
-        <location filename="../MicroPython/MicroPythonWidget.py" line="263"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="300"/>
         <source>%n supported device(s) detected.</source>
         <translation>
             <numerusform>Обнаружено %n поддерживаемое устройство.</numerusform>
@@ -43774,42 +44014,42 @@
         </translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="269"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="306"/>
         <source>{0} at {1}</source>
         <translation>{0} из {1}</translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="277"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="314"/>
         <source>No supported devices detected.</source>
         <translation>Поддерживаемые устройства не обнаружены.</translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="390"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="430"/>
         <source>Clear</source>
         <translation>Очистить</translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="392"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="432"/>
         <source>Copy</source>
         <translation>Копировать</translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="393"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="433"/>
         <source>Paste</source>
         <translation>Вставить</translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="415"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="455"/>
         <source>Press to disconnect the current device</source>
         <translation>Отключить выбранное устройство</translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="436"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="476"/>
         <source>No device attached</source>
         <translation>Устройство не подключено</translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="436"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="476"/>
         <source>Please ensure the device is plugged into your computer and selected.
 
 It must have a version of MicroPython (or CircuitPython) flashed onto it before anything will work.
@@ -43822,217 +44062,217 @@
 И наконец, нажмите кнопку сброса устройства и подождите несколько секунд, прежде чем повторить попытку.</translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="463"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="503"/>
         <source>Start REPL</source>
         <translation>Запустить REPL</translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="463"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="503"/>
         <source>&lt;p&gt;The REPL cannot be started.&lt;/p&gt;&lt;p&gt;Reason: {0}&lt;/p&gt;</source>
         <translation>&lt;p&gt;Неудается запустить REPL.&lt;/p&gt;&lt;p&gt;Причина:&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="853"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="893"/>
         <source>Serial Device Connect</source>
         <translation>Подсоединение последовательного устройства</translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="853"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="893"/>
         <source>&lt;p&gt;Cannot connect to device at serial port &lt;b&gt;{0}&lt;/b&gt;.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Не удается соединиться с устройством через последовательный порт &lt;b&gt;{0}&lt;/b&gt;.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="898"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="938"/>
         <source>Run Script</source>
         <translation>Выполнить скрипт</translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="881"/>
-        <source>There is no editor open. Abort...</source>
-        <translation>Редактор не открыт. Прервать...</translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="889"/>
-        <source>The current editor does not contain a script. Abort...</source>
-        <translation>Текущий редактор не содержит скрипт. Прервать...</translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="898"/>
-        <source>&lt;p&gt;Cannot run script.&lt;/p&gt;&lt;p&gt;Reason: {0}&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Не удается выполнить скрипт.&lt;/p&gt;&lt;p&gt;Причина: {0}&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="921"/>
-        <source>Open Python File</source>
-        <translation>Открыть файл Python</translation>
-    </message>
-    <message>
         <location filename="../MicroPython/MicroPythonWidget.py" line="921"/>
+        <source>There is no editor open. Abort...</source>
+        <translation>Редактор не открыт. Прервать...</translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="929"/>
+        <source>The current editor does not contain a script. Abort...</source>
+        <translation>Текущий редактор не содержит скрипт. Прервать...</translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="938"/>
+        <source>&lt;p&gt;Cannot run script.&lt;/p&gt;&lt;p&gt;Reason: {0}&lt;/p&gt;</source>
+        <translation>&lt;p&gt;Не удается выполнить скрипт.&lt;/p&gt;&lt;p&gt;Причина: {0}&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="961"/>
+        <source>Open Python File</source>
+        <translation>Открыть файл Python</translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="961"/>
         <source>Python3 Files (*.py);;All Files (*)</source>
         <translation>Файлы Python3 (*.py);;Все файлы (*)</translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="965"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1005"/>
         <source>Start Chart</source>
         <translation>Построить диаграмму</translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="965"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1005"/>
         <source>&lt;p&gt;The Chart cannot be started.&lt;/p&gt;&lt;p&gt;Reason: {0}&lt;/p&gt;</source>
         <translation>&lt;p&gt;Не удается построить диаграмму.&lt;/p&gt;&lt;p&gt;Причина: {0}&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="994"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1034"/>
         <source>Unsaved Chart Data</source>
         <translation>Несохраненные данные диаграммы</translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="994"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1034"/>
         <source>The chart contains unsaved data.</source>
         <translation>Диаграмма содержит несохраненные данные.</translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1045"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1085"/>
         <source>Start File Manager</source>
         <translation>Запустить менеджер файлов</translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1045"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1085"/>
         <source>&lt;p&gt;The File Manager cannot be started.&lt;/p&gt;&lt;p&gt;Reason: {0}&lt;/p&gt;</source>
         <translation>&lt;p&gt;Не удается запустить менеджер файлов.&lt;/p&gt;&lt;p&gt;Причина: {0}&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1096"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1136"/>
         <source>Show Version</source>
         <translation>Показать версию</translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1099"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1139"/>
         <source>Show Implementation</source>
         <translation>Показать исполнение</translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1210"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1250"/>
         <source>Synchronize Time</source>
         <translation>Синхронизировать время</translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1107"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1147"/>
         <source>Show Device Time</source>
         <translation>Показать время устройства</translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1110"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1150"/>
         <source>Show Local Time</source>
         <translation>Показать локальное время</translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1421"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1461"/>
         <source>Compile Python File</source>
         <translation>Компилировать файл Python</translation>
     </message>
     <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1481"/>
+        <source>Compile Current Editor</source>
+        <translation>Компилировать текущий редактор</translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1188"/>
+        <source>&lt;h3&gt;Device Version Information&lt;/h3&gt;</source>
+        <translation>&lt;h3&gt;Информация о версии устройства&lt;/h3&gt;</translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1197"/>
+        <source>No version information available.</source>
+        <translation>Информация о версии недоступна.</translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1199"/>
+        <source>Device Version Information</source>
+        <translation>Информация о версии устройства</translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1222"/>
+        <source>unknown</source>
+        <translation>unknown</translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1226"/>
+        <source>Device Implementation Information</source>
+        <translation>Информация о исполнении устройства</translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1226"/>
+        <source>&lt;h3&gt;Device Implementation Information&lt;/h3&gt;&lt;p&gt;This device contains &lt;b&gt;{0} {1}&lt;/b&gt;.&lt;/p&gt;</source>
+        <translation>&lt;h3&gt;Информация о исполнении устройства&lt;/h3&gt;&lt;p&gt;Это устройство содержит &lt;b&gt;{0} {1}&lt;/b&gt;.&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1250"/>
+        <source>&lt;p&gt;The time of the connected device was synchronized with the local time.&lt;/p&gt;</source>
+        <translation>&lt;p&gt;Время подключенного устройства было синхронизировано с локальным временем.&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1272"/>
+        <source>&lt;h3&gt;Device Date and Time&lt;/h3&gt;&lt;table&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Date&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Time&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{1}&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;</source>
+        <translation>&lt;h3&gt;Дата и время устройства&lt;/h3&gt;&lt;table&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Дата&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Время&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{1}&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;</translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1280"/>
+        <source>&lt;h3&gt;Device Date and Time&lt;/h3&gt;&lt;p&gt;{0}&lt;/p&gt;</source>
+        <translation>&lt;h3&gt;Дата и время устройства&lt;/h3&gt;&lt;p&gt;{0}&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1294"/>
+        <source>Device Date and Time</source>
+        <translation>Дата и время устройства</translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1307"/>
+        <source>Local Date and Time</source>
+        <translation>Локальные дата и время</translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1307"/>
+        <source>&lt;h3&gt;Local Date and Time&lt;/h3&gt;&lt;table&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Date&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Time&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{1}&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;</source>
+        <translation>&lt;h3&gt;Локальные дата и время&lt;/h3&gt;&lt;table&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Дата&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Время&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{1}&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;</translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1374"/>
+        <source>Error handling device</source>
+        <translation>Ошибка обработки устройства</translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1374"/>
+        <source>&lt;p&gt;There was an error communicating with the connected device.&lt;/p&gt;&lt;p&gt;Method: {0}&lt;/p&gt;&lt;p&gt;Message: {1}&lt;/p&gt;</source>
+        <translation>&lt;p&gt;Произошла ошибка связи с подключенным устройством.&lt;/p&gt;&lt;p&gt;Метод: {0}&lt;/p&gt;&lt;p&gt;Сообщение: {1}&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1413"/>
+        <source>The MicroPython cross compiler &lt;b&gt;mpy-cross&lt;/b&gt; cannot be found. Ensure it is in the search path or configure it on the MicroPython configuration page.</source>
+        <translation>Кросс-компилятор MicroPython &lt;b&gt;mpy-cross&lt;/b&gt; не найден. Убедитесь, что он находится в пути поиска, или настройте его на странице конфигурации MicroPython.</translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1431"/>
+        <source>Python Files (*.py);;All Files (*)</source>
+        <translation>Файлы Python (*.py);;Все файлы (*)</translation>
+    </message>
+    <message>
         <location filename="../MicroPython/MicroPythonWidget.py" line="1441"/>
-        <source>Compile Current Editor</source>
-        <translation>Компилировать текущий редактор</translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1148"/>
-        <source>&lt;h3&gt;Device Version Information&lt;/h3&gt;</source>
-        <translation>&lt;h3&gt;Информация о версии устройства&lt;/h3&gt;</translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1157"/>
-        <source>No version information available.</source>
-        <translation>Информация о версии недоступна.</translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1159"/>
-        <source>Device Version Information</source>
-        <translation>Информация о версии устройства</translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1182"/>
-        <source>unknown</source>
-        <translation>unknown</translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1186"/>
-        <source>Device Implementation Information</source>
-        <translation>Информация о исполнении устройства</translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1186"/>
-        <source>&lt;h3&gt;Device Implementation Information&lt;/h3&gt;&lt;p&gt;This device contains &lt;b&gt;{0} {1}&lt;/b&gt;.&lt;/p&gt;</source>
-        <translation>&lt;h3&gt;Информация о исполнении устройства&lt;/h3&gt;&lt;p&gt;Это устройство содержит &lt;b&gt;{0} {1}&lt;/b&gt;.&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1210"/>
-        <source>&lt;p&gt;The time of the connected device was synchronized with the local time.&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Время подключенного устройства было синхронизировано с локальным временем.&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1232"/>
-        <source>&lt;h3&gt;Device Date and Time&lt;/h3&gt;&lt;table&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Date&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Time&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{1}&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;</source>
-        <translation>&lt;h3&gt;Дата и время устройства&lt;/h3&gt;&lt;table&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Дата&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Время&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{1}&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;</translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1240"/>
-        <source>&lt;h3&gt;Device Date and Time&lt;/h3&gt;&lt;p&gt;{0}&lt;/p&gt;</source>
-        <translation>&lt;h3&gt;Дата и время устройства&lt;/h3&gt;&lt;p&gt;{0}&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1254"/>
-        <source>Device Date and Time</source>
-        <translation>Дата и время устройства</translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1267"/>
-        <source>Local Date and Time</source>
-        <translation>Локальные дата и время</translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1267"/>
-        <source>&lt;h3&gt;Local Date and Time&lt;/h3&gt;&lt;table&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Date&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Time&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{1}&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;</source>
-        <translation>&lt;h3&gt;Локальные дата и время&lt;/h3&gt;&lt;table&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Дата&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Время&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{1}&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;</translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1334"/>
-        <source>Error handling device</source>
-        <translation>Ошибка обработки устройства</translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1334"/>
-        <source>&lt;p&gt;There was an error communicating with the connected device.&lt;/p&gt;&lt;p&gt;Method: {0}&lt;/p&gt;&lt;p&gt;Message: {1}&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Произошла ошибка связи с подключенным устройством.&lt;/p&gt;&lt;p&gt;Метод: {0}&lt;/p&gt;&lt;p&gt;Сообщение: {1}&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1373"/>
-        <source>The MicroPython cross compiler &lt;b&gt;mpy-cross&lt;/b&gt; cannot be found. Ensure it is in the search path or configure it on the MicroPython configuration page.</source>
-        <translation>Кросс-компилятор MicroPython &lt;b&gt;mpy-cross&lt;/b&gt; не найден. Убедитесь, что он находится в пути поиска, или настройте его на странице конфигурации MicroPython.</translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1391"/>
-        <source>Python Files (*.py);;All Files (*)</source>
-        <translation>Файлы Python (*.py);;Все файлы (*)</translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1401"/>
         <source>The Python file &lt;b&gt;{0}&lt;/b&gt; does not exist. Aborting...</source>
         <translation>Файл Python &lt;b&gt;{0}&lt;/b&gt; не существует. Отмена...</translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1411"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1451"/>
         <source>&apos;mpy-cross&apos; Output</source>
         <translation>Вывод команды &apos;mpy-cross&apos;</translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1434"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1474"/>
         <source>The current editor does not contain a Python file. Aborting...</source>
         <translation>Текущий редактор не содержит файл Python. Отмена...</translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="175"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="211"/>
         <source>MicroPython Menu</source>
         <translation>Меню MicroPython</translation>
     </message>
@@ -44042,47 +44282,47 @@
         <translation>Открыть менеджер файлов на выбранном устройстве</translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="978"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1018"/>
         <source>&#xc2;&#xb5;Py Chart</source>
         <translation>µPy диаграммы</translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1058"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1098"/>
         <source>&#xc2;&#xb5;Py Files</source>
         <translation>µPy файлы</translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1134"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1174"/>
         <source>Show Documentation</source>
         <translation>Обзор документации</translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1138"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1178"/>
         <source>Configure</source>
         <translation>Настройки</translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1113"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1153"/>
         <source>Show Time</source>
         <translation>Показать время</translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1130"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1170"/>
         <source>Download Firmware</source>
         <translation>Загрузить прошивку</translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1310"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1350"/>
         <source>Date and Time</source>
         <translation>Дата и время</translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1293"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1333"/>
         <source>&lt;table&gt;&lt;tr&gt;&lt;th&gt;&lt;/th&gt;&lt;th&gt;Local Date and Time&lt;/th&gt;&lt;th&gt;Device Date and Time&lt;/th&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Date&lt;/b&gt;&lt;/td&gt;&lt;td align=&apos;center&apos;&gt;{0}&lt;/td&gt;&lt;td align=&apos;center&apos;&gt;{2}&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Time&lt;/b&gt;&lt;/td&gt;&lt;td align=&apos;center&apos;&gt;{1}&lt;/td&gt;&lt;td align=&apos;center&apos;&gt;{3}&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;</source>
         <translation>&lt;table&gt;&lt;tr&gt;&lt;th&gt;&lt;/th&gt;&lt;th&gt;Дата и время локальные&lt;/th&gt;&lt;th&gt;Дата и время устройства&lt;/th&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Дата&lt;/b&gt;&lt;/td&gt;&lt;td align=&apos;center&apos;&gt;{0}&lt;/td&gt;&lt;td align=&apos;center&apos;&gt;{2}&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Время&lt;/b&gt;&lt;/td&gt;&lt;td align=&apos;center&apos;&gt;{1}&lt;/td&gt;&lt;td align=&apos;center&apos;&gt;{3}&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;</translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1310"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1350"/>
         <source>&lt;table&gt;&lt;tr&gt;&lt;th&gt;Local Date and Time&lt;/th&gt;&lt;th&gt;Device Date and Time&lt;/th&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td align=&apos;center&apos;&gt;{0} {1}&lt;/td&gt;&lt;td align=&apos;center&apos;&gt;{2}&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;</source>
         <translation>&lt;table&gt;&lt;tr&gt;&lt;th&gt;Дата и время локальные&lt;/th&gt;&lt;th&gt;Дата и время устройства&lt;/th&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td align=&apos;center&apos;&gt;{0} {1}&lt;/td&gt;&lt;td align=&apos;center&apos;&gt;{2}&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;</translation>
     </message>
@@ -44090,89 +44330,94 @@
 <context>
     <name>MicrobitDevice</name>
     <message>
-        <location filename="../MicroPython/MicrobitDevices.py" line="67"/>
+        <location filename="../MicroPython/MicrobitDevices.py" line="74"/>
         <source>BBC micro:bit</source>
         <translation>BBC micro:bit</translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicrobitDevices.py" line="134"/>
+        <location filename="../MicroPython/MicrobitDevices.py" line="149"/>
         <source>Workspace Directory</source>
         <translation>Директория рабочей области</translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicrobitDevices.py" line="134"/>
-        <source>Could not find an attached BBC micro:bit.
-
-Please make sure the device is plugged into this computer.</source>
-        <translation>Не удается найти прикрепленный BBC micro: bit.
-
-Пожалуйста, убедитесь, что устройство подключено к этому компьютеру.</translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicrobitDevices.py" line="171"/>
+        <location filename="../MicroPython/MicrobitDevices.py" line="186"/>
         <source>Save Script as &apos;main.py&apos;</source>
         <translation>Сохранить скрипт как &apos;main.py&apos;</translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicrobitDevices.py" line="173"/>
+        <location filename="../MicroPython/MicrobitDevices.py" line="188"/>
         <source>Save the current script as &apos;main.py&apos; on the connected device</source>
         <translation>Сохранить текущий скрипт как &apos;main.py&apos; на подключенном устройстве</translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicrobitDevices.py" line="177"/>
-        <source>Reset micro:bit</source>
-        <translation>Сброс micro:bit</translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicrobitDevices.py" line="201"/>
+        <location filename="../MicroPython/MicrobitDevices.py" line="241"/>
         <source>MicroPython Firmware Files (*.hex);;All Files (*)</source>
         <translation>Файлы прошивки MicroPython (*.hex);;Все файлы (*)</translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicrobitDevices.py" line="246"/>
+        <location filename="../MicroPython/MicrobitDevices.py" line="286"/>
         <source>The script is empty. Aborting.</source>
         <translation>Скрипт пуст. Прерывание.</translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicrobitDevices.py" line="236"/>
+        <location filename="../MicroPython/MicrobitDevices.py" line="276"/>
         <source>The current editor does not contain a Python script. Write it anyway?</source>
         <translation>Текущий редактор не содержит скрипт Python. Все равно записать?</translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicrobitDevices.py" line="274"/>
+        <location filename="../MicroPython/MicrobitDevices.py" line="314"/>
         <source>&lt;p&gt;The script could not be saved to the device.&lt;/p&gt;&lt;p&gt;Reason: {0}&lt;/p&gt;</source>
         <translation>&lt;p&gt;Не удается сохранить скрипт на устройстве.&lt;/p&gt;&lt;p&gt;Причина: {0}&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicrobitDevices.py" line="201"/>
+        <location filename="../MicroPython/MicrobitDevices.py" line="241"/>
         <source>Flash MicroPython Firmware</source>
         <translation>Прошивка Flash MicroPython</translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicrobitDevices.py" line="233"/>
+        <location filename="../MicroPython/MicrobitDevices.py" line="273"/>
         <source>Save Script</source>
         <translation>Сохранить скрипт</translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicrobitDevices.py" line="190"/>
-        <source>The BBC micro:bit is not ready for flashing. See the &lt;a href=&quot;https://microbit.org/guide/firmware/&quot;&gt;micro:bit web site&lt;/a&gt; for details.</source>
-        <translation>Устройство BBC micro:bit не готово для перепрошивки. Смотрите подробнее на &lt;a href=&quot;https://microbit.org/guide/firmware/&quot;&gt;веб-сайте micro:bit&lt;/a&gt;.</translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicrobitDevices.py" line="263"/>
+        <location filename="../MicroPython/MicrobitDevices.py" line="303"/>
         <source>Save Script as &apos;{0}&apos;</source>
         <translation>Сохранить скрипт как &apos;{0}&apos;</translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicrobitDevices.py" line="254"/>
+        <location filename="../MicroPython/MicrobitDevices.py" line="294"/>
         <source>Enter a file name on the device:</source>
         <translation>Введите имя файла на устройстве:</translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicrobitDevices.py" line="168"/>
+        <location filename="../MicroPython/MicrobitDevices.py" line="183"/>
         <source>Save the current script to the selected device</source>
         <translation>Сохранить текущий скрипт на выбранном устройстве</translation>
     </message>
+    <message>
+        <location filename="../MicroPython/MicrobitDevices.py" line="77"/>
+        <source>Calliope mini</source>
+        <translation>Calliope mini</translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicrobitDevices.py" line="232"/>
+        <source>Could not find an attached {0}.
+
+Please make sure the device is plugged into this computer.</source>
+        <translation>Не удается найти прикрепленный {0}.
+
+Пожалуйста, убедитесь, что устройство подключено к этому компьютеру.</translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicrobitDevices.py" line="192"/>
+        <source>Reset {0}</source>
+        <translation>Сбросить {0}</translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicrobitDevices.py" line="213"/>
+        <source>&lt;p&gt;The BBC micro:bit is not ready for flashing. Follow these instructions.&lt;/p&gt;&lt;ul&gt;&lt;li&gt;unplug USB cable and any batteries&lt;/li&gt;&lt;li&gt;keep RESET button pressed an plug USB cable back in&lt;/li&gt;&lt;li&gt;a drive called MAINTENANCE should be available&lt;/li&gt;&lt;/ul&gt;&lt;p&gt;See the &lt;a href=&quot;https://microbit.org/guide/firmware/&quot;&gt;micro:bit web site&lt;/a&gt; for details.&lt;/p&gt;</source>
+        <translation>&lt;p&gt;BBC micro:bit не готов к перепрошивке. Следуйте данным инструкциям.&lt;/p&gt;&lt;ul&gt;&lt;li&gt;отключите USB-кабель и все аккумуляторы&lt;/li&gt;&lt;li&gt;удерживая кнопку RESET нажатой вставьте USB-кабель обратно&lt;/li&gt;&lt;li&gt;устройство под названием MAINTENANCE должен быть доступно&lt;/li&gt;&lt;/ul&gt;&lt;p&gt;Подробнее на вебсайте &lt;a href=&quot;https://microbit.org/guide/firmware/&quot;&gt;micro:bit&lt;/a&gt;.&lt;/p&gt;</translation>
+    </message>
 </context>
 <context>
     <name>MicrosoftEngine</name>
@@ -49346,17 +49591,17 @@
 <context>
     <name>Preferences</name>
     <message>
-        <location filename="../Preferences/__init__.py" line="1624"/>
+        <location filename="../Preferences/__init__.py" line="1640"/>
         <source>Export Preferences</source>
         <translation>Экспорт предпочтений</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1652"/>
+        <location filename="../Preferences/__init__.py" line="1668"/>
         <source>Import Preferences</source>
         <translation>Импорт предпочтений</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1652"/>
+        <location filename="../Preferences/__init__.py" line="1668"/>
         <source>Properties File (*.ini);;All Files (*)</source>
         <translation>Файлы предпочтений (*.ini);;Все файлы (*)</translation>
     </message>
@@ -49561,11 +49806,6 @@
         <translation>&lt;b&gt;Настройка печати&lt;/b&gt;</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/PrinterPage.ui" line="77"/>
-        <source>Colour</source>
-        <translation>Цветной</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/PrinterPage.ui" line="84"/>
         <source>Gray Scale</source>
         <translation>Оттенки серого</translation>
@@ -49601,11 +49841,6 @@
         <translation>Выбрать шрифт для заголовков страницы</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/PrinterPage.ui" line="49"/>
-        <source>Colour Mode:</source>
-        <translation>Цветовой режим:</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/PrinterPage.ui" line="94"/>
         <source>Page Order:</source>
         <translation>Порядок страниц:</translation>
@@ -49655,6 +49890,16 @@
         <source> DPI</source>
         <translation> DPI</translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/PrinterPage.ui" line="49"/>
+        <source>Color Mode:</source>
+        <translation>Цветовой режим:</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/PrinterPage.ui" line="77"/>
+        <source>Color</source>
+        <translation>Цвет</translation>
+    </message>
 </context>
 <context>
     <name>ProgramsDialog</name>
@@ -49907,312 +50152,312 @@
         <translation>Регистрация типа проекта</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="805"/>
+        <location filename="../Project/Project.py" line="817"/>
         <source>Read project file</source>
         <translation>Загрузить файл проекта</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="805"/>
+        <location filename="../Project/Project.py" line="817"/>
         <source>&lt;p&gt;The project file &lt;b&gt;{0}&lt;/b&gt; could not be read.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Невозможно прочитать файл проекта: &lt;b&gt;{0}&lt;/b&gt;.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="908"/>
+        <location filename="../Project/Project.py" line="920"/>
         <source>Save project file</source>
         <translation>Сохранить файл проекта</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="908"/>
+        <location filename="../Project/Project.py" line="920"/>
         <source>&lt;p&gt;The project file &lt;b&gt;{0}&lt;/b&gt; could not be written.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Невозможно сохранить файл проекта: &lt;b&gt;{0}&lt;/b&gt;&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="944"/>
+        <location filename="../Project/Project.py" line="956"/>
         <source>Read user project properties</source>
         <translation>Прочитать пользовательские настройки проекта</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="944"/>
+        <location filename="../Project/Project.py" line="956"/>
         <source>&lt;p&gt;The user specific project properties file &lt;b&gt;{0}&lt;/b&gt; could not be read.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Невозможно прочитать файл пользовательских настроек &lt;b&gt;{0}&lt;/b&gt;.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="968"/>
+        <location filename="../Project/Project.py" line="980"/>
         <source>Save user project properties</source>
         <translation>Сохранить пользовательские свойства проекта</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="968"/>
+        <location filename="../Project/Project.py" line="980"/>
         <source>&lt;p&gt;The user specific project properties file &lt;b&gt;{0}&lt;/b&gt; could not be written.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Невозможно записать файл пользовательских настроек &lt;b&gt;{0}&lt;/b&gt;.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1026"/>
+        <location filename="../Project/Project.py" line="1038"/>
         <source>Read project session</source>
         <translation>Загрузить сессию проекта</translation>
     </message>
     <message>
+        <location filename="../Project/Project.py" line="1263"/>
+        <source>Please save the project first.</source>
+        <translation>Пожалуйста, сначала сохраните проект.</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="1038"/>
+        <source>&lt;p&gt;The project session file &lt;b&gt;{0}&lt;/b&gt; could not be read.&lt;/p&gt;</source>
+        <translation>&lt;p&gt;Невозможно прочитать файл с сессией проекта: &lt;b&gt;{0}&lt;/b&gt;&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="1074"/>
+        <source>Save project session</source>
+        <translation>Сохранить сессию проекта</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="1074"/>
+        <source>&lt;p&gt;The project session file &lt;b&gt;{0}&lt;/b&gt; could not be written.&lt;/p&gt;</source>
+        <translation>&lt;p&gt;Невозможно сохранить файл с сессией проекта: &lt;b&gt;{0}&lt;/b&gt;&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="1103"/>
+        <source>Delete project session</source>
+        <translation>Удалить сессию проекта</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="1103"/>
+        <source>&lt;p&gt;The project session file &lt;b&gt;{0}&lt;/b&gt; could not be deleted.&lt;/p&gt;</source>
+        <translation>&lt;p&gt;Невозможно удалить выбранный файл с сессией: &lt;b&gt;{0}&lt;/b&gt;.&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="1137"/>
+        <source>Read tasks</source>
+        <translation>Прочитать задачи</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="1137"/>
+        <source>&lt;p&gt;The tasks file &lt;b&gt;{0}&lt;/b&gt; could not be read.&lt;/p&gt;</source>
+        <translation>&lt;p&gt;Невозможно прочитать файл с задачами: &lt;b&gt;{0}&lt;/b&gt;&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="1157"/>
+        <source>Save tasks</source>
+        <translation>Сохранить задачи</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="1157"/>
+        <source>&lt;p&gt;The tasks file &lt;b&gt;{0}&lt;/b&gt; could not be written.&lt;/p&gt;</source>
+        <translation>&lt;p&gt;Невозможно сохранить файл с задачами: &lt;b&gt;{0}&lt;/b&gt;&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="1216"/>
+        <source>Read debugger properties</source>
+        <translation>Прочитать свойства отладчика</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="1216"/>
+        <source>&lt;p&gt;The project debugger properties file &lt;b&gt;{0}&lt;/b&gt; could not be read.&lt;/p&gt;</source>
+        <translation>&lt;p&gt;Невозможно прочитать файл свойств отладчика &lt;b&gt;{0}&lt;/b&gt;.&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="1251"/>
+        <source>Save debugger properties</source>
+        <translation>Сохранить свойства отладчика</translation>
+    </message>
+    <message>
         <location filename="../Project/Project.py" line="1251"/>
-        <source>Please save the project first.</source>
-        <translation>Пожалуйста, сначала сохраните проект.</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="1026"/>
-        <source>&lt;p&gt;The project session file &lt;b&gt;{0}&lt;/b&gt; could not be read.&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Невозможно прочитать файл с сессией проекта: &lt;b&gt;{0}&lt;/b&gt;&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="1062"/>
-        <source>Save project session</source>
-        <translation>Сохранить сессию проекта</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="1062"/>
-        <source>&lt;p&gt;The project session file &lt;b&gt;{0}&lt;/b&gt; could not be written.&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Невозможно сохранить файл с сессией проекта: &lt;b&gt;{0}&lt;/b&gt;&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="1091"/>
-        <source>Delete project session</source>
-        <translation>Удалить сессию проекта</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="1091"/>
-        <source>&lt;p&gt;The project session file &lt;b&gt;{0}&lt;/b&gt; could not be deleted.&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Невозможно удалить выбранный файл с сессией: &lt;b&gt;{0}&lt;/b&gt;.&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="1125"/>
-        <source>Read tasks</source>
-        <translation>Прочитать задачи</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="1125"/>
-        <source>&lt;p&gt;The tasks file &lt;b&gt;{0}&lt;/b&gt; could not be read.&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Невозможно прочитать файл с задачами: &lt;b&gt;{0}&lt;/b&gt;&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="1145"/>
-        <source>Save tasks</source>
-        <translation>Сохранить задачи</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="1145"/>
-        <source>&lt;p&gt;The tasks file &lt;b&gt;{0}&lt;/b&gt; could not be written.&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Невозможно сохранить файл с задачами: &lt;b&gt;{0}&lt;/b&gt;&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="1204"/>
-        <source>Read debugger properties</source>
-        <translation>Прочитать свойства отладчика</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="1204"/>
-        <source>&lt;p&gt;The project debugger properties file &lt;b&gt;{0}&lt;/b&gt; could not be read.&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Невозможно прочитать файл свойств отладчика &lt;b&gt;{0}&lt;/b&gt;.&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="1239"/>
-        <source>Save debugger properties</source>
-        <translation>Сохранить свойства отладчика</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="1239"/>
         <source>&lt;p&gt;The project debugger properties file &lt;b&gt;{0}&lt;/b&gt; could not be written.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Невозможно сохранить файл свойств отладчика &lt;b&gt;{0}&lt;/b&gt;.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1265"/>
+        <location filename="../Project/Project.py" line="1277"/>
         <source>Delete debugger properties</source>
         <translation>Удалить свойства отладчика</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1265"/>
+        <location filename="../Project/Project.py" line="1277"/>
         <source>&lt;p&gt;The project debugger properties file &lt;b&gt;{0}&lt;/b&gt; could not be deleted.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Невозможно удалить файл свойств отладчика &lt;b&gt;{0}&lt;/b&gt;.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1393"/>
+        <location filename="../Project/Project.py" line="1405"/>
         <source>Add Language</source>
         <translation>Добавить язык перевода</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1393"/>
+        <location filename="../Project/Project.py" line="1405"/>
         <source>You have to specify a translation pattern first.</source>
         <translation>Необходимо сначала задать шаблон перевода.</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1519"/>
+        <location filename="../Project/Project.py" line="1531"/>
         <source>Delete translation</source>
         <translation>Удалить перевод</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1684"/>
+        <location filename="../Project/Project.py" line="1696"/>
         <source>Add file</source>
         <translation>Добавить файл</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1748"/>
+        <location filename="../Project/Project.py" line="1760"/>
         <source>&lt;p&gt;The file &lt;b&gt;{0}&lt;/b&gt; already exists.&lt;/p&gt;&lt;p&gt;Overwrite it?&lt;/p&gt;</source>
         <translation>&lt;p&gt;Файл &lt;b&gt;{0}&lt;/b&gt; уже существует. Переписать?&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1671"/>
+        <location filename="../Project/Project.py" line="1683"/>
         <source>&lt;p&gt;The selected file &lt;b&gt;{0}&lt;/b&gt; could not be added to &lt;b&gt;{1}&lt;/b&gt;.&lt;/p&gt;&lt;p&gt;Reason: {2}&lt;/p&gt;</source>
         <translation>&lt;p&gt;Невозможно добавить выделенный файл &lt;b&gt;{0}&lt;/b&gt; в архив &lt;b&gt;{1}&lt;/b&gt;. &lt;/p&gt;&lt;p&gt;Причина: {2}&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1816"/>
+        <location filename="../Project/Project.py" line="1828"/>
         <source>The target directory must not be empty.</source>
         <translation>Целевая директория не должна быть пустой.</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1827"/>
+        <location filename="../Project/Project.py" line="1839"/>
         <source>Add directory</source>
         <translation>Добавить директорию</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1715"/>
+        <location filename="../Project/Project.py" line="1727"/>
         <source>&lt;p&gt;The source directory doesn&apos;t contain any files belonging to the selected category.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Директория не содержит ни одного файла, принадлежащего к заданной категории.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1730"/>
+        <location filename="../Project/Project.py" line="1742"/>
         <source>&lt;p&gt;The target directory &lt;b&gt;{0}&lt;/b&gt; could not be created.&lt;/p&gt;&lt;p&gt;Reason: {1}&lt;/p&gt;</source>
         <translation>&lt;p&gt;Невозможно создать директорию &lt;b&gt;{0}&lt;/b&gt;&lt;/p&gt;&lt;p&gt;Причина: {1}&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1827"/>
+        <location filename="../Project/Project.py" line="1839"/>
         <source>The source directory must not be empty.</source>
         <translation>Исходная директория не должна быть пустой.</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1964"/>
+        <location filename="../Project/Project.py" line="1976"/>
         <source>Rename file</source>
         <translation>Переименовать файл</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1988"/>
+        <location filename="../Project/Project.py" line="2000"/>
         <source>Rename File</source>
         <translation>Переименовать файл</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3130"/>
+        <location filename="../Project/Project.py" line="3147"/>
         <source>&lt;p&gt;The file &lt;b&gt;{0}&lt;/b&gt; already exists. Overwrite it?&lt;/p&gt;</source>
         <translation>&lt;p&gt;Файл &lt;b&gt;{0}&lt;/b&gt; уже существует. Переписать?&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1988"/>
+        <location filename="../Project/Project.py" line="2000"/>
         <source>&lt;p&gt;The file &lt;b&gt;{0}&lt;/b&gt; could not be renamed.&lt;br /&gt;Reason: {1}&lt;/p&gt;</source>
         <translation>&lt;p&gt;Невозможно переименовать файл &lt;b&gt;{0}&lt;/b&gt;:&lt;br&gt;Причина: {1}.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="2233"/>
+        <location filename="../Project/Project.py" line="2250"/>
         <source>Delete file</source>
         <translation>Удалить файл</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="2263"/>
+        <location filename="../Project/Project.py" line="2280"/>
         <source>Delete directory</source>
         <translation>Удалить директорию</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="2358"/>
+        <location filename="../Project/Project.py" line="2375"/>
         <source>Create project directory</source>
         <translation>Создать директорию проекта</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="2358"/>
+        <location filename="../Project/Project.py" line="2375"/>
         <source>&lt;p&gt;The project directory &lt;b&gt;{0}&lt;/b&gt; could not be created.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Невозможно создать директорию проекта &lt;b&gt;{0}&lt;/b&gt;.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="2965"/>
+        <location filename="../Project/Project.py" line="2982"/>
         <source>New Project</source>
         <translation>Новый проект</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="2474"/>
+        <location filename="../Project/Project.py" line="2491"/>
         <source>Add existing files to the project?</source>
         <translation>Добавить существующие файлы в проект?</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="2965"/>
+        <location filename="../Project/Project.py" line="2982"/>
         <source>Select Version Control System</source>
         <translation>Выберите систему контроля версий (VCS)</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="2601"/>
+        <location filename="../Project/Project.py" line="2618"/>
         <source>Would you like to edit the VCS command options?</source>
         <translation>Вы хотите редактировать параметры команд VCS?</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3831"/>
+        <location filename="../Project/Project.py" line="3866"/>
         <source>New project</source>
         <translation>Новый проект</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="2544"/>
+        <location filename="../Project/Project.py" line="2561"/>
         <source>Shall the project file be added to the repository?</source>
         <translation>Должен ли файл проекта быть добавлен в репозиторий?</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="2580"/>
+        <location filename="../Project/Project.py" line="2597"/>
         <source>None</source>
         <translation>None</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="2573"/>
+        <location filename="../Project/Project.py" line="2590"/>
         <source>Select version control system for the project</source>
         <translation>Выберите систему контроля версий для проекта</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="2684"/>
+        <location filename="../Project/Project.py" line="2701"/>
         <source>Translation Pattern</source>
         <translation>Шаблон перевода</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="2684"/>
+        <location filename="../Project/Project.py" line="2701"/>
         <source>Enter the path pattern for translation files (use &apos;%language%&apos; in place of the language code):</source>
         <translation>Введите шаблон пути для файлов переводов (используйте &apos;%language%&apos; вместо language code):</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3845"/>
+        <location filename="../Project/Project.py" line="3880"/>
         <source>Open project</source>
         <translation>Открыть проект</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3115"/>
+        <location filename="../Project/Project.py" line="3132"/>
         <source>Project Files (*.e4p)</source>
         <translation>Файлы проектов (*.e4p)</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3882"/>
+        <location filename="../Project/Project.py" line="3917"/>
         <source>Save project as</source>
         <translation>Сохранить проект как</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3130"/>
+        <location filename="../Project/Project.py" line="3147"/>
         <source>Save File</source>
         <translation>Сохранить файл</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3166"/>
+        <location filename="../Project/Project.py" line="3183"/>
         <source>Close Project</source>
         <translation>Закрыть проект</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3166"/>
+        <location filename="../Project/Project.py" line="3183"/>
         <source>The current project has unsaved changes.</source>
         <translation>Изменения в текущем проекте не сохранены.</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3343"/>
+        <location filename="../Project/Project.py" line="3360"/>
         <source>Syntax errors detected</source>
         <translation>Найдены синтаксические ошибки</translation>
     </message>
     <message numerus="yes">
-        <location filename="../Project/Project.py" line="3343"/>
+        <location filename="../Project/Project.py" line="3360"/>
         <source>The project contains %n file(s) with syntax errors.</source>
         <translation>
             <numerusform>Проект содержит %n файл с синтаксической ошибкой.</numerusform>
@@ -50221,351 +50466,351 @@
         </translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3831"/>
+        <location filename="../Project/Project.py" line="3866"/>
         <source>&amp;New...</source>
         <translation>&amp;Новый...</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3836"/>
+        <location filename="../Project/Project.py" line="3871"/>
         <source>Generate a new project</source>
         <translation>Создать новый проект</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3837"/>
+        <location filename="../Project/Project.py" line="3872"/>
         <source>&lt;b&gt;New...&lt;/b&gt;&lt;p&gt;This opens a dialog for entering the info for a new project.&lt;/p&gt;</source>
         <translation>&lt;b&gt;Новый...&lt;/b&gt;&lt;p&gt;Открытие диалога ввода информации о новом проекте.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3845"/>
+        <location filename="../Project/Project.py" line="3880"/>
         <source>&amp;Open...</source>
         <translation>&amp;Открыть...</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3850"/>
+        <location filename="../Project/Project.py" line="3885"/>
         <source>Open an existing project</source>
         <translation>Открыть существующий проект</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3851"/>
-        <source>&lt;b&gt;Open...&lt;/b&gt;&lt;p&gt;This opens an existing project.&lt;/p&gt;</source>
-        <translation>&lt;b&gt;Открыть...&lt;/b&gt;&lt;p&gt;Открытие существующего проекта.&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="3858"/>
-        <source>Close project</source>
-        <translation>Закрыть проект</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="3858"/>
-        <source>&amp;Close</source>
-        <translation>&amp;Закрыть</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="3862"/>
-        <source>Close the current project</source>
-        <translation>Закрыть текущий проект</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="3863"/>
-        <source>&lt;b&gt;Close&lt;/b&gt;&lt;p&gt;This closes the current project.&lt;/p&gt;</source>
-        <translation>&lt;b&gt;Закрыть&lt;/b&gt;&lt;p&gt;Закрытие текущего проекта.&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="3870"/>
-        <source>Save project</source>
-        <translation>Сохранить проект</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4062"/>
-        <source>&amp;Save</source>
-        <translation>&amp;Сохранить</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="3874"/>
-        <source>Save the current project</source>
-        <translation>Сохранить текущий проект</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="3875"/>
-        <source>&lt;b&gt;Save&lt;/b&gt;&lt;p&gt;This saves the current project.&lt;/p&gt;</source>
-        <translation>&lt;b&gt;Сохранить&lt;/b&gt;&lt;p&gt;Сохранение текущего проекта.&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="3882"/>
-        <source>Save &amp;as...</source>
-        <translation>Сохранить &amp;как...</translation>
-    </message>
-    <message>
         <location filename="../Project/Project.py" line="3886"/>
-        <source>Save the current project to a new file</source>
-        <translation>Сохранить текущий проект в новый файл</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="3888"/>
-        <source>&lt;b&gt;Save as&lt;/b&gt;&lt;p&gt;This saves the current project to a new file.&lt;/p&gt;</source>
-        <translation>&lt;b&gt;Сохранить как&lt;/b&gt;&lt;p&gt; Сохранение текущего проекта в новый файл.&lt;/p&gt;</translation>
+        <source>&lt;b&gt;Open...&lt;/b&gt;&lt;p&gt;This opens an existing project.&lt;/p&gt;</source>
+        <translation>&lt;b&gt;Открыть...&lt;/b&gt;&lt;p&gt;Открытие существующего проекта.&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="3893"/>
+        <source>Close project</source>
+        <translation>Закрыть проект</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="3893"/>
+        <source>&amp;Close</source>
+        <translation>&amp;Закрыть</translation>
     </message>
     <message>
         <location filename="../Project/Project.py" line="3897"/>
+        <source>Close the current project</source>
+        <translation>Закрыть текущий проект</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="3898"/>
+        <source>&lt;b&gt;Close&lt;/b&gt;&lt;p&gt;This closes the current project.&lt;/p&gt;</source>
+        <translation>&lt;b&gt;Закрыть&lt;/b&gt;&lt;p&gt;Закрытие текущего проекта.&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="3905"/>
+        <source>Save project</source>
+        <translation>Сохранить проект</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4097"/>
+        <source>&amp;Save</source>
+        <translation>&amp;Сохранить</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="3909"/>
+        <source>Save the current project</source>
+        <translation>Сохранить текущий проект</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="3910"/>
+        <source>&lt;b&gt;Save&lt;/b&gt;&lt;p&gt;This saves the current project.&lt;/p&gt;</source>
+        <translation>&lt;b&gt;Сохранить&lt;/b&gt;&lt;p&gt;Сохранение текущего проекта.&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="3917"/>
+        <source>Save &amp;as...</source>
+        <translation>Сохранить &amp;как...</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="3921"/>
+        <source>Save the current project to a new file</source>
+        <translation>Сохранить текущий проект в новый файл</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="3923"/>
+        <source>&lt;b&gt;Save as&lt;/b&gt;&lt;p&gt;This saves the current project to a new file.&lt;/p&gt;</source>
+        <translation>&lt;b&gt;Сохранить как&lt;/b&gt;&lt;p&gt; Сохранение текущего проекта в новый файл.&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="3932"/>
         <source>Add files to project</source>
         <translation>Добавить файлы в проект</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3897"/>
+        <location filename="../Project/Project.py" line="3932"/>
         <source>Add &amp;files...</source>
         <translation>Добавить &amp;файлы...</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3902"/>
+        <location filename="../Project/Project.py" line="3937"/>
         <source>Add files to the current project</source>
         <translation>Добавить файлы в текущий проект</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3904"/>
+        <location filename="../Project/Project.py" line="3939"/>
         <source>&lt;b&gt;Add files...&lt;/b&gt;&lt;p&gt;This opens a dialog for adding files to the current project. The place to add is determined by the file extension.&lt;/p&gt;</source>
         <translation>&lt;b&gt;Добавить файлы&lt;/b&gt;
 &lt;p&gt;Открытие диалога добавления файлов в текущий проект. Место добавления определяется расширением файла.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3913"/>
+        <location filename="../Project/Project.py" line="3948"/>
         <source>Add directory to project</source>
         <translation>Добавить директорию в проект</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3913"/>
+        <location filename="../Project/Project.py" line="3948"/>
         <source>Add directory...</source>
         <translation>Добавить директорию...</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3918"/>
+        <location filename="../Project/Project.py" line="3953"/>
         <source>Add a directory to the current project</source>
         <translation>Добавить директорию в текущий проект</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3920"/>
+        <location filename="../Project/Project.py" line="3955"/>
         <source>&lt;b&gt;Add directory...&lt;/b&gt;&lt;p&gt;This opens a dialog for adding a directory to the current project.&lt;/p&gt;</source>
         <translation>&lt;b&gt;Добавить директорию...&lt;/b&gt;
 &lt;p&gt;Открытие диалога добавления директории к текущему проекту.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3928"/>
+        <location filename="../Project/Project.py" line="3963"/>
         <source>Add translation to project</source>
         <translation>Добавить перевод в проект</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3928"/>
+        <location filename="../Project/Project.py" line="3963"/>
         <source>Add &amp;translation...</source>
         <translation>Добавить &amp;перевод...</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3933"/>
+        <location filename="../Project/Project.py" line="3968"/>
         <source>Add a translation to the current project</source>
         <translation>Добавить перевод в текущий проект</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3935"/>
+        <location filename="../Project/Project.py" line="3970"/>
         <source>&lt;b&gt;Add translation...&lt;/b&gt;&lt;p&gt;This opens a dialog for add a translation to the current project.&lt;/p&gt;</source>
         <translation>&lt;b&gt;Добавить перевод...&lt;/b&gt;&lt;p&gt;Открытие диалога добавления перевода в текущий проект.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3943"/>
+        <location filename="../Project/Project.py" line="3978"/>
         <source>Search new files</source>
         <translation>Поиск новых файлов</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3943"/>
-        <source>Searc&amp;h new files...</source>
-        <translation>Поис&amp;к новых файлов...</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="3947"/>
-        <source>Search new files in the project directory.</source>
-        <translation>Поиск новых файлов в директории проекта.</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="3973"/>
-        <source>Project properties</source>
-        <translation>Свойства проекта</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="3973"/>
-        <source>&amp;Properties...</source>
-        <translation>&amp;Свойства...</translation>
-    </message>
-    <message>
         <location filename="../Project/Project.py" line="3978"/>
+        <source>Searc&amp;h new files...</source>
+        <translation>Поис&amp;к новых файлов...</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="3982"/>
+        <source>Search new files in the project directory.</source>
+        <translation>Поиск новых файлов в директории проекта.</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4008"/>
+        <source>Project properties</source>
+        <translation>Свойства проекта</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4008"/>
+        <source>&amp;Properties...</source>
+        <translation>&amp;Свойства...</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4013"/>
         <source>Show the project properties</source>
         <translation>Показать свойства проекта</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3979"/>
+        <location filename="../Project/Project.py" line="4014"/>
         <source>&lt;b&gt;Properties...&lt;/b&gt;&lt;p&gt;This shows a dialog to edit the project properties.&lt;/p&gt;</source>
         <translation>&lt;b&gt;Свойства...&lt;/b&gt;&lt;p&gt;Отображение диалога для редактирования свойств проекта.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3986"/>
+        <location filename="../Project/Project.py" line="4021"/>
         <source>User project properties</source>
         <translation>Пользовательские настройки проекта</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3986"/>
+        <location filename="../Project/Project.py" line="4021"/>
         <source>&amp;User Properties...</source>
         <translation>&amp;Пользовательские свойства...</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3991"/>
+        <location filename="../Project/Project.py" line="4026"/>
         <source>Show the user specific project properties</source>
         <translation>Показать пользовательские свойства проекта</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3993"/>
+        <location filename="../Project/Project.py" line="4028"/>
         <source>&lt;b&gt;User Properties...&lt;/b&gt;&lt;p&gt;This shows a dialog to edit the user specific project properties.&lt;/p&gt;</source>
         <translation>&lt;b&gt;Пользовательские свойства...&lt;/b&gt;&lt;p&gt;Отображает диалог редактирования пользовательских свойств проекта.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4001"/>
+        <location filename="../Project/Project.py" line="4036"/>
         <source>Filetype Associations</source>
         <translation>Ассоциации типа файлов</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4001"/>
+        <location filename="../Project/Project.py" line="4036"/>
         <source>Filetype Associations...</source>
         <translation>Ассоциации типа файлов...</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4005"/>
+        <location filename="../Project/Project.py" line="4040"/>
         <source>Show the project filetype associations</source>
         <translation>Показать ассоциации типов файлов для проекта</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4019"/>
+        <location filename="../Project/Project.py" line="4054"/>
         <source>Lexer Associations</source>
         <translation>Ассоциации для лексеров</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4019"/>
+        <location filename="../Project/Project.py" line="4054"/>
         <source>Lexer Associations...</source>
         <translation>Ассоциации для лексеров...</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4023"/>
+        <location filename="../Project/Project.py" line="4058"/>
         <source>Show the project lexer associations (overriding defaults)</source>
         <translation>Показать ассоциации для лексеров проекта (переопределяющие по умолчанию)</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4025"/>
+        <location filename="../Project/Project.py" line="4060"/>
         <source>&lt;b&gt;Lexer Associations...&lt;/b&gt;&lt;p&gt;This shows a dialog to edit the lexer associations of the project. These associations override the global lexer associations. Lexers are used to highlight the editor text.&lt;/p&gt;</source>
         <translation>&lt;b&gt;Ассоциации для лексеров...&lt;/b&gt;&lt;p&gt;Показать ассоциации лексеров для проекта. Эти ассоциации переопределяют глобальные ассоциации лексеров. Лексеры используются для подсвечивания текста в редакторе.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4037"/>
+        <location filename="../Project/Project.py" line="4072"/>
         <source>Debugger Properties</source>
         <translation>Свойства отладчика</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4037"/>
+        <location filename="../Project/Project.py" line="4072"/>
         <source>Debugger &amp;Properties...</source>
         <translation>&amp;Свойства отладчика...</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4041"/>
+        <location filename="../Project/Project.py" line="4076"/>
         <source>Show the debugger properties</source>
         <translation>Показать свойства отладчика</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4042"/>
+        <location filename="../Project/Project.py" line="4077"/>
         <source>&lt;b&gt;Debugger Properties...&lt;/b&gt;&lt;p&gt;This shows a dialog to edit project specific debugger settings.&lt;/p&gt;</source>
         <translation>&lt;b&gt;Свойства отладчика...&lt;/b&gt;
 &lt;p&gt;Отображение диалога редактирования свойств отладчика, специфичных для данного проекта.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4050"/>
+        <location filename="../Project/Project.py" line="4085"/>
         <source>Load</source>
         <translation>Загрузить</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4050"/>
+        <location filename="../Project/Project.py" line="4085"/>
         <source>&amp;Load</source>
         <translation>&amp;Загрузить</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4054"/>
+        <location filename="../Project/Project.py" line="4089"/>
         <source>Load the debugger properties</source>
         <translation>Загрузить свойства отладчика</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4055"/>
+        <location filename="../Project/Project.py" line="4090"/>
         <source>&lt;b&gt;Load Debugger Properties&lt;/b&gt;&lt;p&gt;This loads the project specific debugger settings.&lt;/p&gt;</source>
         <translation>&lt;b&gt;Загрузить свойства отладчика&lt;/b&gt;
 &lt;p&gt;Загрузить свойства отладчика, специфичные для данного проекта.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4062"/>
+        <location filename="../Project/Project.py" line="4097"/>
         <source>Save</source>
         <translation>Сохранить</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4066"/>
-        <source>Save the debugger properties</source>
-        <translation>Сохранить свойства отладчика</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4067"/>
-        <source>&lt;b&gt;Save Debugger Properties&lt;/b&gt;&lt;p&gt;This saves the project specific debugger settings.&lt;/p&gt;</source>
-        <translation>&lt;b&gt;Сохранить свойства отладчика&lt;/b&gt;&lt;p&gt;Сохранить свойства отладчика, специфичные для данного проекта.&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4074"/>
-        <source>Delete</source>
-        <translation>Удалить</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4074"/>
-        <source>&amp;Delete</source>
-        <translation>&amp;Удалить</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4078"/>
-        <source>Delete the debugger properties</source>
-        <translation>Удалить свойства отладчика</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4079"/>
-        <source>&lt;b&gt;Delete Debugger Properties&lt;/b&gt;&lt;p&gt;This deletes the file containing the project specific debugger settings.&lt;/p&gt;</source>
-        <translation>&lt;b&gt;Удалить свойства отладчика&lt;/b&gt;&lt;p&gt;Удалить свойства отладчика, специфичные для данного проекта.&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4087"/>
-        <source>Reset</source>
-        <translation>Сбросить</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4087"/>
-        <source>&amp;Reset</source>
-        <translation>&amp;Сбросить</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4091"/>
-        <source>Reset the debugger properties</source>
-        <translation>Сбросить свойства отладчика</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4092"/>
-        <source>&lt;b&gt;Reset Debugger Properties&lt;/b&gt;&lt;p&gt;This resets the project specific debugger settings.&lt;/p&gt;</source>
-        <translation>&lt;b&gt;Сбросить свойства отладчика&lt;/b&gt;&lt;p&gt;Сбросить свойства отладчика, специфичные для данного проекта.&lt;/p&gt;</translation>
-    </message>
-    <message>
         <location filename="../Project/Project.py" line="4101"/>
+        <source>Save the debugger properties</source>
+        <translation>Сохранить свойства отладчика</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4102"/>
+        <source>&lt;b&gt;Save Debugger Properties&lt;/b&gt;&lt;p&gt;This saves the project specific debugger settings.&lt;/p&gt;</source>
+        <translation>&lt;b&gt;Сохранить свойства отладчика&lt;/b&gt;&lt;p&gt;Сохранить свойства отладчика, специфичные для данного проекта.&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4109"/>
+        <source>Delete</source>
+        <translation>Удалить</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4109"/>
+        <source>&amp;Delete</source>
+        <translation>&amp;Удалить</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4113"/>
+        <source>Delete the debugger properties</source>
+        <translation>Удалить свойства отладчика</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4114"/>
+        <source>&lt;b&gt;Delete Debugger Properties&lt;/b&gt;&lt;p&gt;This deletes the file containing the project specific debugger settings.&lt;/p&gt;</source>
+        <translation>&lt;b&gt;Удалить свойства отладчика&lt;/b&gt;&lt;p&gt;Удалить свойства отладчика, специфичные для данного проекта.&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4122"/>
+        <source>Reset</source>
+        <translation>Сбросить</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4122"/>
+        <source>&amp;Reset</source>
+        <translation>&amp;Сбросить</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4126"/>
+        <source>Reset the debugger properties</source>
+        <translation>Сбросить свойства отладчика</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4127"/>
+        <source>&lt;b&gt;Reset Debugger Properties&lt;/b&gt;&lt;p&gt;This resets the project specific debugger settings.&lt;/p&gt;</source>
+        <translation>&lt;b&gt;Сбросить свойства отладчика&lt;/b&gt;&lt;p&gt;Сбросить свойства отладчика, специфичные для данного проекта.&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4136"/>
         <source>Load session</source>
         <translation>Загрузить сессию</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4105"/>
+        <location filename="../Project/Project.py" line="4140"/>
         <source>Load the projects session file.</source>
         <translation>Загрузить файл с сессией проекта.</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4106"/>
+        <location filename="../Project/Project.py" line="4141"/>
         <source>&lt;b&gt;Load session&lt;/b&gt;&lt;p&gt;This loads the projects session file. The session consists of the following data.&lt;br&gt;- all open source files&lt;br&gt;- all breakpoint&lt;br&gt;- the commandline arguments&lt;br&gt;- the working directory&lt;br&gt;- the exception reporting flag&lt;/p&gt;</source>
         <translation>&lt;b&gt;Загрузить сессию&lt;/b&gt;
 &lt;p&gt;Загрузить файл с сессией проекта. Сессия содержит следующие данные:&lt;br&gt;
@@ -50577,17 +50822,17 @@
 &lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4119"/>
+        <location filename="../Project/Project.py" line="4154"/>
         <source>Save session</source>
         <translation>Сохранить сессию</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4123"/>
+        <location filename="../Project/Project.py" line="4158"/>
         <source>Save the projects session file.</source>
         <translation>Сохранить файл с сессией проекта.</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4124"/>
+        <location filename="../Project/Project.py" line="4159"/>
         <source>&lt;b&gt;Save session&lt;/b&gt;&lt;p&gt;This saves the projects session file. The session consists of the following data.&lt;br&gt;- all open source files&lt;br&gt;- all breakpoint&lt;br&gt;- the commandline arguments&lt;br&gt;- the working directory&lt;br&gt;- the exception reporting flag&lt;/p&gt;</source>
         <translation>&lt;b&gt;Сохранить сессию&lt;/b&gt;
 &lt;p&gt;Сохранить файл с сессией проекта. Сессия содержит следующие данные:&lt;br&gt;
@@ -50599,252 +50844,252 @@
 &lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4137"/>
+        <location filename="../Project/Project.py" line="4172"/>
         <source>Delete session</source>
         <translation>Удалить сессию</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4141"/>
+        <location filename="../Project/Project.py" line="4176"/>
         <source>Delete the projects session file.</source>
         <translation>Удалить файл с сессией проекта.</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4142"/>
+        <location filename="../Project/Project.py" line="4177"/>
         <source>&lt;b&gt;Delete session&lt;/b&gt;&lt;p&gt;This deletes the projects session file&lt;/p&gt;</source>
         <translation>&lt;b&gt;Удалить сессию&lt;/b&gt;&lt;p&gt;Удалить файл с сессией проекта&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4151"/>
+        <location filename="../Project/Project.py" line="4186"/>
         <source>Code Metrics</source>
         <translation>Метрики кода</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4151"/>
+        <location filename="../Project/Project.py" line="4186"/>
         <source>&amp;Code Metrics...</source>
         <translation>&amp;Метрики кода...</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4155"/>
+        <location filename="../Project/Project.py" line="4190"/>
         <source>Show some code metrics for the project.</source>
         <translation>Отображение некоторых метрик кода проекта.</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4157"/>
+        <location filename="../Project/Project.py" line="4192"/>
         <source>&lt;b&gt;Code Metrics...&lt;/b&gt;&lt;p&gt;This shows some code metrics for all Python files in the project.&lt;/p&gt;</source>
         <translation>&lt;b&gt;Метрики кода...&lt;/b&gt;&lt;p&gt;Отображение некоторых метрик кода для всех Python-файлов проекта.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4165"/>
+        <location filename="../Project/Project.py" line="4200"/>
         <source>Python Code Coverage</source>
         <translation>Покрытие кода Python</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4165"/>
-        <source>Code Co&amp;verage...</source>
-        <translation>&amp;Покрытие кода...</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4169"/>
-        <source>Show code coverage information for the project.</source>
-        <translation>Показать информацию покрытия кода проекта.</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4171"/>
-        <source>&lt;b&gt;Code Coverage...&lt;/b&gt;&lt;p&gt;This shows the code coverage information for all Python files in the project.&lt;/p&gt;</source>
-        <translation>&lt;b&gt;Покрытие кода...&lt;/b&gt;&lt;p&gt;Показать информацию покрытия кода всех Python-файлов проекта.&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="5053"/>
-        <source>Profile Data</source>
-        <translation>Данные профайлера</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4179"/>
-        <source>&amp;Profile Data...</source>
-        <translation>&amp;Данные профайлера...</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4183"/>
-        <source>Show profiling data for the project.</source>
-        <translation>Отображение результатов профилирования проекта.</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4185"/>
-        <source>&lt;b&gt;Profile Data...&lt;/b&gt;&lt;p&gt;This shows the profiling data for the project.&lt;/p&gt;</source>
-        <translation>&lt;b&gt;Данные профайлера...&lt;/b&gt;&lt;p&gt;Отображение результатов профилирования проекта.&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="5107"/>
-        <source>Application Diagram</source>
-        <translation>Диаграмма приложения</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4194"/>
-        <source>&amp;Application Diagram...</source>
-        <translation>&amp;Диаграмма приложения...</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4198"/>
-        <source>Show a diagram of the project.</source>
-        <translation>Показать диаграмму проекта.</translation>
-    </message>
-    <message>
         <location filename="../Project/Project.py" line="4200"/>
+        <source>Code Co&amp;verage...</source>
+        <translation>&amp;Покрытие кода...</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4204"/>
+        <source>Show code coverage information for the project.</source>
+        <translation>Показать информацию покрытия кода проекта.</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4206"/>
+        <source>&lt;b&gt;Code Coverage...&lt;/b&gt;&lt;p&gt;This shows the code coverage information for all Python files in the project.&lt;/p&gt;</source>
+        <translation>&lt;b&gt;Покрытие кода...&lt;/b&gt;&lt;p&gt;Показать информацию покрытия кода всех Python-файлов проекта.&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="5088"/>
+        <source>Profile Data</source>
+        <translation>Данные профайлера</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4214"/>
+        <source>&amp;Profile Data...</source>
+        <translation>&amp;Данные профайлера...</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4218"/>
+        <source>Show profiling data for the project.</source>
+        <translation>Отображение результатов профилирования проекта.</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4220"/>
+        <source>&lt;b&gt;Profile Data...&lt;/b&gt;&lt;p&gt;This shows the profiling data for the project.&lt;/p&gt;</source>
+        <translation>&lt;b&gt;Данные профайлера...&lt;/b&gt;&lt;p&gt;Отображение результатов профилирования проекта.&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="5142"/>
+        <source>Application Diagram</source>
+        <translation>Диаграмма приложения</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4229"/>
+        <source>&amp;Application Diagram...</source>
+        <translation>&amp;Диаграмма приложения...</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4233"/>
+        <source>Show a diagram of the project.</source>
+        <translation>Показать диаграмму проекта.</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4235"/>
         <source>&lt;b&gt;Application Diagram...&lt;/b&gt;&lt;p&gt;This shows a diagram of the project.&lt;/p&gt;</source>
         <translation>&lt;b&gt;Диаграмма приложения...&lt;/b&gt;&lt;p&gt;Отображает диаграмму проекта.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5300"/>
+        <location filename="../Project/Project.py" line="5335"/>
         <source>Create Package List</source>
         <translation>Создать список пакета</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4223"/>
+        <location filename="../Project/Project.py" line="4258"/>
         <source>Create &amp;Package List</source>
         <translation>&amp;Создать список пакета</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5574"/>
+        <location filename="../Project/Project.py" line="5609"/>
         <source>Create Plugin Archive</source>
         <translation>Создать архив плагина</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4239"/>
+        <location filename="../Project/Project.py" line="4274"/>
         <source>Create Plugin &amp;Archives</source>
         <translation>Создать архивы &amp;плагина</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4325"/>
+        <location filename="../Project/Project.py" line="4360"/>
         <source>&amp;Project</source>
         <translation>&amp;Проект</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4326"/>
+        <location filename="../Project/Project.py" line="4361"/>
         <source>Open &amp;Recent Projects</source>
         <translation>Открыть &amp;недавние проекты</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4331"/>
+        <location filename="../Project/Project.py" line="4366"/>
         <source>&amp;Version Control</source>
         <translation>Контроль &amp;версий</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4335"/>
+        <location filename="../Project/Project.py" line="4370"/>
         <source>Chec&amp;k</source>
         <translation>&amp;Проверить</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4337"/>
+        <location filename="../Project/Project.py" line="4372"/>
         <source>Sho&amp;w</source>
         <translation>По&amp;казать</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4338"/>
+        <location filename="../Project/Project.py" line="4373"/>
         <source>&amp;Diagrams</source>
         <translation>&amp;Диаграммы</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4327"/>
+        <location filename="../Project/Project.py" line="4362"/>
         <source>Session</source>
         <translation>Сессия</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4340"/>
+        <location filename="../Project/Project.py" line="4375"/>
         <source>Source &amp;Documentation</source>
         <translation>&amp;Документация исходников</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4328"/>
+        <location filename="../Project/Project.py" line="4363"/>
         <source>Debugger</source>
         <translation>Отладка</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4339"/>
+        <location filename="../Project/Project.py" line="4374"/>
         <source>Pac&amp;kagers</source>
         <translation>У&amp;паковщики</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4465"/>
+        <location filename="../Project/Project.py" line="4500"/>
         <source>Project</source>
         <translation>Проект</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4531"/>
+        <location filename="../Project/Project.py" line="4566"/>
         <source>&amp;Clear</source>
         <translation>&amp;Очистить</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4704"/>
+        <location filename="../Project/Project.py" line="4739"/>
         <source>Search New Files</source>
         <translation>Поиск новых файлов</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4704"/>
+        <location filename="../Project/Project.py" line="4739"/>
         <source>There were no new files found to be added.</source>
         <translation>Не найдено новых файлов для добавления.</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4850"/>
+        <location filename="../Project/Project.py" line="4885"/>
         <source>Version Control System</source>
         <translation>Система контроля версий</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4850"/>
+        <location filename="../Project/Project.py" line="4885"/>
         <source>&lt;p&gt;The selected VCS &lt;b&gt;{0}&lt;/b&gt; could not be found.&lt;br/&gt;Disabling version control.&lt;/p&gt;&lt;p&gt;{1}&lt;/p&gt;</source>
         <translation>&lt;p&gt;Выбранная VCS &lt;b&gt;{0}&lt;/b&gt; не найдена.&lt;br/&gt;Контроль версий отключен.&lt;/p&gt;&lt;p&gt;{1}&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4980"/>
+        <location filename="../Project/Project.py" line="5015"/>
         <source>Coverage Data</source>
         <translation>Данные покрытия</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5030"/>
+        <location filename="../Project/Project.py" line="5065"/>
         <source>There is no main script defined for the current project. Aborting</source>
         <translation>Для текущего проекта не определён главный сценарий. Отмена</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5003"/>
+        <location filename="../Project/Project.py" line="5038"/>
         <source>Code Coverage</source>
         <translation>Покрытие кода</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5003"/>
+        <location filename="../Project/Project.py" line="5038"/>
         <source>Please select a coverage file</source>
         <translation>Пожалуйста, выберите файл покрытия</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5053"/>
+        <location filename="../Project/Project.py" line="5088"/>
         <source>Please select a profile file</source>
         <translation>Пожалуйста, выберите файл профиля</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5107"/>
+        <location filename="../Project/Project.py" line="5142"/>
         <source>Include module names?</source>
         <translation>Включать имена модулей?</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5251"/>
+        <location filename="../Project/Project.py" line="5286"/>
         <source>&lt;p&gt;The file &lt;b&gt;PKGLIST&lt;/b&gt; already exists.&lt;/p&gt;&lt;p&gt;Overwrite it?&lt;/p&gt;</source>
         <translation>&lt;p&gt;Файл &lt;b&gt;PKGLIST&lt;/b&gt; уже существует. Переписать?&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5300"/>
+        <location filename="../Project/Project.py" line="5335"/>
         <source>&lt;p&gt;The file &lt;b&gt;PKGLIST&lt;/b&gt; could not be created.&lt;/p&gt;&lt;p&gt;Reason: {0}&lt;/p&gt;</source>
         <translation>&lt;p&gt;Невозможно создать файл &lt;b&gt;PKGLIST&lt;/b&gt;.&lt;/p&gt;&lt;p&gt;Причина: {0}&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5319"/>
+        <location filename="../Project/Project.py" line="5354"/>
         <source>The project does not have a main script defined. Aborting...</source>
         <translation>Для текущего проекта не определён главный сценарий. Отмена...</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5460"/>
+        <location filename="../Project/Project.py" line="5495"/>
         <source>&lt;p&gt;The file &lt;b&gt;{0}&lt;/b&gt; could not be stored in the archive. Ignoring it.&lt;/p&gt;&lt;p&gt;Reason: {1}&lt;/p&gt;</source>
         <translation>&lt;p&gt;Невозможно сохранить файл &lt;b&gt;{0}&lt;/b&gt; в архиве. Игнорируем его.&lt;/p&gt;&lt;p&gt;Причина: {1}&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5533"/>
+        <location filename="../Project/Project.py" line="5568"/>
         <source>&lt;p&gt;The plugin file &lt;b&gt;{0}&lt;/b&gt; could not be read.&lt;/p&gt;&lt;p&gt;Reason: {1}&lt;/p&gt;</source>
         <translation>&lt;p&gt;Невозможно прочитать файл плагина &lt;b&gt;{0}&lt;/b&gt;.&lt;/p&gt;&lt;p&gt;Причина: {1}&lt;/p&gt;</translation>
     </message>
@@ -50854,32 +51099,32 @@
         <translation>Файлы Python2 (*.py2);;Файлы Python2 GUI (*.pyw2);;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="2441"/>
+        <location filename="../Project/Project.py" line="2458"/>
         <source>Create main script</source>
         <translation>Создать главный сценарий</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="2441"/>
+        <location filename="../Project/Project.py" line="2458"/>
         <source>&lt;p&gt;The mainscript &lt;b&gt;{0}&lt;/b&gt; could not be created.&lt;br/&gt;Reason: {1}&lt;/p&gt;</source>
         <translation>&lt;p&gt;Невозможно создать главный сценарий проекта&lt;b&gt;{0}&lt;/b&gt;.&lt;br&gt;Причина: {1}&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4208"/>
+        <location filename="../Project/Project.py" line="4243"/>
         <source>Load Diagram</source>
         <translation>Загрузить диаграмму</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4208"/>
+        <location filename="../Project/Project.py" line="4243"/>
         <source>&amp;Load Diagram...</source>
         <translation>&amp;Загрузить диаграмму...</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4212"/>
+        <location filename="../Project/Project.py" line="4247"/>
         <source>Load a diagram from file.</source>
         <translation>Загрузить диаграмму из файла.</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4214"/>
+        <location filename="../Project/Project.py" line="4249"/>
         <source>&lt;b&gt;Load Diagram...&lt;/b&gt;&lt;p&gt;This loads a diagram from file.&lt;/p&gt;</source>
         <translation>&lt;b&gt;Загрузить диаграмму...&lt;/b&gt;&lt;p&gt;Загрузить диаграмму из файла.&lt;/p&gt;</translation>
     </message>
@@ -50909,37 +51154,37 @@
         <translation>Консоль PyQt5</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4839"/>
+        <location filename="../Project/Project.py" line="4874"/>
         <source>&lt;p&gt;The selected VCS &lt;b&gt;{0}&lt;/b&gt; could not be found. &lt;br/&gt;Reverting override.&lt;/p&gt;&lt;p&gt;{1}&lt;/p&gt;</source>
         <translation>&lt;p&gt;Выбранная VCS &lt;b&gt;{0}&lt;/b&gt; не найдена.&lt;br/&gt;Возврат отвергнут.&lt;/p&gt;&lt;p&gt;{1}&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5574"/>
+        <location filename="../Project/Project.py" line="5609"/>
         <source>&lt;p&gt;The plugin file &lt;b&gt;{0}&lt;/b&gt; could not be read.&lt;/p&gt; &lt;p&gt;Reason: {1}&lt;/p&gt;</source>
         <translation>&lt;p&gt;Невозможно прочитать файл плагина &lt;b&gt;{0}&lt;/b&gt;.&lt;/p&gt;&lt;p&gt;Причина: {1}&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4228"/>
+        <location filename="../Project/Project.py" line="4263"/>
         <source>Create an initial PKGLIST file for an eric6 plugin.</source>
         <translation>Создать первичный файл PKGLIST для плагина eric6.</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4230"/>
+        <location filename="../Project/Project.py" line="4265"/>
         <source>&lt;b&gt;Create Package List&lt;/b&gt;&lt;p&gt;This creates an initial list of files to include in an eric6 plugin archive. The list is created from the project file.&lt;/p&gt;</source>
         <translation>&lt;b&gt;Создать список пакета&lt;/b&gt;&lt;p&gt;Создаёт начальный список файлов для включения в архив плагина eric6. Список создаётся из файла проекта.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4244"/>
+        <location filename="../Project/Project.py" line="4279"/>
         <source>Create eric6 plugin archive files.</source>
         <translation>Создание архивных файлов плагина eric6.</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4246"/>
+        <location filename="../Project/Project.py" line="4281"/>
         <source>&lt;b&gt;Create Plugin Archives&lt;/b&gt;&lt;p&gt;This creates eric6 plugin archive files using the list of files given in a PKGLIST* file. The archive name is built from the main script name if not designated in the package list file.&lt;/p&gt;</source>
         <translation>&lt;b&gt;Создать архивы плагина&lt;/b&gt;&lt;p&gt;Создание архивных файлов плагина eric6, используя список файлов, приведенный в файле PKGLIST. Имя архива, если оно не задано в файле со списком пакета, создается из имени главного сценария.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5424"/>
+        <location filename="../Project/Project.py" line="5459"/>
         <source>&lt;p&gt;The eric6 plugin archive file &lt;b&gt;{0}&lt;/b&gt; could not be created.&lt;/p&gt;&lt;p&gt;Reason: {1}&lt;/p&gt;</source>
         <translation>&lt;p&gt;Невозможно создать архив плагина &lt;b&gt;{0}&lt;/b&gt; eric6.&lt;/p&gt;&lt;p&gt;Причина: {1}&lt;/p&gt;</translation>
     </message>
@@ -50949,213 +51194,213 @@
         <translation>Плагин eric6</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="2933"/>
+        <location filename="../Project/Project.py" line="2950"/>
         <source>Create project management directory</source>
         <translation>Создать служебную директорию проекта</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="2933"/>
+        <location filename="../Project/Project.py" line="2950"/>
         <source>&lt;p&gt;The project directory &lt;b&gt;{0}&lt;/b&gt; is not writable.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Директория проекта &lt;b&gt;{0}&lt;/b&gt; не доступна для записи.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3958"/>
+        <location filename="../Project/Project.py" line="3993"/>
         <source>Alt+Ctrl+P</source>
         <comment>Project|Search Project File</comment>
         <translation>Alt+Ctrl+P</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3964"/>
+        <location filename="../Project/Project.py" line="3999"/>
         <source>Search for a file in the project list of files.</source>
         <translation>Поиск файла в списке файлов проекта.</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3966"/>
+        <location filename="../Project/Project.py" line="4001"/>
         <source>&lt;b&gt;Search Project File&lt;/b&gt;&lt;p&gt;This searches for a file in the project list of files.&lt;/p&gt;</source>
         <translation>&lt;b&gt;Поиск файла проекта&lt;/b&gt;&lt;p&gt;Поиск файла в списке файлов проекта.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3958"/>
+        <location filename="../Project/Project.py" line="3993"/>
         <source>Search Project File</source>
         <translation>Поиск файла проекта</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3958"/>
+        <location filename="../Project/Project.py" line="3993"/>
         <source>Search Project File...</source>
         <translation>Поиск файла проекта...</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5355"/>
+        <location filename="../Project/Project.py" line="5390"/>
         <source>Create Plugin Archives</source>
         <translation>Создать архивы плагина</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4256"/>
+        <location filename="../Project/Project.py" line="4291"/>
         <source>Create Plugin Archives (Snapshot)</source>
         <translation>Создать архивы плагина (Snapshot)</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4256"/>
+        <location filename="../Project/Project.py" line="4291"/>
         <source>Create Plugin Archives (&amp;Snapshot)</source>
         <translation>Создать архивы плагина (&amp;Snapshot)</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4261"/>
+        <location filename="../Project/Project.py" line="4296"/>
         <source>Create eric6 plugin archive files (snapshot releases).</source>
         <translation>Создание архивных файлов плагина eric6 (snapshot releases).</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4263"/>
+        <location filename="../Project/Project.py" line="4298"/>
         <source>&lt;b&gt;Create Plugin Archives (Snapshot)&lt;/b&gt;&lt;p&gt;This creates eric6 plugin archive files using the list of files given in the PKGLIST* file. The archive name is built from the main script name if not designated in the package list file. The version entry of the main script is modified to reflect a snapshot release.&lt;/p&gt;</source>
         <translation>&lt;b&gt;Создать архивы плагина (Snapshot)&lt;/b&gt;&lt;p&gt;Создание архивных файлов плагина eric6, используя список файлов, приведенный в файле PKGLIST. Имя архива, если оно не задано в файле со списком пакета, создается из имени главного сценария. Версия главного скрипта изменяется в соответствии релизом snapshot.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5333"/>
-        <source>Select package lists:</source>
-        <translation>Выбор списков пакета:</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="5351"/>
-        <source>Creating plugin archives...</source>
-        <translation>Создание архивов плагина...</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="5351"/>
-        <source>Abort</source>
-        <translation>Прервать</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="5351"/>
-        <source>%v/%m Archives</source>
-        <translation>%v из %m архивов</translation>
-    </message>
-    <message>
         <location filename="../Project/Project.py" line="5368"/>
+        <source>Select package lists:</source>
+        <translation>Выбор списков пакета:</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="5386"/>
+        <source>Creating plugin archives...</source>
+        <translation>Создание архивов плагина...</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="5386"/>
+        <source>Abort</source>
+        <translation>Прервать</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="5386"/>
+        <source>%v/%m Archives</source>
+        <translation>%v из %m архивов</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="5403"/>
         <source>&lt;p&gt;The file &lt;b&gt;{0}&lt;/b&gt; could not be read.&lt;/p&gt;&lt;p&gt;Reason: {1}&lt;/p&gt;</source>
         <translation>&lt;p&gt;Невозможно прочитать файл &lt;b&gt;{0}&lt;/b&gt;.&lt;/p&gt;&lt;p&gt;Причина: {1}&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5479"/>
+        <location filename="../Project/Project.py" line="5514"/>
         <source>&lt;p&gt;The eric6 plugin archive files were created with some errors.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Файлы архива плагина eric6 были созданы с ошибками.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5482"/>
+        <location filename="../Project/Project.py" line="5517"/>
         <source>&lt;p&gt;The eric6 plugin archive files were created successfully.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Файлы архива плагина eric6 созданы успешно.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5344"/>
+        <location filename="../Project/Project.py" line="5379"/>
         <source>&lt;p&gt;No package list files (PKGLIST*) available or selected. Aborting...&lt;/p&gt;</source>
         <translation>&lt;p&gt;Файлы со списком пакета (PKGLIST*) не доступны или не выбраны. Отмена...&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5396"/>
+        <location filename="../Project/Project.py" line="5431"/>
         <source>&lt;p&gt;The file &lt;b&gt;{0}&lt;/b&gt; is not ready yet.&lt;/p&gt;&lt;p&gt;Please rework it and delete the&apos;; initial_list&apos; line of the header.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Файл &lt;b&gt;{0}&lt;/b&gt; пока не готов.&lt;/p&gt;&lt;p&gt;Пожалуйста переработайте его и удалите строки &apos;; initial_list&apos; из его заголовка.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3949"/>
+        <location filename="../Project/Project.py" line="3984"/>
         <source>&lt;b&gt;Search new files...&lt;/b&gt;&lt;p&gt;This searches for new files (sources, *.ui, *.idl, *.proto) in the project directory and registered subdirectories.&lt;/p&gt;</source>
         <translation>&lt;b&gt;Поиск новых файлов...&lt;/b&gt;&lt;p&gt; Поиск новых файлов (источники, * .ui, * .idl, * .proto) в директории проекта и зарегистрированных поддиректориях..&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4007"/>
+        <location filename="../Project/Project.py" line="4042"/>
         <source>&lt;b&gt;Filetype Associations...&lt;/b&gt;&lt;p&gt;This shows a dialog to edit the file type associations of the project. These associations determine the type (source, form, interface, protocol or others) with a filename pattern. They are used when adding a file to the project and when performing a search for new files.&lt;/p&gt;</source>
         <translation>&lt;b&gt;Ассоциации типов файлов...&lt;/b&gt;&lt;p&gt;Отображается диалоговое окно для редактирования ассоциаций типов файлов проекта. Эти ассоциации определяют тип (источник, форму, интерфейс, протокол или другие) с шаблоном имени файла. Они используются при добавлении файла в проект и при поиске новых файлов.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1519"/>
+        <location filename="../Project/Project.py" line="1531"/>
         <source>&lt;p&gt;The selected translation file &lt;b&gt;{0}&lt;/b&gt; could not be deleted.&lt;/p&gt;&lt;p&gt;Reason: {1}&lt;/p&gt;</source>
         <translation>&lt;p&gt;Невозможно удалить файла перевода &lt;b&gt;{0}&lt;/b&gt;.&lt;/p&gt;&lt;p&gt;Причина: {1}&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="2233"/>
+        <location filename="../Project/Project.py" line="2250"/>
         <source>&lt;p&gt;The selected file &lt;b&gt;{0}&lt;/b&gt; could not be deleted.&lt;/p&gt;&lt;p&gt;Reason: {1}&lt;/p&gt;</source>
         <translation>&lt;p&gt;Невозможно удалить выбранный файл &lt;b&gt;{0}&lt;/b&gt;.&lt;/p&gt;&lt;p&gt;Причина: {1}&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="2263"/>
+        <location filename="../Project/Project.py" line="2280"/>
         <source>&lt;p&gt;The selected directory &lt;b&gt;{0}&lt;/b&gt; could not be deleted.&lt;/p&gt;&lt;p&gt;Reason: {1}&lt;/p&gt;</source>
         <translation>&lt;p&gt;Невозможно удалить выбранную директорию &lt;b&gt;{0}&lt;/b&gt;.&lt;/p&gt;&lt;p&gt;Причина: {1}&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="2756"/>
+        <location filename="../Project/Project.py" line="2773"/>
         <source>Create Makefile</source>
         <translation>Создать Makefile</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="2756"/>
+        <location filename="../Project/Project.py" line="2773"/>
         <source>&lt;p&gt;The makefile &lt;b&gt;{0}&lt;/b&gt; could not be created.&lt;br/&gt;Reason: {1}&lt;/p&gt;</source>
         <translation>&lt;p&gt;Файл makefile &lt;b&gt;{0}&lt;/b&gt; невозможно создать.&lt;br/&gt;Причина: {1}&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5760"/>
+        <location filename="../Project/Project.py" line="5795"/>
         <source>Execute Make</source>
         <translation>Выполнить Make</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4277"/>
+        <location filename="../Project/Project.py" line="4312"/>
         <source>&amp;Execute Make</source>
         <translation>&amp;Выполнить Make</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4281"/>
+        <location filename="../Project/Project.py" line="4316"/>
         <source>Perform a &apos;make&apos; run.</source>
         <translation>Выполнить прогон &apos;make&apos;.</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4283"/>
+        <location filename="../Project/Project.py" line="4318"/>
         <source>&lt;b&gt;Execute Make&lt;/b&gt;&lt;p&gt;This performs a &apos;make&apos; run to rebuild the configured target.&lt;/p&gt;</source>
         <translation>&lt;b&gt;Выполнить Make&lt;/b&gt;&lt;p&gt;Выполнение прогона &apos;make&apos; для пересборки настроеной цели.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5740"/>
+        <location filename="../Project/Project.py" line="5775"/>
         <source>Test for Changes</source>
         <translation>Проверить изменения</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4291"/>
+        <location filename="../Project/Project.py" line="4326"/>
         <source>&amp;Test for Changes</source>
         <translation>&amp;Проверить изменения</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4295"/>
+        <location filename="../Project/Project.py" line="4330"/>
         <source>Question &apos;make&apos;, if a rebuild is needed.</source>
         <translation>Запрос &apos;make&apos;, если необходима пересборка.</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4297"/>
+        <location filename="../Project/Project.py" line="4332"/>
         <source>&lt;b&gt;Test for Changes&lt;/b&gt;&lt;p&gt;This questions &apos;make&apos;, if a rebuild of the configured target is necessary.&lt;/p&gt;</source>
         <translation>&lt;b&gt;Проверка изменений&lt;/b&gt;&lt;p&gt;Запрос &apos;make&apos;, если требуется пересборка настроенной цели.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4342"/>
+        <location filename="../Project/Project.py" line="4377"/>
         <source>Make</source>
         <translation>Make</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5688"/>
+        <location filename="../Project/Project.py" line="5723"/>
         <source>The make process did not start.</source>
         <translation>Make-процесс не был запущен.</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5733"/>
+        <location filename="../Project/Project.py" line="5768"/>
         <source>The make process crashed.</source>
         <translation>Make-процесс разрушен.</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5743"/>
+        <location filename="../Project/Project.py" line="5778"/>
         <source>&lt;p&gt;There are changes that require the configured make target &lt;b&gt;{0}&lt;/b&gt; to be rebuilt.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Существуют изменения, которые требуют конфигурации make-цели &lt;b&gt;{0}&lt;/b&gt; для ее пересборки.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5748"/>
+        <location filename="../Project/Project.py" line="5783"/>
         <source>&lt;p&gt;There are changes that require the default make target to be rebuilt.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Существуют изменения, которые требуют make-цель по умолчанию для ее пересборки.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5760"/>
+        <location filename="../Project/Project.py" line="5795"/>
         <source>The makefile contains errors.</source>
         <translation>Makefile содержит ошибки.</translation>
     </message>
@@ -51170,7 +51415,7 @@
         <translation>Консоль PySide2</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4330"/>
+        <location filename="../Project/Project.py" line="4365"/>
         <source>Project-T&amp;ools</source>
         <translation>&amp;Инструменты-проекта</translation>
     </message>
@@ -51274,7 +51519,7 @@
         <translation>Статус VCS</translation>
     </message>
     <message>
-        <location filename="../Project/ProjectBrowserModel.py" line="782"/>
+        <location filename="../Project/ProjectBrowserModel.py" line="798"/>
         <source>local</source>
         <translation>локальный</translation>
     </message>
@@ -51287,21 +51532,11 @@
         <translation>&lt;b&gt;Настройка параметров просмотра проектов&lt;/b&gt;</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/ProjectBrowserPage.ui" line="37"/>
-        <source>Colours</source>
-        <translation>Цвета</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/ProjectBrowserPage.ui" line="43"/>
         <source>Highlighted entries (Others):</source>
         <translation>Выделенные записи (другие):</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/ProjectBrowserPage.ui" line="56"/>
-        <source>Select the colour for highlighted entries in the Others viewer.</source>
-        <translation>Выберите цвет для выделения записей в других просмотрщиках.</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/ProjectBrowserPage.ui" line="82"/>
         <source>Visible Project Browsers</source>
         <translation>Видимые браузеры проекта</translation>
@@ -51426,6 +51661,16 @@
         <source>Protocols (protobuf) Browser</source>
         <translation>Просмотр протоколов (protobuf)</translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/ProjectBrowserPage.ui" line="37"/>
+        <source>Colors</source>
+        <translation>Цвет</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/ProjectBrowserPage.ui" line="56"/>
+        <source>Select the color for highlighted entries in the Others viewer.</source>
+        <translation>Выберите цвет для выделения записей в других просмотрщиках.</translation>
+    </message>
 </context>
 <context>
     <name>ProjectFormsBrowser</name>
@@ -61330,54 +61575,54 @@
         <translation>Настроить...</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="767"/>
+        <location filename="../QScintilla/Shell.py" line="771"/>
         <source>Select History</source>
         <translation>Выберите историю</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="767"/>
+        <location filename="../QScintilla/Shell.py" line="771"/>
         <source>Select the history entry to execute (most recent shown last).</source>
         <translation>Выберите одну из предыдущих команд для выполнения.</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="835"/>
+        <location filename="../QScintilla/Shell.py" line="839"/>
         <source>Passive Debug Mode</source>
         <translation>Режим пассивной отладки</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="836"/>
+        <location filename="../QScintilla/Shell.py" line="840"/>
         <source>
 Not connected</source>
         <translation>
 Нет соединения</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="839"/>
+        <location filename="../QScintilla/Shell.py" line="843"/>
         <source>No.</source>
         <translation>Нет.</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="841"/>
+        <location filename="../QScintilla/Shell.py" line="845"/>
         <source>{0} on {1}, {2}</source>
         <translation>{0} on {1}, {2}</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="1030"/>
+        <location filename="../QScintilla/Shell.py" line="1034"/>
         <source>StdOut: {0}</source>
         <translation>StdOut: {0}</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="1038"/>
+        <location filename="../QScintilla/Shell.py" line="1042"/>
         <source>StdErr: {0}</source>
         <translation>StdErr: {0}</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="2157"/>
+        <location filename="../QScintilla/Shell.py" line="2161"/>
         <source>Drop Error</source>
         <translation>Ошибка Drag&amp;&amp;Drop</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="2157"/>
+        <location filename="../QScintilla/Shell.py" line="2161"/>
         <source>&lt;p&gt;&lt;b&gt;{0}&lt;/b&gt; is not a file.&lt;/p&gt;</source>
         <translation>&lt;p&gt;&lt;b&gt;{0}&lt;/b&gt; не является файлом&lt;/p&gt;</translation>
     </message>
@@ -61387,7 +61632,7 @@
         <translation>Найти</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="888"/>
+        <location filename="../QScintilla/Shell.py" line="892"/>
         <source>Exception &quot;{0}&quot;
 {1}
 File: {2}, Line: {3}
@@ -61398,14 +61643,14 @@
 </translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="923"/>
+        <location filename="../QScintilla/Shell.py" line="927"/>
         <source>Unspecified syntax error.
 </source>
         <translation>Неизвестная синтакcическая ошибка.
 </translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="898"/>
+        <location filename="../QScintilla/Shell.py" line="902"/>
         <source>Exception &quot;{0}&quot;
 {1}
 </source>
@@ -61414,21 +61659,21 @@
 </translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="925"/>
+        <location filename="../QScintilla/Shell.py" line="929"/>
         <source>Syntax error &quot;{1}&quot; in file {0} at line {2}, character {3}.
 </source>
         <translation>Синтаксическая ошибка &quot;{1}&quot; в файле {0} в строке {2}, символ {3}.
 </translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="948"/>
+        <location filename="../QScintilla/Shell.py" line="952"/>
         <source>Signal &quot;{0}&quot; generated in file {1} at line {2}.
 Function: {3}({4})</source>
         <translation>Сигнал &quot;{0}&quot; сгенерирован в файле {1} в строке {2}.
 Функция: {3}({4})</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="2015"/>
+        <location filename="../QScintilla/Shell.py" line="2019"/>
         <source>Project</source>
         <translation>Проект</translation>
     </message>
@@ -61458,7 +61703,7 @@
         <translation>Активное виртуальное окружение</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="1835"/>
+        <location filename="../QScintilla/Shell.py" line="1839"/>
         <source>Available Virtual Environments:
 {0}
 </source>
@@ -61467,7 +61712,7 @@
 </translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="1876"/>
+        <location filename="../QScintilla/Shell.py" line="1880"/>
         <source>Current Virtual Environment: &apos;{0}&apos;
 </source>
         <translation>Текущее виртуальное окружение: &apos;{0}&apos;
@@ -69571,7 +69816,7 @@
         <translation>Обработчик:</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/Sync/SyncCheckPage.py" line="56"/>
+        <location filename="../WebBrowser/Sync/SyncCheckPage.py" line="50"/>
         <source>Host:</source>
         <translation>Хост:</translation>
     </message>
@@ -69601,22 +69846,22 @@
         <translation>Настройки агента пользователя:</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/Sync/SyncCheckPage.py" line="55"/>
+        <location filename="../WebBrowser/Sync/SyncCheckPage.py" line="49"/>
         <source>FTP</source>
         <translation>FTP</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/Sync/SyncCheckPage.py" line="68"/>
+        <location filename="../WebBrowser/Sync/SyncCheckPage.py" line="62"/>
         <source>No Synchronization</source>
         <translation>Нет синхронизации</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/Sync/SyncCheckPage.py" line="211"/>
+        <location filename="../WebBrowser/Sync/SyncCheckPage.py" line="204"/>
         <source>&lt;font color=&quot;#FF0000&quot;&gt;&lt;b&gt;Error:&lt;/b&gt; {0}&lt;/font&gt;</source>
         <translation>&lt;font color=&quot;#FF0000&quot;&gt;&lt;b&gt;Ошибка:&lt;/b&gt; {0}&lt;/font&gt;</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/Sync/SyncCheckPage.py" line="63"/>
+        <location filename="../WebBrowser/Sync/SyncCheckPage.py" line="57"/>
         <source>Shared Directory</source>
         <translation>Общая директория</translation>
     </message>
@@ -69626,7 +69871,7 @@
         <translation>Настройки быстрых вкладок:</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/Sync/SyncCheckPage.py" line="64"/>
+        <location filename="../WebBrowser/Sync/SyncCheckPage.py" line="58"/>
         <source>Directory:</source>
         <translation>Директория:</translation>
     </message>
@@ -71299,12 +71544,12 @@
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/TasksPage.ui" line="105"/>
-        <source>Tasks Background Colours</source>
+        <source>Tasks Background Colors</source>
         <translation>Цвет фона задач</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/TasksPage.ui" line="206"/>
-        <source>Select the background colour for these tasks.</source>
+        <source>Select the background color for these tasks.</source>
         <translation>Выберите цвет фона для этих задач.</translation>
     </message>
 </context>
@@ -71903,7 +72148,7 @@
     <message>
         <location filename="../Preferences/ToolConfigurationDialog.ui" line="205"/>
         <source>&amp;Icon file:</source>
-        <translation>Файл &amp;пиктограммы:</translation>
+        <translation>Файл &amp;иконки:</translation>
     </message>
     <message>
         <location filename="../Preferences/ToolConfigurationDialog.ui" line="265"/>
@@ -71918,14 +72163,14 @@
     <message>
         <location filename="../Preferences/ToolConfigurationDialog.ui" line="224"/>
         <source>Enter the filename of the icon</source>
-        <translation>Введите имя файла пиктограммы</translation>
+        <translation>Введите имя файла иконки</translation>
     </message>
     <message>
         <location filename="../Preferences/ToolConfigurationDialog.ui" line="227"/>
         <source>&lt;b&gt;Icon&lt;/b&gt;
 &lt;p&gt;Enter the filename of the icon.&lt;/p&gt;</source>
-        <translation>&lt;b&gt;Пиктограмма&lt;/b&gt;
-&lt;p&gt;Задайте имя файла, содержащего пиктограмму.&lt;/p&gt;</translation>
+        <translation>&lt;b&gt;Иконка&lt;/b&gt;
+&lt;p&gt;Введите имя файла, содержащего иконку.&lt;/p&gt;</translation>
     </message>
     <message>
         <location filename="../Preferences/ToolConfigurationDialog.ui" line="286"/>
@@ -72368,27 +72613,27 @@
 <context>
     <name>Translator</name>
     <message>
-        <location filename="../Plugins/UiExtensionPlugins/Translator/Translator.py" line="52"/>
+        <location filename="../Plugins/UiExtensionPlugins/Translator/Translator.py" line="63"/>
         <source>Translator</source>
         <translation>Переводчик</translation>
     </message>
     <message>
-        <location filename="../Plugins/UiExtensionPlugins/Translator/Translator.py" line="52"/>
+        <location filename="../Plugins/UiExtensionPlugins/Translator/Translator.py" line="63"/>
         <source>T&amp;ranslator</source>
         <translation>Пе&amp;реводчик</translation>
     </message>
     <message>
-        <location filename="../Plugins/UiExtensionPlugins/Translator/Translator.py" line="52"/>
+        <location filename="../Plugins/UiExtensionPlugins/Translator/Translator.py" line="63"/>
         <source>Alt+Shift+R</source>
         <translation>Alt+Shift+R</translation>
     </message>
     <message>
-        <location filename="../Plugins/UiExtensionPlugins/Translator/Translator.py" line="58"/>
+        <location filename="../Plugins/UiExtensionPlugins/Translator/Translator.py" line="69"/>
         <source>Switch the input focus to the Translator window.</source>
         <translation>Переключить фокус ввода в окно перевода.</translation>
     </message>
     <message>
-        <location filename="../Plugins/UiExtensionPlugins/Translator/Translator.py" line="60"/>
+        <location filename="../Plugins/UiExtensionPlugins/Translator/Translator.py" line="71"/>
         <source>&lt;b&gt;Activate Translator&lt;/b&gt;&lt;p&gt;This switches the input focus to the Translator window.&lt;/p&gt;</source>
         <translation>&lt;b&gt;Активация перевода&lt;/b&gt;&lt;p&gt;Переключение фокуса ввода в окно перевода.&lt;/p&gt;</translation>
     </message>
@@ -72396,52 +72641,52 @@
 <context>
     <name>TranslatorEngines</name>
     <message>
-        <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorEngines/__init__.py" line="37"/>
+        <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorEngines/__init__.py" line="39"/>
         <source>Google V.1</source>
         <translation>Google V.1</translation>
     </message>
     <message>
-        <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorEngines/__init__.py" line="39"/>
-        <source>MyMemory</source>
-        <translation>MyMemory</translation>
-    </message>
-    <message>
         <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorEngines/__init__.py" line="41"/>
-        <source>Glosbe</source>
-        <translation>Glosbe</translation>
+        <source>MyMemory</source>
+        <translation>MyMemory</translation>
     </message>
     <message>
         <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorEngines/__init__.py" line="43"/>
-        <source>PROMT</source>
-        <translation>PROMT</translation>
+        <source>Glosbe</source>
+        <translation>Glosbe</translation>
     </message>
     <message>
         <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorEngines/__init__.py" line="45"/>
-        <source>Yandex</source>
-        <translation>Yandex</translation>
-    </message>
-    <message>
-        <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorEngines/__init__.py" line="55"/>
-        <source>Unknow translation service name ({0})</source>
-        <translation>Имя неизвестного сервиса перевода ({0})</translation>
+        <source>PROMT</source>
+        <translation>PROMT</translation>
     </message>
     <message>
         <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorEngines/__init__.py" line="47"/>
-        <source>Google V.2</source>
-        <translation>Google V.2</translation>
+        <source>Yandex</source>
+        <translation>Yandex</translation>
+    </message>
+    <message>
+        <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorEngines/__init__.py" line="57"/>
+        <source>Unknow translation service name ({0})</source>
+        <translation>Имя неизвестного сервиса перевода ({0})</translation>
     </message>
     <message>
         <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorEngines/__init__.py" line="49"/>
+        <source>Google V.2</source>
+        <translation>Google V.2</translation>
+    </message>
+    <message>
+        <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorEngines/__init__.py" line="51"/>
         <source>Microsoft</source>
         <translation>Microsoft</translation>
     </message>
     <message>
+        <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorEngines/__init__.py" line="55"/>
+        <source>IBM Watson</source>
+        <translation>IBM Watson</translation>
+    </message>
+    <message>
         <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorEngines/__init__.py" line="53"/>
-        <source>IBM Watson</source>
-        <translation>IBM Watson</translation>
-    </message>
-    <message>
-        <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorEngines/__init__.py" line="51"/>
         <source>DeepL Pro</source>
         <translation>DeepL Pro</translation>
     </message>
@@ -72669,16 +72914,6 @@
         <translation></translation>
     </message>
     <message>
-        <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorLanguagesDb.py" line="79"/>
-        <source>Chinese S</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorLanguagesDb.py" line="80"/>
-        <source>Chinese T</source>
-        <translation></translation>
-    </message>
-    <message>
         <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorLanguagesDb.py" line="31"/>
         <source>Afrikaans</source>
         <translation></translation>
@@ -72698,6 +72933,16 @@
         <source>Hebrew (iw)</source>
         <translation></translation>
     </message>
+    <message>
+        <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorLanguagesDb.py" line="79"/>
+        <source>Chinese (China)</source>
+        <translation>Chinese (China)</translation>
+    </message>
+    <message>
+        <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorLanguagesDb.py" line="80"/>
+        <source>Chinese (Taiwan)</source>
+        <translation>Chinese (Taiwan)</translation>
+    </message>
 </context>
 <context>
     <name>TranslatorPage</name>
@@ -72875,7 +73120,7 @@
 <context>
     <name>TranslatorPlugin</name>
     <message>
-        <location filename="../Plugins/PluginTranslator.py" line="65"/>
+        <location filename="../Plugins/PluginTranslator.py" line="71"/>
         <source>Translator</source>
         <translation>Перевод</translation>
     </message>
@@ -76296,7 +76541,7 @@
     <message>
         <location filename="../UI/UserInterface.py" line="2854"/>
         <source>&lt;b&gt;Eric API Documentation&lt;/b&gt;&lt;p&gt;Display the Eric API documentation. The location for the documentation is the Documentation/Source subdirectory of the eric6 installation directory.&lt;/p&gt;</source>
-        <translation>&lt;b&gt;Документация eric API&lt;/b&gt;&lt;p&gt;Показать документацию eric API. Местонахождение документации - каталог Documentation/Source, расположенный в директории инсталляции eric6.&lt;/p&gt;</translation>
+        <translation>&lt;b&gt;Документация API eric&lt;/b&gt;&lt;p&gt;Показать документацию API eric. Местонахождение документации - каталог Documentation/Source, расположенный в директории инсталляции eric6.&lt;/p&gt;</translation>
     </message>
     <message>
         <location filename="../UI/UserInterface.py" line="5062"/>
@@ -77412,68 +77657,68 @@
         <translation>Автоматическое обновление</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="128"/>
-        <source>Colours</source>
-        <translation>Цвета VCS статуса</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="134"/>
         <source>VCS status &quot;added&quot;:</source>
         <translation>статус &quot;добавлен&quot;:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="147"/>
-        <source>Select the background colour for entries with VCS status &quot;added&quot;.</source>
-        <translation>Задайте цвет фона для записей с VCS-статусом &quot;добавлен&quot;.</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="157"/>
         <source>VCS status &quot;conflict&quot;:</source>
         <translation>статус &quot;конфликт&quot;:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="170"/>
-        <source>Select the background colour for entries with VCS status &quot;conflict&quot;.</source>
-        <translation>Задайте цвет фона для записей с VCS-статусом &quot;конфликт&quot;.</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="193"/>
         <source>VCS status &quot;modified&quot;:</source>
         <translation>статус &quot;изменён&quot;:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="206"/>
-        <source>Select the background colour for entries with VCS status &quot;modified&quot;.</source>
-        <translation>Задайте цвет фона для записей с VCS-статусом &quot;изменён&quot;.</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="216"/>
         <source>VCS status &quot;replaced&quot;:</source>
         <translation>статус &quot;замещён&quot;:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="229"/>
-        <source>Select the background colour for entries with VCS status &quot;replaced&quot;.</source>
-        <translation>Задайте цвет фона для записей с VCS-статусом &quot;замещён&quot;.</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="239"/>
         <source>VCS status &quot;needs update&quot;:</source>
         <translation>статус &quot;требует обновления&quot;:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="252"/>
-        <source>Select the background colour for entries with VCS status &quot;needs update&quot;.</source>
-        <translation>Задайте цвет фона для записей с VCS-статусом &quot;требует обновления&quot;.</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="262"/>
         <source>VCS status &quot;removed&quot;:</source>
         <translation>статус &quot;удалён&quot;:</translation>
     </message>
     <message>
+        <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="128"/>
+        <source>Colors</source>
+        <translation>Цвет</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="147"/>
+        <source>Select the background color for entries with VCS status &quot;added&quot;.</source>
+        <translation>Задайте цвет фона для записей с VCS-статусом &quot;добавлен&quot;.</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="170"/>
+        <source>Select the background color for entries with VCS status &quot;conflict&quot;.</source>
+        <translation>Задайте цвет фона для записей с VCS-статусом &quot;конфликт&quot;.</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="206"/>
+        <source>Select the background color for entries with VCS status &quot;modified&quot;.</source>
+        <translation>Задайте цвет фона для записей с VCS-статусом &quot;изменён&quot;.</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="229"/>
+        <source>Select the background color for entries with VCS status &quot;replaced&quot;.</source>
+        <translation>Задайте цвет фона для записей с VCS-статусом &quot;замещён&quot;.</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="252"/>
+        <source>Select the background color for entries with VCS status &quot;needs update&quot;.</source>
+        <translation>Задайте цвет фона для записей с VCS-статусом &quot;требует обновления&quot;.</translation>
+    </message>
+    <message>
         <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="275"/>
-        <source>Select the background colour for entries with VCS status &quot;removed&quot;.</source>
+        <source>Select the background color for entries with VCS status &quot;removed&quot;.</source>
         <translation>Задайте цвет фона для записей с VCS-статусом &quot;удалён&quot;.</translation>
     </message>
 </context>
@@ -80876,7 +81121,7 @@
     <message>
         <location filename="../ViewManager/ViewManager.py" line="1375"/>
         <source>&lt;b&gt;Complete from APIs&lt;/b&gt;&lt;p&gt;Performs a completion from APIs of the word containing the cursor.&lt;/p&gt;</source>
-        <translation>&lt;b&gt;Дополнить из APIs&lt;/b&gt;&lt;p&gt;Выполняется дополнение слова, содержащего курсор, из APIs.&lt;/p&gt;</translation>
+        <translation>&lt;b&gt;Дополнить из API&lt;/b&gt;&lt;p&gt;Выполняется дополнение слова, содержащего курсор, из API.&lt;/p&gt;</translation>
     </message>
     <message>
         <location filename="../ViewManager/ViewManager.py" line="1385"/>
@@ -82457,21 +82702,6 @@
         <translation>Минимальный размер логического шрифта:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="279"/>
-        <source>Colours</source>
-        <translation>Цвета</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="285"/>
-        <source>Background colour of secure URLs:</source>
-        <translation>Цвет фона защищенных URL:</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="298"/>
-        <source>Select the background colour for secure URLs.</source>
-        <translation>Выбор цвета фона защищенных URLs.</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="324"/>
         <source>Images</source>
         <translation>Изображения</translation>
@@ -82566,6 +82796,21 @@
         <source>Show Scrollbars</source>
         <translation>Показывать полосы прокрутки</translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="279"/>
+        <source>Colors</source>
+        <translation>Цвет</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="285"/>
+        <source>Background color of secure URLs:</source>
+        <translation>Цвет фона защищенных URL:</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="298"/>
+        <source>Select the background color for secure URLs.</source>
+        <translation>Выберите цвет фона безопасных URL-адресов.</translation>
+    </message>
 </context>
 <context>
     <name>WebBrowserClearPrivateDataDialog</name>
@@ -83455,12 +83700,12 @@
         <translation> сек</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserPage.py" line="171"/>
+        <location filename="../WebBrowser/WebBrowserPage.py" line="172"/>
         <source>Suspicuous URL detected</source>
         <translation>Обнаружен подозрительный URL</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserPage.py" line="171"/>
+        <location filename="../WebBrowser/WebBrowserPage.py" line="172"/>
         <source>&lt;p&gt;The URL &lt;b&gt;{0}&lt;/b&gt; was found in the Safe Browsing database.&lt;/p&gt;{1}</source>
         <translation>&lt;p&gt;URL &lt;b&gt;{0}&lt;/b&gt; был найден в базе Safe Browsing.&lt;/p&gt;{1}</translation>
     </message>
@@ -83764,112 +84009,112 @@
 <context>
     <name>WebBrowserTabWidget</name>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="124"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="122"/>
         <source>Show a navigation menu</source>
         <translation>Меню навигации</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="137"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="135"/>
         <source>Show a navigation menu for closed tabs</source>
         <translation>Меню навигации для закрытых вкладок</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="151"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="149"/>
         <source>Open a new web browser tab</source>
         <translation>Открыть новую вкладку web-браузера</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="165"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="163"/>
         <source>New Tab</source>
         <translation>Новая вкладка</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="169"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="167"/>
         <source>Move Left</source>
         <translation>Сдвинуть влево</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="172"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="170"/>
         <source>Move Right</source>
         <translation>Сдвинуть вправо</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="176"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="174"/>
         <source>Duplicate Page</source>
         <translation>Продублировать страницу</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="179"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="177"/>
         <source>Close</source>
         <translation>Закрыть</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="182"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="180"/>
         <source>Close Others</source>
         <translation>Закрыть остальные</translation>
     </message>
     <message>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="211"/>
+        <source>Close All</source>
+        <translation>Закрыть все</translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="186"/>
+        <source>Print Preview</source>
+        <translation>Предварительный просмотр печати</translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="189"/>
+        <source>Print</source>
+        <translation>Печать</translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="192"/>
+        <source>Print as PDF</source>
+        <translation>Печать как PDF</translation>
+    </message>
+    <message>
         <location filename="../WebBrowser/WebBrowserTabWidget.py" line="213"/>
-        <source>Close All</source>
-        <translation>Закрыть все</translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="188"/>
-        <source>Print Preview</source>
-        <translation>Предварительный просмотр печати</translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="191"/>
-        <source>Print</source>
-        <translation>Печать</translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="194"/>
-        <source>Print as PDF</source>
-        <translation>Печать как PDF</translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="215"/>
         <source>Reload All</source>
         <translation>Перезагрузить все</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="218"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="216"/>
         <source>Bookmark All Tabs</source>
         <translation>Создать закладку для всех вкладок</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="222"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="220"/>
         <source>Restore Closed Tab</source>
         <translation>Восстановить закрытые вкладки</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="458"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="456"/>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="898"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="892"/>
         <source>Loading...</source>
         <translation>Загрузка...</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="918"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="912"/>
         <source>Finished loading</source>
         <translation>Загрузка завершена</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="920"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="914"/>
         <source>Failed to load</source>
         <translation>Загрука не удалась</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="961"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="955"/>
         <source>Are you sure you want to close the window?</source>
         <translation>Вы действительно хотите закрыть окно?</translation>
     </message>
     <message numerus="yes">
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="961"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="955"/>
         <source>Are you sure you want to close the window?
 You have %n tab(s) open.</source>
         <translation>
@@ -83882,47 +84127,47 @@
         </translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="968"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="962"/>
         <source>&amp;Quit</source>
         <translation>&amp;Выход</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="971"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="965"/>
         <source>C&amp;lose Current Tab</source>
         <translation>&amp;Закрыть текущую вкладку</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="1152"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="1146"/>
         <source>Restore All Closed Tabs</source>
         <translation>Восстановить все закрытые вкладки</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="1154"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="1148"/>
         <source>Clear List</source>
         <translation>Очистить список</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="252"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="250"/>
         <source>Unmute Tab</source>
         <translation>Включить звук во вкладке</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="256"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="254"/>
         <source>Mute Tab</source>
         <translation>Отключить звук во вкладке</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="755"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="753"/>
         <source>Print to PDF</source>
         <translation>Печать в PDF</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="705"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="703"/>
         <source>&lt;p&gt;The file &lt;b&gt;{0}&lt;/b&gt; exists already. Shall it be overwritten?&lt;/p&gt;</source>
         <translation>&lt;p&gt;Файл &lt;b&gt;{0}&lt;/b&gt; уже существует. Переписать его?&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="755"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="753"/>
         <source>&lt;p&gt;The PDF could not be written to file &lt;b&gt;{0}&lt;/b&gt;.&lt;/p&gt;&lt;p&gt;&lt;b&gt;Error:&lt;/b&gt; {1}&lt;/p&gt;</source>
         <translation>&lt;p&gt;PDF не может быть записан в файл &lt;b&gt;{0}&lt;/b&gt;.&lt;/p&gt;&lt;p&gt;&lt;b&gt;Ошибка:&lt;/b&gt; {1}&lt;/p&gt;</translation>
     </message>
--- a/eric6/i18n/eric6_tr.ts	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/i18n/eric6_tr.ts	Sat May 02 13:51:07 2020 +0200
@@ -1211,12 +1211,12 @@
         <translation type="unfinished">&lt;&lt;Diğerleri&gt;&gt;</translation>
     </message>
     <message>
-        <location filename="../Graphics/ApplicationDiagramBuilder.py" line="292"/>
+        <location filename="../Graphics/ApplicationDiagramBuilder.py" line="294"/>
         <source>Load Diagram</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Graphics/ApplicationDiagramBuilder.py" line="292"/>
+        <location filename="../Graphics/ApplicationDiagramBuilder.py" line="294"/>
         <source>&lt;p&gt;The diagram belongs to the project &lt;b&gt;{0}&lt;/b&gt;. Shall this project be opened?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2384,32 +2384,32 @@
 <context>
     <name>BrowserModel</name>
     <message>
-        <location filename="../UI/BrowserModel.py" line="62"/>
+        <location filename="../UI/BrowserModel.py" line="63"/>
         <source>Name</source>
         <translation>Adı</translation>
     </message>
     <message>
-        <location filename="../UI/BrowserModel.py" line="654"/>
+        <location filename="../UI/BrowserModel.py" line="655"/>
         <source>Coding: {0}</source>
         <translation>Kodlama: {0}</translation>
     </message>
     <message>
-        <location filename="../UI/BrowserModel.py" line="660"/>
+        <location filename="../UI/BrowserModel.py" line="661"/>
         <source>Globals</source>
         <translation>Evrensel</translation>
     </message>
     <message>
-        <location filename="../UI/BrowserModel.py" line="730"/>
+        <location filename="../UI/BrowserModel.py" line="731"/>
         <source>Attributes</source>
         <translation>Nitelikler</translation>
     </message>
     <message>
-        <location filename="../UI/BrowserModel.py" line="740"/>
+        <location filename="../UI/BrowserModel.py" line="741"/>
         <source>Class Attributes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/BrowserModel.py" line="666"/>
+        <location filename="../UI/BrowserModel.py" line="667"/>
         <source>Imports</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3103,54 +3103,54 @@
 <context>
     <name>CodeDocumentationViewer</name>
     <message>
-        <location filename="../UI/CodeDocumentationViewer.py" line="175"/>
+        <location filename="../UI/CodeDocumentationViewer.py" line="211"/>
         <source>Code Info Provider:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/CodeDocumentationViewer.py" line="188"/>
+        <location filename="../UI/CodeDocumentationViewer.py" line="224"/>
         <source>Select the code info provider</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/CodeDocumentationViewer.py" line="190"/>
+        <location filename="../UI/CodeDocumentationViewer.py" line="226"/>
         <source>&lt;disabled&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/CodeDocumentationViewer.py" line="371"/>
+        <location filename="../UI/CodeDocumentationViewer.py" line="407"/>
         <source>No documentation available</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/CodeDocumentationViewer.py" line="392"/>
+        <location filename="../UI/CodeDocumentationViewer.py" line="428"/>
         <source>No source code documentation provider has been registered. This function has been disabled.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/CodeDocumentationViewer.py" line="397"/>
+        <location filename="../UI/CodeDocumentationViewer.py" line="433"/>
         <source>This function has been disabled.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/CodeDocumentationViewerTemplate.py" line="137"/>
+        <location filename="../UI/CodeDocumentationViewerTemplate.py" line="139"/>
         <source>No further documentation available</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/CodeDocumentationViewerTemplate.py" line="58"/>
+        <location filename="../UI/CodeDocumentationViewerTemplate.py" line="60"/>
         <source>&lt;p&gt;&lt;b&gt;Definition:&lt;/b&gt; &lt;span class=&quot;def&quot;&gt;@NAME@@ARGSPEC@&lt;/span&gt;&lt;/p&gt;</source>
         <comment>Just translate &apos;Definition:&apos; and leave the rest intact.</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/CodeDocumentationViewerTemplate.py" line="68"/>
+        <location filename="../UI/CodeDocumentationViewerTemplate.py" line="70"/>
         <source>&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; @NOTE@&lt;/p&gt;</source>
         <comment>Just translate &apos;Note:&apos; and leave the rest intact.</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/CodeDocumentationViewerTemplate.py" line="63"/>
+        <location filename="../UI/CodeDocumentationViewerTemplate.py" line="65"/>
         <source>&lt;p&gt;&lt;b&gt;Type:&lt;/b&gt; @TYPE@&lt;/p&gt;</source>
         <comment>Just translate &apos;Type:&apos; and leave the rest intact.</comment>
         <translation type="unfinished"></translation>
@@ -4234,7 +4234,7 @@
     <message>
         <location filename="../Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.ui" line="143"/>
         <source>Colour</source>
-        <translation>Renk</translation>
+        <translation type="obsolete">Renk</translation>
     </message>
     <message>
         <location filename="../Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.ui" line="42"/>
@@ -4259,7 +4259,7 @@
     <message>
         <location filename="../Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.ui" line="155"/>
         <source>Enter a variable name or a colour</source>
-        <translation>Bir değişken adı yada renk girin</translation>
+        <translation type="obsolete">Bir değişken adı yada renk girin</translation>
     </message>
     <message>
         <location filename="../Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.ui" line="167"/>
@@ -4419,7 +4419,7 @@
     <message>
         <location filename="../Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.py" line="72"/>
         <source>&lt;p&gt;The colour &lt;b&gt;{0}&lt;/b&gt; is not valid.&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Renk &lt;b&gt;{0}&lt;/b&gt;geçerli değil.&lt;/p&gt;</translation>
+        <translation type="obsolete">&lt;p&gt;Renk &lt;b&gt;{0}&lt;/b&gt;geçerli değil.&lt;/p&gt;</translation>
     </message>
     <message>
         <location filename="../Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.ui" line="55"/>
@@ -4432,11 +4432,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.ui" line="292"/>
-        <source>Colour Variable</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.ui" line="87"/>
         <source>Parent</source>
         <translation type="unfinished"></translation>
@@ -4476,6 +4471,26 @@
         <source>Enter the parent expression</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.ui" line="143"/>
+        <source>Color</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.ui" line="155"/>
+        <source>Enter a variable name or a color</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.ui" line="292"/>
+        <source>Color Variable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.py" line="72"/>
+        <source>&lt;p&gt;The color &lt;b&gt;{0}&lt;/b&gt; is not valid.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>CompareDialog</name>
@@ -6408,22 +6423,22 @@
         <translation>&lt;p&gt;&lt;b&gt;{0}&lt;/b&gt;.&lt;/p&gt;&lt;p&gt;{1} formlarını yüklerken hata meydana geldi&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/CreateDialogCodeDialog.py" line="577"/>
+        <location filename="../Project/CreateDialogCodeDialog.py" line="580"/>
         <source>Code Generation</source>
         <translation>Kod üretici</translation>
     </message>
     <message>
-        <location filename="../Project/CreateDialogCodeDialog.py" line="437"/>
+        <location filename="../Project/CreateDialogCodeDialog.py" line="440"/>
         <source>&lt;p&gt;Could not open the code template file &quot;{0}&quot;.&lt;/p&gt;&lt;p&gt;Reason: {1}&lt;/p&gt;</source>
         <translation>&lt;p&gt;Kod şablon dosyası &quot;{0}&quot; açılamıyor.&lt;/p&gt;&lt;p&gt;Sebep: {1}&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/CreateDialogCodeDialog.py" line="475"/>
+        <location filename="../Project/CreateDialogCodeDialog.py" line="478"/>
         <source>&lt;p&gt;Could not open the source file &quot;{0}&quot;.&lt;/p&gt;&lt;p&gt;Reason: {1}&lt;/p&gt;</source>
         <translation>&lt;p&gt;Kaynak dosyası açılamıyor &quot;{0}&quot;.&lt;/p&gt;&lt;p&gt;.Sebep: {1}&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/CreateDialogCodeDialog.py" line="577"/>
+        <location filename="../Project/CreateDialogCodeDialog.py" line="580"/>
         <source>&lt;p&gt;Could not write the source file &quot;{0}&quot;.&lt;/p&gt;&lt;p&gt;Reason: {1}&lt;/p&gt;</source>
         <translation>&lt;p&gt;Kaynak dosyası &quot;{0}&quot;yazılamıyor.&lt;/p&gt;&lt;p&gt;Sebep: {1}&lt;/p&gt;</translation>
     </message>
@@ -7644,21 +7659,6 @@
         <translation type="unfinished">Hata ayıklayıcı uzaktan yürütülecekse, seçiniz</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="630"/>
-        <source>Background Colours</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="659"/>
-        <source>Select the background colour for changed items.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="695"/>
-        <source>Select the background colour for elements which are loaded for the first time.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="669"/>
         <source>Changed elements:</source>
         <translation type="unfinished"></translation>
@@ -7668,6 +7668,21 @@
         <source>First time opened elements:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="630"/>
+        <source>Background Colors</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="659"/>
+        <source>Select the background color for changed items.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="695"/>
+        <source>Select the background color for elements which are loaded for the first time.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DebuggerInterfacePython</name>
@@ -8152,110 +8167,110 @@
 <context>
     <name>DiffColoursPage</name>
     <message>
-        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="17"/>
-        <source>&lt;b&gt;Configure Diff colours&lt;/b&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="39"/>
-        <source>Select the background colour for header lines</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="42"/>
-        <source>Header Colour</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="52"/>
         <source>Header Line</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="65"/>
-        <source>Select the background colour for bad whitespace</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="68"/>
-        <source>Whitespace Colour</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="88"/>
-        <source>Select the text foreground colour</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="91"/>
-        <source>Text Colour</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="101"/>
         <source>Normal Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="114"/>
-        <source>Select the background colour for additions</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="117"/>
-        <source>Added Colour</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="127"/>
         <source>Added Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="140"/>
-        <source>Select the background colour for removed text</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="143"/>
-        <source>Removed Colour</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="153"/>
         <source>Removed Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="166"/>
-        <source>Select the background colour for replaced text</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="169"/>
-        <source>Replaced Colour</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="179"/>
         <source>Replaced Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="192"/>
-        <source>Select the background colour for context lines</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="195"/>
-        <source>Context Colour</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="205"/>
         <source>Context Line</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="17"/>
+        <source>&lt;b&gt;Configure Diff colors&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="39"/>
+        <source>Select the background color for header lines</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="42"/>
+        <source>Header Color</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="65"/>
+        <source>Select the background color for bad whitespace</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="68"/>
+        <source>Whitespace Color</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="88"/>
+        <source>Select the text foreground color</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="91"/>
+        <source>Text Color</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="114"/>
+        <source>Select the background color for additions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="117"/>
+        <source>Added Color</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="140"/>
+        <source>Select the background color for removed text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="143"/>
+        <source>Removed Color</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="166"/>
+        <source>Select the background color for replaced text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="169"/>
+        <source>Replaced Color</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="192"/>
+        <source>Select the background color for context lines</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="195"/>
+        <source>Context Color</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DiffDialog</name>
@@ -9464,7 +9479,7 @@
 <context>
     <name>E5GraphicsView</name>
     <message>
-        <location filename="../E5Graphics/E5GraphicsView.py" line="56"/>
+        <location filename="../E5Graphics/E5GraphicsView.py" line="58"/>
         <source>&lt;b&gt;Graphics View&lt;/b&gt;
 &lt;p&gt;This graphics view is used to show a diagram. 
 There are various actions available to manipulate the 
@@ -9494,7 +9509,7 @@
 </translation>
     </message>
     <message>
-        <location filename="../E5Graphics/E5GraphicsView.py" line="377"/>
+        <location filename="../E5Graphics/E5GraphicsView.py" line="416"/>
         <source>{0}, Page {1}</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11004,7 +11019,7 @@
 <context>
     <name>Editor</name>
     <message>
-        <location filename="../QScintilla/Editor.py" line="3106"/>
+        <location filename="../QScintilla/Editor.py" line="3107"/>
         <source>Open File</source>
         <translation>Dosya Aç</translation>
     </message>
@@ -11094,7 +11109,7 @@
         <translation>Tüm seçimi iptal et</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7834"/>
+        <location filename="../QScintilla/Editor.py" line="7847"/>
         <source>Check spelling...</source>
         <translation>Yazım Kontrolü...</translation>
     </message>
@@ -11319,7 +11334,7 @@
         <translation>Bekleme noktasını düzenle...</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5607"/>
+        <location filename="../QScintilla/Editor.py" line="5615"/>
         <source>Enable breakpoint</source>
         <translation>Beklemenoktasını etkinleştir</translation>
     </message>
@@ -11424,327 +11439,327 @@
         <translation>Kullanmak için Pygment lexer seç.</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="1955"/>
+        <location filename="../QScintilla/Editor.py" line="1956"/>
         <source>Modification of Read Only file</source>
         <translation>Yalnızca okunabilir dosyada değişiklik</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="1955"/>
+        <location filename="../QScintilla/Editor.py" line="1956"/>
         <source>You are attempting to change a read only file. Please save to a different file first.</source>
         <translation>Yalnızca okunabilir bir dosyayı değiştirmeşe çalışıyorsunuz. Lütfen önce farklı bir isimde kaydediniz.</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="2663"/>
+        <location filename="../QScintilla/Editor.py" line="2664"/>
         <source>Printing...</source>
         <translation>Yazılıyor...</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="2680"/>
+        <location filename="../QScintilla/Editor.py" line="2681"/>
         <source>Printing completed</source>
         <translation>Yazdırma tamalandı</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="2682"/>
+        <location filename="../QScintilla/Editor.py" line="2683"/>
         <source>Error while printing</source>
         <translation>Yazdırılırken hata</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="2685"/>
+        <location filename="../QScintilla/Editor.py" line="2686"/>
         <source>Printing aborted</source>
         <translation>Yazdırma iptal edildi</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="3046"/>
+        <location filename="../QScintilla/Editor.py" line="3047"/>
         <source>File Modified</source>
         <translation>Dosya Değiştirildi</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="3046"/>
+        <location filename="../QScintilla/Editor.py" line="3047"/>
         <source>&lt;p&gt;The file &lt;b&gt;{0}&lt;/b&gt; has unsaved changes.&lt;/p&gt;</source>
         <translation>&lt;p&gt;&lt;b&gt;{0}&lt;/b&gt;dosyasında kaydedilmemiş değişiklikler var.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="3106"/>
+        <location filename="../QScintilla/Editor.py" line="3107"/>
         <source>&lt;p&gt;The file &lt;b&gt;{0}&lt;/b&gt; could not be opened.&lt;/p&gt;&lt;p&gt;Reason: {1}&lt;/p&gt;</source>
         <translation>&lt;p&gt;Dosya &lt;b&gt;{0}&lt;/b&gt; açılamıyor.&lt;/p&gt;&lt;p&gt;Sebep: {1}&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="3295"/>
+        <location filename="../QScintilla/Editor.py" line="3296"/>
         <source>Save File</source>
         <translation>Dosyayı Kaydet</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="3232"/>
+        <location filename="../QScintilla/Editor.py" line="3233"/>
         <source>&lt;p&gt;The file &lt;b&gt;{0}&lt;/b&gt; could not be saved.&lt;br/&gt;Reason: {1}&lt;/p&gt;</source>
         <translation>&lt;p&gt;Dosya &lt;b&gt;{0}&lt;/b&gt; kaydedilemiyor.&lt;/p&gt;&lt;p&gt;Sebep: {1}&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="4772"/>
+        <location filename="../QScintilla/Editor.py" line="4777"/>
         <source>Autocompletion</source>
         <translation>Otomatik tamamlama</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="4772"/>
+        <location filename="../QScintilla/Editor.py" line="4777"/>
         <source>Autocompletion is not available because there is no autocompletion source set.</source>
         <translation>Otomatiktamamlama uygun değil çünkü bu otomatiktamamlama kaynağı değil.</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5610"/>
+        <location filename="../QScintilla/Editor.py" line="5618"/>
         <source>Disable breakpoint</source>
         <translation>Durmanoktasını iptal et</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5985"/>
+        <location filename="../QScintilla/Editor.py" line="5993"/>
         <source>Code Coverage</source>
         <translation>Kod Koruyucu</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5985"/>
+        <location filename="../QScintilla/Editor.py" line="5993"/>
         <source>Please select a coverage file</source>
         <translation>Lütfen bir koruyucu dosya seçiniz</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6048"/>
+        <location filename="../QScintilla/Editor.py" line="6056"/>
         <source>Show Code Coverage Annotations</source>
         <translation>Kodların Dipnotunu Göster</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6041"/>
+        <location filename="../QScintilla/Editor.py" line="6049"/>
         <source>All lines have been covered.</source>
         <translation>Tüm satırlar korumaya alındı.</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6048"/>
+        <location filename="../QScintilla/Editor.py" line="6056"/>
         <source>There is no coverage file available.</source>
         <translation>Hazırda koruma dosyası yok.</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6165"/>
+        <location filename="../QScintilla/Editor.py" line="6173"/>
         <source>Profile Data</source>
         <translation>Veri Kesiti</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6165"/>
+        <location filename="../QScintilla/Editor.py" line="6173"/>
         <source>Please select a profile file</source>
         <translation>Lütfen kesit dosyasını seçiniz</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6327"/>
+        <location filename="../QScintilla/Editor.py" line="6335"/>
         <source>Syntax Error</source>
         <translation>Sözdizimi Hatası</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6327"/>
+        <location filename="../QScintilla/Editor.py" line="6335"/>
         <source>No syntax error message available.</source>
         <translation>Uygun söz dizimi hata mesajı yok.</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6718"/>
+        <location filename="../QScintilla/Editor.py" line="6726"/>
         <source>Macro Name</source>
         <translation>Makro Adı</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6718"/>
+        <location filename="../QScintilla/Editor.py" line="6726"/>
         <source>Select a macro name:</source>
         <translation>Bir makro ismi seç:</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6746"/>
+        <location filename="../QScintilla/Editor.py" line="6754"/>
         <source>Load macro file</source>
         <translation>Makro dosyasını yükle</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6789"/>
+        <location filename="../QScintilla/Editor.py" line="6797"/>
         <source>Macro files (*.macro)</source>
         <translation>Makro dosyaları (*.macro)</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6769"/>
+        <location filename="../QScintilla/Editor.py" line="6777"/>
         <source>Error loading macro</source>
         <translation>Makronun yüklenmesinde hata</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6760"/>
+        <location filename="../QScintilla/Editor.py" line="6768"/>
         <source>&lt;p&gt;The macro file &lt;b&gt;{0}&lt;/b&gt; could not be read.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Makro dosyası &lt;b&gt;{0}&lt;/b&gt; okunamıyor.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6769"/>
+        <location filename="../QScintilla/Editor.py" line="6777"/>
         <source>&lt;p&gt;The macro file &lt;b&gt;{0}&lt;/b&gt; is corrupt.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Makro dosyası &lt;b&gt;{0}&lt;/b&gt; bozuk.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6789"/>
+        <location filename="../QScintilla/Editor.py" line="6797"/>
         <source>Save macro file</source>
         <translation>Makro Dosyasını Kaydet</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6806"/>
+        <location filename="../QScintilla/Editor.py" line="6814"/>
         <source>Save macro</source>
         <translation>Makro Kaydet</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6822"/>
+        <location filename="../QScintilla/Editor.py" line="6830"/>
         <source>Error saving macro</source>
         <translation>Makronun kaydedilmesinde hata</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6822"/>
+        <location filename="../QScintilla/Editor.py" line="6830"/>
         <source>&lt;p&gt;The macro file &lt;b&gt;{0}&lt;/b&gt; could not be written.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Makro dosyası &lt;b&gt;{0}&lt;/b&gt; yazılamıyor.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6835"/>
+        <location filename="../QScintilla/Editor.py" line="6843"/>
         <source>Start Macro Recording</source>
         <translation>Makro Kaydı Başladı</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6835"/>
+        <location filename="../QScintilla/Editor.py" line="6843"/>
         <source>Macro recording is already active. Start new?</source>
         <translation>Makro kaydı şuan aktif. Yeniden başlasın mı?</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6861"/>
+        <location filename="../QScintilla/Editor.py" line="6869"/>
         <source>Macro Recording</source>
         <translation>Makro Kaydediliyor</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6861"/>
+        <location filename="../QScintilla/Editor.py" line="6869"/>
         <source>Enter name of the macro:</source>
         <translation>Makronun ismini gir:</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7001"/>
+        <location filename="../QScintilla/Editor.py" line="7009"/>
         <source>File changed</source>
         <translation>Dosya değiştirilmiş</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7166"/>
+        <location filename="../QScintilla/Editor.py" line="7179"/>
         <source>{0} (ro)</source>
         <translation>{0} (ro)</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7307"/>
+        <location filename="../QScintilla/Editor.py" line="7320"/>
         <source>Drop Error</source>
         <translation>Düşme hatası</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7307"/>
+        <location filename="../QScintilla/Editor.py" line="7320"/>
         <source>&lt;p&gt;&lt;b&gt;{0}&lt;/b&gt; is not a file.&lt;/p&gt;</source>
         <translation>&lt;p&gt;&lt;b&gt;{0}&lt;/b&gt; bir dosya değil.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7328"/>
-        <source>Resources</source>
-        <translation>Kaynaklar</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="7330"/>
-        <source>Add file...</source>
-        <translation>Dosya ekle...</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="7332"/>
-        <source>Add files...</source>
-        <translation>Dosyaları ekle...</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="7334"/>
-        <source>Add aliased file...</source>
-        <translation>Kısaltmalar dosyasına ekle...</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="7337"/>
-        <source>Add localized resource...</source>
-        <translation>Yaral kaynak ekle...</translation>
-    </message>
-    <message>
         <location filename="../QScintilla/Editor.py" line="7341"/>
+        <source>Resources</source>
+        <translation>Kaynaklar</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="7343"/>
+        <source>Add file...</source>
+        <translation>Dosya ekle...</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="7345"/>
+        <source>Add files...</source>
+        <translation>Dosyaları ekle...</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="7347"/>
+        <source>Add aliased file...</source>
+        <translation>Kısaltmalar dosyasına ekle...</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="7350"/>
+        <source>Add localized resource...</source>
+        <translation>Yaral kaynak ekle...</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="7354"/>
         <source>Add resource frame</source>
         <translation>Çerçeve kaynağı ekle</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7360"/>
+        <location filename="../QScintilla/Editor.py" line="7373"/>
         <source>Add file resource</source>
         <translation>Dosya kaynağını ekle</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7376"/>
+        <location filename="../QScintilla/Editor.py" line="7389"/>
         <source>Add file resources</source>
         <translation>Dosya kaynaklarını ekle</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7403"/>
+        <location filename="../QScintilla/Editor.py" line="7416"/>
         <source>Add aliased file resource</source>
         <translation>Kısaltmalar dosyası kaynağını ekle</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7403"/>
+        <location filename="../QScintilla/Editor.py" line="7416"/>
         <source>Alias for file &lt;b&gt;{0}&lt;/b&gt;:</source>
         <translation>&lt;b&gt;{0} dosyası için takma ad&lt;/b&gt;:</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7469"/>
+        <location filename="../QScintilla/Editor.py" line="7482"/>
         <source>Package Diagram</source>
         <translation>Paket Şeması</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7469"/>
+        <location filename="../QScintilla/Editor.py" line="7482"/>
         <source>Include class attributes?</source>
         <translation>Sınıf nitelikleri dahil edilsin mi?</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7491"/>
+        <location filename="../QScintilla/Editor.py" line="7504"/>
         <source>Imports Diagram</source>
         <translation>Şemayı İçe Aktar</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7491"/>
+        <location filename="../QScintilla/Editor.py" line="7504"/>
         <source>Include imports from external modules?</source>
         <translation>Harici modüllerdan içe aktarım dahil edilsin mi?</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7505"/>
+        <location filename="../QScintilla/Editor.py" line="7518"/>
         <source>Application Diagram</source>
         <translation>Uygulama Şeması</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7505"/>
+        <location filename="../QScintilla/Editor.py" line="7518"/>
         <source>Include module names?</source>
         <translation>Modül isimleri dahil edilsin mi?</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7837"/>
+        <location filename="../QScintilla/Editor.py" line="7850"/>
         <source>Add to dictionary</source>
         <translation>Sözlüğe ekle</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7839"/>
+        <location filename="../QScintilla/Editor.py" line="7852"/>
         <source>Ignore All</source>
         <translation>Hepsini Yoksay</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="3295"/>
+        <location filename="../QScintilla/Editor.py" line="3296"/>
         <source>&lt;p&gt;The file &lt;b&gt;{0}&lt;/b&gt; already exists. Overwrite it?&lt;/p&gt;</source>
         <translation>&lt;p&gt;&lt;b&gt;{0}&lt;/b&gt; dosyası halen mevcut. Üzerine yazılsın mı?&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6606"/>
+        <location filename="../QScintilla/Editor.py" line="6614"/>
         <source>Warning: {0}</source>
         <translation>Dikkat: {0}</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6613"/>
+        <location filename="../QScintilla/Editor.py" line="6621"/>
         <source>Error: {0}</source>
         <translation>Hata: {0}</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6806"/>
+        <location filename="../QScintilla/Editor.py" line="6814"/>
         <source>&lt;p&gt;The macro file &lt;b&gt;{0}&lt;/b&gt; already exists. Overwrite it?&lt;/p&gt;</source>
         <translation>&lt;p&gt;Makro dosyası &lt;b&gt;{0}&lt;/b&gt; zaten var. Üzerine yazılsın mı?&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6997"/>
+        <location filename="../QScintilla/Editor.py" line="7005"/>
         <source>&lt;br&gt;&lt;b&gt;Warning:&lt;/b&gt; You will lose your changes upon reopening it.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11769,27 +11784,27 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="8255"/>
+        <location filename="../QScintilla/Editor.py" line="8268"/>
         <source>Sort Lines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="8255"/>
+        <location filename="../QScintilla/Editor.py" line="8268"/>
         <source>The selection contains illegal data for a numerical sort.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6541"/>
+        <location filename="../QScintilla/Editor.py" line="6549"/>
         <source>Warning</source>
         <translation type="unfinished">Dikkat</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6541"/>
+        <location filename="../QScintilla/Editor.py" line="6549"/>
         <source>No warning messages available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6603"/>
+        <location filename="../QScintilla/Editor.py" line="6611"/>
         <source>Style: {0}</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11814,7 +11829,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6991"/>
+        <location filename="../QScintilla/Editor.py" line="6999"/>
         <source>&lt;p&gt;The file &lt;b&gt;{0}&lt;/b&gt; has been changed while it was opened in eric6. Reread it?&lt;/p&gt;</source>
         <translation type="unfinished">&lt;p&gt;Eric5 ile açıldıktan sonra &lt;b&gt;{0}&lt;/b&gt; dosyasında değişiklik olmuş. Yeniden açılsın mı?&lt;/p&gt; {0}?} {6.?}</translation>
     </message>
@@ -11829,32 +11844,32 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="4902"/>
+        <location filename="../QScintilla/Editor.py" line="4907"/>
         <source>Auto-Completion Provider</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="4902"/>
+        <location filename="../QScintilla/Editor.py" line="4907"/>
         <source>The completion list provider &apos;{0}&apos; was already registered. Ignoring duplicate request.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5177"/>
+        <location filename="../QScintilla/Editor.py" line="5185"/>
         <source>Call-Tips Provider</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5177"/>
+        <location filename="../QScintilla/Editor.py" line="5185"/>
         <source>The call-tips provider &apos;{0}&apos; was already registered. Ignoring duplicate request.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="8344"/>
+        <location filename="../QScintilla/Editor.py" line="8357"/>
         <source>Register Mouse Click Handler</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="8344"/>
+        <location filename="../QScintilla/Editor.py" line="8357"/>
         <source>A mouse click handler for &quot;{0}&quot; was already registered by &quot;{1}&quot;. Aborting request by &quot;{2}&quot;...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11884,12 +11899,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="8465"/>
+        <location filename="../QScintilla/Editor.py" line="8478"/>
         <source>EditorConfig Properties</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="8465"/>
+        <location filename="../QScintilla/Editor.py" line="8478"/>
         <source>&lt;p&gt;The EditorConfig properties for file &lt;b&gt;{0}&lt;/b&gt; could not be loaded.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12426,35 +12441,35 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="122"/>
         <source>Colours</source>
-        <translation>Renkler</translation>
+        <translation type="obsolete">Renkler</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="128"/>
         <source>Background colour:</source>
-        <translation>Arkaalan rengi:</translation>
+        <translation type="obsolete">Arkaalan rengi:</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="141"/>
         <source>Select the background colour for calltips.</source>
-        <translation>İpuçlarının arkaalan rengini seç.</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="167"/>
+        <translation type="obsolete">İpuçlarının arkaalan rengini seç.</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="213"/>
         <source>Plug-In Behavior</source>
         <translation>Eklenti Davranışı</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="173"/>
+        <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="219"/>
         <source>Select to show QScintilla provided calltips, if the selected plug-ins fail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="176"/>
+        <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="222"/>
         <source>Qscintilla provided calltips are shown, if this option is enabled and calltips shall be provided by plug-ins (see calltips sub-page of the plug-in) and the plugin-ins don&apos;t deliver any calltips.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="179"/>
+        <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="225"/>
         <source>Show QScintilla calltips, if plug-ins fail</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12483,6 +12498,41 @@
         <source>Above Text</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="122"/>
+        <source>Colors</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="128"/>
+        <source>Background color:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="141"/>
+        <source>Select the background color for calltips.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="164"/>
+        <source>Foreground color:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="177"/>
+        <source>Select the foreground color for calltips.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="187"/>
+        <source>Highlight color:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="200"/>
+        <source>Select the highlight color for calltips.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>EditorCalltipsQScintillaPage</name>
@@ -13420,22 +13470,22 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="174"/>
         <source>Select the foreground colour.</source>
-        <translation>Önalan rengini seç.</translation>
+        <translation type="obsolete">Önalan rengini seç.</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="177"/>
         <source>Foreground Colour</source>
-        <translation>Önalana Rengi</translation>
+        <translation type="obsolete">Önalana Rengi</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="184"/>
         <source>Select the background colour.</source>
-        <translation>Arkaalan rengini seç.</translation>
+        <translation type="obsolete">Arkaalan rengini seç.</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="187"/>
         <source>Background Colour</source>
-        <translation>Arkaalan Rengi</translation>
+        <translation type="obsolete">Arkaalan Rengi</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="194"/>
@@ -13465,12 +13515,12 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="273"/>
         <source>Select the background colour for all styles</source>
-        <translation>Tüm stiller için arkaalan rengini seç</translation>
+        <translation type="obsolete">Tüm stiller için arkaalan rengini seç</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="276"/>
         <source>All Background Colours</source>
-        <translation>Tüm Arkaalan Renkleri</translation>
+        <translation type="obsolete">Tüm Arkaalan Renkleri</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="283"/>
@@ -13682,6 +13732,36 @@
         <source>Press to set all sub-styles to default values</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="174"/>
+        <source>Select the foreground color.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="177"/>
+        <source>Foreground Color</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="184"/>
+        <source>Select the background color.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="187"/>
+        <source>Background Color</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="273"/>
+        <source>Select the background color for all styles</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="276"/>
+        <source>All Background Colors</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>EditorKeywordsPage</name>
@@ -14518,12 +14598,12 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorSearchPage.ui" line="127"/>
         <source>Marker Colour:</source>
-        <translation>İşaretleme Rengi:</translation>
+        <translation type="obsolete">İşaretleme Rengi:</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorSearchPage.ui" line="140"/>
         <source>Select the colour for the search markers.</source>
-        <translation>Arama işaretleri için renk seç.</translation>
+        <translation type="obsolete">Arama işaretleri için renk seç.</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorSearchPage.ui" line="168"/>
@@ -14550,6 +14630,16 @@
         <source>QScintilla Extended  Mode (C++11)</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorSearchPage.ui" line="127"/>
+        <source>Marker Color:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorSearchPage.ui" line="140"/>
+        <source>Select the color for the search markers.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>EditorSpellCheckingPage</name>
@@ -14621,17 +14711,12 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorSpellCheckingPage.ui" line="215"/>
         <source>Colours</source>
-        <translation>Renkler</translation>
+        <translation type="obsolete">Renkler</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorSpellCheckingPage.ui" line="221"/>
         <source>Marker Colour:</source>
-        <translation>İşaretleme Rengi:</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorSpellCheckingPage.ui" line="234"/>
-        <source>Select the colour for the spelling markers.</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">İşaretleme Rengi:</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorSpellCheckingPage.ui" line="260"/>
@@ -14714,6 +14799,21 @@
 &lt;p&gt;Enter the file extension of pure text files. The complete contents of files with these extensions will be checked.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorSpellCheckingPage.ui" line="215"/>
+        <source>Colors</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorSpellCheckingPage.ui" line="221"/>
+        <source>Marker Color:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorSpellCheckingPage.ui" line="234"/>
+        <source>Select the color for the spelling markers.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>EditorStylesPage</name>
@@ -14855,7 +14955,7 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="351"/>
         <source>Select the foreground colour for the margins</source>
-        <translation>Kenarlar için önalan rengini seç</translation>
+        <translation type="obsolete">Kenarlar için önalan rengini seç</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="361"/>
@@ -14865,7 +14965,7 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="374"/>
         <source>Select the background colour for the margins</source>
-        <translation>Kenarlar için arkaalan rengini seç</translation>
+        <translation type="obsolete">Kenarlar için arkaalan rengini seç</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="384"/>
@@ -14873,11 +14973,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="397"/>
-        <source>Select the background colour for the foldmargin</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="457"/>
         <source>Press to select the font for the editor line numbers</source>
         <translation type="unfinished"></translation>
@@ -14898,29 +14993,14 @@
         <translation>Seçim</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="515"/>
-        <source>Select to use custom selection colours</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="518"/>
-        <source>&lt;b&gt;Use custom selection colours&lt;/b&gt;&lt;p&gt;Select this entry in order to use custom selection colours in the editor and shell windows. The colours for the selection foreground and background are defined on the colours page.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="521"/>
         <source>Use custom selection colours</source>
-        <translation>Özel seçim renklerini kullan</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="528"/>
-        <source>Select, if selected text should be colourized by the lexer.</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Özel seçim renklerini kullan</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="531"/>
         <source>Colourize selected text</source>
-        <translation>Seçilen metni renklendir</translation>
+        <translation type="obsolete">Seçilen metni renklendir</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="538"/>
@@ -14938,21 +15018,11 @@
         <translation>Seçim önalanı:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="565"/>
-        <source>Select the foreground colour for the selection.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="575"/>
         <source>Selection background:</source>
         <translation type="unfinished">Düzeltme imi görünür</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="588"/>
-        <source>Select the background colour for the selection.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="609"/>
         <source>Caret</source>
         <translation type="unfinished">Düzeltme imi genişliği:</translation>
@@ -14970,7 +15040,7 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="648"/>
         <source>Select the colour for the caret.</source>
-        <translation>Düzeltme imi için renk seçiniz.</translation>
+        <translation type="obsolete">Düzeltme imi için renk seçiniz.</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="672"/>
@@ -14978,11 +15048,6 @@
         <translation type="obsolete">Düzeltme imi çizgisi arkaalan:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="761"/>
-        <source>Select the background colour for the line containing the caret.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="831"/>
         <source>Error line marker:</source>
         <translation type="unfinished">Hatalı satır işaretleyicisi:</translation>
@@ -15008,41 +15073,21 @@
         <translation>Eşleşen Köşeli ayraçlar:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="886"/>
-        <source>Select the colour for highlighting matching braces.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="896"/>
         <source>Matched braces background:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="909"/>
-        <source>Select the background colour for highlighting matching braces.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="925"/>
         <source>Unmatched brace:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="932"/>
-        <source>Select the colour for  highlighting nonmatching braces.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="948"/>
         <source>Unmatched brace background:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="955"/>
-        <source>Select the background colour for  highlighting nonmatching braces.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="968"/>
         <source>End of Line</source>
         <translation>Satırın Sonu</translation>
@@ -15068,14 +15113,9 @@
         <translation>Köşe Modu</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1124"/>
-        <source>Select the colour for the edge marker.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1134"/>
         <source>Background colour:</source>
-        <translation>Arkaalan rengi:</translation>
+        <translation type="obsolete">Arkaalan rengi:</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1147"/>
@@ -15110,7 +15150,7 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1222"/>
         <source>Change Background Colour</source>
-        <translation>Arkaalan Rengini Değiştir</translation>
+        <translation type="obsolete">Arkaalan Rengini Değiştir</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1236"/>
@@ -15173,21 +15213,11 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="420"/>
-        <source>Select the foreground colour of the foldmarkers</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="430"/>
         <source>Foldmarkers background:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="443"/>
-        <source>Select the background colour of the foldmarkers</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1290"/>
         <source>Annotations</source>
         <translation type="unfinished"></translation>
@@ -15208,21 +15238,11 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1402"/>
-        <source>Press to select the foreground colour</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1405"/>
         <source>Foreground</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1412"/>
-        <source>Press to select the background colour</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1415"/>
         <source>Background</source>
         <translation type="unfinished"></translation>
@@ -15253,54 +15273,24 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1636"/>
-        <source>Select the foreground colour for visible whitespace</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1646"/>
         <source>Whitespace background:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1659"/>
-        <source>Select the background colour for visible whitespace</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="53"/>
-        <source>Select to set the colour of the edit area different to the default style</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="56"/>
-        <source>Override edit area colours</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="68"/>
         <source>Edit area foreground:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="81"/>
-        <source>Select the foreground colour for the edit area.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="91"/>
         <source>Edit area background:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="104"/>
-        <source>Select the background colour for the edit area.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="47"/>
         <source>Colours</source>
-        <translation type="unfinished">Renkler</translation>
+        <translation type="obsolete">Renkler</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1444"/>
@@ -15333,26 +15323,6 @@
         <translation type="unfinished">ms</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1514"/>
-        <source>Unsaved changes colour:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1527"/>
-        <source>Select the colour for the change marker for unsaved changes.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1537"/>
-        <source>Saved changes colour:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1550"/>
-        <source>Select the colour for the change marker for saved changes.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1003"/>
         <source>Select the wrap mode for long lines</source>
         <translation type="unfinished"></translation>
@@ -15428,91 +15398,46 @@
         <translation type="unfinished">Hatalar:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1782"/>
-        <source>Select the colour for error markers</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1792"/>
         <source>Warnings:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1805"/>
-        <source>Select the colour for warning markers</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1815"/>
         <source>Bookmarks:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1828"/>
-        <source>Select the colour for bookmark markers</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1838"/>
         <source>Breakpoints:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1851"/>
-        <source>Select the colour for breakpoint markers</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1861"/>
         <source>Tasks:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1874"/>
-        <source>Select the colour for task markers</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1884"/>
         <source>Changes:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1897"/>
-        <source>Select the colour for change markers</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1907"/>
         <source>Coverage:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1920"/>
-        <source>Select the colour for coverage markers</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1930"/>
         <source>Current Line:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1943"/>
-        <source>Select the colour for the current line marker</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1999"/>
         <source>Background:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="2012"/>
-        <source>Select the background colour for the marker map</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1674"/>
         <source>Indentation Guides</source>
         <translation type="unfinished"></translation>
@@ -15533,31 +15458,16 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1705"/>
-        <source>Select the foreground colour for indentation guides</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1715"/>
         <source>Indentation Guides background:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1728"/>
-        <source>Select the background colour for indentation guides</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1953"/>
         <source>Search Markers:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1966"/>
-        <source>Select the colour for the search marker</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="2093"/>
         <source>Select to hide the Format Buttons bar when formatting is not supported</source>
         <translation type="unfinished"></translation>
@@ -15573,41 +15483,16 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="801"/>
-        <source>Use background colours</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="808"/>
         <source>Current line marker:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="821"/>
-        <source>Select the colour for the current line marker.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="798"/>
-        <source>Select to indicate the debug markers using coloured line backgrounds, arrow indicators otherwise</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="844"/>
-        <source>Select the colour for the error line marker.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1976"/>
         <source>Conflict Marker Line:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1989"/>
-        <source>Select the colour for the conflict marker line marker</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1749"/>
         <source>Select to show the marker map right of the editor</source>
         <translation type="unfinished"></translation>
@@ -15754,8 +15639,263 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="47"/>
+        <source>Colors</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="53"/>
+        <source>Select to set the color of the edit area different to the default style</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="56"/>
+        <source>Override edit area colors</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="81"/>
+        <source>Select the foreground color for the edit area.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="104"/>
+        <source>Select the background color for the edit area.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="648"/>
+        <source>Select the color for the caret.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="351"/>
+        <source>Select the foreground color for the margins</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="374"/>
+        <source>Select the background color for the margins</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="397"/>
+        <source>Select the background color for the foldmargin</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="420"/>
+        <source>Select the foreground color of the foldmarkers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="443"/>
+        <source>Select the background color of the foldmarkers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="515"/>
+        <source>Select to use custom selection colors</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="518"/>
+        <source>&lt;b&gt;Use custom selection colors&lt;/b&gt;&lt;p&gt;Select this entry in order to use custom selection colors in the editor and shell windows. The colors for the selection foreground and background are defined on the colors page.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="521"/>
+        <source>Use custom selection colors</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="528"/>
+        <source>Select, if selected text should be colorized by the lexer.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="531"/>
+        <source>Colorize selected text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="565"/>
+        <source>Select the foreground color for the selection.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="588"/>
+        <source>Select the background color for the selection.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="761"/>
+        <source>Select the background color for the line containing the caret.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="798"/>
+        <source>Select to indicate the debug markers using colored line backgrounds, arrow indicators otherwise</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="801"/>
+        <source>Use background colors</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="821"/>
+        <source>Select the color for the current line marker.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="844"/>
+        <source>Select the color for the error line marker.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="886"/>
+        <source>Select the color for highlighting matching braces.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="909"/>
+        <source>Select the background color for highlighting matching braces.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="932"/>
+        <source>Select the color for  highlighting nonmatching braces.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="955"/>
+        <source>Select the background color for  highlighting nonmatching braces.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1124"/>
+        <source>Select the color for the edge marker.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1134"/>
+        <source>Background color:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1222"/>
+        <source>Change Background Color</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1402"/>
+        <source>Press to select the foreground color</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1412"/>
+        <source>Press to select the background color</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1514"/>
+        <source>Unsaved changes color:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1527"/>
+        <source>Select the color for the change marker for unsaved changes.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1537"/>
+        <source>Saved changes color:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1550"/>
+        <source>Select the color for the change marker for saved changes.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1636"/>
+        <source>Select the foreground color for visible whitespace</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1659"/>
+        <source>Select the background color for visible whitespace</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1705"/>
+        <source>Select the foreground color for indentation guides</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1728"/>
+        <source>Select the background color for indentation guides</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1763"/>
-        <source>Marker Colours</source>
+        <source>Marker Colors</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1782"/>
+        <source>Select the color for error markers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1805"/>
+        <source>Select the color for warning markers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1828"/>
+        <source>Select the color for bookmark markers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1851"/>
+        <source>Select the color for breakpoint markers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1874"/>
+        <source>Select the color for task markers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1897"/>
+        <source>Select the color for change markers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1920"/>
+        <source>Select the color for coverage markers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1943"/>
+        <source>Select the color for the current line marker</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1966"/>
+        <source>Select the color for the search marker</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1989"/>
+        <source>Select the color for the conflict marker line marker</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="2012"/>
+        <source>Select the background color for the marker map</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -16893,17 +17033,17 @@
     <message>
         <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="252"/>
         <source>Enter the filename of a CSS style sheet. Leave empty to use the colours defined below.</source>
-        <translation>CSS sayfa stilinin dosya adını giriniz. Boş bırakırsanız önceden tanımlı renkler kullanılır.</translation>
+        <translation type="obsolete">CSS sayfa stilinin dosya adını giriniz. Boş bırakırsanız önceden tanımlı renkler kullanılır.</translation>
     </message>
     <message>
         <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="262"/>
         <source>Colours</source>
-        <translation>Renkler</translation>
+        <translation type="obsolete">Renkler</translation>
     </message>
     <message>
         <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="268"/>
         <source>Press to select the class and function header background colour.</source>
-        <translation>Sınıf ve fonksiyon başlıklarının arkaalan rengini seçmek için basınız.</translation>
+        <translation type="obsolete">Sınıf ve fonksiyon başlıklarının arkaalan rengini seçmek için basınız.</translation>
     </message>
     <message>
         <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="271"/>
@@ -16913,7 +17053,7 @@
     <message>
         <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="278"/>
         <source>Press to select the class and function header foreground colour.</source>
-        <translation>Sınıf ve fonksiyon başlıklarının önalan rengini seçmek için basınız.</translation>
+        <translation type="obsolete">Sınıf ve fonksiyon başlıklarının önalan rengini seçmek için basınız.</translation>
     </message>
     <message>
         <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="281"/>
@@ -16923,7 +17063,7 @@
     <message>
         <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="288"/>
         <source>Press to select the level 2 header background colour.</source>
-        <translation>Başlık 2nci seviye arkaalan rengini seçmek için basınız.</translation>
+        <translation type="obsolete">Başlık 2nci seviye arkaalan rengini seçmek için basınız.</translation>
     </message>
     <message>
         <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="291"/>
@@ -16933,7 +17073,7 @@
     <message>
         <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="298"/>
         <source>Press to select the level 2 header foreground colour.</source>
-        <translation>Başlık 2nci seviye önalan rengini seçmek için basınız.</translation>
+        <translation type="obsolete">Başlık 2nci seviye önalan rengini seçmek için basınız.</translation>
     </message>
     <message>
         <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="301"/>
@@ -16943,7 +17083,7 @@
     <message>
         <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="308"/>
         <source>Press to select the level 1 header background colour.</source>
-        <translation>Başlık 1nci seviye arkaalan rengini seçmek için basınız.</translation>
+        <translation type="obsolete">Başlık 1nci seviye arkaalan rengini seçmek için basınız.</translation>
     </message>
     <message>
         <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="311"/>
@@ -16953,7 +17093,7 @@
     <message>
         <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="318"/>
         <source>Press to select the level 1 header foreground colour.</source>
-        <translation>Başlık 1nci seviye önalan rengini seçmek için basınız.</translation>
+        <translation type="obsolete">Başlık 1nci seviye önalan rengini seçmek için basınız.</translation>
     </message>
     <message>
         <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="321"/>
@@ -16963,7 +17103,7 @@
     <message>
         <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="328"/>
         <source>Press to select the body background colour.</source>
-        <translation>Gövde arkalan rengini seçmek için basınız.</translation>
+        <translation type="obsolete">Gövde arkalan rengini seçmek için basınız.</translation>
     </message>
     <message>
         <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="331"/>
@@ -16973,7 +17113,7 @@
     <message>
         <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="338"/>
         <source>Press to select the body foreground colour.</source>
-        <translation>Gövde önalan rengini seçmek için basınız.</translation>
+        <translation type="obsolete">Gövde önalan rengini seçmek için basınız.</translation>
     </message>
     <message>
         <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="341"/>
@@ -16983,7 +17123,7 @@
     <message>
         <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="348"/>
         <source>Press to select the foreground colour of links.</source>
-        <translation>Bağlantıların önalan rengini seçmek için basınız.</translation>
+        <translation type="obsolete">Bağlantıların önalan rengini seçmek için basınız.</translation>
     </message>
     <message>
         <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="351"/>
@@ -16993,7 +17133,7 @@
     <message>
         <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="358"/>
         <source>This shows an example of the selected colours.</source>
-        <translation>Bu seçilen renklerin örneklerini gösterir.</translation>
+        <translation type="obsolete">Bu seçilen renklerin örneklerini gösterir.</translation>
     </message>
     <message>
         <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="372"/>
@@ -17075,6 +17215,66 @@
         <source>&lt;?xml version=&quot;1.0&quot; encoding=&quot;utf-8&quot;?&gt;&lt;!DOCTYPE html PUBLIC &quot;-//W3C//DTD XHTML 1.0 Strict//EN&quot;&quot;http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd&quot;&gt;&lt;html&gt;&lt;head&gt;&lt;title&gt;&lt;/title&gt;&lt;/head&gt;&lt;body style=&quot;background-color:{BodyBgColor};color:{BodyColor}&quot;&gt;&lt;h1 style=&quot;background-color:{Level1HeaderBgColor};color:{Level1HeaderColor}&quot;&gt;Level 1 Header&lt;/h1&gt;&lt;h3 style=&quot;background-color:{Level2HeaderBgColor};color:{Level2HeaderColor}&quot;&gt;Level 2 Header&lt;/h3&gt;&lt;h2 style=&quot;background-color:{CFBgColor};color:{CFColor}&quot;&gt;Class and Function Header&lt;/h2&gt;Standard body text with &lt;a style=&quot;color:{LinkColor}&quot;&gt;some links&lt;/a&gt; embedded.&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="252"/>
+        <source>Enter the filename of a CSS style sheet. Leave empty to use the colors defined below.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="262"/>
+        <source>Colors</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="268"/>
+        <source>Press to select the class and function header background color.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="278"/>
+        <source>Press to select the class and function header foreground color.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="288"/>
+        <source>Press to select the level 2 header background color.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="298"/>
+        <source>Press to select the level 2 header foreground color.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="308"/>
+        <source>Press to select the level 1 header background color.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="318"/>
+        <source>Press to select the level 1 header foreground color.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="328"/>
+        <source>Press to select the body background color.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="338"/>
+        <source>Press to select the body foreground color.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="348"/>
+        <source>Press to select the foreground color of links.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="358"/>
+        <source>This shows an example of the selected colors.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>EricdocExecDialog</name>
@@ -17562,30 +17762,50 @@
         <translation>HTML Dosyaları (*.html)</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="516"/>
+        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="537"/>
         <source>Export source</source>
         <translation>Kaynağı dışaktar</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="448"/>
+        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="466"/>
         <source>&lt;p&gt;The source could not be exported to &lt;b&gt;{0}&lt;/b&gt;.&lt;/p&gt;&lt;p&gt;Reason: {1}&lt;/p&gt;</source>
         <translation>&lt;p&gt;Kaynak &lt;b&gt;{0}&lt;/b&gt;na ihraç edilemiyor.&lt;/p&gt;&lt;p&gt;Sebep: {1}&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="457"/>
+        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="475"/>
         <source>&lt;p&gt;The source could not be exported to &lt;b&gt;{0}&lt;/b&gt;.&lt;/p&gt;&lt;p&gt;Reason: No HTML code generated.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="516"/>
+        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="537"/>
         <source>&lt;p&gt;Markdown export requires the &lt;b&gt;python-markdown&lt;/b&gt; package.&lt;br/&gt;Install it with your package manager, &apos;pip install docutils&apos; or see &lt;a href=&quot;http://pythonhosted.org/Markdown/install.html&quot;&gt; installation instructions.&lt;/a&gt;&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="484"/>
+        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="502"/>
         <source>&lt;p&gt;ReStructuredText export requires the &lt;b&gt;python-docutils&lt;/b&gt; package.&lt;br/&gt;Install it with your package manager, &apos;pip install docutils&apos; or see &lt;a href=&quot;http://pypi.python.org/pypi/docutils&quot;&gt;this page.&lt;/a&gt;&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="412"/>
+        <source>Light Background Color</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="413"/>
+        <source>Dark Background Color</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="416"/>
+        <source>Markdown Export</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="416"/>
+        <source>Select color scheme:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ExporterODT</name>
@@ -21279,12 +21499,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="101"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="106"/>
         <source>Commit ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="102"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="107"/>
         <source>Author</source>
         <translation type="unfinished">Yazar</translation>
     </message>
@@ -21294,7 +21514,7 @@
         <translation type="unfinished">Tarih</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="103"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="108"/>
         <source>Committer</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21304,7 +21524,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="104"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="109"/>
         <source>Subject</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21379,7 +21599,7 @@
         <translation type="unfinished">den Kopyala</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2098"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2100"/>
         <source>Differences</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21439,328 +21659,328 @@
         <translation type="unfinished">Alt+P</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="88"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="93"/>
         <source>&amp;Refresh</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="90"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="95"/>
         <source>Press to refresh the list of commits</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="98"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="103"/>
         <source>Find</source>
         <translation type="unfinished">Bul</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="99"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="104"/>
         <source>Filter</source>
         <translation type="unfinished">Süzgeç</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="105"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="110"/>
         <source>File</source>
         <translation type="unfinished">Dosya</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="122"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="128"/>
         <source>&lt;table&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Commit ID&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Date&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{1}&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Author&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{2} &amp;lt;{3}&amp;gt;&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Commit Date&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{4}&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Committer&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{5} &amp;lt;{6}&amp;gt;&lt;/td&gt;&lt;/tr&gt;{7}&lt;tr&gt;&lt;td&gt;&lt;b&gt;Subject&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{8}&lt;/td&gt;&lt;/tr&gt;{9}&lt;/table&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="134"/>
-        <source>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Parents&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</source>
-        <translation type="unfinished">&lt;tr&gt;&lt;td&gt;&lt;b&gt;Esas&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</translation>
-    </message>
-    <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="137"/>
-        <source>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Children&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="140"/>
-        <source>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Branches&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</source>
-        <translation type="unfinished">&lt;tr&gt;&lt;td&gt;&lt;b&gt;Branşlar&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</translation>
+        <source>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Parents&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</source>
+        <translation type="unfinished">&lt;tr&gt;&lt;td&gt;&lt;b&gt;Esas&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</translation>
     </message>
     <message>
         <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="143"/>
-        <source>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Tags&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</source>
-        <translation type="unfinished">&lt;tr&gt;&lt;td&gt;&lt;b&gt;Etiketler&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</translation>
+        <source>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Children&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="146"/>
+        <source>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Branches&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</source>
+        <translation type="unfinished">&lt;tr&gt;&lt;td&gt;&lt;b&gt;Branşlar&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</translation>
+    </message>
+    <message>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="149"/>
+        <source>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Tags&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</source>
+        <translation type="unfinished">&lt;tr&gt;&lt;td&gt;&lt;b&gt;Etiketler&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</translation>
+    </message>
+    <message>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="152"/>
         <source>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Message&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="197"/>
-        <source>Added</source>
-        <translation type="unfinished">Eklendi</translation>
-    </message>
-    <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="198"/>
-        <source>Deleted</source>
-        <translation type="unfinished">Silindi</translation>
-    </message>
-    <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="199"/>
-        <source>Modified</source>
-        <translation type="unfinished">Değiştirildi</translation>
-    </message>
-    <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="200"/>
-        <source>Copied</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="201"/>
-        <source>Renamed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="202"/>
-        <source>Type changed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="203"/>
-        <source>Unmerged</source>
-        <translation type="unfinished"></translation>
+        <source>Added</source>
+        <translation type="unfinished">Eklendi</translation>
     </message>
     <message>
         <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="204"/>
+        <source>Deleted</source>
+        <translation type="unfinished">Silindi</translation>
+    </message>
+    <message>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="205"/>
+        <source>Modified</source>
+        <translation type="unfinished">Değiştirildi</translation>
+    </message>
+    <message>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="206"/>
+        <source>Copied</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="207"/>
+        <source>Renamed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="208"/>
+        <source>Type changed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="209"/>
+        <source>Unmerged</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="210"/>
         <source>Unknown</source>
         <translation type="unfinished">Bilinmeyen</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="240"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="246"/>
         <source>Show Commit ID Column</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="242"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="248"/>
         <source>Press to show the commit ID column</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="250"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="256"/>
         <source>Show Author Columns</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="252"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="258"/>
         <source>Press to show the author columns</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="260"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="266"/>
         <source>Show Committer Columns</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="262"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="268"/>
         <source>Press to show the committer columns</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="270"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="276"/>
         <source>Show Branches Column</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="272"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="278"/>
         <source>Press to show the branches column</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="280"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="286"/>
         <source>Show Tags Column</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="282"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="288"/>
         <source>Press to show the Tags column</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="309"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="315"/>
         <source>Copy Commits</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="311"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="317"/>
         <source>Cherry-pick the selected commits to the current branch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="316"/>
-        <source>Tag</source>
-        <translation type="unfinished">Etiket</translation>
-    </message>
-    <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="318"/>
-        <source>Tag the selected commit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1792"/>
-        <source>Branch</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="322"/>
-        <source>Create a new branch at the selected commit.</source>
-        <translation type="unfinished"></translation>
+        <source>Tag</source>
+        <translation type="unfinished">Etiket</translation>
     </message>
     <message>
         <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="324"/>
+        <source>Tag the selected commit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1794"/>
+        <source>Branch</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="328"/>
+        <source>Create a new branch at the selected commit.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="330"/>
         <source>Branch &amp;&amp; Switch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="326"/>
-        <source>Create a new branch at the selected commit and switch the work tree to it.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1844"/>
-        <source>Switch</source>
-        <translation type="unfinished">Değiştirmek</translation>
-    </message>
-    <message>
         <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="332"/>
-        <source>Switch the working directory to the selected commit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1870"/>
-        <source>Show Short Log</source>
-        <translation type="unfinished"></translation>
+        <source>Create a new branch at the selected commit and switch the work tree to it.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1846"/>
+        <source>Switch</source>
+        <translation type="unfinished">Değiştirmek</translation>
     </message>
     <message>
         <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="338"/>
+        <source>Switch the working directory to the selected commit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1872"/>
+        <source>Show Short Log</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="344"/>
         <source>Show a dialog with a log output for release notes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="341"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="347"/>
         <source>Describe</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="343"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="349"/>
         <source>Show the most recent tag reachable from a commit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="632"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="634"/>
         <source>The git process did not finish within 30s.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="635"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="637"/>
         <source>Could not start the git executable.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="638"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="640"/>
         <source>Git Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="754"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="756"/>
         <source>{0} ({1}%)</source>
         <comment>action, confidence</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="820"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="822"/>
         <source>Process Generation Error</source>
         <translation type="unfinished">İşlem Üretecinde Hata</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="820"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="822"/>
         <source>The process {0} could not be started. Ensure, that it is in the search path.</source>
         <translation type="unfinished">Süreç {0} başlatılamadı. Bunun arama yolunda olduğundan emin olun.</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1265"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1267"/>
         <source>Side-by-Side Diff to Parent {0}</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1277"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1279"/>
         <source>&lt;a href=&quot;sbsdiff:{0}_{1}&quot;&gt;Side-by-Side Compare&lt;/a&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1706"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1708"/>
         <source>Copy Changesets</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1844"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1846"/>
         <source>The project should be reread. Do this now?</source>
         <translation type="unfinished">Projenin yeniden okunması gerekiyor. Şimdi yapılsın mı?</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1870"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1872"/>
         <source>Select a branch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1823"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1825"/>
         <source>Select a default branch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1823"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1825"/>
         <source>Branch &amp; Switch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2052"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2054"/>
         <source>Find Commit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2052"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2054"/>
         <source>&apos;{0}&apos; was not found.</source>
         <translation type="unfinished">&apos;{0}&apos; bulunamadı.</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2112"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2114"/>
         <source>Differences to Parent {0}</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2127"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2129"/>
         <source>Diff to Parent {0}</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2153"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2155"/>
         <source>There is no difference.</source>
         <translation type="unfinished">Herhangi bir farklılık bulunamadı.</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2316"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2318"/>
         <source>Save Diff</source>
         <translation type="unfinished">Farklılıkları Kaydet</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2282"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2284"/>
         <source>Patch Files (*.diff)</source>
         <translation type="unfinished">Patch Dosyaları (*.diff)</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2299"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2301"/>
         <source>&lt;p&gt;The patch file &lt;b&gt;{0}&lt;/b&gt; already exists. Overwrite it?&lt;/p&gt;</source>
         <translation type="unfinished">&lt;p&gt;Yama dosyası &lt;b&gt;{0}&lt;/b&gt;  zaten var. Üzerine yazılsın mı?&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2316"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2318"/>
         <source>&lt;p&gt;The patch file &lt;b&gt;{0}&lt;/b&gt; could not be saved.&lt;br&gt;Reason: {1}&lt;/p&gt;</source>
         <translation type="unfinished">&lt;p&gt;&lt;b&gt;{0}&lt;/b&gt;yama kaydedilemedi.&lt;br&gt;Sebep: {1}&lt;/p&gt;</translation>
     </message>
@@ -26201,20 +26421,60 @@
 <context>
     <name>GraphicsPage</name>
     <message>
-        <location filename="../Preferences/ConfigurationPages/GraphicsPage.ui" line="16"/>
+        <location filename="../Preferences/ConfigurationPages/GraphicsPage.ui" line="17"/>
         <source>&lt;b&gt;Configure graphics settings&lt;/b&gt;</source>
         <translation>&lt;b&gt;Grafik özelliklerini ayarla&lt;/b&gt;</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/GraphicsPage.ui" line="38"/>
+        <location filename="../Preferences/ConfigurationPages/GraphicsPage.ui" line="43"/>
         <source>Press to select the font for the graphic items</source>
         <translation>Grafik maddelerinin yazi tipini seçmek için basınız</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/GraphicsPage.ui" line="51"/>
+        <location filename="../Preferences/ConfigurationPages/GraphicsPage.ui" line="56"/>
         <source>Graphics Font</source>
         <translation>Grafik Yazı Tipi</translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/GraphicsPage.ui" line="37"/>
+        <source>Font</source>
+        <translation type="unfinished">Yazı Tipi</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/GraphicsPage.ui" line="72"/>
+        <source>Drawing Mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/GraphicsPage.ui" line="78"/>
+        <source>Select to determine the drawing mode automatically</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/GraphicsPage.ui" line="81"/>
+        <source>Automatic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/GraphicsPage.ui" line="91"/>
+        <source>Select to draw black shapes on a white background</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/GraphicsPage.ui" line="94"/>
+        <source>Black On White</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/GraphicsPage.ui" line="101"/>
+        <source>Select to draw white shapes on a black background</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/GraphicsPage.ui" line="104"/>
+        <source>White On Black</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>GreaseMonkeyAddScriptDialog</name>
@@ -29990,21 +30250,11 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/HexEditorPage.ui" line="142"/>
-        <source>Select the foreground colour of the address area</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/HexEditorPage.ui" line="291"/>
         <source>Background:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/HexEditorPage.ui" line="165"/>
-        <source>Select the background colour of the address area</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/HexEditorPage.ui" line="178"/>
         <source>ASCII Area</source>
         <translation type="unfinished"></translation>
@@ -30035,31 +30285,11 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/HexEditorPage.ui" line="226"/>
-        <source>Select the foreground colour for highlighted data</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/HexEditorPage.ui" line="249"/>
-        <source>Select the background colour for highlighted data</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/HexEditorPage.ui" line="262"/>
         <source>Selection</source>
         <translation type="unfinished">Seçim</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/HexEditorPage.ui" line="281"/>
-        <source>Select the foreground colour of the selection</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/HexEditorPage.ui" line="304"/>
-        <source>Select the background colour of the selection</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/HexEditorPage.ui" line="317"/>
         <source>Font</source>
         <translation type="unfinished">Yazı Tipi</translation>
@@ -30089,6 +30319,36 @@
         <source>Enter the number of recent files to remember</source>
         <translation type="unfinished">Hatırlanacak geçmiş dosya sayısını girin</translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/HexEditorPage.ui" line="142"/>
+        <source>Select the foreground color of the address area</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/HexEditorPage.ui" line="165"/>
+        <source>Select the background color of the address area</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/HexEditorPage.ui" line="226"/>
+        <source>Select the foreground color for highlighted data</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/HexEditorPage.ui" line="249"/>
+        <source>Select the background color for highlighted data</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/HexEditorPage.ui" line="281"/>
+        <source>Select the foreground color of the selection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/HexEditorPage.ui" line="304"/>
+        <source>Select the background color of the selection</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Hg</name>
@@ -32891,7 +33151,7 @@
 <context>
     <name>HgLogBrowserDialog</name>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="92"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="98"/>
         <source>Mercurial Log</source>
         <translation>Mercurial Günlüğü</translation>
     </message>
@@ -32921,17 +33181,17 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="122"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="128"/>
         <source>Revision</source>
         <translation>Gözden Geçirme</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="123"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="129"/>
         <source>Author</source>
         <translation>Yazar</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="124"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="130"/>
         <source>Message</source>
         <translation>Mesaj</translation>
     </message>
@@ -33046,22 +33306,22 @@
         <translation type="obsolete">Alt+P</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="200"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="206"/>
         <source>Added</source>
         <translation>Eklendi</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="201"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="207"/>
         <source>Deleted</source>
         <translation>Silindi</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="202"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="208"/>
         <source>Modified</source>
         <translation>Değiştirildi</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="840"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="845"/>
         <source>Mercurial Error</source>
         <translation type="unfinished"></translation>
     </message>
@@ -33086,63 +33346,63 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="94"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="100"/>
         <source>Mercurial Log (Incoming)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="96"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="102"/>
         <source>Mercurial Log (Outgoing)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="182"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="188"/>
         <source>All</source>
         <translation>Hepsi</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="217"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="223"/>
         <source>Bookmarks</source>
         <translation type="unfinished">Yerimleri</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="111"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="117"/>
         <source>Press to refresh the list of changesets</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="109"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="115"/>
         <source>&amp;Refresh</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="126"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="132"/>
         <source>Phase</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="268"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="275"/>
         <source>Change the phase of the selected revisions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="270"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="277"/>
         <source>&lt;b&gt;Change Phase&lt;/b&gt;
 &lt;p&gt;This changes the phase of the selected revisions. The selected revisions have to have the same current phase.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="266"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="273"/>
         <source>Change Phase</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2000"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2005"/>
         <source>Copy Changesets</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2343"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2348"/>
         <source>The project should be reread. Do this now?</source>
         <translation type="unfinished">Projenin yeniden okunması gerekiyor. Şimdi yapılsın mı?</translation>
     </message>
@@ -33152,42 +33412,42 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="257"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="264"/>
         <source>Copy the selected changesets to the current branch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="275"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="282"/>
         <source>Tag</source>
         <translation type="unfinished">Etiket</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="278"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="285"/>
         <source>Tag the selected revision</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2072"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2077"/>
         <source>Switch</source>
         <translation type="unfinished">Değiştirmek</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="288"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="295"/>
         <source>Switch the working directory to the selected revision</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="311"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="318"/>
         <source>Pull Large Files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="313"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="320"/>
         <source>Pull large files for selected revisions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1130"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1135"/>
         <source>{0} (large file)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -33212,147 +33472,147 @@
         <translation type="unfinished">Sonraki eşlişmeyi bulmak için basınız</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="119"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="125"/>
         <source>Find</source>
         <translation type="unfinished">Bul</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="120"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="126"/>
         <source>Filter</source>
         <translation type="unfinished">Süzgeç</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="164"/>
-        <source>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Tags&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</source>
-        <translation type="unfinished">&lt;tr&gt;&lt;td&gt;&lt;b&gt;Etiketler&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</translation>
-    </message>
-    <message>
         <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="170"/>
+        <source>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Tags&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</source>
+        <translation type="unfinished">&lt;tr&gt;&lt;td&gt;&lt;b&gt;Etiketler&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</translation>
+    </message>
+    <message>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="176"/>
         <source>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Bookmarks&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2485"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2490"/>
         <source>Find Commit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2485"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2490"/>
         <source>&apos;{0}&apos; was not found.</source>
         <translation type="unfinished">&apos;{0}&apos; bulunamadı.</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="125"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="131"/>
         <source>File</source>
         <translation type="unfinished">Dosya</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="206"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="212"/>
         <source>Draft</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="207"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="213"/>
         <source>Public</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="208"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="214"/>
         <source>Secret</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2205"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2210"/>
         <source>Pull Changes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="309"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="316"/>
         <source>Pull changes from a remote repository</source>
         <translation type="unfinished">Değişiklileri uzak kaynak havuzundan çek</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="322"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="329"/>
         <source>Push Selected Changes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="325"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="332"/>
         <source>Push changes of the selected changeset and its ancestors to a remote repository</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="328"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="335"/>
         <source>Push All Changes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="331"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="338"/>
         <source>Push all changes to a remote repository</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2170"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2175"/>
         <source>Fetch Changes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2251"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2256"/>
         <source>Strip Changesets</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="317"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="324"/>
         <source>Fetch changes from a remote repository</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="374"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="381"/>
         <source>Strip changesets from a repository</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="293"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="300"/>
         <source>Define Bookmark...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="296"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="303"/>
         <source>Bookmark the selected revision</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="298"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="305"/>
         <source>Move Bookmark...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="301"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="308"/>
         <source>Move bookmark to the selected revision</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2095"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2100"/>
         <source>Define Bookmark</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2095"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2100"/>
         <source>Enter bookmark name for changeset &quot;{0}&quot;:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2119"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2124"/>
         <source>Move Bookmark</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2119"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2124"/>
         <source>Select the bookmark to be moved  to changeset &quot;{0}&quot;:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2058"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2063"/>
         <source>Select bookmark to switch to (leave empty to use revision):</source>
         <translation type="unfinished"></translation>
     </message>
@@ -33367,148 +33627,148 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="167"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="173"/>
         <source>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Latest Tag&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="148"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="154"/>
         <source>&lt;table&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Revision&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Date&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{1}&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Author&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{2}&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Branch&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{3}&lt;/td&gt;&lt;/tr&gt;{4}&lt;tr&gt;&lt;td&gt;&lt;b&gt;Message&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{5}&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="158"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="164"/>
         <source>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Parents&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</source>
         <translation type="unfinished">&lt;tr&gt;&lt;td&gt;&lt;b&gt;Esas&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="161"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="167"/>
         <source>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Children&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="260"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="267"/>
         <source>Merge with Changeset</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="263"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="270"/>
         <source>Merge the working directory with the selected changeset</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="336"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="343"/>
         <source>Create Changegroup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="339"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="346"/>
         <source>Create a changegroup file containing the selected changesets</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="341"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="348"/>
         <source>&lt;b&gt;Create Changegroup&lt;/b&gt;
 &lt;p&gt;This creates a changegroup file containing the selected revisions. If no revisions are selected, all changesets will be bundled. If one revision is selected, it will be interpreted as the base revision. Otherwise the lowest revision will be used as the base revision and all other revision will be bundled. If the dialog is showing outgoing changesets, all selected changesets will be bundled.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2343"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2348"/>
         <source>Apply Changegroup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="353"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="360"/>
         <source>Apply the currently viewed changegroup file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="358"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="365"/>
         <source>Sign Revisions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="361"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="368"/>
         <source>Add a signature for the selected revisions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="363"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="370"/>
         <source>Verify Signatures</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="366"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="373"/>
         <source>Verify all signatures there may be for the selected revision</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="379"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="386"/>
         <source>Select All Entries</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="381"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="388"/>
         <source>Deselect All Entries</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1369"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1374"/>
         <source>Side-by-Side Diff to Parent {0}</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1380"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1385"/>
         <source>&lt;a href=&quot;sbsdiff:{0}_{1}&quot;&gt;Side-by-Side Compare&lt;/a&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1521"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1526"/>
         <source>Pull Selected Changes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1522"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1527"/>
         <source>Fetch Selected Changes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2529"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2534"/>
         <source>Differences</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2539"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2544"/>
         <source>Differences to Parent {0}</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2555"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2560"/>
         <source>Diff to Parent {0}{1}</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2580"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2585"/>
         <source>There is no difference.</source>
         <translation type="unfinished">Herhangi bir farklılık bulunamadı.</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2723"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2728"/>
         <source>Save Diff</source>
         <translation type="unfinished">Farklılıkları Kaydet</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2690"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2695"/>
         <source>Patch Files (*.diff)</source>
         <translation type="unfinished">Patch Dosyaları (*.diff)</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2707"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2712"/>
         <source>&lt;p&gt;The patch file &lt;b&gt;{0}&lt;/b&gt; already exists. Overwrite it?&lt;/p&gt;</source>
         <translation type="unfinished">&lt;p&gt;Yama dosyası &lt;b&gt;{0}&lt;/b&gt;  zaten var. Üzerine yazılsın mı?&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2723"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2728"/>
         <source>&lt;p&gt;The patch file &lt;b&gt;{0}&lt;/b&gt; could not be saved.&lt;br&gt;Reason: {1}&lt;/p&gt;</source>
         <translation type="unfinished">&lt;p&gt;&lt;b&gt;{0}&lt;/b&gt;yama kaydedilemedi.&lt;br&gt;Sebep: {1}&lt;/p&gt;</translation>
     </message>
@@ -33518,22 +33778,22 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2528"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2533"/>
         <source>Generating differences ...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="98"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="104"/>
         <source>Mercurial Full Log</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="280"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="287"/>
         <source>Close Heads</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="283"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="290"/>
         <source>Close the selected heads</source>
         <translation type="unfinished"></translation>
     </message>
@@ -33908,7 +34168,7 @@
         <translation>Kaynak havuzundan kaldır (ve diskten)</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="833"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="835"/>
         <source>Remove from repository only</source>
         <translation>Yalnızca kaynak havuzundan kaldır</translation>
     </message>
@@ -33953,7 +34213,7 @@
         <translation>Giriş yapılan tüm dizinleri seç</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="833"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="835"/>
         <source>Do you really want to remove these files from the repository?</source>
         <translation>Bu dosyaları gerçekten kaynak havuzundan kaldırmak istiyor musunuz?</translation>
     </message>
@@ -36569,52 +36829,52 @@
 <context>
     <name>HgServeDialog</name>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py" line="47"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py" line="50"/>
         <source>Mercurial Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py" line="49"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py" line="57"/>
         <source>Start Server</source>
         <translation>Sunucuyu Başlat</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py" line="55"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py" line="63"/>
         <source>Stop Server</source>
         <translation>Sunucuyu durdur</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py" line="61"/>
-        <source>Start Browser</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py" line="69"/>
+        <source>Start Browser</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py" line="77"/>
         <source>Enter the server port</source>
         <translation>Sunucu bağlantı noktsasını giriniz</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py" line="75"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py" line="83"/>
         <source>Select the style to use</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py" line="79"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py" line="87"/>
         <source>Server</source>
         <translation>Sunucu</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py" line="86"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py" line="94"/>
         <source>Browser</source>
         <translation>Gözatıcı</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py" line="140"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py" line="148"/>
         <source>Process Generation Error</source>
         <translation>İşlem Üretecinde Hata</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py" line="140"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py" line="148"/>
         <source>The process {0} could not be started. Ensure, that it is in the search path.</source>
         <translation>Süreç {0} başlatılamadı. Bunun arama yolunda olduğundan emin olun.</translation>
     </message>
@@ -40078,53 +40338,138 @@
         <translation>&lt;font color=&quot;#FF0000&quot;&gt;&lt;b&gt;Not:&lt;/b&gt; Bu ayarlamalar uygulamanın bir sonraki çalıştırılmasında aktif hale geçecektir.&lt;/font&gt;</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="115"/>
+        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="217"/>
         <source>Press to delete the selected directory from the list</source>
         <translation>Seçilen dizini listeden silmek için basınız</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="118"/>
+        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="220"/>
         <source>Delete</source>
         <translation>Sil</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="128"/>
+        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="230"/>
         <source>Press to add the entered directory to the list</source>
         <translation>Girilen dizini eklemek ve listelemek için basınız</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="131"/>
+        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="233"/>
         <source>Add</source>
         <translation>Ekle</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="156"/>
+        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="258"/>
         <source>Show</source>
         <translation>Göster</translation>
     </message>
     <message>
+        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="177"/>
+        <source>Up</source>
+        <translation>Up</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="187"/>
+        <source>Down</source>
+        <translation>Down</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="146"/>
+        <source>List of icon directories</source>
+        <translation>İcın dizinleri listesi</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="44"/>
+        <source>Default Icons</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="52"/>
+        <source>Select to select between Breeze (dark) and Breeze (light) based on the window lightness</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="55"/>
+        <source>Automatic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="65"/>
+        <source>Select to use the Breeze vector icons for light window background</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="68"/>
+        <source>Breeze (light)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="75"/>
-        <source>Up</source>
-        <translation>Up</translation>
+        <source>Select to use the Breeze vector icons for dark window background</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="78"/>
+        <source>Breeze (dark)</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="85"/>
-        <source>Down</source>
-        <translation>Down</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="44"/>
-        <source>List of icon directories</source>
-        <translation>İcın dizinleri listesi</translation>
+        <source>Select to use the Oxygen pixmap icons</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="88"/>
+        <source>Oxygen</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="112"/>
+        <source>Press to show a dialog with a preview of the selected default icon set</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="140"/>
+        <source>Custom Icon Directories</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IconsPreviewDialog</name>
     <message>
-        <location filename="../Preferences/ConfigurationPages/IconsPreviewDialog.ui" line="13"/>
+        <location filename="../Preferences/ConfigurationPages/IconsPreviewDialog.ui" line="14"/>
         <source>Icons Preview</source>
         <translation>İcon Öngörünümü</translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IconsPreviewDialog.ui" line="25"/>
+        <source>Directory:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IconsPreviewDialog.ui" line="38"/>
+        <source>Select the icons directory to be shown</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IconsPreviewDialog.ui" line="74"/>
+        <source>Invert Background</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IconsPreviewDialog.ui" line="87"/>
+        <source>Refresh</source>
+        <translation type="unfinished">Tazele</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IconsPreviewDialog.ui" line="84"/>
+        <source>Select to refresh the icons display</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IconsPreviewDialog.ui" line="71"/>
+        <source>Select to invert the background color</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>IdlCompilerDefineNameDialog</name>
@@ -42351,7 +42696,7 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="102"/>
         <source>Colours</source>
-        <translation type="unfinished">Renkler</translation>
+        <translation type="obsolete">Renkler</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="108"/>
@@ -42359,116 +42704,56 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="121"/>
-        <source>Select the colour for network messages</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="131"/>
         <source>Nick Names:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="144"/>
-        <source>Select the colour for nick names</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="154"/>
         <source>Server Messages:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="167"/>
-        <source>Select the colour for server messages</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="177"/>
         <source>Own Nick Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="190"/>
-        <source>Select the colour for own nick name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="200"/>
         <source>Channel Messages:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="213"/>
-        <source>Select the colour for channel messages</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="223"/>
         <source>Join Channel:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="236"/>
-        <source>Select the colour for join channel messages</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="246"/>
         <source>Error Messages:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="259"/>
-        <source>Select the colour for error messages</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="269"/>
         <source>Leave Channel:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="282"/>
-        <source>Select the colour for leave channel messages</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="292"/>
         <source>Timestamp:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="305"/>
-        <source>Select the colour for timestamps</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="315"/>
         <source>Channel Info:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="328"/>
-        <source>Select the colour for channel info messages</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="338"/>
         <source>Hyperlink:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="351"/>
-        <source>Select the colour for hyperlinks</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="364"/>
-        <source>Enable to allow coloured text in IRC messages</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="367"/>
         <source>Allow Colored Text in IRC Messages</source>
         <translation type="unfinished"></translation>
@@ -42574,21 +42859,11 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="824"/>
-        <source>Select the foreground colour for the marker</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="834"/>
         <source>Marker Background:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="847"/>
-        <source>Select the background colour for the marker</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="862"/>
         <source>Shutdown</source>
         <translation type="unfinished"></translation>
@@ -42603,6 +42878,81 @@
         <source>Confirm Shutdown When Connected</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="102"/>
+        <source>Colors</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="121"/>
+        <source>Select the color for network messages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="144"/>
+        <source>Select the color for nick names</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="167"/>
+        <source>Select the color for server messages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="190"/>
+        <source>Select the color for own nick name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="213"/>
+        <source>Select the color for channel messages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="236"/>
+        <source>Select the color for join channel messages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="259"/>
+        <source>Select the color for error messages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="282"/>
+        <source>Select the color for leave channel messages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="305"/>
+        <source>Select the color for timestamps</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="328"/>
+        <source>Select the color for channel info messages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="351"/>
+        <source>Select the color for hyperlinks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="364"/>
+        <source>Enable to allow colored text in IRC messages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="824"/>
+        <source>Select the foreground color for the marker</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="847"/>
+        <source>Select the background color for the marker</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>IrcServerEditDialog</name>
@@ -43997,257 +44347,257 @@
 <context>
     <name>LexerPygments</name>
     <message>
-        <location filename="../QScintilla/Lexers/LexerPygments.py" line="180"/>
+        <location filename="../QScintilla/Lexers/LexerPygments.py" line="196"/>
         <source>Default</source>
         <translation>Varsayılan</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/LexerPygments.py" line="181"/>
-        <source>Comment</source>
-        <translation>Yorumlayıcı</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/LexerPygments.py" line="182"/>
-        <source>Preprocessor</source>
-        <translation>Önişlemci</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/LexerPygments.py" line="183"/>
-        <source>Keyword</source>
-        <translation>Anahtar kelime </translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/LexerPygments.py" line="184"/>
-        <source>Pseudo Keyword</source>
-        <translation>Takma Anahtarkellime</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/LexerPygments.py" line="185"/>
-        <source>Type Keyword</source>
-        <translation>Kelime Tipi</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/LexerPygments.py" line="186"/>
-        <source>Operator</source>
-        <translation>Operatör</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/LexerPygments.py" line="187"/>
-        <source>Word</source>
-        <translation>Kelime</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/LexerPygments.py" line="188"/>
-        <source>Builtin</source>
-        <translation>Yerleşik</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/LexerPygments.py" line="189"/>
-        <source>Function or method name</source>
-        <translation>Fonksiyon yada Yöntem (method) adı</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/LexerPygments.py" line="190"/>
-        <source>Class name</source>
-        <translation>Sınıf adı</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/LexerPygments.py" line="191"/>
-        <source>Namespace</source>
-        <translation>İsimboşluğu</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/LexerPygments.py" line="192"/>
-        <source>Exception</source>
-        <translation>İstisna</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/LexerPygments.py" line="193"/>
-        <source>Identifier</source>
-        <translation>Tanımlayıcı</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/LexerPygments.py" line="194"/>
-        <source>Constant</source>
-        <translation>Sabit</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/LexerPygments.py" line="195"/>
-        <source>Label</source>
-        <translation>Etiket</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/LexerPygments.py" line="196"/>
-        <source>Entity</source>
-        <translation>Varlık</translation>
-    </message>
-    <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="197"/>
-        <source>Attribute</source>
-        <translation>Nitelik</translation>
+        <source>Comment</source>
+        <translation>Yorumlayıcı</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="198"/>
-        <source>Tag</source>
-        <translation>Etiket</translation>
+        <source>Preprocessor</source>
+        <translation>Önişlemci</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="199"/>
-        <source>Decorator</source>
-        <translation>Dekoratör</translation>
+        <source>Keyword</source>
+        <translation>Anahtar kelime </translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="200"/>
-        <source>String</source>
-        <translation>Karakter Dizini</translation>
+        <source>Pseudo Keyword</source>
+        <translation>Takma Anahtarkellime</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="201"/>
-        <source>Documentation string</source>
-        <translation>Belgeleme Karakter dizini</translation>
+        <source>Type Keyword</source>
+        <translation>Kelime Tipi</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="202"/>
-        <source>Scalar</source>
-        <translation>Skala</translation>
+        <source>Operator</source>
+        <translation>Operatör</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="203"/>
-        <source>Escape</source>
-        <translation>Kaçış</translation>
+        <source>Word</source>
+        <translation>Kelime</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="204"/>
-        <source>Regular expression</source>
-        <translation>Düzenli ifade</translation>
+        <source>Builtin</source>
+        <translation>Yerleşik</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="205"/>
-        <source>Symbol</source>
-        <translation>Sembol</translation>
+        <source>Function or method name</source>
+        <translation>Fonksiyon yada Yöntem (method) adı</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="206"/>
-        <source>Other string</source>
-        <translation>Diğer karakter dizini</translation>
+        <source>Class name</source>
+        <translation>Sınıf adı</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="207"/>
-        <source>Number</source>
-        <translation>Numara</translation>
+        <source>Namespace</source>
+        <translation>İsimboşluğu</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="208"/>
-        <source>Heading</source>
-        <translation>Başlık</translation>
+        <source>Exception</source>
+        <translation>İstisna</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="209"/>
-        <source>Subheading</source>
-        <translation>Altbaşlık</translation>
+        <source>Identifier</source>
+        <translation>Tanımlayıcı</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="210"/>
-        <source>Deleted</source>
-        <translation>Silindi</translation>
+        <source>Constant</source>
+        <translation>Sabit</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="211"/>
-        <source>Inserted</source>
-        <translation>Araya girme</translation>
+        <source>Label</source>
+        <translation>Etiket</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="212"/>
-        <source>Generic error</source>
-        <translation>Genel Hata</translation>
+        <source>Entity</source>
+        <translation>Varlık</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="213"/>
-        <source>Emphasized text</source>
-        <translation>Vurgulanmış Metin</translation>
+        <source>Attribute</source>
+        <translation>Nitelik</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="214"/>
-        <source>Strong text</source>
-        <translation>Vurgulu Metin</translation>
+        <source>Tag</source>
+        <translation>Etiket</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="215"/>
-        <source>Prompt</source>
-        <translation>İleti</translation>
+        <source>Decorator</source>
+        <translation>Dekoratör</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="216"/>
-        <source>Output</source>
-        <translation>Çıktı</translation>
+        <source>String</source>
+        <translation>Karakter Dizini</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="217"/>
-        <source>Traceback</source>
-        <translation>Geriiz</translation>
+        <source>Documentation string</source>
+        <translation>Belgeleme Karakter dizini</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="218"/>
-        <source>Error</source>
-        <translation>Hata</translation>
+        <source>Scalar</source>
+        <translation>Skala</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="219"/>
-        <source>Comment block</source>
-        <translation type="unfinished"></translation>
+        <source>Escape</source>
+        <translation>Kaçış</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="220"/>
-        <source>Property</source>
-        <translation type="unfinished"></translation>
+        <source>Regular expression</source>
+        <translation>Düzenli ifade</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="221"/>
-        <source>Character</source>
-        <translation type="unfinished"></translation>
+        <source>Symbol</source>
+        <translation>Sembol</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="222"/>
-        <source>Here document</source>
-        <translation type="unfinished"></translation>
+        <source>Other string</source>
+        <translation>Diğer karakter dizini</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="223"/>
-        <source>Punctuation</source>
-        <translation type="unfinished"></translation>
+        <source>Number</source>
+        <translation>Numara</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="224"/>
-        <source>Hashbang</source>
-        <translation type="unfinished"></translation>
+        <source>Heading</source>
+        <translation>Başlık</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="225"/>
-        <source>Reserved Keyword</source>
-        <translation type="unfinished"></translation>
+        <source>Subheading</source>
+        <translation>Altbaşlık</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="226"/>
-        <source>Literal</source>
-        <translation type="unfinished"></translation>
+        <source>Deleted</source>
+        <translation>Silindi</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="227"/>
-        <source>Double quoted string</source>
-        <translation type="unfinished"></translation>
+        <source>Inserted</source>
+        <translation>Araya girme</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="228"/>
-        <source>Single quoted string</source>
-        <translation type="unfinished"></translation>
+        <source>Generic error</source>
+        <translation>Genel Hata</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="229"/>
-        <source>Backtick string</source>
-        <translation type="unfinished"></translation>
+        <source>Emphasized text</source>
+        <translation>Vurgulanmış Metin</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="230"/>
+        <source>Strong text</source>
+        <translation>Vurgulu Metin</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/LexerPygments.py" line="231"/>
+        <source>Prompt</source>
+        <translation>İleti</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/LexerPygments.py" line="232"/>
+        <source>Output</source>
+        <translation>Çıktı</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/LexerPygments.py" line="233"/>
+        <source>Traceback</source>
+        <translation>Geriiz</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/LexerPygments.py" line="234"/>
+        <source>Error</source>
+        <translation>Hata</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/LexerPygments.py" line="235"/>
+        <source>Comment block</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/LexerPygments.py" line="236"/>
+        <source>Property</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/LexerPygments.py" line="237"/>
+        <source>Character</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/LexerPygments.py" line="238"/>
+        <source>Here document</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/LexerPygments.py" line="239"/>
+        <source>Punctuation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/LexerPygments.py" line="240"/>
+        <source>Hashbang</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/LexerPygments.py" line="241"/>
+        <source>Reserved Keyword</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/LexerPygments.py" line="242"/>
+        <source>Literal</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/LexerPygments.py" line="243"/>
+        <source>Double quoted string</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/LexerPygments.py" line="244"/>
+        <source>Single quoted string</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/LexerPygments.py" line="245"/>
+        <source>Backtick string</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/LexerPygments.py" line="246"/>
         <source>Whitespace</source>
         <translation type="unfinished"></translation>
     </message>
@@ -45312,14 +45662,9 @@
         <translation type="unfinished">Yeni çıktının üzerinde göster</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/LogViewerPage.ui" line="49"/>
-        <source>Error Colour:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/LogViewerPage.ui" line="62"/>
         <source>Select the colour for text sent to stderr</source>
-        <translation type="unfinished">Stdhatalarda gösterilecek metnin rengini seç</translation>
+        <translation type="obsolete">Stdhatalarda gösterilecek metnin rengini seç</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/LogViewerPage.ui" line="87"/>
@@ -45356,6 +45701,16 @@
         <source>&lt;b&gt;Message Filters for both&lt;/b&gt;&lt;p&gt;This list shows the configured message filters used to suppress messages received via stdout or stderr.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/LogViewerPage.ui" line="49"/>
+        <source>Error Color:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/LogViewerPage.ui" line="62"/>
+        <source>Select the color for text sent to stderr</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MakePropertiesDialog</name>
@@ -46141,27 +46496,27 @@
 <context>
     <name>MicroPythonDevice</name>
     <message>
-        <location filename="../MicroPython/MicroPythonDevices.py" line="207"/>
+        <location filename="../MicroPython/MicroPythonDevices.py" line="214"/>
         <source>Unsupported Device</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonDevices.py" line="217"/>
+        <location filename="../MicroPython/MicroPythonDevices.py" line="224"/>
         <source>REPL is not supported by this device.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonDevices.py" line="236"/>
+        <location filename="../MicroPython/MicroPythonDevices.py" line="243"/>
         <source>Plotter is not supported by this device.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonDevices.py" line="255"/>
+        <location filename="../MicroPython/MicroPythonDevices.py" line="262"/>
         <source>Running scripts is not supported by this device.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonDevices.py" line="275"/>
+        <location filename="../MicroPython/MicroPythonDevices.py" line="282"/>
         <source>File Manager is not supported by this device.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -46425,27 +46780,27 @@
 <context>
     <name>MicroPythonGraphWidget</name>
     <message>
-        <location filename="../MicroPython/MicroPythonGraphWidget.py" line="63"/>
+        <location filename="../MicroPython/MicroPythonGraphWidget.py" line="64"/>
         <source>Press to save the raw data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonGraphWidget.py" line="72"/>
+        <location filename="../MicroPython/MicroPythonGraphWidget.py" line="73"/>
         <source>max. X:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonGraphWidget.py" line="81"/>
+        <location filename="../MicroPython/MicroPythonGraphWidget.py" line="82"/>
         <source>Enter the maximum number of data points to be plotted.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonGraphWidget.py" line="311"/>
+        <location filename="../MicroPython/MicroPythonGraphWidget.py" line="329"/>
         <source>Save Chart Data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonGraphWidget.py" line="311"/>
+        <location filename="../MicroPython/MicroPythonGraphWidget.py" line="329"/>
         <source>&lt;p&gt;The chart data could not be saved into file &lt;b&gt;{0}&lt;/b&gt;.&lt;/p&gt;&lt;p&gt;Reason: {1}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -46513,93 +46868,168 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="169"/>
+        <source>MPY Cross Compiler</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="175"/>
+        <source>Program:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="191"/>
+        <source>Enter the path of the cross compiler executable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.py" line="67"/>
+        <source>All Files (*)</source>
+        <translation type="unfinished">Tüm Dosyalar (*)</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="298"/>
+        <source>Documentation</source>
+        <translation type="unfinished">Belgeleme</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="304"/>
+        <source>MicroPython:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="311"/>
+        <source>Enter the URL for the MicroPython documentation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="318"/>
+        <source>CircuitPython:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="325"/>
+        <source>Enter the URL for the CircuitPython documentation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="332"/>
+        <source>BBC micro:bit:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="339"/>
+        <source>Enter the URL for the BBC micro:bit MicroPython documentation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="201"/>
+        <source>PyBoard</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="207"/>
+        <source>dfu-util Path:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="223"/>
+        <source>Enter the path of the dfu-util flashing executable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="233"/>
+        <source>Firmware</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="246"/>
+        <source>Enter the URL for the MicroPython firmware for PyBoard, ESP8266 and ESP32</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="260"/>
+        <source>Enter the URL for the CircuitPython firmware</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="274"/>
+        <source>Enter the URL for the BBC micro:bit Firmware</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="140"/>
-        <source>MPY Cross Compiler</source>
+        <source>Chart Pane</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="146"/>
-        <source>Program:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="162"/>
-        <source>Enter the path of the cross compiler executable</source>
+        <source>Color Theme:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="159"/>
+        <source>Select the color scheme of the chart</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/MicroPythonPage.py" line="42"/>
-        <source>All Files (*)</source>
-        <translation type="unfinished">Tüm Dosyalar (*)</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="255"/>
-        <source>Documentation</source>
-        <translation type="unfinished">Belgeleme</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="261"/>
-        <source>MicroPython:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="268"/>
-        <source>Enter the URL for the MicroPython documentation</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="275"/>
-        <source>CircuitPython:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="282"/>
-        <source>Enter the URL for the CircuitPython documentation</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="289"/>
-        <source>BBC micro:bit:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="296"/>
-        <source>Enter the URL for the BBC micro:bit MicroPython documentation</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="172"/>
-        <source>PyBoard</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="178"/>
-        <source>dfu-util Path:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="194"/>
-        <source>Enter the path of the dfu-util flashing executable</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="204"/>
-        <source>Firmware</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="217"/>
-        <source>Enter the URL for the MicroPython firmware for PyBoard, ESP8266 and ESP32</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="231"/>
-        <source>Enter the URL for the CircuitPython firmware</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="245"/>
-        <source>Enter the URL for the BBC micro:bit Firmware</source>
+        <source>Automatic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.py" line="44"/>
+        <source>Light</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.py" line="46"/>
+        <source>Dark</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.py" line="48"/>
+        <source>Blue Cerulean</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.py" line="50"/>
+        <source>Brown Sand</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.py" line="52"/>
+        <source>Blue NCS</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.py" line="54"/>
+        <source>High Contrast</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.py" line="56"/>
+        <source>Blue Icy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.py" line="58"/>
+        <source>Qt</source>
+        <translation type="unfinished">Qt</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="346"/>
+        <source>Calliope mini:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="288"/>
+        <source>Enter the URL for the Callope mini Firmware</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="353"/>
+        <source>Enter the URL for the Calliope mini MicroPython documentation</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -46644,17 +47074,17 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="420"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="460"/>
         <source>Press to connect the selected device</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="226"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="263"/>
         <source>&lt;h3&gt;The QtSerialPort package is not available.&lt;br/&gt;MicroPython support is deactivated.&lt;/h3&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message numerus="yes">
-        <location filename="../MicroPython/MicroPythonWidget.py" line="263"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="300"/>
         <source>%n supported device(s) detected.</source>
         <translation type="unfinished">
             <numerusform></numerusform>
@@ -46662,42 +47092,42 @@
         </translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="269"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="306"/>
         <source>{0} at {1}</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="277"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="314"/>
         <source>No supported devices detected.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="390"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="430"/>
         <source>Clear</source>
         <translation type="unfinished">Temizle</translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="392"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="432"/>
         <source>Copy</source>
         <translation type="unfinished">Kopyala</translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="393"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="433"/>
         <source>Paste</source>
         <translation type="unfinished">Yapıştır</translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="415"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="455"/>
         <source>Press to disconnect the current device</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="436"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="476"/>
         <source>No device attached</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="436"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="476"/>
         <source>Please ensure the device is plugged into your computer and selected.
 
 It must have a version of MicroPython (or CircuitPython) flashed onto it before anything will work.
@@ -46706,217 +47136,217 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="463"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="503"/>
         <source>Start REPL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="463"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="503"/>
         <source>&lt;p&gt;The REPL cannot be started.&lt;/p&gt;&lt;p&gt;Reason: {0}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="853"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="893"/>
         <source>Serial Device Connect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="853"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="893"/>
         <source>&lt;p&gt;Cannot connect to device at serial port &lt;b&gt;{0}&lt;/b&gt;.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="898"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="938"/>
         <source>Run Script</source>
         <translation type="unfinished">Betiği Çalıştır</translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="881"/>
-        <source>There is no editor open. Abort...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="889"/>
-        <source>The current editor does not contain a script. Abort...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="898"/>
-        <source>&lt;p&gt;Cannot run script.&lt;/p&gt;&lt;p&gt;Reason: {0}&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="921"/>
-        <source>Open Python File</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../MicroPython/MicroPythonWidget.py" line="921"/>
+        <source>There is no editor open. Abort...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="929"/>
+        <source>The current editor does not contain a script. Abort...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="938"/>
+        <source>&lt;p&gt;Cannot run script.&lt;/p&gt;&lt;p&gt;Reason: {0}&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="961"/>
+        <source>Open Python File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="961"/>
         <source>Python3 Files (*.py);;All Files (*)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="965"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1005"/>
         <source>Start Chart</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="965"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1005"/>
         <source>&lt;p&gt;The Chart cannot be started.&lt;/p&gt;&lt;p&gt;Reason: {0}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="994"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1034"/>
         <source>Unsaved Chart Data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="994"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1034"/>
         <source>The chart contains unsaved data.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1045"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1085"/>
         <source>Start File Manager</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1045"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1085"/>
         <source>&lt;p&gt;The File Manager cannot be started.&lt;/p&gt;&lt;p&gt;Reason: {0}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1096"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1136"/>
         <source>Show Version</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1099"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1139"/>
         <source>Show Implementation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1210"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1250"/>
         <source>Synchronize Time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1107"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1147"/>
         <source>Show Device Time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1110"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1150"/>
         <source>Show Local Time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1421"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1461"/>
         <source>Compile Python File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1481"/>
+        <source>Compile Current Editor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1188"/>
+        <source>&lt;h3&gt;Device Version Information&lt;/h3&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1197"/>
+        <source>No version information available.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1199"/>
+        <source>Device Version Information</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1222"/>
+        <source>unknown</source>
+        <translation type="unfinished">bilinmeyen</translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1226"/>
+        <source>Device Implementation Information</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1226"/>
+        <source>&lt;h3&gt;Device Implementation Information&lt;/h3&gt;&lt;p&gt;This device contains &lt;b&gt;{0} {1}&lt;/b&gt;.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1250"/>
+        <source>&lt;p&gt;The time of the connected device was synchronized with the local time.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1272"/>
+        <source>&lt;h3&gt;Device Date and Time&lt;/h3&gt;&lt;table&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Date&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Time&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{1}&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1280"/>
+        <source>&lt;h3&gt;Device Date and Time&lt;/h3&gt;&lt;p&gt;{0}&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1294"/>
+        <source>Device Date and Time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1307"/>
+        <source>Local Date and Time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1307"/>
+        <source>&lt;h3&gt;Local Date and Time&lt;/h3&gt;&lt;table&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Date&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Time&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{1}&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1374"/>
+        <source>Error handling device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1374"/>
+        <source>&lt;p&gt;There was an error communicating with the connected device.&lt;/p&gt;&lt;p&gt;Method: {0}&lt;/p&gt;&lt;p&gt;Message: {1}&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1413"/>
+        <source>The MicroPython cross compiler &lt;b&gt;mpy-cross&lt;/b&gt; cannot be found. Ensure it is in the search path or configure it on the MicroPython configuration page.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1431"/>
+        <source>Python Files (*.py);;All Files (*)</source>
+        <translation type="unfinished">Python Dosyaları (*.py);;Tüm Dosyalar (*)</translation>
+    </message>
+    <message>
         <location filename="../MicroPython/MicroPythonWidget.py" line="1441"/>
-        <source>Compile Current Editor</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1148"/>
-        <source>&lt;h3&gt;Device Version Information&lt;/h3&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1157"/>
-        <source>No version information available.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1159"/>
-        <source>Device Version Information</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1182"/>
-        <source>unknown</source>
-        <translation type="unfinished">bilinmeyen</translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1186"/>
-        <source>Device Implementation Information</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1186"/>
-        <source>&lt;h3&gt;Device Implementation Information&lt;/h3&gt;&lt;p&gt;This device contains &lt;b&gt;{0} {1}&lt;/b&gt;.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1210"/>
-        <source>&lt;p&gt;The time of the connected device was synchronized with the local time.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1232"/>
-        <source>&lt;h3&gt;Device Date and Time&lt;/h3&gt;&lt;table&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Date&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Time&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{1}&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1240"/>
-        <source>&lt;h3&gt;Device Date and Time&lt;/h3&gt;&lt;p&gt;{0}&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1254"/>
-        <source>Device Date and Time</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1267"/>
-        <source>Local Date and Time</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1267"/>
-        <source>&lt;h3&gt;Local Date and Time&lt;/h3&gt;&lt;table&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Date&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Time&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{1}&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1334"/>
-        <source>Error handling device</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1334"/>
-        <source>&lt;p&gt;There was an error communicating with the connected device.&lt;/p&gt;&lt;p&gt;Method: {0}&lt;/p&gt;&lt;p&gt;Message: {1}&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1373"/>
-        <source>The MicroPython cross compiler &lt;b&gt;mpy-cross&lt;/b&gt; cannot be found. Ensure it is in the search path or configure it on the MicroPython configuration page.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1391"/>
-        <source>Python Files (*.py);;All Files (*)</source>
-        <translation type="unfinished">Python Dosyaları (*.py);;Tüm Dosyalar (*)</translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1401"/>
         <source>The Python file &lt;b&gt;{0}&lt;/b&gt; does not exist. Aborting...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1411"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1451"/>
         <source>&apos;mpy-cross&apos; Output</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1434"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1474"/>
         <source>The current editor does not contain a Python file. Aborting...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="175"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="211"/>
         <source>MicroPython Menu</source>
         <translation type="unfinished"></translation>
     </message>
@@ -46926,47 +47356,47 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="978"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1018"/>
         <source>&#xc2;&#xb5;Py Chart</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1058"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1098"/>
         <source>&#xc2;&#xb5;Py Files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1134"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1174"/>
         <source>Show Documentation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1138"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1178"/>
         <source>Configure</source>
         <translation type="unfinished">Yapılandırma</translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1113"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1153"/>
         <source>Show Time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1130"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1170"/>
         <source>Download Firmware</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1310"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1350"/>
         <source>Date and Time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1293"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1333"/>
         <source>&lt;table&gt;&lt;tr&gt;&lt;th&gt;&lt;/th&gt;&lt;th&gt;Local Date and Time&lt;/th&gt;&lt;th&gt;Device Date and Time&lt;/th&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Date&lt;/b&gt;&lt;/td&gt;&lt;td align=&apos;center&apos;&gt;{0}&lt;/td&gt;&lt;td align=&apos;center&apos;&gt;{2}&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Time&lt;/b&gt;&lt;/td&gt;&lt;td align=&apos;center&apos;&gt;{1}&lt;/td&gt;&lt;td align=&apos;center&apos;&gt;{3}&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1310"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1350"/>
         <source>&lt;table&gt;&lt;tr&gt;&lt;th&gt;Local Date and Time&lt;/th&gt;&lt;th&gt;Device Date and Time&lt;/th&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td align=&apos;center&apos;&gt;{0} {1}&lt;/td&gt;&lt;td align=&apos;center&apos;&gt;{2}&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -46974,85 +47404,90 @@
 <context>
     <name>MicrobitDevice</name>
     <message>
-        <location filename="../MicroPython/MicrobitDevices.py" line="67"/>
+        <location filename="../MicroPython/MicrobitDevices.py" line="74"/>
         <source>BBC micro:bit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicrobitDevices.py" line="134"/>
+        <location filename="../MicroPython/MicrobitDevices.py" line="149"/>
         <source>Workspace Directory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicrobitDevices.py" line="134"/>
-        <source>Could not find an attached BBC micro:bit.
+        <location filename="../MicroPython/MicrobitDevices.py" line="186"/>
+        <source>Save Script as &apos;main.py&apos;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicrobitDevices.py" line="188"/>
+        <source>Save the current script as &apos;main.py&apos; on the connected device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicrobitDevices.py" line="241"/>
+        <source>MicroPython Firmware Files (*.hex);;All Files (*)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicrobitDevices.py" line="286"/>
+        <source>The script is empty. Aborting.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicrobitDevices.py" line="276"/>
+        <source>The current editor does not contain a Python script. Write it anyway?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicrobitDevices.py" line="314"/>
+        <source>&lt;p&gt;The script could not be saved to the device.&lt;/p&gt;&lt;p&gt;Reason: {0}&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicrobitDevices.py" line="241"/>
+        <source>Flash MicroPython Firmware</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicrobitDevices.py" line="273"/>
+        <source>Save Script</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicrobitDevices.py" line="303"/>
+        <source>Save Script as &apos;{0}&apos;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicrobitDevices.py" line="294"/>
+        <source>Enter a file name on the device:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicrobitDevices.py" line="183"/>
+        <source>Save the current script to the selected device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicrobitDevices.py" line="77"/>
+        <source>Calliope mini</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicrobitDevices.py" line="232"/>
+        <source>Could not find an attached {0}.
 
 Please make sure the device is plugged into this computer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicrobitDevices.py" line="171"/>
-        <source>Save Script as &apos;main.py&apos;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicrobitDevices.py" line="173"/>
-        <source>Save the current script as &apos;main.py&apos; on the connected device</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicrobitDevices.py" line="177"/>
-        <source>Reset micro:bit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicrobitDevices.py" line="201"/>
-        <source>MicroPython Firmware Files (*.hex);;All Files (*)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicrobitDevices.py" line="246"/>
-        <source>The script is empty. Aborting.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicrobitDevices.py" line="236"/>
-        <source>The current editor does not contain a Python script. Write it anyway?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicrobitDevices.py" line="274"/>
-        <source>&lt;p&gt;The script could not be saved to the device.&lt;/p&gt;&lt;p&gt;Reason: {0}&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicrobitDevices.py" line="201"/>
-        <source>Flash MicroPython Firmware</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicrobitDevices.py" line="233"/>
-        <source>Save Script</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicrobitDevices.py" line="190"/>
-        <source>The BBC micro:bit is not ready for flashing. See the &lt;a href=&quot;https://microbit.org/guide/firmware/&quot;&gt;micro:bit web site&lt;/a&gt; for details.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicrobitDevices.py" line="263"/>
-        <source>Save Script as &apos;{0}&apos;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicrobitDevices.py" line="254"/>
-        <source>Enter a file name on the device:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicrobitDevices.py" line="168"/>
-        <source>Save the current script to the selected device</source>
+        <location filename="../MicroPython/MicrobitDevices.py" line="192"/>
+        <source>Reset {0}</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicrobitDevices.py" line="213"/>
+        <source>&lt;p&gt;The BBC micro:bit is not ready for flashing. Follow these instructions.&lt;/p&gt;&lt;ul&gt;&lt;li&gt;unplug USB cable and any batteries&lt;/li&gt;&lt;li&gt;keep RESET button pressed an plug USB cable back in&lt;/li&gt;&lt;li&gt;a drive called MAINTENANCE should be available&lt;/li&gt;&lt;/ul&gt;&lt;p&gt;See the &lt;a href=&quot;https://microbit.org/guide/firmware/&quot;&gt;micro:bit web site&lt;/a&gt; for details.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -50936,7 +51371,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message numerus="yes">
-        <location filename="../PipInterface/PipPackagesWidget.py" line="635"/>
+        <location filename="../PipInterface/PipPackagesWidget.py" line="645"/>
         <source>%n package(s) found.</source>
         <translation type="unfinished">
             <numerusform></numerusform>
@@ -50944,102 +51379,102 @@
         </translation>
     </message>
     <message>
-        <location filename="../PipInterface/PipPackagesWidget.py" line="888"/>
+        <location filename="../PipInterface/PipPackagesWidget.py" line="898"/>
         <source>Search PyPI</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../PipInterface/PipPackagesWidget.py" line="673"/>
+        <location filename="../PipInterface/PipPackagesWidget.py" line="683"/>
         <source>&lt;p&gt;The package search did not return anything.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../PipInterface/PipPackagesWidget.py" line="710"/>
+        <location filename="../PipInterface/PipPackagesWidget.py" line="720"/>
         <source>&lt;p&gt;The package search failed.&lt;/p&gt;&lt;p&gt;Reason: {0}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../PipInterface/PipPackagesWidget.py" line="715"/>
+        <location filename="../PipInterface/PipPackagesWidget.py" line="725"/>
         <source>Error: {0}</source>
         <translation type="unfinished">Hata: {0}</translation>
     </message>
     <message>
-        <location filename="../PipInterface/PipPackagesWidget.py" line="848"/>
+        <location filename="../PipInterface/PipPackagesWidget.py" line="858"/>
         <source>Show Package Details</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../PipInterface/PipPackagesWidget.py" line="848"/>
+        <location filename="../PipInterface/PipPackagesWidget.py" line="858"/>
         <source>Select the package version:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../PipInterface/PipPackagesWidget.py" line="888"/>
+        <location filename="../PipInterface/PipPackagesWidget.py" line="898"/>
         <source>&lt;p&gt;No package details info for &lt;b&gt;{0}&lt;/b&gt; available.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../PipInterface/PipPackagesWidget.py" line="904"/>
+        <location filename="../PipInterface/PipPackagesWidget.py" line="914"/>
         <source>Install Pip</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../PipInterface/PipPackagesWidget.py" line="907"/>
-        <source>Install Pip to User-Site</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../PipInterface/PipPackagesWidget.py" line="910"/>
-        <source>Repair Pip</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../PipInterface/PipPackagesWidget.py" line="1005"/>
-        <source>Install Packages</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../PipInterface/PipPackagesWidget.py" line="917"/>
-        <source>Install Local Package</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../PipInterface/PipPackagesWidget.py" line="921"/>
-        <source>Install Requirements</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../PipInterface/PipPackagesWidget.py" line="924"/>
-        <source>Uninstall Requirements</source>
+        <source>Install Pip to User-Site</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../PipInterface/PipPackagesWidget.py" line="920"/>
+        <source>Repair Pip</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../PipInterface/PipPackagesWidget.py" line="1015"/>
+        <source>Install Packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../PipInterface/PipPackagesWidget.py" line="927"/>
+        <source>Install Local Package</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../PipInterface/PipPackagesWidget.py" line="931"/>
+        <source>Install Requirements</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../PipInterface/PipPackagesWidget.py" line="934"/>
+        <source>Uninstall Requirements</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../PipInterface/PipPackagesWidget.py" line="937"/>
         <source>Generate Requirements...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../PipInterface/PipPackagesWidget.py" line="932"/>
+        <location filename="../PipInterface/PipPackagesWidget.py" line="942"/>
         <source>Edit User Configuration...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../PipInterface/PipPackagesWidget.py" line="935"/>
+        <location filename="../PipInterface/PipPackagesWidget.py" line="945"/>
         <source>Edit Environment Configuration...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../PipInterface/PipPackagesWidget.py" line="940"/>
+        <location filename="../PipInterface/PipPackagesWidget.py" line="950"/>
         <source>Configure...</source>
         <translation type="unfinished">Ayarlanıyor...</translation>
     </message>
     <message>
-        <location filename="../PipInterface/PipPackagesWidget.py" line="1118"/>
+        <location filename="../PipInterface/PipPackagesWidget.py" line="1128"/>
         <source>Edit Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../PipInterface/PipPackagesWidget.py" line="1118"/>
+        <location filename="../PipInterface/PipPackagesWidget.py" line="1128"/>
         <source>No valid configuration path determined. Aborting</source>
         <translation type="unfinished"></translation>
     </message>
@@ -52320,17 +52755,17 @@
 <context>
     <name>Preferences</name>
     <message>
-        <location filename="../Preferences/__init__.py" line="1624"/>
+        <location filename="../Preferences/__init__.py" line="1640"/>
         <source>Export Preferences</source>
         <translation>Seçenekleri Dışa Aktar</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1652"/>
+        <location filename="../Preferences/__init__.py" line="1668"/>
         <source>Import Preferences</source>
         <translation>Seçenekleri İçe Aktar</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1652"/>
+        <location filename="../Preferences/__init__.py" line="1668"/>
         <source>Properties File (*.ini);;All Files (*)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -52537,7 +52972,7 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/PrinterPage.ui" line="77"/>
         <source>Colour</source>
-        <translation>Renk</translation>
+        <translation type="obsolete">Renk</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/PrinterPage.ui" line="84"/>
@@ -52577,7 +53012,7 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/PrinterPage.ui" line="49"/>
         <source>Colour Mode:</source>
-        <translation>Renk Modu:</translation>
+        <translation type="obsolete">Renk Modu:</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/PrinterPage.ui" line="94"/>
@@ -52629,6 +53064,16 @@
         <source> DPI</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/PrinterPage.ui" line="49"/>
+        <source>Color Mode:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/PrinterPage.ui" line="77"/>
+        <source>Color</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ProgramsDialog</name>
@@ -52881,312 +53326,312 @@
         <translation>Kaydedilmiş Proje Türü</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="805"/>
+        <location filename="../Project/Project.py" line="817"/>
         <source>Read project file</source>
         <translation>Proje dosyasını oku</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="805"/>
+        <location filename="../Project/Project.py" line="817"/>
         <source>&lt;p&gt;The project file &lt;b&gt;{0}&lt;/b&gt; could not be read.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Proje dosyası &lt;b&gt;{0}&lt;/b&gt; okunamdı.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="908"/>
+        <location filename="../Project/Project.py" line="920"/>
         <source>Save project file</source>
         <translation>Proje dosyasını kaydet</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="908"/>
+        <location filename="../Project/Project.py" line="920"/>
         <source>&lt;p&gt;The project file &lt;b&gt;{0}&lt;/b&gt; could not be written.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="944"/>
+        <location filename="../Project/Project.py" line="956"/>
         <source>Read user project properties</source>
         <translation>Kullanıcı projesinin özelliklerini oku</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="944"/>
+        <location filename="../Project/Project.py" line="956"/>
         <source>&lt;p&gt;The user specific project properties file &lt;b&gt;{0}&lt;/b&gt; could not be read.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="968"/>
+        <location filename="../Project/Project.py" line="980"/>
         <source>Save user project properties</source>
         <translation>Kullanıcı projesinin özelliklerini kaydet</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="968"/>
+        <location filename="../Project/Project.py" line="980"/>
         <source>&lt;p&gt;The user specific project properties file &lt;b&gt;{0}&lt;/b&gt; could not be written.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1026"/>
+        <location filename="../Project/Project.py" line="1038"/>
         <source>Read project session</source>
         <translation>Proje oturumunu oku</translation>
     </message>
     <message>
+        <location filename="../Project/Project.py" line="1263"/>
+        <source>Please save the project first.</source>
+        <translation>Lütfen ilkolarak projeyi kaydedin.</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="1038"/>
+        <source>&lt;p&gt;The project session file &lt;b&gt;{0}&lt;/b&gt; could not be read.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="1074"/>
+        <source>Save project session</source>
+        <translation>Proje oturumunu kaydet</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="1074"/>
+        <source>&lt;p&gt;The project session file &lt;b&gt;{0}&lt;/b&gt; could not be written.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="1103"/>
+        <source>Delete project session</source>
+        <translation>Proje oturumunu sil</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="1103"/>
+        <source>&lt;p&gt;The project session file &lt;b&gt;{0}&lt;/b&gt; could not be deleted.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="1137"/>
+        <source>Read tasks</source>
+        <translation>Görevler Okunuyor</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="1137"/>
+        <source>&lt;p&gt;The tasks file &lt;b&gt;{0}&lt;/b&gt; could not be read.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="1157"/>
+        <source>Save tasks</source>
+        <translation>Görevleri kaydet</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="1157"/>
+        <source>&lt;p&gt;The tasks file &lt;b&gt;{0}&lt;/b&gt; could not be written.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="1216"/>
+        <source>Read debugger properties</source>
+        <translation>Hata ayıklayıcı özelliklerini oku</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="1216"/>
+        <source>&lt;p&gt;The project debugger properties file &lt;b&gt;{0}&lt;/b&gt; could not be read.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="1251"/>
+        <source>Save debugger properties</source>
+        <translation>Hata ayıklayıcı özelliklerini kaydet</translation>
+    </message>
+    <message>
         <location filename="../Project/Project.py" line="1251"/>
-        <source>Please save the project first.</source>
-        <translation>Lütfen ilkolarak projeyi kaydedin.</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="1026"/>
-        <source>&lt;p&gt;The project session file &lt;b&gt;{0}&lt;/b&gt; could not be read.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="1062"/>
-        <source>Save project session</source>
-        <translation>Proje oturumunu kaydet</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="1062"/>
-        <source>&lt;p&gt;The project session file &lt;b&gt;{0}&lt;/b&gt; could not be written.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="1091"/>
-        <source>Delete project session</source>
-        <translation>Proje oturumunu sil</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="1091"/>
-        <source>&lt;p&gt;The project session file &lt;b&gt;{0}&lt;/b&gt; could not be deleted.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="1125"/>
-        <source>Read tasks</source>
-        <translation>Görevler Okunuyor</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="1125"/>
-        <source>&lt;p&gt;The tasks file &lt;b&gt;{0}&lt;/b&gt; could not be read.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="1145"/>
-        <source>Save tasks</source>
-        <translation>Görevleri kaydet</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="1145"/>
-        <source>&lt;p&gt;The tasks file &lt;b&gt;{0}&lt;/b&gt; could not be written.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="1204"/>
-        <source>Read debugger properties</source>
-        <translation>Hata ayıklayıcı özelliklerini oku</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="1204"/>
-        <source>&lt;p&gt;The project debugger properties file &lt;b&gt;{0}&lt;/b&gt; could not be read.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="1239"/>
-        <source>Save debugger properties</source>
-        <translation>Hata ayıklayıcı özelliklerini kaydet</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="1239"/>
         <source>&lt;p&gt;The project debugger properties file &lt;b&gt;{0}&lt;/b&gt; could not be written.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1265"/>
+        <location filename="../Project/Project.py" line="1277"/>
         <source>Delete debugger properties</source>
         <translation>Hata ayıklayıcı özelliklerini sil</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1265"/>
+        <location filename="../Project/Project.py" line="1277"/>
         <source>&lt;p&gt;The project debugger properties file &lt;b&gt;{0}&lt;/b&gt; could not be deleted.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1393"/>
+        <location filename="../Project/Project.py" line="1405"/>
         <source>Add Language</source>
         <translation>Dil Ekle</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1393"/>
+        <location filename="../Project/Project.py" line="1405"/>
         <source>You have to specify a translation pattern first.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1519"/>
+        <location filename="../Project/Project.py" line="1531"/>
         <source>Delete translation</source>
         <translation>Çeviriyi silin</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1684"/>
+        <location filename="../Project/Project.py" line="1696"/>
         <source>Add file</source>
         <translation>Dosya ekle</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1748"/>
+        <location filename="../Project/Project.py" line="1760"/>
         <source>&lt;p&gt;The file &lt;b&gt;{0}&lt;/b&gt; already exists.&lt;/p&gt;&lt;p&gt;Overwrite it?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1671"/>
+        <location filename="../Project/Project.py" line="1683"/>
         <source>&lt;p&gt;The selected file &lt;b&gt;{0}&lt;/b&gt; could not be added to &lt;b&gt;{1}&lt;/b&gt;.&lt;/p&gt;&lt;p&gt;Reason: {2}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1816"/>
+        <location filename="../Project/Project.py" line="1828"/>
         <source>The target directory must not be empty.</source>
         <translation>Hedef dizin boş olamaz.</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1827"/>
+        <location filename="../Project/Project.py" line="1839"/>
         <source>Add directory</source>
         <translation>Dizin Ekle</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1715"/>
+        <location filename="../Project/Project.py" line="1727"/>
         <source>&lt;p&gt;The source directory doesn&apos;t contain any files belonging to the selected category.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1730"/>
+        <location filename="../Project/Project.py" line="1742"/>
         <source>&lt;p&gt;The target directory &lt;b&gt;{0}&lt;/b&gt; could not be created.&lt;/p&gt;&lt;p&gt;Reason: {1}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1827"/>
+        <location filename="../Project/Project.py" line="1839"/>
         <source>The source directory must not be empty.</source>
         <translation>Kaynak dizin boş olamaz.</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1964"/>
+        <location filename="../Project/Project.py" line="1976"/>
         <source>Rename file</source>
         <translation>Dosya adını değiştir</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1988"/>
+        <location filename="../Project/Project.py" line="2000"/>
         <source>Rename File</source>
         <translation>Dosya adını Değiştir</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3130"/>
+        <location filename="../Project/Project.py" line="3147"/>
         <source>&lt;p&gt;The file &lt;b&gt;{0}&lt;/b&gt; already exists. Overwrite it?&lt;/p&gt;</source>
         <translation>&lt;p&gt;&lt;b&gt;{0}&lt;/b&gt; dosyası halen mevcut. Üzerine yazılsın mı?&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1988"/>
+        <location filename="../Project/Project.py" line="2000"/>
         <source>&lt;p&gt;The file &lt;b&gt;{0}&lt;/b&gt; could not be renamed.&lt;br /&gt;Reason: {1}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="2233"/>
+        <location filename="../Project/Project.py" line="2250"/>
         <source>Delete file</source>
         <translation>Dosya sil</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="2263"/>
+        <location filename="../Project/Project.py" line="2280"/>
         <source>Delete directory</source>
         <translation>Dizini sil</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="2358"/>
+        <location filename="../Project/Project.py" line="2375"/>
         <source>Create project directory</source>
         <translation>Proje dizinin oluştur</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="2358"/>
+        <location filename="../Project/Project.py" line="2375"/>
         <source>&lt;p&gt;The project directory &lt;b&gt;{0}&lt;/b&gt; could not be created.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Proje dizini &lt;b&gt;{0}&lt;/b&gt; oluşturulamıyor.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="2965"/>
+        <location filename="../Project/Project.py" line="2982"/>
         <source>New Project</source>
         <translation>Yeni Proje</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="2474"/>
+        <location filename="../Project/Project.py" line="2491"/>
         <source>Add existing files to the project?</source>
         <translation>Var olan dosyalar projeye eklensin mi?</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="2965"/>
+        <location filename="../Project/Project.py" line="2982"/>
         <source>Select Version Control System</source>
         <translation>Sürüm Kontrol Sistemini Seç</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="2601"/>
+        <location filename="../Project/Project.py" line="2618"/>
         <source>Would you like to edit the VCS command options?</source>
         <translation>VCS komut seçeneklerini düzenlemek istiyor musunuz?</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3831"/>
+        <location filename="../Project/Project.py" line="3866"/>
         <source>New project</source>
         <translation>Yeni Proje</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="2544"/>
+        <location filename="../Project/Project.py" line="2561"/>
         <source>Shall the project file be added to the repository?</source>
         <translation>Proje dosyaları kaynak havuzuna aktarılacak mı?</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="2580"/>
+        <location filename="../Project/Project.py" line="2597"/>
         <source>None</source>
         <translation>Yok</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="2573"/>
+        <location filename="../Project/Project.py" line="2590"/>
         <source>Select version control system for the project</source>
         <translation>proje için sürüm kontrol sistemini seçin</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="2684"/>
+        <location filename="../Project/Project.py" line="2701"/>
         <source>Translation Pattern</source>
         <translation>Çeviri Kalıbı</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="2684"/>
+        <location filename="../Project/Project.py" line="2701"/>
         <source>Enter the path pattern for translation files (use &apos;%language%&apos; in place of the language code):</source>
         <translation>Çeviri dosylarınınyol kalıbını giriniz (kullanılan &apos;% dil %&apos;dil kodu):</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3845"/>
+        <location filename="../Project/Project.py" line="3880"/>
         <source>Open project</source>
         <translation>Projeyi aç</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3115"/>
+        <location filename="../Project/Project.py" line="3132"/>
         <source>Project Files (*.e4p)</source>
         <translation>Proje Dosyaları (*.e4p)</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3882"/>
+        <location filename="../Project/Project.py" line="3917"/>
         <source>Save project as</source>
         <translation>projeyi farklı adda kaydet</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3130"/>
+        <location filename="../Project/Project.py" line="3147"/>
         <source>Save File</source>
         <translation>Dosyayı Kaydet</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3166"/>
+        <location filename="../Project/Project.py" line="3183"/>
         <source>Close Project</source>
         <translation>Projeyi Kapat</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3166"/>
+        <location filename="../Project/Project.py" line="3183"/>
         <source>The current project has unsaved changes.</source>
         <translation>Geçerli projede kaydedilmemiş dosyalar var.</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3343"/>
+        <location filename="../Project/Project.py" line="3360"/>
         <source>Syntax errors detected</source>
         <translation>Sözdizimi Hataları tespit edildi</translation>
     </message>
     <message numerus="yes">
-        <location filename="../Project/Project.py" line="3343"/>
+        <location filename="../Project/Project.py" line="3360"/>
         <source>The project contains %n file(s) with syntax errors.</source>
         <translation type="unfinished">
             <numerusform></numerusform>
@@ -53194,612 +53639,612 @@
         </translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3831"/>
+        <location filename="../Project/Project.py" line="3866"/>
         <source>&amp;New...</source>
         <translation>Ye&amp;ni...</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3836"/>
+        <location filename="../Project/Project.py" line="3871"/>
         <source>Generate a new project</source>
         <translation>Yeni bir proje üret</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3837"/>
+        <location filename="../Project/Project.py" line="3872"/>
         <source>&lt;b&gt;New...&lt;/b&gt;&lt;p&gt;This opens a dialog for entering the info for a new project.&lt;/p&gt;</source>
         <translation>&lt;b&gt;Yeni...&lt;/b&gt;&lt;p&gt;Bu yeni bir proje için bilgilerin girileceği bir diyalog açar.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3845"/>
+        <location filename="../Project/Project.py" line="3880"/>
         <source>&amp;Open...</source>
         <translation>&amp;Aç...</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3850"/>
+        <location filename="../Project/Project.py" line="3885"/>
         <source>Open an existing project</source>
         <translation>Var olan bir projeyi aç</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3851"/>
-        <source>&lt;b&gt;Open...&lt;/b&gt;&lt;p&gt;This opens an existing project.&lt;/p&gt;</source>
-        <translation>&lt;b&gt;Aç...&lt;/b&gt;&lt;p&gt;Bu varolan bir projeyi açar.&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="3858"/>
-        <source>Close project</source>
-        <translation>Projeyi kapat</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="3858"/>
-        <source>&amp;Close</source>
-        <translation>&amp;Kapat</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="3862"/>
-        <source>Close the current project</source>
-        <translation>Geçerli projeyi kapat</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="3863"/>
-        <source>&lt;b&gt;Close&lt;/b&gt;&lt;p&gt;This closes the current project.&lt;/p&gt;</source>
-        <translation>&lt;b&gt;Kapat&lt;/b&gt;&lt;p&gt;Bu geçerli projeyi kapatır.&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="3870"/>
-        <source>Save project</source>
-        <translation>Projeyi kaydet</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4062"/>
-        <source>&amp;Save</source>
-        <translation>&amp;Kaydet</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="3874"/>
-        <source>Save the current project</source>
-        <translation>Geçerli projeyi kapat</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="3875"/>
-        <source>&lt;b&gt;Save&lt;/b&gt;&lt;p&gt;This saves the current project.&lt;/p&gt;</source>
-        <translation>&lt;b&gt;Kaydet&lt;/b&gt;&lt;p&gt;Bu geçerli projeyi kaydeder.&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="3882"/>
-        <source>Save &amp;as...</source>
-        <translation>Farklı k&amp;aydet...</translation>
-    </message>
-    <message>
         <location filename="../Project/Project.py" line="3886"/>
-        <source>Save the current project to a new file</source>
-        <translation>Geçerli projeyi yeni bir dosya olarak kaydet</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="3888"/>
-        <source>&lt;b&gt;Save as&lt;/b&gt;&lt;p&gt;This saves the current project to a new file.&lt;/p&gt;</source>
-        <translation>&lt;b&gt;Farklı kaydet&lt;/b&gt;&lt;p&gt;Bu geçerli projeyi yeni bir dosya olarak kaydeder.&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="3897"/>
-        <source>Add files to project</source>
-        <translation>Projeye dosyalar ekle</translation>
+        <source>&lt;b&gt;Open...&lt;/b&gt;&lt;p&gt;This opens an existing project.&lt;/p&gt;</source>
+        <translation>&lt;b&gt;Aç...&lt;/b&gt;&lt;p&gt;Bu varolan bir projeyi açar.&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="3893"/>
+        <source>Close project</source>
+        <translation>Projeyi kapat</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="3893"/>
+        <source>&amp;Close</source>
+        <translation>&amp;Kapat</translation>
     </message>
     <message>
         <location filename="../Project/Project.py" line="3897"/>
+        <source>Close the current project</source>
+        <translation>Geçerli projeyi kapat</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="3898"/>
+        <source>&lt;b&gt;Close&lt;/b&gt;&lt;p&gt;This closes the current project.&lt;/p&gt;</source>
+        <translation>&lt;b&gt;Kapat&lt;/b&gt;&lt;p&gt;Bu geçerli projeyi kapatır.&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="3905"/>
+        <source>Save project</source>
+        <translation>Projeyi kaydet</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4097"/>
+        <source>&amp;Save</source>
+        <translation>&amp;Kaydet</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="3909"/>
+        <source>Save the current project</source>
+        <translation>Geçerli projeyi kapat</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="3910"/>
+        <source>&lt;b&gt;Save&lt;/b&gt;&lt;p&gt;This saves the current project.&lt;/p&gt;</source>
+        <translation>&lt;b&gt;Kaydet&lt;/b&gt;&lt;p&gt;Bu geçerli projeyi kaydeder.&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="3917"/>
+        <source>Save &amp;as...</source>
+        <translation>Farklı k&amp;aydet...</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="3921"/>
+        <source>Save the current project to a new file</source>
+        <translation>Geçerli projeyi yeni bir dosya olarak kaydet</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="3923"/>
+        <source>&lt;b&gt;Save as&lt;/b&gt;&lt;p&gt;This saves the current project to a new file.&lt;/p&gt;</source>
+        <translation>&lt;b&gt;Farklı kaydet&lt;/b&gt;&lt;p&gt;Bu geçerli projeyi yeni bir dosya olarak kaydeder.&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="3932"/>
+        <source>Add files to project</source>
+        <translation>Projeye dosyalar ekle</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="3932"/>
         <source>Add &amp;files...</source>
         <translation>Dosyaları &amp;ekle...</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3902"/>
+        <location filename="../Project/Project.py" line="3937"/>
         <source>Add files to the current project</source>
         <translation>Geçerli projeye dosyalar ekle</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3904"/>
+        <location filename="../Project/Project.py" line="3939"/>
         <source>&lt;b&gt;Add files...&lt;/b&gt;&lt;p&gt;This opens a dialog for adding files to the current project. The place to add is determined by the file extension.&lt;/p&gt;</source>
         <translation>&lt;b&gt;Dosya ekle...&lt;/b&gt;&lt;p&gt;Bu geçerli projeye bir dosya eklemek için bir diyalog açar. Alana belirlenmiş uzantıda bir dosya eklenir.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3913"/>
+        <location filename="../Project/Project.py" line="3948"/>
         <source>Add directory to project</source>
         <translation>Projeye dizin ekle</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3913"/>
+        <location filename="../Project/Project.py" line="3948"/>
         <source>Add directory...</source>
         <translation>Dizin ekle...</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3918"/>
+        <location filename="../Project/Project.py" line="3953"/>
         <source>Add a directory to the current project</source>
         <translation>Geçerli projeye bir dizin ekleyiniz</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3920"/>
+        <location filename="../Project/Project.py" line="3955"/>
         <source>&lt;b&gt;Add directory...&lt;/b&gt;&lt;p&gt;This opens a dialog for adding a directory to the current project.&lt;/p&gt;</source>
         <translation>&lt;b&gt;Dizin Ekle...&lt;/b&gt;&lt;p&gt;Bu geçerli projeye bir dizin eklemek için bir diyalog açar.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3928"/>
+        <location filename="../Project/Project.py" line="3963"/>
         <source>Add translation to project</source>
         <translation>Projeye çeviri ekle</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3928"/>
+        <location filename="../Project/Project.py" line="3963"/>
         <source>Add &amp;translation...</source>
         <translation>Çeviri &amp;ekle...</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3933"/>
+        <location filename="../Project/Project.py" line="3968"/>
         <source>Add a translation to the current project</source>
         <translation>Geçerli projeye çeviri ekle</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3935"/>
+        <location filename="../Project/Project.py" line="3970"/>
         <source>&lt;b&gt;Add translation...&lt;/b&gt;&lt;p&gt;This opens a dialog for add a translation to the current project.&lt;/p&gt;</source>
         <translation>&lt;b&gt;Çeviri ekle...&lt;/b&gt;&lt;p&gt;Bu geçerli projeye bir çeviri eklemek için bir diyalog açar.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3943"/>
-        <source>Search new files</source>
-        <translation>Yeni dosyaları ara</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="3943"/>
-        <source>Searc&amp;h new files...</source>
-        <translation>Yeni dosyaları a&amp;ra...</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="3947"/>
-        <source>Search new files in the project directory.</source>
-        <translation>Proje dizininde yeni dosyaları ara.</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="3973"/>
-        <source>Project properties</source>
-        <translation>Proje özellikleri</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="3973"/>
-        <source>&amp;Properties...</source>
-        <translation>&amp;Özellikler...</translation>
-    </message>
-    <message>
         <location filename="../Project/Project.py" line="3978"/>
+        <source>Search new files</source>
+        <translation>Yeni dosyaları ara</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="3978"/>
+        <source>Searc&amp;h new files...</source>
+        <translation>Yeni dosyaları a&amp;ra...</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="3982"/>
+        <source>Search new files in the project directory.</source>
+        <translation>Proje dizininde yeni dosyaları ara.</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4008"/>
+        <source>Project properties</source>
+        <translation>Proje özellikleri</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4008"/>
+        <source>&amp;Properties...</source>
+        <translation>&amp;Özellikler...</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4013"/>
         <source>Show the project properties</source>
         <translation>Proje özelliklerini göster</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3979"/>
+        <location filename="../Project/Project.py" line="4014"/>
         <source>&lt;b&gt;Properties...&lt;/b&gt;&lt;p&gt;This shows a dialog to edit the project properties.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3986"/>
+        <location filename="../Project/Project.py" line="4021"/>
         <source>User project properties</source>
         <translation>Kullanıcı projesi özellikleri</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3986"/>
+        <location filename="../Project/Project.py" line="4021"/>
         <source>&amp;User Properties...</source>
         <translation>K&amp;ullanıcı Özellikleri...</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3991"/>
+        <location filename="../Project/Project.py" line="4026"/>
         <source>Show the user specific project properties</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3993"/>
+        <location filename="../Project/Project.py" line="4028"/>
         <source>&lt;b&gt;User Properties...&lt;/b&gt;&lt;p&gt;This shows a dialog to edit the user specific project properties.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4001"/>
+        <location filename="../Project/Project.py" line="4036"/>
         <source>Filetype Associations</source>
         <translation>Dosyatipi Birleştirme</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4001"/>
+        <location filename="../Project/Project.py" line="4036"/>
         <source>Filetype Associations...</source>
         <translation>Dosyatipi Birleştirme...</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4005"/>
+        <location filename="../Project/Project.py" line="4040"/>
         <source>Show the project filetype associations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4019"/>
+        <location filename="../Project/Project.py" line="4054"/>
         <source>Lexer Associations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4019"/>
-        <source>Lexer Associations...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4023"/>
-        <source>Show the project lexer associations (overriding defaults)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4025"/>
-        <source>&lt;b&gt;Lexer Associations...&lt;/b&gt;&lt;p&gt;This shows a dialog to edit the lexer associations of the project. These associations override the global lexer associations. Lexers are used to highlight the editor text.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4037"/>
-        <source>Debugger Properties</source>
-        <translation>Hata Ayıklayıcı Özellikleri</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4037"/>
-        <source>Debugger &amp;Properties...</source>
-        <translation>Hata Ayıklayıcı &amp;Özellikleri...</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4041"/>
-        <source>Show the debugger properties</source>
-        <translation>Hata ayıklayıcı özelliklerini göster</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4042"/>
-        <source>&lt;b&gt;Debugger Properties...&lt;/b&gt;&lt;p&gt;This shows a dialog to edit project specific debugger settings.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4050"/>
-        <source>Load</source>
-        <translation>Yükle</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4050"/>
-        <source>&amp;Load</source>
-        <translation>Yük&amp;le</translation>
-    </message>
-    <message>
         <location filename="../Project/Project.py" line="4054"/>
+        <source>Lexer Associations...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4058"/>
+        <source>Show the project lexer associations (overriding defaults)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4060"/>
+        <source>&lt;b&gt;Lexer Associations...&lt;/b&gt;&lt;p&gt;This shows a dialog to edit the lexer associations of the project. These associations override the global lexer associations. Lexers are used to highlight the editor text.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4072"/>
+        <source>Debugger Properties</source>
+        <translation>Hata Ayıklayıcı Özellikleri</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4072"/>
+        <source>Debugger &amp;Properties...</source>
+        <translation>Hata Ayıklayıcı &amp;Özellikleri...</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4076"/>
+        <source>Show the debugger properties</source>
+        <translation>Hata ayıklayıcı özelliklerini göster</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4077"/>
+        <source>&lt;b&gt;Debugger Properties...&lt;/b&gt;&lt;p&gt;This shows a dialog to edit project specific debugger settings.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4085"/>
+        <source>Load</source>
+        <translation>Yükle</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4085"/>
+        <source>&amp;Load</source>
+        <translation>Yük&amp;le</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4089"/>
         <source>Load the debugger properties</source>
         <translation>Hata ayıklayıcı özelliklerini yükle</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4055"/>
+        <location filename="../Project/Project.py" line="4090"/>
         <source>&lt;b&gt;Load Debugger Properties&lt;/b&gt;&lt;p&gt;This loads the project specific debugger settings.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4062"/>
+        <location filename="../Project/Project.py" line="4097"/>
         <source>Save</source>
         <translation>Kaydet</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4066"/>
-        <source>Save the debugger properties</source>
-        <translation>Hata ayıklayıcı özelliklerini kaydet</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4067"/>
-        <source>&lt;b&gt;Save Debugger Properties&lt;/b&gt;&lt;p&gt;This saves the project specific debugger settings.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4074"/>
-        <source>Delete</source>
-        <translation>Sil</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4074"/>
-        <source>&amp;Delete</source>
-        <translation>&amp;Sil</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4078"/>
-        <source>Delete the debugger properties</source>
-        <translation>Hata ayıklayıcı özelliklerini sil</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4079"/>
-        <source>&lt;b&gt;Delete Debugger Properties&lt;/b&gt;&lt;p&gt;This deletes the file containing the project specific debugger settings.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4087"/>
-        <source>Reset</source>
-        <translation>Başadön</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4087"/>
-        <source>&amp;Reset</source>
-        <translation>Başad&amp;ön</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4091"/>
-        <source>Reset the debugger properties</source>
-        <translation>Hata ayıklayıcı özelliklerini başa döndür</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4092"/>
-        <source>&lt;b&gt;Reset Debugger Properties&lt;/b&gt;&lt;p&gt;This resets the project specific debugger settings.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Project/Project.py" line="4101"/>
+        <source>Save the debugger properties</source>
+        <translation>Hata ayıklayıcı özelliklerini kaydet</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4102"/>
+        <source>&lt;b&gt;Save Debugger Properties&lt;/b&gt;&lt;p&gt;This saves the project specific debugger settings.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4109"/>
+        <source>Delete</source>
+        <translation>Sil</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4109"/>
+        <source>&amp;Delete</source>
+        <translation>&amp;Sil</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4113"/>
+        <source>Delete the debugger properties</source>
+        <translation>Hata ayıklayıcı özelliklerini sil</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4114"/>
+        <source>&lt;b&gt;Delete Debugger Properties&lt;/b&gt;&lt;p&gt;This deletes the file containing the project specific debugger settings.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4122"/>
+        <source>Reset</source>
+        <translation>Başadön</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4122"/>
+        <source>&amp;Reset</source>
+        <translation>Başad&amp;ön</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4126"/>
+        <source>Reset the debugger properties</source>
+        <translation>Hata ayıklayıcı özelliklerini başa döndür</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4127"/>
+        <source>&lt;b&gt;Reset Debugger Properties&lt;/b&gt;&lt;p&gt;This resets the project specific debugger settings.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4136"/>
         <source>Load session</source>
         <translation>Oturum yükleniyor</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4105"/>
+        <location filename="../Project/Project.py" line="4140"/>
         <source>Load the projects session file.</source>
         <translation>Projelerin oturm dosyasını yükle.</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4106"/>
-        <source>&lt;b&gt;Load session&lt;/b&gt;&lt;p&gt;This loads the projects session file. The session consists of the following data.&lt;br&gt;- all open source files&lt;br&gt;- all breakpoint&lt;br&gt;- the commandline arguments&lt;br&gt;- the working directory&lt;br&gt;- the exception reporting flag&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4119"/>
-        <source>Save session</source>
-        <translation>Oturumu kaydet</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4123"/>
-        <source>Save the projects session file.</source>
-        <translation>Proje oturum dosyasını kaydet.</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4124"/>
-        <source>&lt;b&gt;Save session&lt;/b&gt;&lt;p&gt;This saves the projects session file. The session consists of the following data.&lt;br&gt;- all open source files&lt;br&gt;- all breakpoint&lt;br&gt;- the commandline arguments&lt;br&gt;- the working directory&lt;br&gt;- the exception reporting flag&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4137"/>
-        <source>Delete session</source>
-        <translation>Oturumu sil</translation>
-    </message>
-    <message>
         <location filename="../Project/Project.py" line="4141"/>
+        <source>&lt;b&gt;Load session&lt;/b&gt;&lt;p&gt;This loads the projects session file. The session consists of the following data.&lt;br&gt;- all open source files&lt;br&gt;- all breakpoint&lt;br&gt;- the commandline arguments&lt;br&gt;- the working directory&lt;br&gt;- the exception reporting flag&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4154"/>
+        <source>Save session</source>
+        <translation>Oturumu kaydet</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4158"/>
+        <source>Save the projects session file.</source>
+        <translation>Proje oturum dosyasını kaydet.</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4159"/>
+        <source>&lt;b&gt;Save session&lt;/b&gt;&lt;p&gt;This saves the projects session file. The session consists of the following data.&lt;br&gt;- all open source files&lt;br&gt;- all breakpoint&lt;br&gt;- the commandline arguments&lt;br&gt;- the working directory&lt;br&gt;- the exception reporting flag&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4172"/>
+        <source>Delete session</source>
+        <translation>Oturumu sil</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4176"/>
         <source>Delete the projects session file.</source>
         <translation>Proje oturum dosyasını sil.</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4142"/>
+        <location filename="../Project/Project.py" line="4177"/>
         <source>&lt;b&gt;Delete session&lt;/b&gt;&lt;p&gt;This deletes the projects session file&lt;/p&gt;</source>
         <translation>&lt;b&gt;Oturumu Sil&lt;/b&gt;&lt;p&gt;Bu proje dosya oturumunu siler&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4151"/>
+        <location filename="../Project/Project.py" line="4186"/>
         <source>Code Metrics</source>
         <translation>Metrik Kod</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4151"/>
+        <location filename="../Project/Project.py" line="4186"/>
         <source>&amp;Code Metrics...</source>
         <translation>Me&amp;trik Kod...</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4155"/>
+        <location filename="../Project/Project.py" line="4190"/>
         <source>Show some code metrics for the project.</source>
         <translation>Proje için bazı metrik kodları göster.</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4157"/>
+        <location filename="../Project/Project.py" line="4192"/>
         <source>&lt;b&gt;Code Metrics...&lt;/b&gt;&lt;p&gt;This shows some code metrics for all Python files in the project.&lt;/p&gt;</source>
         <translation>&lt;b&gt;Metrik Kodlar...&lt;/b&gt;&lt;p&gt;Bu proje içindeki tüm Python dosyalarının bazı metrik kodlarını gösterir.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4165"/>
+        <location filename="../Project/Project.py" line="4200"/>
         <source>Python Code Coverage</source>
         <translation>Python Kod Koruyucu</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4165"/>
-        <source>Code Co&amp;verage...</source>
-        <translation>Kod Koru&amp;yucu...</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4169"/>
-        <source>Show code coverage information for the project.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4171"/>
-        <source>&lt;b&gt;Code Coverage...&lt;/b&gt;&lt;p&gt;This shows the code coverage information for all Python files in the project.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="5053"/>
-        <source>Profile Data</source>
-        <translation>Veri Kesiti</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4179"/>
-        <source>&amp;Profile Data...</source>
-        <translation>&amp;Veri kesiti...</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4183"/>
-        <source>Show profiling data for the project.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4185"/>
-        <source>&lt;b&gt;Profile Data...&lt;/b&gt;&lt;p&gt;This shows the profiling data for the project.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="5107"/>
-        <source>Application Diagram</source>
-        <translation>Uygulama Şeması</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4194"/>
-        <source>&amp;Application Diagram...</source>
-        <translation>Uygulama Şem&amp;ası...</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4198"/>
-        <source>Show a diagram of the project.</source>
-        <translation>Projenin bir şemasını göster.</translation>
-    </message>
-    <message>
         <location filename="../Project/Project.py" line="4200"/>
+        <source>Code Co&amp;verage...</source>
+        <translation>Kod Koru&amp;yucu...</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4204"/>
+        <source>Show code coverage information for the project.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4206"/>
+        <source>&lt;b&gt;Code Coverage...&lt;/b&gt;&lt;p&gt;This shows the code coverage information for all Python files in the project.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="5088"/>
+        <source>Profile Data</source>
+        <translation>Veri Kesiti</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4214"/>
+        <source>&amp;Profile Data...</source>
+        <translation>&amp;Veri kesiti...</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4218"/>
+        <source>Show profiling data for the project.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4220"/>
+        <source>&lt;b&gt;Profile Data...&lt;/b&gt;&lt;p&gt;This shows the profiling data for the project.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="5142"/>
+        <source>Application Diagram</source>
+        <translation>Uygulama Şeması</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4229"/>
+        <source>&amp;Application Diagram...</source>
+        <translation>Uygulama Şem&amp;ası...</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4233"/>
+        <source>Show a diagram of the project.</source>
+        <translation>Projenin bir şemasını göster.</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4235"/>
         <source>&lt;b&gt;Application Diagram...&lt;/b&gt;&lt;p&gt;This shows a diagram of the project.&lt;/p&gt;</source>
         <translation>&lt;b&gt;Uygulama Şeması...&lt;/b&gt;&lt;p&gt;Bu projenin bir şemasını gösterir.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5300"/>
+        <location filename="../Project/Project.py" line="5335"/>
         <source>Create Package List</source>
         <translation>Paket Listesini Oluştur</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4223"/>
+        <location filename="../Project/Project.py" line="4258"/>
         <source>Create &amp;Package List</source>
         <translation type="unfinished">Eklenti &amp;Arşivi Oluştur</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5574"/>
+        <location filename="../Project/Project.py" line="5609"/>
         <source>Create Plugin Archive</source>
         <translation>Eklenti Arşivi Oluştur</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4239"/>
+        <location filename="../Project/Project.py" line="4274"/>
         <source>Create Plugin &amp;Archives</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4325"/>
+        <location filename="../Project/Project.py" line="4360"/>
         <source>&amp;Project</source>
         <translation>&amp;Proje</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4326"/>
+        <location filename="../Project/Project.py" line="4361"/>
         <source>Open &amp;Recent Projects</source>
         <translation>Geçmiş P&amp;rojeleri Aç</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4331"/>
+        <location filename="../Project/Project.py" line="4366"/>
         <source>&amp;Version Control</source>
         <translation>S&amp;ürüm Kontrol</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4335"/>
+        <location filename="../Project/Project.py" line="4370"/>
         <source>Chec&amp;k</source>
         <translation>&amp;Kontrol</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4337"/>
+        <location filename="../Project/Project.py" line="4372"/>
         <source>Sho&amp;w</source>
         <translation>G&amp;öster</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4338"/>
+        <location filename="../Project/Project.py" line="4373"/>
         <source>&amp;Diagrams</source>
         <translation>Şemalar &amp;D</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4327"/>
+        <location filename="../Project/Project.py" line="4362"/>
         <source>Session</source>
         <translation>Oturum</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4340"/>
+        <location filename="../Project/Project.py" line="4375"/>
         <source>Source &amp;Documentation</source>
         <translation>Kaynak Belgeleme &amp;D</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4328"/>
+        <location filename="../Project/Project.py" line="4363"/>
         <source>Debugger</source>
         <translation>Hata Ayıklayıcı</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4339"/>
+        <location filename="../Project/Project.py" line="4374"/>
         <source>Pac&amp;kagers</source>
         <translation>Pa&amp;ketleyici</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4465"/>
+        <location filename="../Project/Project.py" line="4500"/>
         <source>Project</source>
         <translation>Proje</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4531"/>
+        <location filename="../Project/Project.py" line="4566"/>
         <source>&amp;Clear</source>
         <translation>T&amp;emizle</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4704"/>
+        <location filename="../Project/Project.py" line="4739"/>
         <source>Search New Files</source>
         <translation>Yeni Dosyaları Ara</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4704"/>
+        <location filename="../Project/Project.py" line="4739"/>
         <source>There were no new files found to be added.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4850"/>
+        <location filename="../Project/Project.py" line="4885"/>
         <source>Version Control System</source>
         <translation>Sürüm Kontrol Sistemi</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4850"/>
+        <location filename="../Project/Project.py" line="4885"/>
         <source>&lt;p&gt;The selected VCS &lt;b&gt;{0}&lt;/b&gt; could not be found.&lt;br/&gt;Disabling version control.&lt;/p&gt;&lt;p&gt;{1}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4980"/>
+        <location filename="../Project/Project.py" line="5015"/>
         <source>Coverage Data</source>
         <translation>Veri Kapsamı</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5030"/>
+        <location filename="../Project/Project.py" line="5065"/>
         <source>There is no main script defined for the current project. Aborting</source>
         <translation>Bugeçerli projede tanımlanan ana betik değil. Durduruluyor</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5003"/>
+        <location filename="../Project/Project.py" line="5038"/>
         <source>Code Coverage</source>
         <translation>Kod Koruyucu</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5003"/>
+        <location filename="../Project/Project.py" line="5038"/>
         <source>Please select a coverage file</source>
         <translation>Lütfen bir koruyucu dosya seçiniz</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5053"/>
+        <location filename="../Project/Project.py" line="5088"/>
         <source>Please select a profile file</source>
         <translation>Lütfen kesit dosyasını seçiniz</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5107"/>
+        <location filename="../Project/Project.py" line="5142"/>
         <source>Include module names?</source>
         <translation>Modül isimleri dahil edilsin mi?</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5251"/>
+        <location filename="../Project/Project.py" line="5286"/>
         <source>&lt;p&gt;The file &lt;b&gt;PKGLIST&lt;/b&gt; already exists.&lt;/p&gt;&lt;p&gt;Overwrite it?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5300"/>
+        <location filename="../Project/Project.py" line="5335"/>
         <source>&lt;p&gt;The file &lt;b&gt;PKGLIST&lt;/b&gt; could not be created.&lt;/p&gt;&lt;p&gt;Reason: {0}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5319"/>
+        <location filename="../Project/Project.py" line="5354"/>
         <source>The project does not have a main script defined. Aborting...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5460"/>
+        <location filename="../Project/Project.py" line="5495"/>
         <source>&lt;p&gt;The file &lt;b&gt;{0}&lt;/b&gt; could not be stored in the archive. Ignoring it.&lt;/p&gt;&lt;p&gt;Reason: {1}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5533"/>
+        <location filename="../Project/Project.py" line="5568"/>
         <source>&lt;p&gt;The plugin file &lt;b&gt;{0}&lt;/b&gt; could not be read.&lt;/p&gt;&lt;p&gt;Reason: {1}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -53809,32 +54254,32 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="2441"/>
+        <location filename="../Project/Project.py" line="2458"/>
         <source>Create main script</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="2441"/>
+        <location filename="../Project/Project.py" line="2458"/>
         <source>&lt;p&gt;The mainscript &lt;b&gt;{0}&lt;/b&gt; could not be created.&lt;br/&gt;Reason: {1}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4208"/>
+        <location filename="../Project/Project.py" line="4243"/>
         <source>Load Diagram</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4208"/>
+        <location filename="../Project/Project.py" line="4243"/>
         <source>&amp;Load Diagram...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4212"/>
+        <location filename="../Project/Project.py" line="4247"/>
         <source>Load a diagram from file.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4214"/>
+        <location filename="../Project/Project.py" line="4249"/>
         <source>&lt;b&gt;Load Diagram...&lt;/b&gt;&lt;p&gt;This loads a diagram from file.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -53864,27 +54309,27 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4839"/>
+        <location filename="../Project/Project.py" line="4874"/>
         <source>&lt;p&gt;The selected VCS &lt;b&gt;{0}&lt;/b&gt; could not be found. &lt;br/&gt;Reverting override.&lt;/p&gt;&lt;p&gt;{1}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5574"/>
+        <location filename="../Project/Project.py" line="5609"/>
         <source>&lt;p&gt;The plugin file &lt;b&gt;{0}&lt;/b&gt; could not be read.&lt;/p&gt; &lt;p&gt;Reason: {1}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4228"/>
+        <location filename="../Project/Project.py" line="4263"/>
         <source>Create an initial PKGLIST file for an eric6 plugin.</source>
         <translation type="unfinished">Eric5 eklenti arşiv dosyası oluştur. {6 ?}</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4230"/>
+        <location filename="../Project/Project.py" line="4265"/>
         <source>&lt;b&gt;Create Package List&lt;/b&gt;&lt;p&gt;This creates an initial list of files to include in an eric6 plugin archive. The list is created from the project file.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5424"/>
+        <location filename="../Project/Project.py" line="5459"/>
         <source>&lt;p&gt;The eric6 plugin archive file &lt;b&gt;{0}&lt;/b&gt; could not be created.&lt;/p&gt;&lt;p&gt;Reason: {1}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -53894,223 +54339,223 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="2933"/>
+        <location filename="../Project/Project.py" line="2950"/>
         <source>Create project management directory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="2933"/>
+        <location filename="../Project/Project.py" line="2950"/>
         <source>&lt;p&gt;The project directory &lt;b&gt;{0}&lt;/b&gt; is not writable.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3958"/>
+        <location filename="../Project/Project.py" line="3993"/>
         <source>Alt+Ctrl+P</source>
         <comment>Project|Search Project File</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3964"/>
+        <location filename="../Project/Project.py" line="3999"/>
         <source>Search for a file in the project list of files.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3966"/>
+        <location filename="../Project/Project.py" line="4001"/>
         <source>&lt;b&gt;Search Project File&lt;/b&gt;&lt;p&gt;This searches for a file in the project list of files.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3958"/>
+        <location filename="../Project/Project.py" line="3993"/>
         <source>Search Project File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3958"/>
+        <location filename="../Project/Project.py" line="3993"/>
         <source>Search Project File...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5355"/>
+        <location filename="../Project/Project.py" line="5390"/>
         <source>Create Plugin Archives</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4244"/>
+        <location filename="../Project/Project.py" line="4279"/>
         <source>Create eric6 plugin archive files.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4246"/>
+        <location filename="../Project/Project.py" line="4281"/>
         <source>&lt;b&gt;Create Plugin Archives&lt;/b&gt;&lt;p&gt;This creates eric6 plugin archive files using the list of files given in a PKGLIST* file. The archive name is built from the main script name if not designated in the package list file.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4256"/>
+        <location filename="../Project/Project.py" line="4291"/>
         <source>Create Plugin Archives (Snapshot)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4256"/>
+        <location filename="../Project/Project.py" line="4291"/>
         <source>Create Plugin Archives (&amp;Snapshot)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4261"/>
+        <location filename="../Project/Project.py" line="4296"/>
         <source>Create eric6 plugin archive files (snapshot releases).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4263"/>
+        <location filename="../Project/Project.py" line="4298"/>
         <source>&lt;b&gt;Create Plugin Archives (Snapshot)&lt;/b&gt;&lt;p&gt;This creates eric6 plugin archive files using the list of files given in the PKGLIST* file. The archive name is built from the main script name if not designated in the package list file. The version entry of the main script is modified to reflect a snapshot release.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5333"/>
-        <source>Select package lists:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="5351"/>
-        <source>Creating plugin archives...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="5351"/>
-        <source>Abort</source>
-        <translation type="unfinished">Vazgeç</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="5351"/>
-        <source>%v/%m Archives</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Project/Project.py" line="5368"/>
+        <source>Select package lists:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="5386"/>
+        <source>Creating plugin archives...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="5386"/>
+        <source>Abort</source>
+        <translation type="unfinished">Vazgeç</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="5386"/>
+        <source>%v/%m Archives</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="5403"/>
         <source>&lt;p&gt;The file &lt;b&gt;{0}&lt;/b&gt; could not be read.&lt;/p&gt;&lt;p&gt;Reason: {1}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5479"/>
+        <location filename="../Project/Project.py" line="5514"/>
         <source>&lt;p&gt;The eric6 plugin archive files were created with some errors.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5482"/>
+        <location filename="../Project/Project.py" line="5517"/>
         <source>&lt;p&gt;The eric6 plugin archive files were created successfully.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5344"/>
+        <location filename="../Project/Project.py" line="5379"/>
         <source>&lt;p&gt;No package list files (PKGLIST*) available or selected. Aborting...&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5396"/>
+        <location filename="../Project/Project.py" line="5431"/>
         <source>&lt;p&gt;The file &lt;b&gt;{0}&lt;/b&gt; is not ready yet.&lt;/p&gt;&lt;p&gt;Please rework it and delete the&apos;; initial_list&apos; line of the header.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3949"/>
+        <location filename="../Project/Project.py" line="3984"/>
         <source>&lt;b&gt;Search new files...&lt;/b&gt;&lt;p&gt;This searches for new files (sources, *.ui, *.idl, *.proto) in the project directory and registered subdirectories.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4007"/>
+        <location filename="../Project/Project.py" line="4042"/>
         <source>&lt;b&gt;Filetype Associations...&lt;/b&gt;&lt;p&gt;This shows a dialog to edit the file type associations of the project. These associations determine the type (source, form, interface, protocol or others) with a filename pattern. They are used when adding a file to the project and when performing a search for new files.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1519"/>
+        <location filename="../Project/Project.py" line="1531"/>
         <source>&lt;p&gt;The selected translation file &lt;b&gt;{0}&lt;/b&gt; could not be deleted.&lt;/p&gt;&lt;p&gt;Reason: {1}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="2233"/>
+        <location filename="../Project/Project.py" line="2250"/>
         <source>&lt;p&gt;The selected file &lt;b&gt;{0}&lt;/b&gt; could not be deleted.&lt;/p&gt;&lt;p&gt;Reason: {1}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="2263"/>
+        <location filename="../Project/Project.py" line="2280"/>
         <source>&lt;p&gt;The selected directory &lt;b&gt;{0}&lt;/b&gt; could not be deleted.&lt;/p&gt;&lt;p&gt;Reason: {1}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="2756"/>
+        <location filename="../Project/Project.py" line="2773"/>
         <source>Create Makefile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="2756"/>
+        <location filename="../Project/Project.py" line="2773"/>
         <source>&lt;p&gt;The makefile &lt;b&gt;{0}&lt;/b&gt; could not be created.&lt;br/&gt;Reason: {1}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5760"/>
+        <location filename="../Project/Project.py" line="5795"/>
         <source>Execute Make</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4277"/>
+        <location filename="../Project/Project.py" line="4312"/>
         <source>&amp;Execute Make</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4281"/>
+        <location filename="../Project/Project.py" line="4316"/>
         <source>Perform a &apos;make&apos; run.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4283"/>
+        <location filename="../Project/Project.py" line="4318"/>
         <source>&lt;b&gt;Execute Make&lt;/b&gt;&lt;p&gt;This performs a &apos;make&apos; run to rebuild the configured target.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5740"/>
+        <location filename="../Project/Project.py" line="5775"/>
         <source>Test for Changes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4291"/>
+        <location filename="../Project/Project.py" line="4326"/>
         <source>&amp;Test for Changes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4295"/>
+        <location filename="../Project/Project.py" line="4330"/>
         <source>Question &apos;make&apos;, if a rebuild is needed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4297"/>
+        <location filename="../Project/Project.py" line="4332"/>
         <source>&lt;b&gt;Test for Changes&lt;/b&gt;&lt;p&gt;This questions &apos;make&apos;, if a rebuild of the configured target is necessary.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4342"/>
+        <location filename="../Project/Project.py" line="4377"/>
         <source>Make</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5688"/>
+        <location filename="../Project/Project.py" line="5723"/>
         <source>The make process did not start.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5733"/>
+        <location filename="../Project/Project.py" line="5768"/>
         <source>The make process crashed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5743"/>
+        <location filename="../Project/Project.py" line="5778"/>
         <source>&lt;p&gt;There are changes that require the configured make target &lt;b&gt;{0}&lt;/b&gt; to be rebuilt.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5748"/>
+        <location filename="../Project/Project.py" line="5783"/>
         <source>&lt;p&gt;There are changes that require the default make target to be rebuilt.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5760"/>
+        <location filename="../Project/Project.py" line="5795"/>
         <source>The makefile contains errors.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -54125,7 +54570,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4330"/>
+        <location filename="../Project/Project.py" line="4365"/>
         <source>Project-T&amp;ools</source>
         <translation type="unfinished"></translation>
     </message>
@@ -54229,7 +54674,7 @@
         <translation>VCS Durumu</translation>
     </message>
     <message>
-        <location filename="../Project/ProjectBrowserModel.py" line="782"/>
+        <location filename="../Project/ProjectBrowserModel.py" line="798"/>
         <source>local</source>
         <translation>yerel</translation>
     </message>
@@ -54244,7 +54689,7 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/ProjectBrowserPage.ui" line="37"/>
         <source>Colours</source>
-        <translation>Renkler</translation>
+        <translation type="obsolete">Renkler</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/ProjectBrowserPage.ui" line="43"/>
@@ -54254,7 +54699,7 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/ProjectBrowserPage.ui" line="56"/>
         <source>Select the colour for highlighted entries in the Others viewer.</source>
-        <translation>Diğer Göstericilerde ilgili Vurguların rengini seç.</translation>
+        <translation type="obsolete">Diğer Göstericilerde ilgili Vurguların rengini seç.</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/ProjectBrowserPage.ui" line="82"/>
@@ -54381,6 +54826,16 @@
         <source>Protocols (protobuf) Browser</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/ProjectBrowserPage.ui" line="37"/>
+        <source>Colors</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/ProjectBrowserPage.ui" line="56"/>
+        <source>Select the color for highlighted entries in the Others viewer.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ProjectFormsBrowser</name>
@@ -64106,54 +64561,54 @@
         <translation>Ayarlanıyor...</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="767"/>
+        <location filename="../QScintilla/Shell.py" line="771"/>
         <source>Select History</source>
         <translation>Geçmişi Seç</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="767"/>
+        <location filename="../QScintilla/Shell.py" line="771"/>
         <source>Select the history entry to execute (most recent shown last).</source>
         <translation>geçmişte yapılanları göster (ençok gösterilenleri seç).</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="835"/>
+        <location filename="../QScintilla/Shell.py" line="839"/>
         <source>Passive Debug Mode</source>
         <translation>Pasif Hata Ayıklama Modu</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="836"/>
+        <location filename="../QScintilla/Shell.py" line="840"/>
         <source>
 Not connected</source>
         <translation>
 Bağlantı yok</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="839"/>
+        <location filename="../QScintilla/Shell.py" line="843"/>
         <source>No.</source>
         <translation>NO.</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="841"/>
+        <location filename="../QScintilla/Shell.py" line="845"/>
         <source>{0} on {1}, {2}</source>
         <translation>{0} üzerin {1}, {2}</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="1030"/>
+        <location filename="../QScintilla/Shell.py" line="1034"/>
         <source>StdOut: {0}</source>
         <translation>Stdçıktı:{0}</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="1038"/>
+        <location filename="../QScintilla/Shell.py" line="1042"/>
         <source>StdErr: {0}</source>
         <translation>stdhata: {0}</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="2157"/>
+        <location filename="../QScintilla/Shell.py" line="2161"/>
         <source>Drop Error</source>
         <translation>Düşme hatası</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="2157"/>
+        <location filename="../QScintilla/Shell.py" line="2161"/>
         <source>&lt;p&gt;&lt;b&gt;{0}&lt;/b&gt; is not a file.&lt;/p&gt;</source>
         <translation>&lt;p&gt;&lt;b&gt;{0}&lt;/b&gt; bir dosya değil.&lt;/p&gt;</translation>
     </message>
@@ -64163,7 +64618,7 @@
         <translation type="unfinished">Bul</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="888"/>
+        <location filename="../QScintilla/Shell.py" line="892"/>
         <source>Exception &quot;{0}&quot;
 {1}
 File: {2}, Line: {3}
@@ -64171,32 +64626,32 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="923"/>
+        <location filename="../QScintilla/Shell.py" line="927"/>
         <source>Unspecified syntax error.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="898"/>
+        <location filename="../QScintilla/Shell.py" line="902"/>
         <source>Exception &quot;{0}&quot;
 {1}
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="925"/>
+        <location filename="../QScintilla/Shell.py" line="929"/>
         <source>Syntax error &quot;{1}&quot; in file {0} at line {2}, character {3}.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="948"/>
+        <location filename="../QScintilla/Shell.py" line="952"/>
         <source>Signal &quot;{0}&quot; generated in file {1} at line {2}.
 Function: {3}({4})</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="2015"/>
+        <location filename="../QScintilla/Shell.py" line="2019"/>
         <source>Project</source>
         <translation type="unfinished">Proje</translation>
     </message>
@@ -64226,14 +64681,14 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="1835"/>
+        <location filename="../QScintilla/Shell.py" line="1839"/>
         <source>Available Virtual Environments:
 {0}
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="1876"/>
+        <location filename="../QScintilla/Shell.py" line="1880"/>
         <source>Current Virtual Environment: &apos;{0}&apos;
 </source>
         <translation type="unfinished"></translation>
@@ -72314,7 +72769,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/Sync/SyncCheckPage.py" line="56"/>
+        <location filename="../WebBrowser/Sync/SyncCheckPage.py" line="50"/>
         <source>Host:</source>
         <translation type="unfinished">Sunucu:</translation>
     </message>
@@ -72344,22 +72799,22 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/Sync/SyncCheckPage.py" line="55"/>
+        <location filename="../WebBrowser/Sync/SyncCheckPage.py" line="49"/>
         <source>FTP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/Sync/SyncCheckPage.py" line="68"/>
+        <location filename="../WebBrowser/Sync/SyncCheckPage.py" line="62"/>
         <source>No Synchronization</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/Sync/SyncCheckPage.py" line="211"/>
+        <location filename="../WebBrowser/Sync/SyncCheckPage.py" line="204"/>
         <source>&lt;font color=&quot;#FF0000&quot;&gt;&lt;b&gt;Error:&lt;/b&gt; {0}&lt;/font&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/Sync/SyncCheckPage.py" line="63"/>
+        <location filename="../WebBrowser/Sync/SyncCheckPage.py" line="57"/>
         <source>Shared Directory</source>
         <translation type="unfinished"></translation>
     </message>
@@ -72369,7 +72824,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/Sync/SyncCheckPage.py" line="64"/>
+        <location filename="../WebBrowser/Sync/SyncCheckPage.py" line="58"/>
         <source>Directory:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -74038,12 +74493,12 @@
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/TasksPage.ui" line="105"/>
-        <source>Tasks Background Colours</source>
+        <source>Tasks Background Colors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/TasksPage.ui" line="206"/>
-        <source>Select the background colour for these tasks.</source>
+        <source>Select the background color for these tasks.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -75094,27 +75549,27 @@
 <context>
     <name>Translator</name>
     <message>
-        <location filename="../Plugins/UiExtensionPlugins/Translator/Translator.py" line="52"/>
+        <location filename="../Plugins/UiExtensionPlugins/Translator/Translator.py" line="63"/>
         <source>Translator</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/UiExtensionPlugins/Translator/Translator.py" line="52"/>
+        <location filename="../Plugins/UiExtensionPlugins/Translator/Translator.py" line="63"/>
         <source>T&amp;ranslator</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/UiExtensionPlugins/Translator/Translator.py" line="52"/>
+        <location filename="../Plugins/UiExtensionPlugins/Translator/Translator.py" line="63"/>
         <source>Alt+Shift+R</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/UiExtensionPlugins/Translator/Translator.py" line="58"/>
+        <location filename="../Plugins/UiExtensionPlugins/Translator/Translator.py" line="69"/>
         <source>Switch the input focus to the Translator window.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/UiExtensionPlugins/Translator/Translator.py" line="60"/>
+        <location filename="../Plugins/UiExtensionPlugins/Translator/Translator.py" line="71"/>
         <source>&lt;b&gt;Activate Translator&lt;/b&gt;&lt;p&gt;This switches the input focus to the Translator window.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -75122,52 +75577,52 @@
 <context>
     <name>TranslatorEngines</name>
     <message>
-        <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorEngines/__init__.py" line="37"/>
+        <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorEngines/__init__.py" line="39"/>
         <source>Google V.1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorEngines/__init__.py" line="39"/>
-        <source>MyMemory</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorEngines/__init__.py" line="41"/>
-        <source>Glosbe</source>
+        <source>MyMemory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorEngines/__init__.py" line="43"/>
-        <source>PROMT</source>
+        <source>Glosbe</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorEngines/__init__.py" line="45"/>
-        <source>Yandex</source>
+        <source>PROMT</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorEngines/__init__.py" line="47"/>
-        <source>Google V.2</source>
+        <source>Yandex</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorEngines/__init__.py" line="49"/>
+        <source>Google V.2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorEngines/__init__.py" line="51"/>
         <source>Microsoft</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorEngines/__init__.py" line="57"/>
+        <source>Unknow translation service name ({0})</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorEngines/__init__.py" line="55"/>
-        <source>Unknow translation service name ({0})</source>
+        <source>IBM Watson</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorEngines/__init__.py" line="53"/>
-        <source>IBM Watson</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorEngines/__init__.py" line="51"/>
         <source>DeepL Pro</source>
         <translation type="unfinished"></translation>
     </message>
@@ -75416,12 +75871,12 @@
     </message>
     <message>
         <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorLanguagesDb.py" line="79"/>
-        <source>Chinese S</source>
+        <source>Chinese (China)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorLanguagesDb.py" line="80"/>
-        <source>Chinese T</source>
+        <source>Chinese (Taiwan)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -75601,7 +76056,7 @@
 <context>
     <name>TranslatorPlugin</name>
     <message>
-        <location filename="../Plugins/PluginTranslator.py" line="65"/>
+        <location filename="../Plugins/PluginTranslator.py" line="71"/>
         <source>Translator</source>
         <translation type="unfinished"></translation>
     </message>
@@ -77823,7 +78278,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="6329"/>
+        <location filename="../UI/UserInterface.py" line="6327"/>
         <source>Export Keyboard Shortcuts</source>
         <translation>Kılavye Kısa Yollarını Dışa Aktar</translation>
     </message>
@@ -77843,7 +78298,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="6353"/>
+        <location filename="../UI/UserInterface.py" line="6351"/>
         <source>Import Keyboard Shortcuts</source>
         <translation>Klavye kısayollarını İçe Aktar</translation>
     </message>
@@ -78143,7 +78598,7 @@
         <translation type="obsolete">&lt;h3&gt;Sürüm Numaraları&lt;/h3&gt;&lt;table&gt;</translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="7326"/>
+        <location filename="../UI/UserInterface.py" line="7324"/>
         <source>&lt;/table&gt;</source>
         <translation>&lt;/table&gt;</translation>
     </message>
@@ -78315,87 +78770,87 @@
         <translation>&lt;p&gt;PyQt4 Belgelerinin başlama noktası ayarlanmamış.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="6523"/>
+        <location filename="../UI/UserInterface.py" line="6521"/>
         <source>Save tasks</source>
         <translation>Görevleri kaydet</translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="6523"/>
+        <location filename="../UI/UserInterface.py" line="6521"/>
         <source>&lt;p&gt;The tasks file &lt;b&gt;{0}&lt;/b&gt; could not be written.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="6552"/>
+        <location filename="../UI/UserInterface.py" line="6550"/>
         <source>Read tasks</source>
         <translation>Görevler Okunuyor</translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="6552"/>
+        <location filename="../UI/UserInterface.py" line="6550"/>
         <source>&lt;p&gt;The tasks file &lt;b&gt;{0}&lt;/b&gt; could not be read.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="6648"/>
+        <location filename="../UI/UserInterface.py" line="6646"/>
         <source>Save session</source>
         <translation>Oturumu kaydet</translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="6586"/>
+        <location filename="../UI/UserInterface.py" line="6584"/>
         <source>&lt;p&gt;The session file &lt;b&gt;{0}&lt;/b&gt; could not be written.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="6632"/>
+        <location filename="../UI/UserInterface.py" line="6630"/>
         <source>Read session</source>
         <translation>Oturumu oku</translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="6632"/>
+        <location filename="../UI/UserInterface.py" line="6630"/>
         <source>&lt;p&gt;The session file &lt;b&gt;{0}&lt;/b&gt; could not be read.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="6916"/>
+        <location filename="../UI/UserInterface.py" line="6914"/>
         <source>Drop Error</source>
         <translation>Düşme hatası</translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="6916"/>
+        <location filename="../UI/UserInterface.py" line="6914"/>
         <source>&lt;p&gt;&lt;b&gt;{0}&lt;/b&gt; is not a file.&lt;/p&gt;</source>
         <translation>&lt;p&gt;&lt;b&gt;{0}&lt;/b&gt; bir dosya değil.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="7101"/>
+        <location filename="../UI/UserInterface.py" line="7099"/>
         <source>&amp;Cancel</source>
         <translation>&amp;Vazgeç</translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="7110"/>
+        <location filename="../UI/UserInterface.py" line="7108"/>
         <source>Trying host {0}</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="7268"/>
+        <location filename="../UI/UserInterface.py" line="7266"/>
         <source>Update available</source>
         <translation>Güncelleme mümkün değil</translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="7287"/>
+        <location filename="../UI/UserInterface.py" line="7285"/>
         <source>Error during updates check</source>
         <translation>Güncellemeleri kontrol esnasında hata</translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="7287"/>
+        <location filename="../UI/UserInterface.py" line="7285"/>
         <source>Could not perform updates check.</source>
         <translation>Güncellemelere ulaşamıyorum.</translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="7311"/>
+        <location filename="../UI/UserInterface.py" line="7309"/>
         <source>&lt;h3&gt;Available versions&lt;/h3&gt;&lt;table&gt;</source>
         <translation>&lt;h3&gt;Mümkün sürümler&lt;/h3&gt;&lt;table&gt;</translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="7363"/>
+        <location filename="../UI/UserInterface.py" line="7361"/>
         <source>First time usage</source>
         <translation>İlk kullanım</translation>
     </message>
@@ -78455,32 +78910,32 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="6353"/>
+        <location filename="../UI/UserInterface.py" line="6351"/>
         <source>Keyboard shortcut file (*.e4k)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="7176"/>
+        <location filename="../UI/UserInterface.py" line="7174"/>
         <source>Error getting versions information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="7169"/>
+        <location filename="../UI/UserInterface.py" line="7167"/>
         <source>The versions information could not be downloaded. Please go online and try again.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="6121"/>
+        <location filename="../UI/UserInterface.py" line="6119"/>
         <source>Open Browser</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="6121"/>
+        <location filename="../UI/UserInterface.py" line="6119"/>
         <source>Could not start a web browser</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="7176"/>
+        <location filename="../UI/UserInterface.py" line="7174"/>
         <source>The versions information could not be downloaded for the last 7 days. Please go online and try again.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -78571,7 +79026,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="7382"/>
+        <location filename="../UI/UserInterface.py" line="7380"/>
         <source>Select Workspace Directory</source>
         <translation type="unfinished"></translation>
     </message>
@@ -78946,7 +79401,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="7101"/>
+        <location filename="../UI/UserInterface.py" line="7099"/>
         <source>%v/%m</source>
         <translation type="unfinished"></translation>
     </message>
@@ -78966,7 +79421,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="7105"/>
+        <location filename="../UI/UserInterface.py" line="7103"/>
         <source>Version Check</source>
         <translation type="unfinished"></translation>
     </message>
@@ -79041,22 +79496,22 @@
         <translation type="unfinished">Qt v.3 eric5 tarafından desteklenmiyor. {3 ?} {6.?}</translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="7268"/>
+        <location filename="../UI/UserInterface.py" line="7266"/>
         <source>The update to &lt;b&gt;{0}&lt;/b&gt; of eric6 is available at &lt;b&gt;{1}&lt;/b&gt;. Would you like to get it?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="7280"/>
+        <location filename="../UI/UserInterface.py" line="7278"/>
         <source>Eric6 is up to date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="7280"/>
+        <location filename="../UI/UserInterface.py" line="7278"/>
         <source>You are using the latest version of eric6</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="7363"/>
+        <location filename="../UI/UserInterface.py" line="7361"/>
         <source>eric6 has not been configured yet. The configuration dialog will be started.</source>
         <translation type="unfinished">Eric5 henüz ayarlanmadı. Ayarlar Diyaloğu başlatılıyor. {6 ?}</translation>
     </message>
@@ -79076,7 +79531,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="7121"/>
+        <location filename="../UI/UserInterface.py" line="7119"/>
         <source>The versions information cannot not be downloaded because you are &lt;b&gt;offline&lt;/b&gt;. Please go online and try again.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -79121,7 +79576,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="6670"/>
+        <location filename="../UI/UserInterface.py" line="6668"/>
         <source>Load session</source>
         <translation type="unfinished">Oturum yükleniyor</translation>
     </message>
@@ -79136,17 +79591,17 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="6670"/>
+        <location filename="../UI/UserInterface.py" line="6668"/>
         <source>eric6 Session Files (*.e5s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="6721"/>
+        <location filename="../UI/UserInterface.py" line="6719"/>
         <source>Crash Session found!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="6721"/>
+        <location filename="../UI/UserInterface.py" line="6719"/>
         <source>A session file of a crashed session was found. Shall this session be restored?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -79161,17 +79616,17 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="7256"/>
+        <location filename="../UI/UserInterface.py" line="7254"/>
         <source>Update Check</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="7256"/>
+        <location filename="../UI/UserInterface.py" line="7254"/>
         <source>You installed eric directly from the source code. There is no possibility to check for the availability of an update.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="7246"/>
+        <location filename="../UI/UserInterface.py" line="7244"/>
         <source>You are using a snapshot release of eric6. A more up-to-date stable release might be available.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -80179,7 +80634,7 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="128"/>
         <source>Colours</source>
-        <translation>Renkler</translation>
+        <translation type="obsolete">Renkler</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="134"/>
@@ -80189,7 +80644,7 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="147"/>
         <source>Select the background colour for entries with VCS status &quot;added&quot;.</source>
-        <translation>VCS durumu &quot;eklendi&quot; için arka alan rengini seçiniz.</translation>
+        <translation type="obsolete">VCS durumu &quot;eklendi&quot; için arka alan rengini seçiniz.</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="157"/>
@@ -80199,7 +80654,7 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="170"/>
         <source>Select the background colour for entries with VCS status &quot;conflict&quot;.</source>
-        <translation>VCS durumu &quot;uyuşmazlık&quot; için arka alan rengini seçiniz.</translation>
+        <translation type="obsolete">VCS durumu &quot;uyuşmazlık&quot; için arka alan rengini seçiniz.</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="193"/>
@@ -80209,7 +80664,7 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="206"/>
         <source>Select the background colour for entries with VCS status &quot;modified&quot;.</source>
-        <translation>VCS durumu &quot;düzenlendi&quot; için arka alan rengini seçiniz.</translation>
+        <translation type="obsolete">VCS durumu &quot;düzenlendi&quot; için arka alan rengini seçiniz.</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="216"/>
@@ -80217,11 +80672,6 @@
         <translation>VCS durumu &quot;değiştirildi&quot;:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="229"/>
-        <source>Select the background colour for entries with VCS status &quot;replaced&quot;.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="239"/>
         <source>VCS status &quot;needs update&quot;:</source>
         <translation>VCS durumu &quot;güncelleme gerekiyor&quot;:</translation>
@@ -80229,7 +80679,7 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="252"/>
         <source>Select the background colour for entries with VCS status &quot;needs update&quot;.</source>
-        <translation>VCS durumu &quot;güncelleme gerekiyor&quot; için arka alan rengini seçiniz.</translation>
+        <translation type="obsolete">VCS durumu &quot;güncelleme gerekiyor&quot; için arka alan rengini seçiniz.</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="262"/>
@@ -80237,8 +80687,38 @@
         <translation>VCS durumu &quot;kaldırılmış&quot;:</translation>
     </message>
     <message>
+        <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="128"/>
+        <source>Colors</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="147"/>
+        <source>Select the background color for entries with VCS status &quot;added&quot;.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="170"/>
+        <source>Select the background color for entries with VCS status &quot;conflict&quot;.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="206"/>
+        <source>Select the background color for entries with VCS status &quot;modified&quot;.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="229"/>
+        <source>Select the background color for entries with VCS status &quot;replaced&quot;.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="252"/>
+        <source>Select the background color for entries with VCS status &quot;needs update&quot;.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="275"/>
-        <source>Select the background colour for entries with VCS status &quot;removed&quot;.</source>
+        <source>Select the background color for entries with VCS status &quot;removed&quot;.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -85165,17 +85645,12 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="279"/>
         <source>Colours</source>
-        <translation type="unfinished">Renkler</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="285"/>
-        <source>Background colour of secure URLs:</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Renkler</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="298"/>
         <source>Select the background colour for secure URLs.</source>
-        <translation type="unfinished">Güvenli URL&apos;nin arkaalan rengini seçiniz.</translation>
+        <translation type="obsolete">Güvenli URL&apos;nin arkaalan rengini seçiniz.</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="324"/>
@@ -85277,6 +85752,21 @@
         <source>Show Scrollbars</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="279"/>
+        <source>Colors</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="285"/>
+        <source>Background color of secure URLs:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="298"/>
+        <source>Select the background color for secure URLs.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>WebBrowserClearPrivateDataDialog</name>
@@ -86171,12 +86661,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserPage.py" line="171"/>
+        <location filename="../WebBrowser/WebBrowserPage.py" line="172"/>
         <source>Suspicuous URL detected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserPage.py" line="171"/>
+        <location filename="../WebBrowser/WebBrowserPage.py" line="172"/>
         <source>&lt;p&gt;The URL &lt;b&gt;{0}&lt;/b&gt; was found in the Safe Browsing database.&lt;/p&gt;{1}</source>
         <translation type="unfinished"></translation>
     </message>
@@ -86461,112 +86951,112 @@
 <context>
     <name>WebBrowserTabWidget</name>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="124"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="122"/>
         <source>Show a navigation menu</source>
         <translation type="unfinished">Yönlendirme Menüsünü Göster</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="137"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="135"/>
         <source>Show a navigation menu for closed tabs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="151"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="149"/>
         <source>Open a new web browser tab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="165"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="163"/>
         <source>New Tab</source>
         <translation type="unfinished">Yeni Sekme</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="169"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="167"/>
         <source>Move Left</source>
         <translation type="unfinished">Sola Götür</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="172"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="170"/>
         <source>Move Right</source>
         <translation type="unfinished">Sağa Götür</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="176"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="174"/>
         <source>Duplicate Page</source>
         <translation type="unfinished">Sayfayı Çoğalt</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="179"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="177"/>
         <source>Close</source>
         <translation type="unfinished">Kapat</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="182"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="180"/>
         <source>Close Others</source>
         <translation type="unfinished">Diğerlerini Kapat</translation>
     </message>
     <message>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="211"/>
+        <source>Close All</source>
+        <translation type="unfinished">Hepsini Kapat</translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="186"/>
+        <source>Print Preview</source>
+        <translation type="unfinished">Baskı Öngörünümü</translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="189"/>
+        <source>Print</source>
+        <translation type="unfinished">Yazdır</translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="192"/>
+        <source>Print as PDF</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../WebBrowser/WebBrowserTabWidget.py" line="213"/>
-        <source>Close All</source>
-        <translation type="unfinished">Hepsini Kapat</translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="188"/>
-        <source>Print Preview</source>
-        <translation type="unfinished">Baskı Öngörünümü</translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="191"/>
-        <source>Print</source>
-        <translation type="unfinished">Yazdır</translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="194"/>
-        <source>Print as PDF</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="215"/>
         <source>Reload All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="218"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="216"/>
         <source>Bookmark All Tabs</source>
         <translation type="unfinished">Tüm Sekmeleri Yerimi yap</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="222"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="220"/>
         <source>Restore Closed Tab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="458"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="456"/>
         <source>...</source>
         <translation type="unfinished">...</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="898"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="892"/>
         <source>Loading...</source>
         <translation type="unfinished">Yükleniyor...</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="918"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="912"/>
         <source>Finished loading</source>
         <translation type="unfinished">Yükleme bitirildi</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="920"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="914"/>
         <source>Failed to load</source>
         <translation type="unfinished">Yüklerken başarısız olundu</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="961"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="955"/>
         <source>Are you sure you want to close the window?</source>
         <translation type="unfinished"></translation>
     </message>
     <message numerus="yes">
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="961"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="955"/>
         <source>Are you sure you want to close the window?
 You have %n tab(s) open.</source>
         <translation type="unfinished">
@@ -86575,47 +87065,47 @@
         </translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="968"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="962"/>
         <source>&amp;Quit</source>
         <translation type="unfinished">&amp;Çıkış</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="971"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="965"/>
         <source>C&amp;lose Current Tab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="1152"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="1146"/>
         <source>Restore All Closed Tabs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="1154"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="1148"/>
         <source>Clear List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="252"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="250"/>
         <source>Unmute Tab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="256"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="254"/>
         <source>Mute Tab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="755"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="753"/>
         <source>Print to PDF</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="705"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="703"/>
         <source>&lt;p&gt;The file &lt;b&gt;{0}&lt;/b&gt; exists already. Shall it be overwritten?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="755"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="753"/>
         <source>&lt;p&gt;The PDF could not be written to file &lt;b&gt;{0}&lt;/b&gt;.&lt;/p&gt;&lt;p&gt;&lt;b&gt;Error:&lt;/b&gt; {1}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
--- a/eric6/i18n/eric6_zh_CN.ts	Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/i18n/eric6_zh_CN.ts	Sat May 02 13:51:07 2020 +0200
@@ -1225,12 +1225,12 @@
         <translation type="unfinished">&lt;&lt;Others&gt;&gt;</translation>
     </message>
     <message>
-        <location filename="../Graphics/ApplicationDiagramBuilder.py" line="292"/>
+        <location filename="../Graphics/ApplicationDiagramBuilder.py" line="294"/>
         <source>Load Diagram</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Graphics/ApplicationDiagramBuilder.py" line="292"/>
+        <location filename="../Graphics/ApplicationDiagramBuilder.py" line="294"/>
         <source>&lt;p&gt;The diagram belongs to the project &lt;b&gt;{0}&lt;/b&gt;. Shall this project be opened?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2400,32 +2400,32 @@
 <context>
     <name>BrowserModel</name>
     <message>
-        <location filename="../UI/BrowserModel.py" line="62"/>
+        <location filename="../UI/BrowserModel.py" line="63"/>
         <source>Name</source>
         <translation>名称</translation>
     </message>
     <message>
-        <location filename="../UI/BrowserModel.py" line="660"/>
+        <location filename="../UI/BrowserModel.py" line="661"/>
         <source>Globals</source>
         <translation>全局</translation>
     </message>
     <message>
-        <location filename="../UI/BrowserModel.py" line="730"/>
+        <location filename="../UI/BrowserModel.py" line="731"/>
         <source>Attributes</source>
         <translation>属性</translation>
     </message>
     <message>
-        <location filename="../UI/BrowserModel.py" line="654"/>
+        <location filename="../UI/BrowserModel.py" line="655"/>
         <source>Coding: {0}</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/BrowserModel.py" line="740"/>
+        <location filename="../UI/BrowserModel.py" line="741"/>
         <source>Class Attributes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/BrowserModel.py" line="666"/>
+        <location filename="../UI/BrowserModel.py" line="667"/>
         <source>Imports</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3119,54 +3119,54 @@
 <context>
     <name>CodeDocumentationViewer</name>
     <message>
-        <location filename="../UI/CodeDocumentationViewer.py" line="175"/>
+        <location filename="../UI/CodeDocumentationViewer.py" line="211"/>
         <source>Code Info Provider:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/CodeDocumentationViewer.py" line="188"/>
+        <location filename="../UI/CodeDocumentationViewer.py" line="224"/>
         <source>Select the code info provider</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/CodeDocumentationViewer.py" line="190"/>
+        <location filename="../UI/CodeDocumentationViewer.py" line="226"/>
         <source>&lt;disabled&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/CodeDocumentationViewer.py" line="371"/>
+        <location filename="../UI/CodeDocumentationViewer.py" line="407"/>
         <source>No documentation available</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/CodeDocumentationViewer.py" line="392"/>
+        <location filename="../UI/CodeDocumentationViewer.py" line="428"/>
         <source>No source code documentation provider has been registered. This function has been disabled.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/CodeDocumentationViewer.py" line="397"/>
+        <location filename="../UI/CodeDocumentationViewer.py" line="433"/>
         <source>This function has been disabled.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/CodeDocumentationViewerTemplate.py" line="137"/>
+        <location filename="../UI/CodeDocumentationViewerTemplate.py" line="139"/>
         <source>No further documentation available</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/CodeDocumentationViewerTemplate.py" line="58"/>
+        <location filename="../UI/CodeDocumentationViewerTemplate.py" line="60"/>
         <source>&lt;p&gt;&lt;b&gt;Definition:&lt;/b&gt; &lt;span class=&quot;def&quot;&gt;@NAME@@ARGSPEC@&lt;/span&gt;&lt;/p&gt;</source>
         <comment>Just translate &apos;Definition:&apos; and leave the rest intact.</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/CodeDocumentationViewerTemplate.py" line="68"/>
+        <location filename="../UI/CodeDocumentationViewerTemplate.py" line="70"/>
         <source>&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; @NOTE@&lt;/p&gt;</source>
         <comment>Just translate &apos;Note:&apos; and leave the rest intact.</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/CodeDocumentationViewerTemplate.py" line="63"/>
+        <location filename="../UI/CodeDocumentationViewerTemplate.py" line="65"/>
         <source>&lt;p&gt;&lt;b&gt;Type:&lt;/b&gt; @TYPE@&lt;/p&gt;</source>
         <comment>Just translate &apos;Type:&apos; and leave the rest intact.</comment>
         <translation type="unfinished"></translation>
@@ -4244,7 +4244,7 @@
     <message>
         <location filename="../Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.ui" line="143"/>
         <source>Colour</source>
-        <translation>颜色</translation>
+        <translation type="obsolete">颜色</translation>
     </message>
     <message>
         <location filename="../Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.ui" line="42"/>
@@ -4259,7 +4259,7 @@
     <message>
         <location filename="../Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.ui" line="155"/>
         <source>Enter a variable name or a colour</source>
-        <translation>输入变量名或颜色</translation>
+        <translation type="obsolete">输入变量名或颜色</translation>
     </message>
     <message>
         <location filename="../Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.ui" line="167"/>
@@ -4427,11 +4427,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.py" line="72"/>
-        <source>&lt;p&gt;The colour &lt;b&gt;{0}&lt;/b&gt; is not valid.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.ui" line="55"/>
         <source>Result</source>
         <translation type="unfinished"></translation>
@@ -4442,11 +4437,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.ui" line="292"/>
-        <source>Colour Variable</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.ui" line="87"/>
         <source>Parent</source>
         <translation type="unfinished"></translation>
@@ -4486,6 +4476,26 @@
         <source>Enter the parent expression</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.ui" line="143"/>
+        <source>Color</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.ui" line="155"/>
+        <source>Enter a variable name or a color</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.ui" line="292"/>
+        <source>Color Variable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.py" line="72"/>
+        <source>&lt;p&gt;The color &lt;b&gt;{0}&lt;/b&gt; is not valid.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>CompareDialog</name>
@@ -6392,7 +6402,7 @@
         <translation>uic 错误</translation>
     </message>
     <message>
-        <location filename="../Project/CreateDialogCodeDialog.py" line="577"/>
+        <location filename="../Project/CreateDialogCodeDialog.py" line="580"/>
         <source>Code Generation</source>
         <translation>代码生成</translation>
     </message>
@@ -6407,17 +6417,17 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/CreateDialogCodeDialog.py" line="437"/>
+        <location filename="../Project/CreateDialogCodeDialog.py" line="440"/>
         <source>&lt;p&gt;Could not open the code template file &quot;{0}&quot;.&lt;/p&gt;&lt;p&gt;Reason: {1}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/CreateDialogCodeDialog.py" line="475"/>
+        <location filename="../Project/CreateDialogCodeDialog.py" line="478"/>
         <source>&lt;p&gt;Could not open the source file &quot;{0}&quot;.&lt;/p&gt;&lt;p&gt;Reason: {1}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/CreateDialogCodeDialog.py" line="577"/>
+        <location filename="../Project/CreateDialogCodeDialog.py" line="580"/>
         <source>&lt;p&gt;Could not write the source file &quot;{0}&quot;.&lt;/p&gt;&lt;p&gt;Reason: {1}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7640,21 +7650,6 @@
         <translation type="unfinished">选择是否远程运行调试器</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="630"/>
-        <source>Background Colours</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="659"/>
-        <source>Select the background colour for changed items.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="695"/>
-        <source>Select the background colour for elements which are loaded for the first time.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="669"/>
         <source>Changed elements:</source>
         <translation type="unfinished"></translation>
@@ -7664,6 +7659,21 @@
         <source>First time opened elements:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="630"/>
+        <source>Background Colors</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="659"/>
+        <source>Select the background color for changed items.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="695"/>
+        <source>Select the background color for elements which are loaded for the first time.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DebuggerInterfacePython</name>
@@ -8149,110 +8159,110 @@
 <context>
     <name>DiffColoursPage</name>
     <message>
-        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="17"/>
-        <source>&lt;b&gt;Configure Diff colours&lt;/b&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="39"/>
-        <source>Select the background colour for header lines</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="42"/>
-        <source>Header Colour</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="52"/>
         <source>Header Line</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="65"/>
-        <source>Select the background colour for bad whitespace</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="68"/>
-        <source>Whitespace Colour</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="88"/>
-        <source>Select the text foreground colour</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="91"/>
-        <source>Text Colour</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="101"/>
         <source>Normal Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="114"/>
-        <source>Select the background colour for additions</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="117"/>
-        <source>Added Colour</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="127"/>
         <source>Added Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="140"/>
-        <source>Select the background colour for removed text</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="143"/>
-        <source>Removed Colour</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="153"/>
         <source>Removed Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="166"/>
-        <source>Select the background colour for replaced text</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="169"/>
-        <source>Replaced Colour</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="179"/>
         <source>Replaced Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="192"/>
-        <source>Select the background colour for context lines</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="195"/>
-        <source>Context Colour</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="205"/>
         <source>Context Line</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="17"/>
+        <source>&lt;b&gt;Configure Diff colors&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="39"/>
+        <source>Select the background color for header lines</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="42"/>
+        <source>Header Color</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="65"/>
+        <source>Select the background color for bad whitespace</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="68"/>
+        <source>Whitespace Color</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="88"/>
+        <source>Select the text foreground color</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="91"/>
+        <source>Text Color</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="114"/>
+        <source>Select the background color for additions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="117"/>
+        <source>Added Color</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="140"/>
+        <source>Select the background color for removed text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="143"/>
+        <source>Removed Color</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="166"/>
+        <source>Select the background color for replaced text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="169"/>
+        <source>Replaced Color</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="192"/>
+        <source>Select the background color for context lines</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="195"/>
+        <source>Context Color</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DiffDialog</name>
@@ -9474,7 +9484,7 @@
 <context>
     <name>E5GraphicsView</name>
     <message>
-        <location filename="../E5Graphics/E5GraphicsView.py" line="56"/>
+        <location filename="../E5Graphics/E5GraphicsView.py" line="58"/>
         <source>&lt;b&gt;Graphics View&lt;/b&gt;
 &lt;p&gt;This graphics view is used to show a diagram. 
 There are various actions available to manipulate the 
@@ -9494,7 +9504,7 @@
 可以使用多种动作对显示的内容进行操纵。&lt;/p&gt;&lt;ul&gt;&lt;li&gt;在对象上单击可以选择对象。&lt;/li&gt;&lt;li&gt;Ctrl-单击将对象添加到选择范围中。&lt;/li&gt;&lt;li&gt;Ctrl-单击一个已选对象可取消对其选择。&lt;/li&gt;&lt;li&gt;在画布的空白区域单击可取消所有选择。&lt;/li&gt;&lt;li&gt;在画布上拖动鼠标可以用选框方式选择多个对象。&lt;/li&gt;&lt;li&gt;在已选对象上拖动鼠标可以对其进行整体移动。&lt;/li&gt;&lt;/ul&gt;</translation>
     </message>
     <message>
-        <location filename="../E5Graphics/E5GraphicsView.py" line="377"/>
+        <location filename="../E5Graphics/E5GraphicsView.py" line="416"/>
         <source>{0}, Page {1}</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10944,7 +10954,7 @@
 <context>
     <name>Editor</name>
     <message>
-        <location filename="../QScintilla/Editor.py" line="3106"/>
+        <location filename="../QScintilla/Editor.py" line="3107"/>
         <source>Open File</source>
         <translation>打开文件</translation>
     </message>
@@ -11029,7 +11039,7 @@
         <translation>全部取消选择</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7834"/>
+        <location filename="../QScintilla/Editor.py" line="7847"/>
         <source>Check spelling...</source>
         <translation>正在进行拼写检查…</translation>
     </message>
@@ -11249,7 +11259,7 @@
         <translation>编辑断点…</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5607"/>
+        <location filename="../QScintilla/Editor.py" line="5615"/>
         <source>Enable breakpoint</source>
         <translation>允许断点</translation>
     </message>
@@ -11324,257 +11334,257 @@
         <translation>选择要应用的 Pygments 词法分析器。</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="1955"/>
+        <location filename="../QScintilla/Editor.py" line="1956"/>
         <source>Modification of Read Only file</source>
         <translation>只读文件的改变</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="1955"/>
+        <location filename="../QScintilla/Editor.py" line="1956"/>
         <source>You are attempting to change a read only file. Please save to a different file first.</source>
         <translation>试图改变只读文件。请先保存到另一个文件中。</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="2663"/>
+        <location filename="../QScintilla/Editor.py" line="2664"/>
         <source>Printing...</source>
         <translation>打印中…</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="2680"/>
+        <location filename="../QScintilla/Editor.py" line="2681"/>
         <source>Printing completed</source>
         <translation>打印已完成</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="2682"/>
+        <location filename="../QScintilla/Editor.py" line="2683"/>
         <source>Error while printing</source>
         <translation>打印时出错</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="2685"/>
+        <location filename="../QScintilla/Editor.py" line="2686"/>
         <source>Printing aborted</source>
         <translation>打印失败</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="3046"/>
+        <location filename="../QScintilla/Editor.py" line="3047"/>
         <source>File Modified</source>
         <translation>文件已改变</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="3295"/>
+        <location filename="../QScintilla/Editor.py" line="3296"/>
         <source>Save File</source>
         <translation>保存文件</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="4772"/>
+        <location filename="../QScintilla/Editor.py" line="4777"/>
         <source>Autocompletion</source>
         <translation>自动完成</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="4772"/>
+        <location filename="../QScintilla/Editor.py" line="4777"/>
         <source>Autocompletion is not available because there is no autocompletion source set.</source>
         <translation>自动完成无效,没有设定自动完成源。</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5610"/>
+        <location filename="../QScintilla/Editor.py" line="5618"/>
         <source>Disable breakpoint</source>
         <translation>去除断点</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5985"/>
+        <location filename="../QScintilla/Editor.py" line="5993"/>
         <source>Code Coverage</source>
         <translation>代码覆盖率</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5985"/>
+        <location filename="../QScintilla/Editor.py" line="5993"/>
         <source>Please select a coverage file</source>
         <translation>请选择一个覆盖率文件</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6048"/>
+        <location filename="../QScintilla/Editor.py" line="6056"/>
         <source>Show Code Coverage Annotations</source>
         <translation>显示代码覆盖率注解</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6041"/>
+        <location filename="../QScintilla/Editor.py" line="6049"/>
         <source>All lines have been covered.</source>
         <translation>所有行均被已覆盖。</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6048"/>
+        <location filename="../QScintilla/Editor.py" line="6056"/>
         <source>There is no coverage file available.</source>
         <translation>没有有效的覆盖率文件。</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6165"/>
+        <location filename="../QScintilla/Editor.py" line="6173"/>
         <source>Profile Data</source>
         <translation>剖析数据</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6165"/>
+        <location filename="../QScintilla/Editor.py" line="6173"/>
         <source>Please select a profile file</source>
         <translation>请选择一个剖析文件</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6327"/>
+        <location filename="../QScintilla/Editor.py" line="6335"/>
         <source>Syntax Error</source>
         <translation>语法错误</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6327"/>
+        <location filename="../QScintilla/Editor.py" line="6335"/>
         <source>No syntax error message available.</source>
         <translation>语法错误消息无效。</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6718"/>
+        <location filename="../QScintilla/Editor.py" line="6726"/>
         <source>Macro Name</source>
         <translation>宏名称</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6718"/>
+        <location filename="../QScintilla/Editor.py" line="6726"/>
         <source>Select a macro name:</source>
         <translation>选择一个宏名称:</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6746"/>
+        <location filename="../QScintilla/Editor.py" line="6754"/>
         <source>Load macro file</source>
         <translation>输入宏文件</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6789"/>
+        <location filename="../QScintilla/Editor.py" line="6797"/>
         <source>Macro files (*.macro)</source>
         <translation>宏文件 (*.macro)</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6769"/>
+        <location filename="../QScintilla/Editor.py" line="6777"/>
         <source>Error loading macro</source>
         <translation>载入宏文件出错</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6789"/>
+        <location filename="../QScintilla/Editor.py" line="6797"/>
         <source>Save macro file</source>
         <translation>保存宏文件</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6806"/>
+        <location filename="../QScintilla/Editor.py" line="6814"/>
         <source>Save macro</source>
         <translation>保存宏</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6822"/>
+        <location filename="../QScintilla/Editor.py" line="6830"/>
         <source>Error saving macro</source>
         <translation>保存宏出错</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6835"/>
+        <location filename="../QScintilla/Editor.py" line="6843"/>
         <source>Start Macro Recording</source>
         <translation>开始宏录制</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6835"/>
+        <location filename="../QScintilla/Editor.py" line="6843"/>
         <source>Macro recording is already active. Start new?</source>
         <translation>宏录制已激活。开始录制新宏?</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6861"/>
+        <location filename="../QScintilla/Editor.py" line="6869"/>
         <source>Macro Recording</source>
         <translation>宏录制</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6861"/>
+        <location filename="../QScintilla/Editor.py" line="6869"/>
         <source>Enter name of the macro:</source>
         <translation>输入宏名称:</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7001"/>
+        <location filename="../QScintilla/Editor.py" line="7009"/>
         <source>File changed</source>
         <translation>文件已改变</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7307"/>
+        <location filename="../QScintilla/Editor.py" line="7320"/>
         <source>Drop Error</source>
         <translation>降落误差</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7328"/>
-        <source>Resources</source>
-        <translation>资源</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="7330"/>
-        <source>Add file...</source>
-        <translation>添加文件…</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="7332"/>
-        <source>Add files...</source>
-        <translation>添加文件…</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="7334"/>
-        <source>Add aliased file...</source>
-        <translation>添加别名文件…</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="7337"/>
-        <source>Add localized resource...</source>
-        <translation>添加本地资源…</translation>
-    </message>
-    <message>
         <location filename="../QScintilla/Editor.py" line="7341"/>
+        <source>Resources</source>
+        <translation>资源</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="7343"/>
+        <source>Add file...</source>
+        <translation>添加文件…</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="7345"/>
+        <source>Add files...</source>
+        <translation>添加文件…</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="7347"/>
+        <source>Add aliased file...</source>
+        <translation>添加别名文件…</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="7350"/>
+        <source>Add localized resource...</source>
+        <translation>添加本地资源…</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="7354"/>
         <source>Add resource frame</source>
         <translation>添加资源结构</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7360"/>
+        <location filename="../QScintilla/Editor.py" line="7373"/>
         <source>Add file resource</source>
         <translation>添加文件资源</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7376"/>
+        <location filename="../QScintilla/Editor.py" line="7389"/>
         <source>Add file resources</source>
         <translation>添加多个文件资源</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7403"/>
+        <location filename="../QScintilla/Editor.py" line="7416"/>
         <source>Add aliased file resource</source>
         <translation>添加别名文件资源</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7469"/>
+        <location filename="../QScintilla/Editor.py" line="7482"/>
         <source>Package Diagram</source>
         <translation>程序包图</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7469"/>
+        <location filename="../QScintilla/Editor.py" line="7482"/>
         <source>Include class attributes?</source>
         <translation>包含类属性?</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7491"/>
+        <location filename="../QScintilla/Editor.py" line="7504"/>
         <source>Imports Diagram</source>
         <translation>引用图</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7491"/>
+        <location filename="../QScintilla/Editor.py" line="7504"/>
         <source>Include imports from external modules?</source>
         <translation>从外部模块包含引用?</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7505"/>
+        <location filename="../QScintilla/Editor.py" line="7518"/>
         <source>Application Diagram</source>
         <translation>应用程序图</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7505"/>
+        <location filename="../QScintilla/Editor.py" line="7518"/>
         <source>Include module names?</source>
         <translation>包含模块名?</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7837"/>
+        <location filename="../QScintilla/Editor.py" line="7850"/>
         <source>Add to dictionary</source>
         <translation>添加到文件夹</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7839"/>
+        <location filename="../QScintilla/Editor.py" line="7852"/>
         <source>Ignore All</source>
         <translation>全部忽略</translation>
     </message>
@@ -11599,47 +11609,47 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="3046"/>
+        <location filename="../QScintilla/Editor.py" line="3047"/>
         <source>&lt;p&gt;The file &lt;b&gt;{0}&lt;/b&gt; has unsaved changes.&lt;/p&gt;</source>
         <translation>&lt;p&gt;文件 &lt;b&gt;{0}&lt;/b&gt; 有未保存的更改。&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="3106"/>
+        <location filename="../QScintilla/Editor.py" line="3107"/>
         <source>&lt;p&gt;The file &lt;b&gt;{0}&lt;/b&gt; could not be opened.&lt;/p&gt;&lt;p&gt;Reason: {1}&lt;/p&gt;</source>
         <translation>&lt;p&gt;文件 &lt;b&gt;{0}&lt;/b&gt; 无法打开。&lt;/p&gt;&lt;p&gt;原因:{1}&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="3232"/>
+        <location filename="../QScintilla/Editor.py" line="3233"/>
         <source>&lt;p&gt;The file &lt;b&gt;{0}&lt;/b&gt; could not be saved.&lt;br/&gt;Reason: {1}&lt;/p&gt;</source>
         <translation>&lt;p&gt;文件 &lt;b&gt;{0}&lt;/b&gt; 无法保存。&lt;br /&gt;原因:{1}&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6760"/>
+        <location filename="../QScintilla/Editor.py" line="6768"/>
         <source>&lt;p&gt;The macro file &lt;b&gt;{0}&lt;/b&gt; could not be read.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6769"/>
+        <location filename="../QScintilla/Editor.py" line="6777"/>
         <source>&lt;p&gt;The macro file &lt;b&gt;{0}&lt;/b&gt; is corrupt.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6822"/>
+        <location filename="../QScintilla/Editor.py" line="6830"/>
         <source>&lt;p&gt;The macro file &lt;b&gt;{0}&lt;/b&gt; could not be written.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7166"/>
+        <location filename="../QScintilla/Editor.py" line="7179"/>
         <source>{0} (ro)</source>
         <translation>{0}(只读)</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7307"/>
+        <location filename="../QScintilla/Editor.py" line="7320"/>
         <source>&lt;p&gt;&lt;b&gt;{0}&lt;/b&gt; is not a file.&lt;/p&gt;</source>
         <translation>&lt;p&gt;&lt;b&gt;{0}&lt;/b&gt; 不是一个文件。&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7403"/>
+        <location filename="../QScintilla/Editor.py" line="7416"/>
         <source>Alias for file &lt;b&gt;{0}&lt;/b&gt;:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11664,27 +11674,27 @@
         <translation>清空警告</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="3295"/>
+        <location filename="../QScintilla/Editor.py" line="3296"/>
         <source>&lt;p&gt;The file &lt;b&gt;{0}&lt;/b&gt; already exists. Overwrite it?&lt;/p&gt;</source>
         <translation>&lt;p&gt;文件 &lt;b&gt;{0}&lt;/b&gt; 已经存在。是否覆盖?&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6806"/>
+        <location filename="../QScintilla/Editor.py" line="6814"/>
         <source>&lt;p&gt;The macro file &lt;b&gt;{0}&lt;/b&gt; already exists. Overwrite it?&lt;/p&gt;</source>
         <translation>&lt;p&gt;宏文件 &lt;b&gt;{0}&lt;/b&gt; 已经存在。是否覆盖?&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6606"/>
+        <location filename="../QScintilla/Editor.py" line="6614"/>
         <source>Warning: {0}</source>
         <translation>警告:{0}</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6613"/>
+        <location filename="../QScintilla/Editor.py" line="6621"/>
         <source>Error: {0}</source>
         <translation>错误:{0}</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6997"/>
+        <location filename="../QScintilla/Editor.py" line="7005"/>
         <source>&lt;br&gt;&lt;b&gt;Warning:&lt;/b&gt; You will lose your changes upon reopening it.</source>
         <translation>&lt;br&gt;&lt;b&gt;警告:&lt;/b&gt;您在重新打开时将丢失所有更改。</translation>
     </message>
@@ -11709,27 +11719,27 @@
         <translation>上一个更改</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="8255"/>
+        <location filename="../QScintilla/Editor.py" line="8268"/>
         <source>Sort Lines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="8255"/>
+        <location filename="../QScintilla/Editor.py" line="8268"/>
         <source>The selection contains illegal data for a numerical sort.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6541"/>
+        <location filename="../QScintilla/Editor.py" line="6549"/>
         <source>Warning</source>
         <translation>警告</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6541"/>
+        <location filename="../QScintilla/Editor.py" line="6549"/>
         <source>No warning messages available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6603"/>
+        <location filename="../QScintilla/Editor.py" line="6611"/>
         <source>Style: {0}</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11754,7 +11764,7 @@
         <translation>使用指定编码重新打开</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6991"/>
+        <location filename="../QScintilla/Editor.py" line="6999"/>
         <source>&lt;p&gt;The file &lt;b&gt;{0}&lt;/b&gt; has been changed while it was opened in eric6. Reread it?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11769,32 +11779,32 @@
         <translation>补全</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="4902"/>
+        <location filename="../QScintilla/Editor.py" line="4907"/>
         <source>Auto-Completion Provider</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="4902"/>
+        <location filename="../QScintilla/Editor.py" line="4907"/>
         <source>The completion list provider &apos;{0}&apos; was already registered. Ignoring duplicate request.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5177"/>
+        <location filename="../QScintilla/Editor.py" line="5185"/>
         <source>Call-Tips Provider</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5177"/>
+        <location filename="../QScintilla/Editor.py" line="5185"/>
         <source>The call-tips provider &apos;{0}&apos; was already registered. Ignoring duplicate request.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="8344"/>
+        <location filename="../QScintilla/Editor.py" line="8357"/>
         <source>Register Mouse Click Handler</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="8344"/>
+        <location filename="../QScintilla/Editor.py" line="8357"/>
         <source>A mouse click handler for &quot;{0}&quot; was already registered by &quot;{1}&quot;. Aborting request by &quot;{2}&quot;...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11824,12 +11834,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="8465"/>
+        <location filename="../QScintilla/Editor.py" line="8478"/>
         <source>EditorConfig Properties</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="8465"/>
+        <location filename="../QScintilla/Editor.py" line="8478"/>
         <source>&lt;p&gt;The EditorConfig properties for file &lt;b&gt;{0}&lt;/b&gt; could not be loaded.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12366,20 +12376,20 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="122"/>
         <source>Colours</source>
-        <translation>颜色</translation>
+        <translation type="obsolete">颜色</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="128"/>
         <source>Background colour:</source>
-        <translation>背景色:</translation>
+        <translation type="obsolete">背景色:</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="141"/>
         <source>Select the background colour for calltips.</source>
-        <translation>为调用提示选择背景色。</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="167"/>
+        <translation type="obsolete">为调用提示选择背景色。</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="213"/>
         <source>Plug-In Behavior</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12409,20 +12419,55 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="176"/>
+        <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="222"/>
         <source>Qscintilla provided calltips are shown, if this option is enabled and calltips shall be provided by plug-ins (see calltips sub-page of the plug-in) and the plugin-ins don&apos;t deliver any calltips.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="179"/>
+        <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="225"/>
         <source>Show QScintilla calltips, if plug-ins fail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="173"/>
+        <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="219"/>
         <source>Select to show QScintilla provided calltips, if the selected plug-ins fail</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="122"/>
+        <source>Colors</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="128"/>
+        <source>Background color:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="141"/>
+        <source>Select the background color for calltips.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="164"/>
+        <source>Foreground color:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="177"/>
+        <source>Select the foreground color for calltips.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="187"/>
+        <source>Highlight color:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="200"/>
+        <source>Select the highlight color for calltips.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>EditorCalltipsQScintillaPage</name>
@@ -13360,22 +13405,22 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="174"/>
         <source>Select the foreground colour.</source>
-        <translation>选择前景色。</translation>
+        <translation type="obsolete">选择前景色。</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="177"/>
         <source>Foreground Colour</source>
-        <translation>前景色</translation>
+        <translation type="obsolete">前景色</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="184"/>
         <source>Select the background colour.</source>
-        <translation>选择背景色。</translation>
+        <translation type="obsolete">选择背景色。</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="187"/>
         <source>Background Colour</source>
-        <translation>背景色</translation>
+        <translation type="obsolete">背景色</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="194"/>
@@ -13405,12 +13450,12 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="273"/>
         <source>Select the background colour for all styles</source>
-        <translation>为所有风格选择背景色</translation>
+        <translation type="obsolete">为所有风格选择背景色</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="276"/>
         <source>All Background Colours</source>
-        <translation>所有背景色</translation>
+        <translation type="obsolete">所有背景色</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="283"/>
@@ -13617,6 +13662,36 @@
         <source>Press to set all sub-styles to default values</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="174"/>
+        <source>Select the foreground color.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="177"/>
+        <source>Foreground Color</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="184"/>
+        <source>Select the background color.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="187"/>
+        <source>Background Color</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="273"/>
+        <source>Select the background color for all styles</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="276"/>
+        <source>All Background Colors</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>EditorKeywordsPage</name>
@@ -14453,12 +14528,12 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorSearchPage.ui" line="127"/>
         <source>Marker Colour:</source>
-        <translation>标记颜色:</translation>
+        <translation type="obsolete">标记颜色:</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorSearchPage.ui" line="140"/>
         <source>Select the colour for the search markers.</source>
-        <translation>为搜索标记选择颜色。</translation>
+        <translation type="obsolete">为搜索标记选择颜色。</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorSearchPage.ui" line="168"/>
@@ -14485,6 +14560,16 @@
         <source>QScintilla Extended  Mode (C++11)</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorSearchPage.ui" line="127"/>
+        <source>Marker Color:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorSearchPage.ui" line="140"/>
+        <source>Select the color for the search markers.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>EditorSpellCheckingPage</name>
@@ -14546,17 +14631,17 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorSpellCheckingPage.ui" line="215"/>
         <source>Colours</source>
-        <translation>颜色</translation>
+        <translation type="obsolete">颜色</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorSpellCheckingPage.ui" line="221"/>
         <source>Marker Colour:</source>
-        <translation>标记颜色:</translation>
+        <translation type="obsolete">标记颜色:</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorSpellCheckingPage.ui" line="234"/>
         <source>Select the colour for the spelling markers.</source>
-        <translation>为拼写标记选择颜色。</translation>
+        <translation type="obsolete">为拼写标记选择颜色。</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorSpellCheckingPage.ui" line="260"/>
@@ -14649,6 +14734,21 @@
 &lt;p&gt;Enter the file extension of pure text files. The complete contents of files with these extensions will be checked.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorSpellCheckingPage.ui" line="215"/>
+        <source>Colors</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorSpellCheckingPage.ui" line="221"/>
+        <source>Marker Color:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorSpellCheckingPage.ui" line="234"/>
+        <source>Select the color for the spelling markers.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>EditorStylesPage</name>
@@ -14795,7 +14895,7 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="351"/>
         <source>Select the foreground colour for the margins</source>
-        <translation>为页边空白选择前景色</translation>
+        <translation type="obsolete">为页边空白选择前景色</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="361"/>
@@ -14805,7 +14905,7 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="374"/>
         <source>Select the background colour for the margins</source>
-        <translation>为页边空白选择背景色</translation>
+        <translation type="obsolete">为页边空白选择背景色</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="384"/>
@@ -14815,7 +14915,7 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="397"/>
         <source>Select the background colour for the foldmargin</source>
-        <translation>为折叠符区域选择背景色</translation>
+        <translation type="obsolete">为折叠符区域选择背景色</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="457"/>
@@ -14840,27 +14940,27 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="515"/>
         <source>Select to use custom selection colours</source>
-        <translation>选择可使用自定义选区颜色</translation>
+        <translation type="obsolete">选择可使用自定义选区颜色</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="518"/>
         <source>&lt;b&gt;Use custom selection colours&lt;/b&gt;&lt;p&gt;Select this entry in order to use custom selection colours in the editor and shell windows. The colours for the selection foreground and background are defined on the colours page.&lt;/p&gt;</source>
-        <translation>&lt;b&gt;使用自定义选区颜色&lt;/b&gt;&lt;p&gt;选择该条目可在编辑器和命令行窗口中使用自定义选区颜色。选区的前景色和背景色在颜色页面中定义。&lt;/p&gt;</translation>
+        <translation type="obsolete">&lt;b&gt;使用自定义选区颜色&lt;/b&gt;&lt;p&gt;选择该条目可在编辑器和命令行窗口中使用自定义选区颜色。选区的前景色和背景色在颜色页面中定义。&lt;/p&gt;</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="521"/>
         <source>Use custom selection colours</source>
-        <translation>使用自定义选区颜色</translation>
+        <translation type="obsolete">使用自定义选区颜色</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="528"/>
         <source>Select, if selected text should be colourized by the lexer.</source>
-        <translation>选择所选文本是否由词法分析器着色</translation>
+        <translation type="obsolete">选择所选文本是否由词法分析器着色</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="531"/>
         <source>Colourize selected text</source>
-        <translation>为所选文本着色</translation>
+        <translation type="obsolete">为所选文本着色</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="538"/>
@@ -14880,7 +14980,7 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="565"/>
         <source>Select the foreground colour for the selection.</source>
-        <translation>为选区选择前景色。</translation>
+        <translation type="obsolete">为选区选择前景色。</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="575"/>
@@ -14890,7 +14990,7 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="588"/>
         <source>Select the background colour for the selection.</source>
-        <translation>为选区选择背景色。</translation>
+        <translation type="obsolete">为选区选择背景色。</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="609"/>
@@ -14915,7 +15015,7 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="648"/>
         <source>Select the colour for the caret.</source>
-        <translation>为插入符选择颜色。</translation>
+        <translation type="obsolete">为插入符选择颜色。</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="672"/>
@@ -14925,7 +15025,7 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="761"/>
         <source>Select the background colour for the line containing the caret.</source>
-        <translation>为包含插入符的行选择背景色。</translation>
+        <translation type="obsolete">为包含插入符的行选择背景色。</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="792"/>
@@ -14940,7 +15040,7 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="821"/>
         <source>Select the colour for the current line marker.</source>
-        <translation type="unfinished">为当前行标记选择颜色。</translation>
+        <translation type="obsolete">为当前行标记选择颜色。</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="831"/>
@@ -14950,7 +15050,7 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="844"/>
         <source>Select the colour for the error line marker.</source>
-        <translation type="unfinished">为错误行标记选择颜色。</translation>
+        <translation type="obsolete">为错误行标记选择颜色。</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="857"/>
@@ -14975,7 +15075,7 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="886"/>
         <source>Select the colour for highlighting matching braces.</source>
-        <translation>为高亮显示的配对括号选择颜色。</translation>
+        <translation type="obsolete">为高亮显示的配对括号选择颜色。</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="896"/>
@@ -14985,7 +15085,7 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="909"/>
         <source>Select the background colour for highlighting matching braces.</source>
-        <translation>为高亮显示的配对括号选择背景色。</translation>
+        <translation type="obsolete">为高亮显示的配对括号选择背景色。</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="925"/>
@@ -14995,7 +15095,7 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="932"/>
         <source>Select the colour for  highlighting nonmatching braces.</source>
-        <translation>为高亮显示的未配对括号选择颜色。</translation>
+        <translation type="obsolete">为高亮显示的未配对括号选择颜色。</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="948"/>
@@ -15005,7 +15105,7 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="955"/>
         <source>Select the background colour for  highlighting nonmatching braces.</source>
-        <translation>为高亮显示的未配对括号选择背景色。</translation>
+        <translation type="obsolete">为高亮显示的未配对括号选择背景色。</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="968"/>
@@ -15035,12 +15135,12 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1124"/>
         <source>Select the colour for the edge marker.</source>
-        <translation>为边界标记选择颜色。</translation>
+        <translation type="obsolete">为边界标记选择颜色。</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1134"/>
         <source>Background colour:</source>
-        <translation>背景色:</translation>
+        <translation type="obsolete">背景色:</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1147"/>
@@ -15075,7 +15175,7 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1222"/>
         <source>Change Background Colour</source>
-        <translation>改变背景颜色</translation>
+        <translation type="obsolete">改变背景颜色</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="2077"/>
@@ -15138,21 +15238,11 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="420"/>
-        <source>Select the foreground colour of the foldmarkers</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="430"/>
         <source>Foldmarkers background:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="443"/>
-        <source>Select the background colour of the foldmarkers</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="37"/>
         <source>&lt;b&gt;Note:&lt;/b&gt; Fonts and colors of the syntax highlighters have to be configured on the syntax highlighter styles page.</source>
         <translation>&lt;b&gt;注意:&lt;/b&gt;语法高亮器的字体和颜色必须在语法高亮器风格页面进行配置。</translation>
@@ -15178,21 +15268,11 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1402"/>
-        <source>Press to select the foreground colour</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1405"/>
         <source>Foreground</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1412"/>
-        <source>Press to select the background colour</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1415"/>
         <source>Background</source>
         <translation type="unfinished"></translation>
@@ -15223,54 +15303,24 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1636"/>
-        <source>Select the foreground colour for visible whitespace</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1646"/>
         <source>Whitespace background:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1659"/>
-        <source>Select the background colour for visible whitespace</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="53"/>
-        <source>Select to set the colour of the edit area different to the default style</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="56"/>
-        <source>Override edit area colours</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="68"/>
         <source>Edit area foreground:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="81"/>
-        <source>Select the foreground colour for the edit area.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="91"/>
         <source>Edit area background:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="104"/>
-        <source>Select the background colour for the edit area.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="47"/>
         <source>Colours</source>
-        <translation>颜色</translation>
+        <translation type="obsolete">颜色</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1444"/>
@@ -15303,26 +15353,6 @@
         <translation type="unfinished">毫秒</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1514"/>
-        <source>Unsaved changes colour:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1527"/>
-        <source>Select the colour for the change marker for unsaved changes.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1537"/>
-        <source>Saved changes colour:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1550"/>
-        <source>Select the colour for the change marker for saved changes.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1003"/>
         <source>Select the wrap mode for long lines</source>
         <translation type="unfinished"></translation>
@@ -15398,91 +15428,46 @@
         <translation type="unfinished">错误:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1782"/>
-        <source>Select the colour for error markers</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1792"/>
         <source>Warnings:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1805"/>
-        <source>Select the colour for warning markers</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1815"/>
         <source>Bookmarks:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1828"/>
-        <source>Select the colour for bookmark markers</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1838"/>
         <source>Breakpoints:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1851"/>
-        <source>Select the colour for breakpoint markers</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1861"/>
         <source>Tasks:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1874"/>
-        <source>Select the colour for task markers</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1884"/>
         <source>Changes:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1897"/>
-        <source>Select the colour for change markers</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1907"/>
         <source>Coverage:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1920"/>
-        <source>Select the colour for coverage markers</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1930"/>
         <source>Current Line:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1943"/>
-        <source>Select the colour for the current line marker</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1999"/>
         <source>Background:</source>
         <translation type="unfinished">后台:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="2012"/>
-        <source>Select the background colour for the marker map</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1674"/>
         <source>Indentation Guides</source>
         <translation type="unfinished"></translation>
@@ -15503,31 +15488,16 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1705"/>
-        <source>Select the foreground colour for indentation guides</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1715"/>
         <source>Indentation Guides background:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1728"/>
-        <source>Select the background colour for indentation guides</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1953"/>
         <source>Search Markers:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1966"/>
-        <source>Select the colour for the search marker</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="2093"/>
         <source>Select to hide the Format Buttons bar when formatting is not supported</source>
         <translation type="unfinished"></translation>
@@ -15538,26 +15508,11 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="798"/>
-        <source>Select to indicate the debug markers using coloured line backgrounds, arrow indicators otherwise</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="801"/>
-        <source>Use background colours</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1976"/>
         <source>Conflict Marker Line:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1989"/>
-        <source>Select the colour for the conflict marker line marker</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1749"/>
         <source>Select to show the marker map right of the editor</source>
         <translation type="unfinished"></translation>
@@ -15704,8 +15659,263 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="47"/>
+        <source>Colors</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="53"/>
+        <source>Select to set the color of the edit area different to the default style</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="56"/>
+        <source>Override edit area colors</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="81"/>
+        <source>Select the foreground color for the edit area.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="104"/>
+        <source>Select the background color for the edit area.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="648"/>
+        <source>Select the color for the caret.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="351"/>
+        <source>Select the foreground color for the margins</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="374"/>
+        <source>Select the background color for the margins</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="397"/>
+        <source>Select the background color for the foldmargin</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="420"/>
+        <source>Select the foreground color of the foldmarkers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="443"/>
+        <source>Select the background color of the foldmarkers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="515"/>
+        <source>Select to use custom selection colors</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="518"/>
+        <source>&lt;b&gt;Use custom selection colors&lt;/b&gt;&lt;p&gt;Select this entry in order to use custom selection colors in the editor and shell windows. The colors for the selection foreground and background are defined on the colors page.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="521"/>
+        <source>Use custom selection colors</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="528"/>
+        <source>Select, if selected text should be colorized by the lexer.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="531"/>
+        <source>Colorize selected text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="565"/>
+        <source>Select the foreground color for the selection.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="588"/>
+        <source>Select the background color for the selection.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="761"/>
+        <source>Select the background color for the line containing the caret.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="798"/>
+        <source>Select to indicate the debug markers using colored line backgrounds, arrow indicators otherwise</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="801"/>
+        <source>Use background colors</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="821"/>
+        <source>Select the color for the current line marker.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="844"/>
+        <source>Select the color for the error line marker.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="886"/>
+        <source>Select the color for highlighting matching braces.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="909"/>
+        <source>Select the background color for highlighting matching braces.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="932"/>
+        <source>Select the color for  highlighting nonmatching braces.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="955"/>
+        <source>Select the background color for  highlighting nonmatching braces.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1124"/>
+        <source>Select the color for the edge marker.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1134"/>
+        <source>Background color:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1222"/>
+        <source>Change Background Color</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1402"/>
+        <source>Press to select the foreground color</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1412"/>
+        <source>Press to select the background color</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1514"/>
+        <source>Unsaved changes color:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1527"/>
+        <source>Select the color for the change marker for unsaved changes.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1537"/>
+        <source>Saved changes color:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1550"/>
+        <source>Select the color for the change marker for saved changes.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1636"/>
+        <source>Select the foreground color for visible whitespace</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1659"/>
+        <source>Select the background color for visible whitespace</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1705"/>
+        <source>Select the foreground color for indentation guides</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1728"/>
+        <source>Select the background color for indentation guides</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1763"/>
-        <source>Marker Colours</source>
+        <source>Marker Colors</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1782"/>
+        <source>Select the color for error markers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1805"/>
+        <source>Select the color for warning markers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1828"/>
+        <source>Select the color for bookmark markers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1851"/>
+        <source>Select the color for breakpoint markers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1874"/>
+        <source>Select the color for task markers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1897"/>
+        <source>Select the color for change markers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1920"/>
+        <source>Select the color for coverage markers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1943"/>
+        <source>Select the color for the current line marker</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1966"/>
+        <source>Select the color for the search marker</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1989"/>
+        <source>Select the color for the conflict marker line marker</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="2012"/>
+        <source>Select the background color for the marker map</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -16889,17 +17099,17 @@
     <message>
         <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="252"/>
         <source>Enter the filename of a CSS style sheet. Leave empty to use the colours defined below.</source>
-        <translation>输入一个 CSS 样式表的文件名。为空则使用以上定义的颜色。</translation>
+        <translation type="obsolete">输入一个 CSS 样式表的文件名。为空则使用以上定义的颜色。</translation>
     </message>
     <message>
         <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="262"/>
         <source>Colours</source>
-        <translation>颜色</translation>
+        <translation type="obsolete">颜色</translation>
     </message>
     <message>
         <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="268"/>
         <source>Press to select the class and function header background colour.</source>
-        <translation>点击选择类和函数标题的背景色。</translation>
+        <translation type="obsolete">点击选择类和函数标题的背景色。</translation>
     </message>
     <message>
         <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="271"/>
@@ -16909,7 +17119,7 @@
     <message>
         <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="278"/>
         <source>Press to select the class and function header foreground colour.</source>
-        <translation>点击选择类和函数标题的前景色。</translation>
+        <translation type="obsolete">点击选择类和函数标题的前景色。</translation>
     </message>
     <message>
         <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="281"/>
@@ -16919,7 +17129,7 @@
     <message>
         <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="288"/>
         <source>Press to select the level 2 header background colour.</source>
-        <translation>点击选择二级标题背景色。</translation>
+        <translation type="obsolete">点击选择二级标题背景色。</translation>
     </message>
     <message>
         <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="291"/>
@@ -16929,7 +17139,7 @@
     <message>
         <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="298"/>
         <source>Press to select the level 2 header foreground colour.</source>
-        <translation>点击选择二级标题前景色。</translation>
+        <translation type="obsolete">点击选择二级标题前景色。</translation>
     </message>
     <message>
         <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="301"/>
@@ -16939,7 +17149,7 @@
     <message>
         <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="308"/>
         <source>Press to select the level 1 header background colour.</source>
-        <translation>点击选择一级标题背景色。</translation>
+        <translation type="obsolete">点击选择一级标题背景色。</translation>
     </message>
     <message>
         <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="311"/>
@@ -16949,7 +17159,7 @@
     <message>
         <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="318"/>
         <source>Press to select the level 1 header foreground colour.</source>
-        <translation>点击选择一级标题前景色。</translation>
+        <translation type="obsolete">点击选择一级标题前景色。</translation>
     </message>
     <message>
         <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="321"/>
@@ -16959,7 +17169,7 @@
     <message>
         <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="328"/>
         <source>Press to select the body background colour.</source>
-        <translation>点击选择主体背景色。</translation>
+        <translation type="obsolete">点击选择主体背景色。</translation>
     </message>
     <message>
         <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="331"/>
@@ -16969,7 +17179,7 @@
     <message>
         <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="338"/>
         <source>Press to select the body foreground colour.</source>
-        <translation>点击选择主体前景色。</translation>
+        <translation type="obsolete">点击选择主体前景色。</translation>
     </message>
     <message>
         <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="341"/>
@@ -16979,7 +17189,7 @@
     <message>
         <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="348"/>
         <source>Press to select the foreground colour of links.</source>
-        <translation>点击选择链接的前景色。</translation>
+        <translation type="obsolete">点击选择链接的前景色。</translation>
     </message>
     <message>
         <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="351"/>
@@ -16989,7 +17199,7 @@
     <message>
         <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="358"/>
         <source>This shows an example of the selected colours.</source>
-        <translation>显示已选颜色的样例。</translation>
+        <translation type="obsolete">显示已选颜色的样例。</translation>
     </message>
     <message>
         <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py" line="53"/>
@@ -17071,6 +17281,66 @@
         <source>&lt;?xml version=&quot;1.0&quot; encoding=&quot;utf-8&quot;?&gt;&lt;!DOCTYPE html PUBLIC &quot;-//W3C//DTD XHTML 1.0 Strict//EN&quot;&quot;http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd&quot;&gt;&lt;html&gt;&lt;head&gt;&lt;title&gt;&lt;/title&gt;&lt;/head&gt;&lt;body style=&quot;background-color:{BodyBgColor};color:{BodyColor}&quot;&gt;&lt;h1 style=&quot;background-color:{Level1HeaderBgColor};color:{Level1HeaderColor}&quot;&gt;Level 1 Header&lt;/h1&gt;&lt;h3 style=&quot;background-color:{Level2HeaderBgColor};color:{Level2HeaderColor}&quot;&gt;Level 2 Header&lt;/h3&gt;&lt;h2 style=&quot;background-color:{CFBgColor};color:{CFColor}&quot;&gt;Class and Function Header&lt;/h2&gt;Standard body text with &lt;a style=&quot;color:{LinkColor}&quot;&gt;some links&lt;/a&gt; embedded.&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="252"/>
+        <source>Enter the filename of a CSS style sheet. Leave empty to use the colors defined below.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="262"/>
+        <source>Colors</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="268"/>
+        <source>Press to select the class and function header background color.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="278"/>
+        <source>Press to select the class and function header foreground color.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="288"/>
+        <source>Press to select the level 2 header background color.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="298"/>
+        <source>Press to select the level 2 header foreground color.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="308"/>
+        <source>Press to select the level 1 header background color.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="318"/>
+        <source>Press to select the level 1 header foreground color.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="328"/>
+        <source>Press to select the body background color.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="338"/>
+        <source>Press to select the body foreground color.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="348"/>
+        <source>Press to select the foreground color of links.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="358"/>
+        <source>This shows an example of the selected colors.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>EricdocExecDialog</name>
@@ -17561,30 +17831,50 @@
         <translation>HTML 文件 (*.html)</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="516"/>
+        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="537"/>
         <source>Export source</source>
         <translation>导出源代码</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="448"/>
+        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="466"/>
         <source>&lt;p&gt;The source could not be exported to &lt;b&gt;{0}&lt;/b&gt;.&lt;/p&gt;&lt;p&gt;Reason: {1}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="457"/>
+        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="475"/>
         <source>&lt;p&gt;The source could not be exported to &lt;b&gt;{0}&lt;/b&gt;.&lt;/p&gt;&lt;p&gt;Reason: No HTML code generated.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="516"/>
+        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="537"/>
         <source>&lt;p&gt;Markdown export requires the &lt;b&gt;python-markdown&lt;/b&gt; package.&lt;br/&gt;Install it with your package manager, &apos;pip install docutils&apos; or see &lt;a href=&quot;http://pythonhosted.org/Markdown/install.html&quot;&gt; installation instructions.&lt;/a&gt;&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="484"/>
+        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="502"/>
         <source>&lt;p&gt;ReStructuredText export requires the &lt;b&gt;python-docutils&lt;/b&gt; package.&lt;br/&gt;Install it with your package manager, &apos;pip install docutils&apos; or see &lt;a href=&quot;http://pypi.python.org/pypi/docutils&quot;&gt;this page.&lt;/a&gt;&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="412"/>
+        <source>Light Background Color</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="413"/>
+        <source>Dark Background Color</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="416"/>
+        <source>Markdown Export</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="416"/>
+        <source>Select color scheme:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ExporterODT</name>
@@ -21306,12 +21596,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="101"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="106"/>
         <source>Commit ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="102"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="107"/>
         <source>Author</source>
         <translation type="unfinished">作者</translation>
     </message>
@@ -21321,7 +21611,7 @@
         <translation type="unfinished">数据</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="103"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="108"/>
         <source>Committer</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21331,7 +21621,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="104"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="109"/>
         <source>Subject</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21406,7 +21696,7 @@
         <translation type="unfinished">复制自</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2098"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2100"/>
         <source>Differences</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21466,328 +21756,328 @@
         <translation type="unfinished">Alt+P</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="88"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="93"/>
         <source>&amp;Refresh</source>
         <translation type="unfinished">刷新(&amp;R)</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="90"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="95"/>
         <source>Press to refresh the list of commits</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="98"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="103"/>
         <source>Find</source>
         <translation type="unfinished">查找</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="99"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="104"/>
         <source>Filter</source>
         <translation type="unfinished">过滤器</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="105"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="110"/>
         <source>File</source>
         <translation type="unfinished">文件</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="122"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="128"/>
         <source>&lt;table&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Commit ID&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Date&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{1}&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Author&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{2} &amp;lt;{3}&amp;gt;&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Commit Date&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{4}&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Committer&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{5} &amp;lt;{6}&amp;gt;&lt;/td&gt;&lt;/tr&gt;{7}&lt;tr&gt;&lt;td&gt;&lt;b&gt;Subject&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{8}&lt;/td&gt;&lt;/tr&gt;{9}&lt;/table&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="134"/>
-        <source>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Parents&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="137"/>
-        <source>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Children&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="140"/>
-        <source>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Branches&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</source>
+        <source>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Parents&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="143"/>
-        <source>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Tags&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</source>
+        <source>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Children&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="146"/>
+        <source>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Branches&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="149"/>
+        <source>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Tags&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="152"/>
         <source>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Message&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="197"/>
-        <source>Added</source>
-        <translation type="unfinished">已添加</translation>
-    </message>
-    <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="198"/>
-        <source>Deleted</source>
-        <translation type="unfinished">已删除</translation>
-    </message>
-    <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="199"/>
-        <source>Modified</source>
-        <translation type="unfinished">已修改</translation>
-    </message>
-    <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="200"/>
-        <source>Copied</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="201"/>
-        <source>Renamed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="202"/>
-        <source>Type changed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="203"/>
-        <source>Unmerged</source>
-        <translation type="unfinished"></translation>
+        <source>Added</source>
+        <translation type="unfinished">已添加</translation>
     </message>
     <message>
         <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="204"/>
+        <source>Deleted</source>
+        <translation type="unfinished">已删除</translation>
+    </message>
+    <message>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="205"/>
+        <source>Modified</source>
+        <translation type="unfinished">已修改</translation>
+    </message>
+    <message>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="206"/>
+        <source>Copied</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="207"/>
+        <source>Renamed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="208"/>
+        <source>Type changed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="209"/>
+        <source>Unmerged</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="210"/>
         <source>Unknown</source>
         <translation type="unfinished">未知</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="240"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="246"/>
         <source>Show Commit ID Column</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="242"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="248"/>
         <source>Press to show the commit ID column</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="250"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="256"/>
         <source>Show Author Columns</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="252"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="258"/>
         <source>Press to show the author columns</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="260"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="266"/>
         <source>Show Committer Columns</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="262"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="268"/>
         <source>Press to show the committer columns</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="270"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="276"/>
         <source>Show Branches Column</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="272"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="278"/>
         <source>Press to show the branches column</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="280"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="286"/>
         <source>Show Tags Column</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="282"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="288"/>
         <source>Press to show the Tags column</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="309"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="315"/>
         <source>Copy Commits</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="311"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="317"/>
         <source>Cherry-pick the selected commits to the current branch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="316"/>
-        <source>Tag</source>
-        <translation type="unfinished">标签</translation>
-    </message>
-    <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="318"/>
-        <source>Tag the selected commit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1792"/>
-        <source>Branch</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="322"/>
-        <source>Create a new branch at the selected commit.</source>
-        <translation type="unfinished"></translation>
+        <source>Tag</source>
+        <translation type="unfinished">标签</translation>
     </message>
     <message>
         <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="324"/>
+        <source>Tag the selected commit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1794"/>
+        <source>Branch</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="328"/>
+        <source>Create a new branch at the selected commit.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="330"/>
         <source>Branch &amp;&amp; Switch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="326"/>
-        <source>Create a new branch at the selected commit and switch the work tree to it.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1844"/>
-        <source>Switch</source>
-        <translation type="unfinished">转换</translation>
-    </message>
-    <message>
         <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="332"/>
-        <source>Switch the working directory to the selected commit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1870"/>
-        <source>Show Short Log</source>
-        <translation type="unfinished"></translation>
+        <source>Create a new branch at the selected commit and switch the work tree to it.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1846"/>
+        <source>Switch</source>
+        <translation type="unfinished">转换</translation>
     </message>
     <message>
         <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="338"/>
+        <source>Switch the working directory to the selected commit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1872"/>
+        <source>Show Short Log</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="344"/>
         <source>Show a dialog with a log output for release notes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="341"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="347"/>
         <source>Describe</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="343"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="349"/>
         <source>Show the most recent tag reachable from a commit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="632"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="634"/>
         <source>The git process did not finish within 30s.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="635"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="637"/>
         <source>Could not start the git executable.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="638"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="640"/>
         <source>Git Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="754"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="756"/>
         <source>{0} ({1}%)</source>
         <comment>action, confidence</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="820"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="822"/>
         <source>Process Generation Error</source>
         <translation type="unfinished">进程生成错误</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="820"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="822"/>
         <source>The process {0} could not be started. Ensure, that it is in the search path.</source>
         <translation type="unfinished">进程 {0} 无法启动。请保证它处在搜索路径中。</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1265"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1267"/>
         <source>Side-by-Side Diff to Parent {0}</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1277"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1279"/>
         <source>&lt;a href=&quot;sbsdiff:{0}_{1}&quot;&gt;Side-by-Side Compare&lt;/a&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1706"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1708"/>
         <source>Copy Changesets</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1844"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1846"/>
         <source>The project should be reread. Do this now?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1870"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1872"/>
         <source>Select a branch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1823"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1825"/>
         <source>Select a default branch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1823"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1825"/>
         <source>Branch &amp; Switch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2052"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2054"/>
         <source>Find Commit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2052"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2054"/>
         <source>&apos;{0}&apos; was not found.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2112"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2114"/>
         <source>Differences to Parent {0}</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2127"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2129"/>
         <source>Diff to Parent {0}</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2153"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2155"/>
         <source>There is no difference.</source>
         <translation type="unfinished">没有差异。</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2316"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2318"/>
         <source>Save Diff</source>
         <translation type="unfinished">保存差异</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2282"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2284"/>
         <source>Patch Files (*.diff)</source>
         <translation type="unfinished">补丁文件 (*.diff)</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2299"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2301"/>
         <source>&lt;p&gt;The patch file &lt;b&gt;{0}&lt;/b&gt; already exists. Overwrite it?&lt;/p&gt;</source>
         <translation type="unfinished">&lt;p&gt;补丁文件 &lt;b&gt;{0}&lt;/b&gt; 已经存在。是否覆盖?&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2316"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2318"/>
         <source>&lt;p&gt;The patch file &lt;b&gt;{0}&lt;/b&gt; could not be saved.&lt;br&gt;Reason: {1}&lt;/p&gt;</source>
         <translation type="unfinished">&lt;p&gt;补丁文件 &lt;b&gt;{0}&lt;/b&gt; 无法保存。&lt;br /&gt;原因:{1}&lt;/p&gt;</translation>
     </message>
@@ -26226,20 +26516,60 @@
 <context>
     <name>GraphicsPage</name>
     <message>
-        <location filename="../Preferences/ConfigurationPages/GraphicsPage.ui" line="16"/>
+        <location filename="../Preferences/ConfigurationPages/GraphicsPage.ui" line="17"/>
         <source>&lt;b&gt;Configure graphics settings&lt;/b&gt;</source>
         <translation>&lt;b&gt;配置图形设定&lt;/b&gt;</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/GraphicsPage.ui" line="38"/>
+        <location filename="../Preferences/ConfigurationPages/GraphicsPage.ui" line="43"/>
         <source>Press to select the font for the graphic items</source>
         <translation>点击为图形项选择字体</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/GraphicsPage.ui" line="51"/>
+        <location filename="../Preferences/ConfigurationPages/GraphicsPage.ui" line="56"/>
         <source>Graphics Font</source>
         <translation>图形的字体</translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/GraphicsPage.ui" line="37"/>
+        <source>Font</source>
+        <translation type="unfinished">字体</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/GraphicsPage.ui" line="72"/>
+        <source>Drawing Mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/GraphicsPage.ui" line="78"/>
+        <source>Select to determine the drawing mode automatically</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/GraphicsPage.ui" line="81"/>
+        <source>Automatic</source>
+        <translation type="unfinished">自动</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/GraphicsPage.ui" line="91"/>
+        <source>Select to draw black shapes on a white background</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/GraphicsPage.ui" line="94"/>
+        <source>Black On White</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/GraphicsPage.ui" line="101"/>
+        <source>Select to draw white shapes on a black background</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/GraphicsPage.ui" line="104"/>
+        <source>White On Black</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>GreaseMonkeyAddScriptDialog</name>
@@ -30513,21 +30843,11 @@
         <translation>前台:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/HexEditorPage.ui" line="142"/>
-        <source>Select the foreground colour of the address area</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/HexEditorPage.ui" line="291"/>
         <source>Background:</source>
         <translation>后台:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/HexEditorPage.ui" line="165"/>
-        <source>Select the background colour of the address area</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/HexEditorPage.ui" line="178"/>
         <source>ASCII Area</source>
         <translation type="unfinished"></translation>
@@ -30558,31 +30878,11 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/HexEditorPage.ui" line="226"/>
-        <source>Select the foreground colour for highlighted data</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/HexEditorPage.ui" line="249"/>
-        <source>Select the background colour for highlighted data</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/HexEditorPage.ui" line="262"/>
         <source>Selection</source>
         <translation>选区</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/HexEditorPage.ui" line="281"/>
-        <source>Select the foreground colour of the selection</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/HexEditorPage.ui" line="304"/>
-        <source>Select the background colour of the selection</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/HexEditorPage.ui" line="317"/>
         <source>Font</source>
         <translation>字体</translation>
@@ -30612,6 +30912,36 @@
         <source>Enter the number of recent files to remember</source>
         <translation>输入要记住的最近文件数目</translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/HexEditorPage.ui" line="142"/>
+        <source>Select the foreground color of the address area</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/HexEditorPage.ui" line="165"/>
+        <source>Select the background color of the address area</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/HexEditorPage.ui" line="226"/>
+        <source>Select the foreground color for highlighted data</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/HexEditorPage.ui" line="249"/>
+        <source>Select the background color for highlighted data</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/HexEditorPage.ui" line="281"/>
+        <source>Select the foreground color of the selection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/HexEditorPage.ui" line="304"/>
+        <source>Select the background color of the selection</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Hg</name>
@@ -33359,7 +33689,7 @@
 <context>
     <name>HgLogBrowserDialog</name>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="92"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="98"/>
         <source>Mercurial Log</source>
         <translation type="unfinished"></translation>
     </message>
@@ -33389,17 +33719,17 @@
         <translation type="unfinished">选择要过滤的区域</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="122"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="128"/>
         <source>Revision</source>
         <translation type="unfinished">修订</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="123"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="129"/>
         <source>Author</source>
         <translation type="unfinished">作者</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="124"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="130"/>
         <source>Message</source>
         <translation type="unfinished">消息</translation>
     </message>
@@ -33499,17 +33829,17 @@
         <translation type="obsolete">Alt+P</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="200"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="206"/>
         <source>Added</source>
         <translation type="unfinished">已添加</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="201"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="207"/>
         <source>Deleted</source>
         <translation type="unfinished">已删除</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="202"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="208"/>
         <source>Modified</source>
         <translation type="unfinished">已修改</translation>
     </message>
@@ -33534,7 +33864,7 @@
         <translation type="obsolete">无法启动 hg 可执行程序。</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="840"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="845"/>
         <source>Mercurial Error</source>
         <translation type="unfinished"></translation>
     </message>
@@ -33554,63 +33884,63 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="182"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="188"/>
         <source>All</source>
         <translation type="unfinished">全部</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="94"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="100"/>
         <source>Mercurial Log (Incoming)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="96"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="102"/>
         <source>Mercurial Log (Outgoing)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="217"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="223"/>
         <source>Bookmarks</source>
         <translation type="unfinished">书签</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="111"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="117"/>
         <source>Press to refresh the list of changesets</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="109"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="115"/>
         <source>&amp;Refresh</source>
         <translation type="unfinished">刷新(&amp;R)</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="126"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="132"/>
         <source>Phase</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="268"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="275"/>
         <source>Change the phase of the selected revisions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="270"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="277"/>
         <source>&lt;b&gt;Change Phase&lt;/b&gt;
 &lt;p&gt;This changes the phase of the selected revisions. The selected revisions have to have the same current phase.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="266"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="273"/>
         <source>Change Phase</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2000"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2005"/>
         <source>Copy Changesets</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2343"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2348"/>
         <source>The project should be reread. Do this now?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -33620,42 +33950,42 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="257"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="264"/>
         <source>Copy the selected changesets to the current branch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="275"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="282"/>
         <source>Tag</source>
         <translation type="unfinished">标签</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="278"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="285"/>
         <source>Tag the selected revision</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2072"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2077"/>
         <source>Switch</source>
         <translation type="unfinished">转换</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="288"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="295"/>
         <source>Switch the working directory to the selected revision</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="311"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="318"/>
         <source>Pull Large Files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="313"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="320"/>
         <source>Pull large files for selected revisions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1130"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1135"/>
         <source>{0} (large file)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -33680,147 +34010,147 @@
         <translation type="unfinished">点击查找下一次出现</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="119"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="125"/>
         <source>Find</source>
         <translation type="unfinished">查找</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="120"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="126"/>
         <source>Filter</source>
         <translation type="unfinished">过滤器</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="164"/>
-        <source>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Tags&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="170"/>
+        <source>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Tags&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="176"/>
         <source>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Bookmarks&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2485"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2490"/>
         <source>Find Commit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2485"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2490"/>
         <source>&apos;{0}&apos; was not found.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="125"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="131"/>
         <source>File</source>
         <translation type="unfinished">文件</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="206"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="212"/>
         <source>Draft</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="207"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="213"/>
         <source>Public</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="208"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="214"/>
         <source>Secret</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2205"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2210"/>
         <source>Pull Changes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="309"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="316"/>
         <source>Pull changes from a remote repository</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="322"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="329"/>
         <source>Push Selected Changes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="325"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="332"/>
         <source>Push changes of the selected changeset and its ancestors to a remote repository</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="328"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="335"/>
         <source>Push All Changes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="331"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="338"/>
         <source>Push all changes to a remote repository</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2170"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2175"/>
         <source>Fetch Changes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2251"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2256"/>
         <source>Strip Changesets</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="317"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="324"/>
         <source>Fetch changes from a remote repository</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="374"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="381"/>
         <source>Strip changesets from a repository</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="293"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="300"/>
         <source>Define Bookmark...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="296"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="303"/>
         <source>Bookmark the selected revision</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="298"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="305"/>
         <source>Move Bookmark...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="301"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="308"/>
         <source>Move bookmark to the selected revision</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2095"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2100"/>
         <source>Define Bookmark</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2095"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2100"/>
         <source>Enter bookmark name for changeset &quot;{0}&quot;:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2119"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2124"/>
         <source>Move Bookmark</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2119"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2124"/>
         <source>Select the bookmark to be moved  to changeset &quot;{0}&quot;:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2058"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2063"/>
         <source>Select bookmark to switch to (leave empty to use revision):</source>
         <translation type="unfinished"></translation>
     </message>
@@ -33835,148 +34165,148 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="167"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="173"/>
         <source>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Latest Tag&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="148"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="154"/>
         <source>&lt;table&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Revision&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Date&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{1}&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Author&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{2}&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Branch&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{3}&lt;/td&gt;&lt;/tr&gt;{4}&lt;tr&gt;&lt;td&gt;&lt;b&gt;Message&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{5}&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="158"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="164"/>
         <source>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Parents&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="161"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="167"/>
         <source>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Children&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="260"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="267"/>
         <source>Merge with Changeset</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="263"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="270"/>
         <source>Merge the working directory with the selected changeset</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="336"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="343"/>
         <source>Create Changegroup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="339"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="346"/>
         <source>Create a changegroup file containing the selected changesets</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="341"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="348"/>
         <source>&lt;b&gt;Create Changegroup&lt;/b&gt;
 &lt;p&gt;This creates a changegroup file containing the selected revisions. If no revisions are selected, all changesets will be bundled. If one revision is selected, it will be interpreted as the base revision. Otherwise the lowest revision will be used as the base revision and all other revision will be bundled. If the dialog is showing outgoing changesets, all selected changesets will be bundled.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2343"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2348"/>
         <source>Apply Changegroup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="353"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="360"/>
         <source>Apply the currently viewed changegroup file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="358"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="365"/>
         <source>Sign Revisions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="361"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="368"/>
         <source>Add a signature for the selected revisions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="363"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="370"/>
         <source>Verify Signatures</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="366"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="373"/>
         <source>Verify all signatures there may be for the selected revision</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="379"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="386"/>
         <source>Select All Entries</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="381"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="388"/>
         <source>Deselect All Entries</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1369"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1374"/>
         <source>Side-by-Side Diff to Parent {0}</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1380"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1385"/>
         <source>&lt;a href=&quot;sbsdiff:{0}_{1}&quot;&gt;Side-by-Side Compare&lt;/a&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1521"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1526"/>
         <source>Pull Selected Changes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1522"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1527"/>
         <source>Fetch Selected Changes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2529"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2534"/>
         <source>Differences</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2539"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2544"/>
         <source>Differences to Parent {0}</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2555"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2560"/>
         <source>Diff to Parent {0}{1}</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2580"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2585"/>
         <source>There is no difference.</source>
         <translation type="unfinished">没有差异。</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2723"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2728"/>
         <source>Save Diff</source>
         <translation type="unfinished">保存差异</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2690"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2695"/>
         <source>Patch Files (*.diff)</source>
         <translation type="unfinished">补丁文件 (*.diff)</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2707"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2712"/>
         <source>&lt;p&gt;The patch file &lt;b&gt;{0}&lt;/b&gt; already exists. Overwrite it?&lt;/p&gt;</source>
         <translation type="unfinished">&lt;p&gt;补丁文件 &lt;b&gt;{0}&lt;/b&gt; 已经存在。是否覆盖?&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2723"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2728"/>
         <source>&lt;p&gt;The patch file &lt;b&gt;{0}&lt;/b&gt; could not be saved.&lt;br&gt;Reason: {1}&lt;/p&gt;</source>
         <translation type="unfinished">&lt;p&gt;补丁文件 &lt;b&gt;{0}&lt;/b&gt; 无法保存。&lt;br /&gt;原因:{1}&lt;/p&gt;</translation>
     </message>
@@ -33986,22 +34316,22 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2528"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2533"/>
         <source>Generating differences ...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="98"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="104"/>
         <source>Mercurial Full Log</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="280"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="287"/>
         <source>Close Heads</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="283"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="290"/>
         <source>Close the selected heads</source>
         <translation type="unfinished"></translation>
     </message>
@@ -34420,12 +34750,12 @@
         <translation type="unfinished">选择所有版本化的文件夹条目</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="833"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="835"/>
         <source>Remove from repository only</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="833"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="835"/>
         <source>Do you really want to remove these files from the repository?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -37031,52 +37361,52 @@
 <context>
     <name>HgServeDialog</name>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py" line="49"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py" line="57"/>
         <source>Start Server</source>
         <translation type="unfinished">启动服务器</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py" line="55"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py" line="63"/>
         <source>Stop Server</source>
         <translation type="unfinished">停止服务器</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py" line="61"/>
-        <source>Start Browser</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py" line="69"/>
+        <source>Start Browser</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py" line="77"/>
         <source>Enter the server port</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py" line="75"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py" line="83"/>
         <source>Select the style to use</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py" line="79"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py" line="87"/>
         <source>Server</source>
         <translation type="unfinished">服务器</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py" line="86"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py" line="94"/>
         <source>Browser</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py" line="140"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py" line="148"/>
         <source>Process Generation Error</source>
         <translation type="unfinished">进程生成错误</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py" line="140"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py" line="148"/>
         <source>The process {0} could not be started. Ensure, that it is in the search path.</source>
         <translation type="unfinished">进程 {0} 无法启动。请保证它处在搜索路径中。</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py" line="47"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py" line="50"/>
         <source>Mercurial Server</source>
         <translation type="unfinished"></translation>
     </message>
@@ -40491,53 +40821,138 @@
         <translation>&lt;font color=&quot;#FF0000&quot;&gt;&lt;b&gt;注意:&lt;/b&gt; 这些设置将在下次启动应用程序时生效。&lt;/font&gt;</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="115"/>
+        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="217"/>
         <source>Press to delete the selected directory from the list</source>
         <translation>点击从列表中删除选中的文件夹</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="118"/>
+        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="220"/>
         <source>Delete</source>
         <translation>删除</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="128"/>
+        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="230"/>
         <source>Press to add the entered directory to the list</source>
         <translation>点击将输入的文件夹添加到列表中</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="131"/>
+        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="233"/>
         <source>Add</source>
         <translation>添加</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="156"/>
+        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="258"/>
         <source>Show</source>
         <translation>显示</translation>
     </message>
     <message>
+        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="177"/>
+        <source>Up</source>
+        <translation>向上</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="187"/>
+        <source>Down</source>
+        <translation>向下</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="146"/>
+        <source>List of icon directories</source>
+        <translation>图标文件夹列表</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="44"/>
+        <source>Default Icons</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="52"/>
+        <source>Select to select between Breeze (dark) and Breeze (light) based on the window lightness</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="55"/>
+        <source>Automatic</source>
+        <translation type="unfinished">自动</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="65"/>
+        <source>Select to use the Breeze vector icons for light window background</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="68"/>
+        <source>Breeze (light)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="75"/>
-        <source>Up</source>
-        <translation>向上</translation>
+        <source>Select to use the Breeze vector icons for dark window background</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="78"/>
+        <source>Breeze (dark)</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="85"/>
-        <source>Down</source>
-        <translation>向下</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="44"/>
-        <source>List of icon directories</source>
-        <translation>图标文件夹列表</translation>
+        <source>Select to use the Oxygen pixmap icons</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="88"/>
+        <source>Oxygen</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="112"/>
+        <source>Press to show a dialog with a preview of the selected default icon set</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="140"/>
+        <source>Custom Icon Directories</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IconsPreviewDialog</name>
     <message>
-        <location filename="../Preferences/ConfigurationPages/IconsPreviewDialog.ui" line="13"/>
+        <location filename="../Preferences/ConfigurationPages/IconsPreviewDialog.ui" line="14"/>
         <source>Icons Preview</source>
         <translation>图标预览</translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IconsPreviewDialog.ui" line="25"/>
+        <source>Directory:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IconsPreviewDialog.ui" line="38"/>
+        <source>Select the icons directory to be shown</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IconsPreviewDialog.ui" line="74"/>
+        <source>Invert Background</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IconsPreviewDialog.ui" line="87"/>
+        <source>Refresh</source>
+        <translation type="unfinished">刷新</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IconsPreviewDialog.ui" line="84"/>
+        <source>Select to refresh the icons display</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IconsPreviewDialog.ui" line="71"/>
+        <source>Select to invert the background color</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>IdlCompilerDefineNameDialog</name>
@@ -42757,7 +43172,7 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="102"/>
         <source>Colours</source>
-        <translation>颜色</translation>
+        <translation type="obsolete">颜色</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="108"/>
@@ -42767,7 +43182,7 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="121"/>
         <source>Select the colour for network messages</source>
-        <translation>选择网络消息的颜色</translation>
+        <translation type="obsolete">选择网络消息的颜色</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="131"/>
@@ -42777,7 +43192,7 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="144"/>
         <source>Select the colour for nick names</source>
-        <translation>选择昵称的颜色</translation>
+        <translation type="obsolete">选择昵称的颜色</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="154"/>
@@ -42787,7 +43202,7 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="167"/>
         <source>Select the colour for server messages</source>
-        <translation>选择服务器消息的颜色</translation>
+        <translation type="obsolete">选择服务器消息的颜色</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="177"/>
@@ -42797,7 +43212,7 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="190"/>
         <source>Select the colour for own nick name</source>
-        <translation>选择自己昵称的颜色</translation>
+        <translation type="obsolete">选择自己昵称的颜色</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="200"/>
@@ -42807,7 +43222,7 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="213"/>
         <source>Select the colour for channel messages</source>
-        <translation>选择频道消息的颜色</translation>
+        <translation type="obsolete">选择频道消息的颜色</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="223"/>
@@ -42817,7 +43232,7 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="236"/>
         <source>Select the colour for join channel messages</source>
-        <translation>选择加入频道消息的颜色</translation>
+        <translation type="obsolete">选择加入频道消息的颜色</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="246"/>
@@ -42827,7 +43242,7 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="259"/>
         <source>Select the colour for error messages</source>
-        <translation>选择错误消息的颜色</translation>
+        <translation type="obsolete">选择错误消息的颜色</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="269"/>
@@ -42837,7 +43252,7 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="282"/>
         <source>Select the colour for leave channel messages</source>
-        <translation>选择离开频道消息的颜色</translation>
+        <translation type="obsolete">选择离开频道消息的颜色</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="292"/>
@@ -42847,7 +43262,7 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="305"/>
         <source>Select the colour for timestamps</source>
-        <translation>选择时间戳的颜色</translation>
+        <translation type="obsolete">选择时间戳的颜色</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="315"/>
@@ -42857,7 +43272,7 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="328"/>
         <source>Select the colour for channel info messages</source>
-        <translation>选择频道信息消息的颜色</translation>
+        <translation type="obsolete">选择频道信息消息的颜色</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="338"/>
@@ -42867,12 +43282,12 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="351"/>
         <source>Select the colour for hyperlinks</source>
-        <translation>选择超链接的颜色</translation>
+        <translation type="obsolete">选择超链接的颜色</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="364"/>
         <source>Enable to allow coloured text in IRC messages</source>
-        <translation>选择以允许在 IRC 消息中显示彩色文字</translation>
+        <translation type="obsolete">选择以允许在 IRC 消息中显示彩色文字</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="367"/>
@@ -42980,21 +43395,11 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="824"/>
-        <source>Select the foreground colour for the marker</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="834"/>
         <source>Marker Background:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="847"/>
-        <source>Select the background colour for the marker</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="862"/>
         <source>Shutdown</source>
         <translation type="unfinished"></translation>
@@ -43009,6 +43414,81 @@
         <source>Confirm Shutdown When Connected</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="102"/>
+        <source>Colors</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="121"/>
+        <source>Select the color for network messages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="144"/>
+        <source>Select the color for nick names</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="167"/>
+        <source>Select the color for server messages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="190"/>
+        <source>Select the color for own nick name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="213"/>
+        <source>Select the color for channel messages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="236"/>
+        <source>Select the color for join channel messages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="259"/>
+        <source>Select the color for error messages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="282"/>
+        <source>Select the color for leave channel messages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="305"/>
+        <source>Select the color for timestamps</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="328"/>
+        <source>Select the color for channel info messages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="351"/>
+        <source>Select the color for hyperlinks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="364"/>
+        <source>Enable to allow colored text in IRC messages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="824"/>
+        <source>Select the foreground color for the marker</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="847"/>
+        <source>Select the background color for the marker</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>IrcServerEditDialog</name>
@@ -44408,257 +44888,257 @@
 <context>
     <name>LexerPygments</name>
     <message>
-        <location filename="../QScintilla/Lexers/LexerPygments.py" line="180"/>
+        <location filename="../QScintilla/Lexers/LexerPygments.py" line="196"/>
         <source>Default</source>
         <translation>默认</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/LexerPygments.py" line="181"/>
-        <source>Comment</source>
-        <translation>注释</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/LexerPygments.py" line="182"/>
-        <source>Preprocessor</source>
-        <translation>预处理器</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/LexerPygments.py" line="183"/>
-        <source>Keyword</source>
-        <translation>关键字</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/LexerPygments.py" line="184"/>
-        <source>Pseudo Keyword</source>
-        <translation>虚拟键盘</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/LexerPygments.py" line="185"/>
-        <source>Type Keyword</source>
-        <translation>输入键盘</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/LexerPygments.py" line="186"/>
-        <source>Operator</source>
-        <translation>运算符</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/LexerPygments.py" line="187"/>
-        <source>Word</source>
-        <translation>单词</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/LexerPygments.py" line="188"/>
-        <source>Builtin</source>
-        <translation>内建</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/LexerPygments.py" line="189"/>
-        <source>Function or method name</source>
-        <translation>函数或方法的名称</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/LexerPygments.py" line="190"/>
-        <source>Class name</source>
-        <translation>类名称</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/LexerPygments.py" line="191"/>
-        <source>Namespace</source>
-        <translation>命名空间</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/LexerPygments.py" line="192"/>
-        <source>Exception</source>
-        <translation>异常</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/LexerPygments.py" line="193"/>
-        <source>Identifier</source>
-        <translation>标识符</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/LexerPygments.py" line="194"/>
-        <source>Constant</source>
-        <translation>常量</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/LexerPygments.py" line="195"/>
-        <source>Label</source>
-        <translation>标签</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/LexerPygments.py" line="196"/>
-        <source>Entity</source>
-        <translation>实体</translation>
-    </message>
-    <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="197"/>
-        <source>Attribute</source>
-        <translation>属性</translation>
+        <source>Comment</source>
+        <translation>注释</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="198"/>
-        <source>Tag</source>
-        <translation>标签</translation>
+        <source>Preprocessor</source>
+        <translation>预处理器</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="199"/>
-        <source>Decorator</source>
-        <translation>Decorator</translation>
+        <source>Keyword</source>
+        <translation>关键字</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="200"/>
-        <source>String</source>
-        <translation>字符串</translation>
+        <source>Pseudo Keyword</source>
+        <translation>虚拟键盘</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="201"/>
-        <source>Documentation string</source>
-        <translation>文档字符串</translation>
+        <source>Type Keyword</source>
+        <translation>输入键盘</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="202"/>
-        <source>Scalar</source>
-        <translation>Scalar</translation>
+        <source>Operator</source>
+        <translation>运算符</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="203"/>
-        <source>Escape</source>
-        <translation>Escape</translation>
+        <source>Word</source>
+        <translation>单词</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="204"/>
-        <source>Regular expression</source>
-        <translation>正则表达式</translation>
+        <source>Builtin</source>
+        <translation>内建</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="205"/>
-        <source>Symbol</source>
-        <translation>符号</translation>
+        <source>Function or method name</source>
+        <translation>函数或方法的名称</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="206"/>
-        <source>Other string</source>
-        <translation>其它字符串</translation>
+        <source>Class name</source>
+        <translation>类名称</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="207"/>
-        <source>Number</source>
-        <translation>号码</translation>
+        <source>Namespace</source>
+        <translation>命名空间</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="208"/>
-        <source>Heading</source>
-        <translation>标题</translation>
+        <source>Exception</source>
+        <translation>异常</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="209"/>
-        <source>Subheading</source>
-        <translation>子标题</translation>
+        <source>Identifier</source>
+        <translation>标识符</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="210"/>
-        <source>Deleted</source>
-        <translation>已删除</translation>
+        <source>Constant</source>
+        <translation>常量</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="211"/>
-        <source>Inserted</source>
-        <translation>已插入</translation>
+        <source>Label</source>
+        <translation>标签</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="212"/>
-        <source>Generic error</source>
-        <translation>一般错误</translation>
+        <source>Entity</source>
+        <translation>实体</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="213"/>
-        <source>Emphasized text</source>
-        <translation>强调的文本</translation>
+        <source>Attribute</source>
+        <translation>属性</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="214"/>
-        <source>Strong text</source>
-        <translation>Strong 文本</translation>
+        <source>Tag</source>
+        <translation>标签</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="215"/>
-        <source>Prompt</source>
-        <translation>提示符</translation>
+        <source>Decorator</source>
+        <translation>Decorator</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="216"/>
-        <source>Output</source>
-        <translation>输出</translation>
+        <source>String</source>
+        <translation>字符串</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="217"/>
-        <source>Traceback</source>
-        <translation>追踪</translation>
+        <source>Documentation string</source>
+        <translation>文档字符串</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="218"/>
-        <source>Error</source>
-        <translation>错误</translation>
+        <source>Scalar</source>
+        <translation>Scalar</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="219"/>
-        <source>Comment block</source>
-        <translation type="unfinished"></translation>
+        <source>Escape</source>
+        <translation>Escape</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="220"/>
-        <source>Property</source>
-        <translation type="unfinished"></translation>
+        <source>Regular expression</source>
+        <translation>正则表达式</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="221"/>
-        <source>Character</source>
-        <translation type="unfinished"></translation>
+        <source>Symbol</source>
+        <translation>符号</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="222"/>
-        <source>Here document</source>
-        <translation type="unfinished"></translation>
+        <source>Other string</source>
+        <translation>其它字符串</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="223"/>
-        <source>Punctuation</source>
-        <translation type="unfinished"></translation>
+        <source>Number</source>
+        <translation>号码</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="224"/>
-        <source>Hashbang</source>
-        <translation type="unfinished"></translation>
+        <source>Heading</source>
+        <translation>标题</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="225"/>
-        <source>Reserved Keyword</source>
-        <translation type="unfinished"></translation>
+        <source>Subheading</source>
+        <translation>子标题</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="226"/>
-        <source>Literal</source>
-        <translation type="unfinished"></translation>
+        <source>Deleted</source>
+        <translation>已删除</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="227"/>
-        <source>Double quoted string</source>
-        <translation type="unfinished"></translation>
+        <source>Inserted</source>
+        <translation>已插入</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="228"/>
-        <source>Single quoted string</source>
-        <translation type="unfinished"></translation>
+        <source>Generic error</source>
+        <translation>一般错误</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="229"/>
-        <source>Backtick string</source>
-        <translation type="unfinished"></translation>
+        <source>Emphasized text</source>
+        <translation>强调的文本</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/LexerPygments.py" line="230"/>
+        <source>Strong text</source>
+        <translation>Strong 文本</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/LexerPygments.py" line="231"/>
+        <source>Prompt</source>
+        <translation>提示符</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/LexerPygments.py" line="232"/>
+        <source>Output</source>
+        <translation>输出</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/LexerPygments.py" line="233"/>
+        <source>Traceback</source>
+        <translation>追踪</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/LexerPygments.py" line="234"/>
+        <source>Error</source>
+        <translation>错误</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/LexerPygments.py" line="235"/>
+        <source>Comment block</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/LexerPygments.py" line="236"/>
+        <source>Property</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/LexerPygments.py" line="237"/>
+        <source>Character</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/LexerPygments.py" line="238"/>
+        <source>Here document</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/LexerPygments.py" line="239"/>
+        <source>Punctuation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/LexerPygments.py" line="240"/>
+        <source>Hashbang</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/LexerPygments.py" line="241"/>
+        <source>Reserved Keyword</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/LexerPygments.py" line="242"/>
+        <source>Literal</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/LexerPygments.py" line="243"/>
+        <source>Double quoted string</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/LexerPygments.py" line="244"/>
+        <source>Single quoted string</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/LexerPygments.py" line="245"/>
+        <source>Backtick string</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/LexerPygments.py" line="246"/>
         <source>Whitespace</source>
         <translation type="unfinished"></translation>
     </message>
@@ -45725,12 +46205,12 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/LogViewerPage.ui" line="49"/>
         <source>Error Colour:</source>
-        <translation>错误颜色:</translation>
+        <translation type="obsolete">错误颜色:</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/LogViewerPage.ui" line="62"/>
         <source>Select the colour for text sent to stderr</source>
-        <translation>选择发送到 stderr 中的文本颜色</translation>
+        <translation type="obsolete">选择发送到 stderr 中的文本颜色</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/LogViewerPage.ui" line="87"/>
@@ -45767,6 +46247,16 @@
         <source>&lt;b&gt;Message Filters for both&lt;/b&gt;&lt;p&gt;This list shows the configured message filters used to suppress messages received via stdout or stderr.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/LogViewerPage.ui" line="49"/>
+        <source>Error Color:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/LogViewerPage.ui" line="62"/>
+        <source>Select the color for text sent to stderr</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MakePropertiesDialog</name>
@@ -46552,27 +47042,27 @@
 <context>
     <name>MicroPythonDevice</name>
     <message>
-        <location filename="../MicroPython/MicroPythonDevices.py" line="207"/>
+        <location filename="../MicroPython/MicroPythonDevices.py" line="214"/>
         <source>Unsupported Device</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonDevices.py" line="217"/>
+        <location filename="../MicroPython/MicroPythonDevices.py" line="224"/>
         <source>REPL is not supported by this device.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonDevices.py" line="236"/>
+        <location filename="../MicroPython/MicroPythonDevices.py" line="243"/>
         <source>Plotter is not supported by this device.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonDevices.py" line="255"/>
+        <location filename="../MicroPython/MicroPythonDevices.py" line="262"/>
         <source>Running scripts is not supported by this device.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonDevices.py" line="275"/>
+        <location filename="../MicroPython/MicroPythonDevices.py" line="282"/>
         <source>File Manager is not supported by this device.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -46836,27 +47326,27 @@
 <context>
     <name>MicroPythonGraphWidget</name>
     <message>
-        <location filename="../MicroPython/MicroPythonGraphWidget.py" line="63"/>
+        <location filename="../MicroPython/MicroPythonGraphWidget.py" line="64"/>
         <source>Press to save the raw data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonGraphWidget.py" line="72"/>
+        <location filename="../MicroPython/MicroPythonGraphWidget.py" line="73"/>
         <source>max. X:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonGraphWidget.py" line="81"/>
+        <location filename="../MicroPython/MicroPythonGraphWidget.py" line="82"/>
         <source>Enter the maximum number of data points to be plotted.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonGraphWidget.py" line="311"/>
+        <location filename="../MicroPython/MicroPythonGraphWidget.py" line="329"/>
         <source>Save Chart Data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonGraphWidget.py" line="311"/>
+        <location filename="../MicroPython/MicroPythonGraphWidget.py" line="329"/>
         <source>&lt;p&gt;The chart data could not be saved into file &lt;b&gt;{0}&lt;/b&gt;.&lt;/p&gt;&lt;p&gt;Reason: {1}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -46924,93 +47414,168 @@
         <translation type="unfinished">长行转行显示</translation>
     </message>
     <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="169"/>
+        <source>MPY Cross Compiler</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="175"/>
+        <source>Program:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="191"/>
+        <source>Enter the path of the cross compiler executable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.py" line="67"/>
+        <source>All Files (*)</source>
+        <translation type="unfinished">所有文件 (*)</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="298"/>
+        <source>Documentation</source>
+        <translation type="unfinished">文档</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="304"/>
+        <source>MicroPython:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="311"/>
+        <source>Enter the URL for the MicroPython documentation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="318"/>
+        <source>CircuitPython:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="325"/>
+        <source>Enter the URL for the CircuitPython documentation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="332"/>
+        <source>BBC micro:bit:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="339"/>
+        <source>Enter the URL for the BBC micro:bit MicroPython documentation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="201"/>
+        <source>PyBoard</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="207"/>
+        <source>dfu-util Path:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="223"/>
+        <source>Enter the path of the dfu-util flashing executable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="233"/>
+        <source>Firmware</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="246"/>
+        <source>Enter the URL for the MicroPython firmware for PyBoard, ESP8266 and ESP32</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="260"/>
+        <source>Enter the URL for the CircuitPython firmware</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="274"/>
+        <source>Enter the URL for the BBC micro:bit Firmware</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="140"/>
-        <source>MPY Cross Compiler</source>
+        <source>Chart Pane</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="146"/>
-        <source>Program:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="162"/>
-        <source>Enter the path of the cross compiler executable</source>
+        <source>Color Theme:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="159"/>
+        <source>Select the color scheme of the chart</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/MicroPythonPage.py" line="42"/>
-        <source>All Files (*)</source>
-        <translation type="unfinished">所有文件 (*)</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="255"/>
-        <source>Documentation</source>
-        <translation type="unfinished">文档</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="261"/>
-        <source>MicroPython:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="268"/>
-        <source>Enter the URL for the MicroPython documentation</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="275"/>
-        <source>CircuitPython:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="282"/>
-        <source>Enter the URL for the CircuitPython documentation</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="289"/>
-        <source>BBC micro:bit:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="296"/>
-        <source>Enter the URL for the BBC micro:bit MicroPython documentation</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="172"/>
-        <source>PyBoard</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="178"/>
-        <source>dfu-util Path:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="194"/>
-        <source>Enter the path of the dfu-util flashing executable</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="204"/>
-        <source>Firmware</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="217"/>
-        <source>Enter the URL for the MicroPython firmware for PyBoard, ESP8266 and ESP32</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="231"/>
-        <source>Enter the URL for the CircuitPython firmware</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="245"/>
-        <source>Enter the URL for the BBC micro:bit Firmware</source>
+        <source>Automatic</source>
+        <translation type="unfinished">自动</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.py" line="44"/>
+        <source>Light</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.py" line="46"/>
+        <source>Dark</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.py" line="48"/>
+        <source>Blue Cerulean</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.py" line="50"/>
+        <source>Brown Sand</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.py" line="52"/>
+        <source>Blue NCS</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.py" line="54"/>
+        <source>High Contrast</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.py" line="56"/>
+        <source>Blue Icy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.py" line="58"/>
+        <source>Qt</source>
+        <translation type="unfinished">Qt</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="346"/>
+        <source>Calliope mini:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="288"/>
+        <source>Enter the URL for the Callope mini Firmware</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="353"/>
+        <source>Enter the URL for the Calliope mini MicroPython documentation</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -47055,59 +47620,59 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="420"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="460"/>
         <source>Press to connect the selected device</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="226"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="263"/>
         <source>&lt;h3&gt;The QtSerialPort package is not available.&lt;br/&gt;MicroPython support is deactivated.&lt;/h3&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message numerus="yes">
-        <location filename="../MicroPython/MicroPythonWidget.py" line="263"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="300"/>
         <source>%n supported device(s) detected.</source>
         <translation type="unfinished">
             <numerusform></numerusform>
         </translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="269"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="306"/>
         <source>{0} at {1}</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="277"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="314"/>
         <source>No supported devices detected.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="390"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="430"/>
         <source>Clear</source>
         <translation type="unfinished">清除</translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="392"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="432"/>
         <source>Copy</source>
         <translation type="unfinished">复制</translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="393"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="433"/>
         <source>Paste</source>
         <translation type="unfinished">粘贴</translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="415"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="455"/>
         <source>Press to disconnect the current device</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="436"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="476"/>
         <source>No device attached</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="436"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="476"/>
         <source>Please ensure the device is plugged into your computer and selected.
 
 It must have a version of MicroPython (or CircuitPython) flashed onto it before anything will work.
@@ -47116,217 +47681,217 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="463"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="503"/>
         <source>Start REPL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="463"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="503"/>
         <source>&lt;p&gt;The REPL cannot be started.&lt;/p&gt;&lt;p&gt;Reason: {0}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="853"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="893"/>
         <source>Serial Device Connect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="853"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="893"/>
         <source>&lt;p&gt;Cannot connect to device at serial port &lt;b&gt;{0}&lt;/b&gt;.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="898"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="938"/>
         <source>Run Script</source>
         <translation type="unfinished">运行脚本</translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="881"/>
-        <source>There is no editor open. Abort...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="889"/>
-        <source>The current editor does not contain a script. Abort...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="898"/>
-        <source>&lt;p&gt;Cannot run script.&lt;/p&gt;&lt;p&gt;Reason: {0}&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="921"/>
-        <source>Open Python File</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../MicroPython/MicroPythonWidget.py" line="921"/>
+        <source>There is no editor open. Abort...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="929"/>
+        <source>The current editor does not contain a script. Abort...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="938"/>
+        <source>&lt;p&gt;Cannot run script.&lt;/p&gt;&lt;p&gt;Reason: {0}&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="961"/>
+        <source>Open Python File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="961"/>
         <source>Python3 Files (*.py);;All Files (*)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="965"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1005"/>
         <source>Start Chart</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="965"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1005"/>
         <source>&lt;p&gt;The Chart cannot be started.&lt;/p&gt;&lt;p&gt;Reason: {0}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="994"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1034"/>
         <source>Unsaved Chart Data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="994"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1034"/>
         <source>The chart contains unsaved data.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1045"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1085"/>
         <source>Start File Manager</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1045"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1085"/>
         <source>&lt;p&gt;The File Manager cannot be started.&lt;/p&gt;&lt;p&gt;Reason: {0}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1096"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1136"/>
         <source>Show Version</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1099"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1139"/>
         <source>Show Implementation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1210"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1250"/>
         <source>Synchronize Time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1107"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1147"/>
         <source>Show Device Time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1110"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1150"/>
         <source>Show Local Time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1421"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1461"/>
         <source>Compile Python File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1481"/>
+        <source>Compile Current Editor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1188"/>
+        <source>&lt;h3&gt;Device Version Information&lt;/h3&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1197"/>
+        <source>No version information available.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1199"/>
+        <source>Device Version Information</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1222"/>
+        <source>unknown</source>
+        <translation type="unfinished">未知</translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1226"/>
+        <source>Device Implementation Information</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1226"/>
+        <source>&lt;h3&gt;Device Implementation Information&lt;/h3&gt;&lt;p&gt;This device contains &lt;b&gt;{0} {1}&lt;/b&gt;.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1250"/>
+        <source>&lt;p&gt;The time of the connected device was synchronized with the local time.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1272"/>
+        <source>&lt;h3&gt;Device Date and Time&lt;/h3&gt;&lt;table&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Date&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Time&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{1}&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1280"/>
+        <source>&lt;h3&gt;Device Date and Time&lt;/h3&gt;&lt;p&gt;{0}&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1294"/>
+        <source>Device Date and Time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1307"/>
+        <source>Local Date and Time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1307"/>
+        <source>&lt;h3&gt;Local Date and Time&lt;/h3&gt;&lt;table&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Date&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Time&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{1}&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1374"/>
+        <source>Error handling device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1374"/>
+        <source>&lt;p&gt;There was an error communicating with the connected device.&lt;/p&gt;&lt;p&gt;Method: {0}&lt;/p&gt;&lt;p&gt;Message: {1}&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1413"/>
+        <source>The MicroPython cross compiler &lt;b&gt;mpy-cross&lt;/b&gt; cannot be found. Ensure it is in the search path or configure it on the MicroPython configuration page.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1431"/>
+        <source>Python Files (*.py);;All Files (*)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../MicroPython/MicroPythonWidget.py" line="1441"/>
-        <source>Compile Current Editor</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1148"/>
-        <source>&lt;h3&gt;Device Version Information&lt;/h3&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1157"/>
-        <source>No version information available.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1159"/>
-        <source>Device Version Information</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1182"/>
-        <source>unknown</source>
-        <translation type="unfinished">未知</translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1186"/>
-        <source>Device Implementation Information</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1186"/>
-        <source>&lt;h3&gt;Device Implementation Information&lt;/h3&gt;&lt;p&gt;This device contains &lt;b&gt;{0} {1}&lt;/b&gt;.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1210"/>
-        <source>&lt;p&gt;The time of the connected device was synchronized with the local time.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1232"/>
-        <source>&lt;h3&gt;Device Date and Time&lt;/h3&gt;&lt;table&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Date&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Time&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{1}&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1240"/>
-        <source>&lt;h3&gt;Device Date and Time&lt;/h3&gt;&lt;p&gt;{0}&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1254"/>
-        <source>Device Date and Time</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1267"/>
-        <source>Local Date and Time</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1267"/>
-        <source>&lt;h3&gt;Local Date and Time&lt;/h3&gt;&lt;table&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Date&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Time&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{1}&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1334"/>
-        <source>Error handling device</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1334"/>
-        <source>&lt;p&gt;There was an error communicating with the connected device.&lt;/p&gt;&lt;p&gt;Method: {0}&lt;/p&gt;&lt;p&gt;Message: {1}&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1373"/>
-        <source>The MicroPython cross compiler &lt;b&gt;mpy-cross&lt;/b&gt; cannot be found. Ensure it is in the search path or configure it on the MicroPython configuration page.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1391"/>
-        <source>Python Files (*.py);;All Files (*)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1401"/>
         <source>The Python file &lt;b&gt;{0}&lt;/b&gt; does not exist. Aborting...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1411"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1451"/>
         <source>&apos;mpy-cross&apos; Output</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1434"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1474"/>
         <source>The current editor does not contain a Python file. Aborting...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="175"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="211"/>
         <source>MicroPython Menu</source>
         <translation type="unfinished"></translation>
     </message>
@@ -47336,47 +47901,47 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="978"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1018"/>
         <source>&#xc2;&#xb5;Py Chart</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1058"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1098"/>
         <source>&#xc2;&#xb5;Py Files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1134"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1174"/>
         <source>Show Documentation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1138"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1178"/>
         <source>Configure</source>
         <translation type="unfinished">配置</translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1113"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1153"/>
         <source>Show Time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1130"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1170"/>
         <source>Download Firmware</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1310"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1350"/>
         <source>Date and Time</source>
         <translation type="unfinished">日期和时间</translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1293"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1333"/>
         <source>&lt;table&gt;&lt;tr&gt;&lt;th&gt;&lt;/th&gt;&lt;th&gt;Local Date and Time&lt;/th&gt;&lt;th&gt;Device Date and Time&lt;/th&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Date&lt;/b&gt;&lt;/td&gt;&lt;td align=&apos;center&apos;&gt;{0}&lt;/td&gt;&lt;td align=&apos;center&apos;&gt;{2}&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Time&lt;/b&gt;&lt;/td&gt;&lt;td align=&apos;center&apos;&gt;{1}&lt;/td&gt;&lt;td align=&apos;center&apos;&gt;{3}&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicroPythonWidget.py" line="1310"/>
+        <location filename="../MicroPython/MicroPythonWidget.py" line="1350"/>
         <source>&lt;table&gt;&lt;tr&gt;&lt;th&gt;Local Date and Time&lt;/th&gt;&lt;th&gt;Device Date and Time&lt;/th&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td align=&apos;center&apos;&gt;{0} {1}&lt;/td&gt;&lt;td align=&apos;center&apos;&gt;{2}&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -47384,85 +47949,90 @@
 <context>
     <name>MicrobitDevice</name>
     <message>
-        <location filename="../MicroPython/MicrobitDevices.py" line="67"/>
+        <location filename="../MicroPython/MicrobitDevices.py" line="74"/>
         <source>BBC micro:bit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicrobitDevices.py" line="134"/>
+        <location filename="../MicroPython/MicrobitDevices.py" line="149"/>
         <source>Workspace Directory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicrobitDevices.py" line="134"/>
-        <source>Could not find an attached BBC micro:bit.
+        <location filename="../MicroPython/MicrobitDevices.py" line="186"/>
+        <source>Save Script as &apos;main.py&apos;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicrobitDevices.py" line="188"/>
+        <source>Save the current script as &apos;main.py&apos; on the connected device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicrobitDevices.py" line="241"/>
+        <source>MicroPython Firmware Files (*.hex);;All Files (*)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicrobitDevices.py" line="286"/>
+        <source>The script is empty. Aborting.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicrobitDevices.py" line="276"/>
+        <source>The current editor does not contain a Python script. Write it anyway?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicrobitDevices.py" line="314"/>
+        <source>&lt;p&gt;The script could not be saved to the device.&lt;/p&gt;&lt;p&gt;Reason: {0}&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicrobitDevices.py" line="241"/>
+        <source>Flash MicroPython Firmware</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicrobitDevices.py" line="273"/>
+        <source>Save Script</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicrobitDevices.py" line="303"/>
+        <source>Save Script as &apos;{0}&apos;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicrobitDevices.py" line="294"/>
+        <source>Enter a file name on the device:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicrobitDevices.py" line="183"/>
+        <source>Save the current script to the selected device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicrobitDevices.py" line="77"/>
+        <source>Calliope mini</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicrobitDevices.py" line="232"/>
+        <source>Could not find an attached {0}.
 
 Please make sure the device is plugged into this computer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/MicrobitDevices.py" line="171"/>
-        <source>Save Script as &apos;main.py&apos;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicrobitDevices.py" line="173"/>
-        <source>Save the current script as &apos;main.py&apos; on the connected device</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicrobitDevices.py" line="177"/>
-        <source>Reset micro:bit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicrobitDevices.py" line="201"/>
-        <source>MicroPython Firmware Files (*.hex);;All Files (*)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicrobitDevices.py" line="246"/>
-        <source>The script is empty. Aborting.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicrobitDevices.py" line="236"/>
-        <source>The current editor does not contain a Python script. Write it anyway?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicrobitDevices.py" line="274"/>
-        <source>&lt;p&gt;The script could not be saved to the device.&lt;/p&gt;&lt;p&gt;Reason: {0}&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicrobitDevices.py" line="201"/>
-        <source>Flash MicroPython Firmware</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicrobitDevices.py" line="233"/>
-        <source>Save Script</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicrobitDevices.py" line="190"/>
-        <source>The BBC micro:bit is not ready for flashing. See the &lt;a href=&quot;https://microbit.org/guide/firmware/&quot;&gt;micro:bit web site&lt;/a&gt; for details.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicrobitDevices.py" line="263"/>
-        <source>Save Script as &apos;{0}&apos;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicrobitDevices.py" line="254"/>
-        <source>Enter a file name on the device:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../MicroPython/MicrobitDevices.py" line="168"/>
-        <source>Save the current script to the selected device</source>
+        <location filename="../MicroPython/MicrobitDevices.py" line="192"/>
+        <source>Reset {0}</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/MicrobitDevices.py" line="213"/>
+        <source>&lt;p&gt;The BBC micro:bit is not ready for flashing. Follow these instructions.&lt;/p&gt;&lt;ul&gt;&lt;li&gt;unplug USB cable and any batteries&lt;/li&gt;&lt;li&gt;keep RESET button pressed an plug USB cable back in&lt;/li&gt;&lt;li&gt;a drive called MAINTENANCE should be available&lt;/li&gt;&lt;/ul&gt;&lt;p&gt;See the &lt;a href=&quot;https://microbit.org/guide/firmware/&quot;&gt;micro:bit web site&lt;/a&gt; for details.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -51442,109 +52012,109 @@
         <translation type="unfinished"></translation>
     </message>
     <message numerus="yes">
-        <location filename="../PipInterface/PipPackagesWidget.py" line="635"/>
+        <location filename="../PipInterface/PipPackagesWidget.py" line="645"/>
         <source>%n package(s) found.</source>
         <translation type="unfinished">
             <numerusform></numerusform>
         </translation>
     </message>
     <message>
-        <location filename="../PipInterface/PipPackagesWidget.py" line="888"/>
+        <location filename="../PipInterface/PipPackagesWidget.py" line="898"/>
         <source>Search PyPI</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../PipInterface/PipPackagesWidget.py" line="673"/>
+        <location filename="../PipInterface/PipPackagesWidget.py" line="683"/>
         <source>&lt;p&gt;The package search did not return anything.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../PipInterface/PipPackagesWidget.py" line="710"/>
+        <location filename="../PipInterface/PipPackagesWidget.py" line="720"/>
         <source>&lt;p&gt;The package search failed.&lt;/p&gt;&lt;p&gt;Reason: {0}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../PipInterface/PipPackagesWidget.py" line="715"/>
+        <location filename="../PipInterface/PipPackagesWidget.py" line="725"/>
         <source>Error: {0}</source>
         <translation type="unfinished">错误:{0}</translation>
     </message>
     <message>
-        <location filename="../PipInterface/PipPackagesWidget.py" line="848"/>
+        <location filename="../PipInterface/PipPackagesWidget.py" line="858"/>
         <source>Show Package Details</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../PipInterface/PipPackagesWidget.py" line="848"/>
+        <location filename="../PipInterface/PipPackagesWidget.py" line="858"/>
         <source>Select the package version:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../PipInterface/PipPackagesWidget.py" line="888"/>
+        <location filename="../PipInterface/PipPackagesWidget.py" line="898"/>
         <source>&lt;p&gt;No package details info for &lt;b&gt;{0}&lt;/b&gt; available.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../PipInterface/PipPackagesWidget.py" line="904"/>
+        <location filename="../PipInterface/PipPackagesWidget.py" line="914"/>
         <source>Install Pip</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../PipInterface/PipPackagesWidget.py" line="907"/>
-        <source>Install Pip to User-Site</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../PipInterface/PipPackagesWidget.py" line="910"/>
-        <source>Repair Pip</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../PipInterface/PipPackagesWidget.py" line="1005"/>
-        <source>Install Packages</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../PipInterface/PipPackagesWidget.py" line="917"/>
-        <source>Install Local Package</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../PipInterface/PipPackagesWidget.py" line="921"/>
-        <source>Install Requirements</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../PipInterface/PipPackagesWidget.py" line="924"/>
-        <source>Uninstall Requirements</source>
+        <source>Install Pip to User-Site</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../PipInterface/PipPackagesWidget.py" line="920"/>
+        <source>Repair Pip</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../PipInterface/PipPackagesWidget.py" line="1015"/>
+        <source>Install Packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../PipInterface/PipPackagesWidget.py" line="927"/>
+        <source>Install Local Package</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../PipInterface/PipPackagesWidget.py" line="931"/>
+        <source>Install Requirements</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../PipInterface/PipPackagesWidget.py" line="934"/>
+        <source>Uninstall Requirements</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../PipInterface/PipPackagesWidget.py" line="937"/>
         <source>Generate Requirements...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../PipInterface/PipPackagesWidget.py" line="932"/>
+        <location filename="../PipInterface/PipPackagesWidget.py" line="942"/>
         <source>Edit User Configuration...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../PipInterface/PipPackagesWidget.py" line="935"/>
+        <location filename="../PipInterface/PipPackagesWidget.py" line="945"/>
         <source>Edit Environment Configuration...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../PipInterface/PipPackagesWidget.py" line="940"/>
+        <location filename="../PipInterface/PipPackagesWidget.py" line="950"/>
         <source>Configure...</source>
         <translation type="unfinished">配置…</translation>
     </message>
     <message>
-        <location filename="../PipInterface/PipPackagesWidget.py" line="1118"/>
+        <location filename="../PipInterface/PipPackagesWidget.py" line="1128"/>
         <source>Edit Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../PipInterface/PipPackagesWidget.py" line="1118"/>
+        <location filename="../PipInterface/PipPackagesWidget.py" line="1128"/>
         <source>No valid configuration path determined. Aborting</source>
         <translation type="unfinished"></translation>
     </message>
@@ -52836,17 +53406,17 @@
 <context>
     <name>Preferences</name>
     <message>
-        <location filename="../Preferences/__init__.py" line="1624"/>
+        <location filename="../Preferences/__init__.py" line="1640"/>
         <source>Export Preferences</source>
         <translation>导出首选项</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1652"/>
+        <location filename="../Preferences/__init__.py" line="1668"/>
         <source>Import Preferences</source>
         <translation>导入首选项</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1652"/>
+        <location filename="../Preferences/__init__.py" line="1668"/>
         <source>Properties File (*.ini);;All Files (*)</source>
         <translation>属性文件 (*.ini);;所有文件 (*)</translation>
     </message>
@@ -53053,7 +53623,7 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/PrinterPage.ui" line="77"/>
         <source>Colour</source>
-        <translation>彩色</translation>
+        <translation type="obsolete">彩色</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/PrinterPage.ui" line="84"/>
@@ -53093,7 +53663,7 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/PrinterPage.ui" line="49"/>
         <source>Colour Mode:</source>
-        <translation>颜色模式:</translation>
+        <translation type="obsolete">颜色模式:</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/PrinterPage.ui" line="94"/>
@@ -53145,6 +53715,16 @@
         <source> DPI</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/PrinterPage.ui" line="49"/>
+        <source>Color Mode:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/PrinterPage.ui" line="77"/>
+        <source>Color</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ProgramsDialog</name>
@@ -53382,814 +53962,814 @@
         <translation>注册项目类型</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="805"/>
+        <location filename="../Project/Project.py" line="817"/>
         <source>Read project file</source>
         <translation>读取项目文件</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="908"/>
+        <location filename="../Project/Project.py" line="920"/>
         <source>Save project file</source>
         <translation>保存项目文件</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="944"/>
+        <location filename="../Project/Project.py" line="956"/>
         <source>Read user project properties</source>
         <translation>读取用户项目属性</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="968"/>
+        <location filename="../Project/Project.py" line="980"/>
         <source>Save user project properties</source>
         <translation>保存用户项目属性</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1026"/>
+        <location filename="../Project/Project.py" line="1038"/>
         <source>Read project session</source>
         <translation>读取项目会话</translation>
     </message>
     <message>
+        <location filename="../Project/Project.py" line="1263"/>
+        <source>Please save the project first.</source>
+        <translation>请先保存项目。</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="1074"/>
+        <source>Save project session</source>
+        <translation>保存项目会话</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="1103"/>
+        <source>Delete project session</source>
+        <translation>删除项目会话</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="1137"/>
+        <source>Read tasks</source>
+        <translation>读取任务</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="1157"/>
+        <source>Save tasks</source>
+        <translation>保存任务</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="1216"/>
+        <source>Read debugger properties</source>
+        <translation>读取调试器属性</translation>
+    </message>
+    <message>
         <location filename="../Project/Project.py" line="1251"/>
-        <source>Please save the project first.</source>
-        <translation>请先保存项目。</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="1062"/>
-        <source>Save project session</source>
-        <translation>保存项目会话</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="1091"/>
-        <source>Delete project session</source>
-        <translation>删除项目会话</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="1125"/>
-        <source>Read tasks</source>
-        <translation>读取任务</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="1145"/>
-        <source>Save tasks</source>
-        <translation>保存任务</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="1204"/>
-        <source>Read debugger properties</source>
-        <translation>读取调试器属性</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="1239"/>
         <source>Save debugger properties</source>
         <translation>保存调试器属性</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1265"/>
+        <location filename="../Project/Project.py" line="1277"/>
         <source>Delete debugger properties</source>
         <translation>删除调试器属性</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1393"/>
+        <location filename="../Project/Project.py" line="1405"/>
         <source>Add Language</source>
         <translation>添加语言</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1393"/>
+        <location filename="../Project/Project.py" line="1405"/>
         <source>You have to specify a translation pattern first.</source>
         <translation>必须先指定一个翻译样式。</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1519"/>
+        <location filename="../Project/Project.py" line="1531"/>
         <source>Delete translation</source>
         <translation>删除翻译</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1684"/>
+        <location filename="../Project/Project.py" line="1696"/>
         <source>Add file</source>
         <translation>添加文件</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1816"/>
+        <location filename="../Project/Project.py" line="1828"/>
         <source>The target directory must not be empty.</source>
         <translation>目标文件夹不能为空。</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1827"/>
+        <location filename="../Project/Project.py" line="1839"/>
         <source>Add directory</source>
         <translation>添加文件夹</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1715"/>
+        <location filename="../Project/Project.py" line="1727"/>
         <source>&lt;p&gt;The source directory doesn&apos;t contain any files belonging to the selected category.&lt;/p&gt;</source>
         <translation>&lt;p&gt;源文件夹不包含任何属于所选类别的文件。&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1827"/>
+        <location filename="../Project/Project.py" line="1839"/>
         <source>The source directory must not be empty.</source>
         <translation>源文件夹不能为空。</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1964"/>
+        <location filename="../Project/Project.py" line="1976"/>
         <source>Rename file</source>
         <translation>重命名文件</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1988"/>
+        <location filename="../Project/Project.py" line="2000"/>
         <source>Rename File</source>
         <translation>重命名文件</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="2233"/>
+        <location filename="../Project/Project.py" line="2250"/>
         <source>Delete file</source>
         <translation>删除文件</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="2263"/>
+        <location filename="../Project/Project.py" line="2280"/>
         <source>Delete directory</source>
         <translation>删除文件夹</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="2358"/>
+        <location filename="../Project/Project.py" line="2375"/>
         <source>Create project directory</source>
         <translation>创建项目文件夹</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="2965"/>
+        <location filename="../Project/Project.py" line="2982"/>
         <source>New Project</source>
         <translation>新建项目</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="2474"/>
+        <location filename="../Project/Project.py" line="2491"/>
         <source>Add existing files to the project?</source>
         <translation>是否将已有文件添加到项目中?</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="2965"/>
+        <location filename="../Project/Project.py" line="2982"/>
         <source>Select Version Control System</source>
         <translation>选择版本控制系统</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="2601"/>
+        <location filename="../Project/Project.py" line="2618"/>
         <source>Would you like to edit the VCS command options?</source>
         <translation>是否编辑版本控制系统命令选项?</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3831"/>
+        <location filename="../Project/Project.py" line="3866"/>
         <source>New project</source>
         <translation>新建项目</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="2544"/>
+        <location filename="../Project/Project.py" line="2561"/>
         <source>Shall the project file be added to the repository?</source>
         <translation>是否将项目文件添加到仓库?</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="2580"/>
+        <location filename="../Project/Project.py" line="2597"/>
         <source>None</source>
         <translation>无</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="2573"/>
+        <location filename="../Project/Project.py" line="2590"/>
         <source>Select version control system for the project</source>
         <translation>为项目选择版本控制系统</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="2684"/>
+        <location filename="../Project/Project.py" line="2701"/>
         <source>Translation Pattern</source>
         <translation>翻译样式</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="2684"/>
+        <location filename="../Project/Project.py" line="2701"/>
         <source>Enter the path pattern for translation files (use &apos;%language%&apos; in place of the language code):</source>
         <translation>为翻译文件输入路径样式(在语言代码的相应位置使用“&apos;%language%”):</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3845"/>
+        <location filename="../Project/Project.py" line="3880"/>
         <source>Open project</source>
         <translation>打开项目</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3115"/>
+        <location filename="../Project/Project.py" line="3132"/>
         <source>Project Files (*.e4p)</source>
         <translation>项目文件 (*.e4p)</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3882"/>
+        <location filename="../Project/Project.py" line="3917"/>
         <source>Save project as</source>
         <translation>项目另存为</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3130"/>
+        <location filename="../Project/Project.py" line="3147"/>
         <source>Save File</source>
         <translation>保存文件</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3166"/>
+        <location filename="../Project/Project.py" line="3183"/>
         <source>Close Project</source>
         <translation>关闭项目</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3166"/>
+        <location filename="../Project/Project.py" line="3183"/>
         <source>The current project has unsaved changes.</source>
         <translation>当前项目的更改未保存。</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3343"/>
+        <location filename="../Project/Project.py" line="3360"/>
         <source>Syntax errors detected</source>
         <translation>检测到语法错误</translation>
     </message>
     <message numerus="yes">
-        <location filename="../Project/Project.py" line="3343"/>
+        <location filename="../Project/Project.py" line="3360"/>
         <source>The project contains %n file(s) with syntax errors.</source>
         <translation>
             <numerusform>项目包含 %n 文件有语法错误。</numerusform>
         </translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3831"/>
+        <location filename="../Project/Project.py" line="3866"/>
         <source>&amp;New...</source>
         <translation>新建(&amp;N)…</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3836"/>
+        <location filename="../Project/Project.py" line="3871"/>
         <source>Generate a new project</source>
         <translation>生成新项目</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3837"/>
+        <location filename="../Project/Project.py" line="3872"/>
         <source>&lt;b&gt;New...&lt;/b&gt;&lt;p&gt;This opens a dialog for entering the info for a new project.&lt;/p&gt;</source>
         <translation>&lt;b&gt;新建…&lt;/b&gt;&lt;p&gt;打开一个对话框为新项目输入信息。&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3845"/>
+        <location filename="../Project/Project.py" line="3880"/>
         <source>&amp;Open...</source>
         <translation>打开(&amp;O)…</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3850"/>
+        <location filename="../Project/Project.py" line="3885"/>
         <source>Open an existing project</source>
         <translation>打开一个已有项目</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3851"/>
-        <source>&lt;b&gt;Open...&lt;/b&gt;&lt;p&gt;This opens an existing project.&lt;/p&gt;</source>
-        <translation>&lt;b&gt;打开…&lt;/b&gt;&lt;p&gt;打开一个已有项目。&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="3858"/>
-        <source>Close project</source>
-        <translation>关闭项目</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="3858"/>
-        <source>&amp;Close</source>
-        <translation>关闭(&amp;C)</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="3862"/>
-        <source>Close the current project</source>
-        <translation>关闭当前项目</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="3863"/>
-        <source>&lt;b&gt;Close&lt;/b&gt;&lt;p&gt;This closes the current project.&lt;/p&gt;</source>
-        <translation>&lt;b&gt;关闭&lt;/b&gt;&lt;p&gt;关闭当前项目。&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="3870"/>
-        <source>Save project</source>
-        <translation>保存项目</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4062"/>
-        <source>&amp;Save</source>
-        <translation>保存(&amp;S)</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="3874"/>
-        <source>Save the current project</source>
-        <translation>保存当前项目</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="3875"/>
-        <source>&lt;b&gt;Save&lt;/b&gt;&lt;p&gt;This saves the current project.&lt;/p&gt;</source>
-        <translation>&lt;b&gt;保存&lt;/b&gt;&lt;p&gt;保存当前项目&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="3882"/>
-        <source>Save &amp;as...</source>
-        <translation>另存为(&amp;A)…</translation>
-    </message>
-    <message>
         <location filename="../Project/Project.py" line="3886"/>
-        <source>Save the current project to a new file</source>
-        <translation>将当前项目另存为一个新文件</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="3888"/>
-        <source>&lt;b&gt;Save as&lt;/b&gt;&lt;p&gt;This saves the current project to a new file.&lt;/p&gt;</source>
-        <translation>&lt;b&gt;另存为&lt;/b&gt;&lt;p&gt;将当前项目另存为一个新文件。&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="3897"/>
-        <source>Add files to project</source>
-        <translation>将文件添加到项目中</translation>
+        <source>&lt;b&gt;Open...&lt;/b&gt;&lt;p&gt;This opens an existing project.&lt;/p&gt;</source>
+        <translation>&lt;b&gt;打开…&lt;/b&gt;&lt;p&gt;打开一个已有项目。&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="3893"/>
+        <source>Close project</source>
+        <translation>关闭项目</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="3893"/>
+        <source>&amp;Close</source>
+        <translation>关闭(&amp;C)</translation>
     </message>
     <message>
         <location filename="../Project/Project.py" line="3897"/>
+        <source>Close the current project</source>
+        <translation>关闭当前项目</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="3898"/>
+        <source>&lt;b&gt;Close&lt;/b&gt;&lt;p&gt;This closes the current project.&lt;/p&gt;</source>
+        <translation>&lt;b&gt;关闭&lt;/b&gt;&lt;p&gt;关闭当前项目。&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="3905"/>
+        <source>Save project</source>
+        <translation>保存项目</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4097"/>
+        <source>&amp;Save</source>
+        <translation>保存(&amp;S)</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="3909"/>
+        <source>Save the current project</source>
+        <translation>保存当前项目</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="3910"/>
+        <source>&lt;b&gt;Save&lt;/b&gt;&lt;p&gt;This saves the current project.&lt;/p&gt;</source>
+        <translation>&lt;b&gt;保存&lt;/b&gt;&lt;p&gt;保存当前项目&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="3917"/>
+        <source>Save &amp;as...</source>
+        <translation>另存为(&amp;A)…</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="3921"/>
+        <source>Save the current project to a new file</source>
+        <translation>将当前项目另存为一个新文件</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="3923"/>
+        <source>&lt;b&gt;Save as&lt;/b&gt;&lt;p&gt;This saves the current project to a new file.&lt;/p&gt;</source>
+        <translation>&lt;b&gt;另存为&lt;/b&gt;&lt;p&gt;将当前项目另存为一个新文件。&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="3932"/>
+        <source>Add files to project</source>
+        <translation>将文件添加到项目中</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="3932"/>
         <source>Add &amp;files...</source>
         <translation>添加文件(&amp;F)…</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3902"/>
+        <location filename="../Project/Project.py" line="3937"/>
         <source>Add files to the current project</source>
         <translation>将文件添加到当前项目中</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3904"/>
+        <location filename="../Project/Project.py" line="3939"/>
         <source>&lt;b&gt;Add files...&lt;/b&gt;&lt;p&gt;This opens a dialog for adding files to the current project. The place to add is determined by the file extension.&lt;/p&gt;</source>
         <translation>&lt;b&gt;添加文件…&lt;/b&gt;&lt;p&gt;打开一个对话框为当前项目添加文件。添加的位置由文件扩展名决定。&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3913"/>
+        <location filename="../Project/Project.py" line="3948"/>
         <source>Add directory to project</source>
         <translation>将文件夹添加到项目中</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3913"/>
+        <location filename="../Project/Project.py" line="3948"/>
         <source>Add directory...</source>
         <translation>添加文件夹…</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3918"/>
+        <location filename="../Project/Project.py" line="3953"/>
         <source>Add a directory to the current project</source>
         <translation>为当前工程添加文件夹</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3920"/>
+        <location filename="../Project/Project.py" line="3955"/>
         <source>&lt;b&gt;Add directory...&lt;/b&gt;&lt;p&gt;This opens a dialog for adding a directory to the current project.&lt;/p&gt;</source>
         <translation>&lt;b&gt;添加文件夹…&lt;/b&gt;&lt;p&gt;打开一个对话框将文件夹添加到当前项目中。&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3928"/>
+        <location filename="../Project/Project.py" line="3963"/>
         <source>Add translation to project</source>
         <translation>将翻译添加到项目中</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3928"/>
+        <location filename="../Project/Project.py" line="3963"/>
         <source>Add &amp;translation...</source>
         <translation>添加翻译(&amp;T)…</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3933"/>
+        <location filename="../Project/Project.py" line="3968"/>
         <source>Add a translation to the current project</source>
         <translation>将翻译添加到当前项目中</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3935"/>
+        <location filename="../Project/Project.py" line="3970"/>
         <source>&lt;b&gt;Add translation...&lt;/b&gt;&lt;p&gt;This opens a dialog for add a translation to the current project.&lt;/p&gt;</source>
         <translation>&lt;b&gt;添加翻译…&lt;/b&gt;&lt;p&gt;打开一个对话框将翻译添加到当前项目中。&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3943"/>
+        <location filename="../Project/Project.py" line="3978"/>
         <source>Search new files</source>
         <translation>搜索新文件</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3943"/>
-        <source>Searc&amp;h new files...</source>
-        <translation>搜索新文件(&amp;H)…</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="3947"/>
-        <source>Search new files in the project directory.</source>
-        <translation>在项目文件夹中搜索新文件。</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="3973"/>
-        <source>Project properties</source>
-        <translation>项目属性</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="3973"/>
-        <source>&amp;Properties...</source>
-        <translation>属性(&amp;P)…</translation>
-    </message>
-    <message>
         <location filename="../Project/Project.py" line="3978"/>
+        <source>Searc&amp;h new files...</source>
+        <translation>搜索新文件(&amp;H)…</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="3982"/>
+        <source>Search new files in the project directory.</source>
+        <translation>在项目文件夹中搜索新文件。</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4008"/>
+        <source>Project properties</source>
+        <translation>项目属性</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4008"/>
+        <source>&amp;Properties...</source>
+        <translation>属性(&amp;P)…</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4013"/>
         <source>Show the project properties</source>
         <translation>显示项目属性</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3979"/>
+        <location filename="../Project/Project.py" line="4014"/>
         <source>&lt;b&gt;Properties...&lt;/b&gt;&lt;p&gt;This shows a dialog to edit the project properties.&lt;/p&gt;</source>
         <translation>&lt;b&gt;属性…&lt;/b&gt;&lt;p&gt;显示一个对话框可编辑项目属性。&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3986"/>
+        <location filename="../Project/Project.py" line="4021"/>
         <source>User project properties</source>
         <translation>用户项目属性</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3986"/>
+        <location filename="../Project/Project.py" line="4021"/>
         <source>&amp;User Properties...</source>
         <translation>用户属性(&amp;U)…</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3991"/>
+        <location filename="../Project/Project.py" line="4026"/>
         <source>Show the user specific project properties</source>
         <translation>显示用户指定的项目属性</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3993"/>
+        <location filename="../Project/Project.py" line="4028"/>
         <source>&lt;b&gt;User Properties...&lt;/b&gt;&lt;p&gt;This shows a dialog to edit the user specific project properties.&lt;/p&gt;</source>
         <translation>&lt;b&gt;用户属性…&lt;/b&gt;&lt;p&gt;显示一个对话框可编辑用户指定的项目属性。&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4001"/>
+        <location filename="../Project/Project.py" line="4036"/>
         <source>Filetype Associations</source>
         <translation>文件类型关联</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4001"/>
+        <location filename="../Project/Project.py" line="4036"/>
         <source>Filetype Associations...</source>
         <translation>文件类型关联…</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4005"/>
+        <location filename="../Project/Project.py" line="4040"/>
         <source>Show the project filetype associations</source>
         <translation>显示项目文件类型关联</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4037"/>
+        <location filename="../Project/Project.py" line="4072"/>
         <source>Debugger Properties</source>
         <translation>调试器属性</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4037"/>
+        <location filename="../Project/Project.py" line="4072"/>
         <source>Debugger &amp;Properties...</source>
         <translation>调试器属性(&amp;P)…</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4041"/>
+        <location filename="../Project/Project.py" line="4076"/>
         <source>Show the debugger properties</source>
         <translation>显示调试器属性</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4042"/>
+        <location filename="../Project/Project.py" line="4077"/>
         <source>&lt;b&gt;Debugger Properties...&lt;/b&gt;&lt;p&gt;This shows a dialog to edit project specific debugger settings.&lt;/p&gt;</source>
         <translation>&lt;b&gt;调试器属性…&lt;/b&gt;&lt;p&gt;显示一个对话框以编辑项目指定的调试器设定。&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4050"/>
+        <location filename="../Project/Project.py" line="4085"/>
         <source>Load</source>
         <translation>载入</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4050"/>
+        <location filename="../Project/Project.py" line="4085"/>
         <source>&amp;Load</source>
         <translation>载入(&amp;L)</translation>
     </message>
     <message>
+        <location filename="../Project/Project.py" line="4089"/>
+        <source>Load the debugger properties</source>
+        <translation>载入调试器属性</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4090"/>
+        <source>&lt;b&gt;Load Debugger Properties&lt;/b&gt;&lt;p&gt;This loads the project specific debugger settings.&lt;/p&gt;</source>
+        <translation>&lt;b&gt;载入调试器属性&lt;/b&gt;&lt;p&gt;载入项目指定的调试器设定。&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4097"/>
+        <source>Save</source>
+        <translation>保存</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4101"/>
+        <source>Save the debugger properties</source>
+        <translation>保存调试器属性</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4102"/>
+        <source>&lt;b&gt;Save Debugger Properties&lt;/b&gt;&lt;p&gt;This saves the project specific debugger settings.&lt;/p&gt;</source>
+        <translation>&lt;b&gt;保存调试器属性&lt;/b&gt;&lt;p&gt;保存项目指定的调试器设置。&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4109"/>
+        <source>Delete</source>
+        <translation>删除</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4109"/>
+        <source>&amp;Delete</source>
+        <translation>删除(&amp;D)</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4113"/>
+        <source>Delete the debugger properties</source>
+        <translation>删除调试器属性</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4114"/>
+        <source>&lt;b&gt;Delete Debugger Properties&lt;/b&gt;&lt;p&gt;This deletes the file containing the project specific debugger settings.&lt;/p&gt;</source>
+        <translation>&lt;b&gt;删除调试器属性&lt;/b&gt;&lt;p&gt;删除包含项目指定调试器设置的文件。&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4122"/>
+        <source>Reset</source>
+        <translation>重置</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4122"/>
+        <source>&amp;Reset</source>
+        <translation>重置(&amp;R)</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4126"/>
+        <source>Reset the debugger properties</source>
+        <translation>重围调试器属性</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4127"/>
+        <source>&lt;b&gt;Reset Debugger Properties&lt;/b&gt;&lt;p&gt;This resets the project specific debugger settings.&lt;/p&gt;</source>
+        <translation>&lt;b&gt;重置调试器属性&lt;/b&gt;&lt;p&gt;重置项目指定的调试器设置。&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4136"/>
+        <source>Load session</source>
+        <translation>载入会话</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4140"/>
+        <source>Load the projects session file.</source>
+        <translation>载入项目会话文件。</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4141"/>
+        <source>&lt;b&gt;Load session&lt;/b&gt;&lt;p&gt;This loads the projects session file. The session consists of the following data.&lt;br&gt;- all open source files&lt;br&gt;- all breakpoint&lt;br&gt;- the commandline arguments&lt;br&gt;- the working directory&lt;br&gt;- the exception reporting flag&lt;/p&gt;</source>
+        <translation>&lt;b&gt;载入会话&lt;/b&gt;&lt;p&gt;载入项目会话文件。会话包括如下数据。&lt;br&gt;- 所有打开的源文件&lt;br&gt;- 所有断点&lt;br&gt;- 命令行参数&lt;br&gt;- 工作文件夹&lt;br&gt;- 异常报告标志&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4154"/>
+        <source>Save session</source>
+        <translation>保存会话</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4158"/>
+        <source>Save the projects session file.</source>
+        <translation>保存项目会话文件。</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4159"/>
+        <source>&lt;b&gt;Save session&lt;/b&gt;&lt;p&gt;This saves the projects session file. The session consists of the following data.&lt;br&gt;- all open source files&lt;br&gt;- all breakpoint&lt;br&gt;- the commandline arguments&lt;br&gt;- the working directory&lt;br&gt;- the exception reporting flag&lt;/p&gt;</source>
+        <translation>&lt;b&gt;保存会话&lt;/b&gt;&lt;p&gt;保存项目会话文件。会话包括如下数据。&lt;br&gt;- 所有打开的源文件&lt;br&gt;- 所有断点&lt;br&gt;- 命令行参数&lt;br&gt;- 工作文件夹&lt;br&gt;- 异常报告标志&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4172"/>
+        <source>Delete session</source>
+        <translation>删除会话</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4176"/>
+        <source>Delete the projects session file.</source>
+        <translation>删除项目会话文件。</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4177"/>
+        <source>&lt;b&gt;Delete session&lt;/b&gt;&lt;p&gt;This deletes the projects session file&lt;/p&gt;</source>
+        <translation>&lt;b&gt;删除会话&lt;/b&gt;&lt;p&gt;删除项目会话文件&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4186"/>
+        <source>Code Metrics</source>
+        <translation>代码度量</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4186"/>
+        <source>&amp;Code Metrics...</source>
+        <translation>代码度量(&amp;C)…</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4190"/>
+        <source>Show some code metrics for the project.</source>
+        <translation>显示项目的部分代码度量。</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4192"/>
+        <source>&lt;b&gt;Code Metrics...&lt;/b&gt;&lt;p&gt;This shows some code metrics for all Python files in the project.&lt;/p&gt;</source>
+        <translation>&lt;b&gt;代码度量…&lt;/b&gt;&lt;p&gt;显示项目中所有 Python 文件的部分代码度量。&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4200"/>
+        <source>Python Code Coverage</source>
+        <translation>Python 代码覆盖率</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4200"/>
+        <source>Code Co&amp;verage...</source>
+        <translation>代码覆盖率(&amp;v)…</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4204"/>
+        <source>Show code coverage information for the project.</source>
+        <translation>显示项目的代码覆盖率信息。</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4206"/>
+        <source>&lt;b&gt;Code Coverage...&lt;/b&gt;&lt;p&gt;This shows the code coverage information for all Python files in the project.&lt;/p&gt;</source>
+        <translation>&lt;b&gt;代码覆盖率…&lt;/b&gt;&lt;p&gt;显示项目中所有 Python 文件的代码覆盖率。&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="5088"/>
+        <source>Profile Data</source>
+        <translation>剖析数据</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4214"/>
+        <source>&amp;Profile Data...</source>
+        <translation>剖析数据(&amp;P)…</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4218"/>
+        <source>Show profiling data for the project.</source>
+        <translation>显示项目的剖析数据。</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4220"/>
+        <source>&lt;b&gt;Profile Data...&lt;/b&gt;&lt;p&gt;This shows the profiling data for the project.&lt;/p&gt;</source>
+        <translation>&lt;b&gt;剖析数据…&lt;/b&gt;&lt;p&gt;显示项目的剖析数据。&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="5142"/>
+        <source>Application Diagram</source>
+        <translation>应用程序图</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4229"/>
+        <source>&amp;Application Diagram...</source>
+        <translation>应用程序(&amp;A)图…</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4233"/>
+        <source>Show a diagram of the project.</source>
+        <translation>显示项目图表。</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4235"/>
+        <source>&lt;b&gt;Application Diagram...&lt;/b&gt;&lt;p&gt;This shows a diagram of the project.&lt;/p&gt;</source>
+        <translation>&lt;b&gt;应用程序图…&lt;/b&gt;&lt;p&gt;显示项目的图表。&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="5335"/>
+        <source>Create Package List</source>
+        <translation>创建程序包列表</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4258"/>
+        <source>Create &amp;Package List</source>
+        <translation type="unfinished">创建插件存档(&amp;A)</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="5609"/>
+        <source>Create Plugin Archive</source>
+        <translation>创建插件存档</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4274"/>
+        <source>Create Plugin &amp;Archives</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4360"/>
+        <source>&amp;Project</source>
+        <translation>项目(&amp;P)</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4361"/>
+        <source>Open &amp;Recent Projects</source>
+        <translation>打开最近的项目</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4366"/>
+        <source>&amp;Version Control</source>
+        <translation>版本控制(&amp;V)</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4370"/>
+        <source>Chec&amp;k</source>
+        <translation>检查(&amp;K)</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4372"/>
+        <source>Sho&amp;w</source>
+        <translation>显示(&amp;W)</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4373"/>
+        <source>&amp;Diagrams</source>
+        <translation>图表(&amp;D)</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4362"/>
+        <source>Session</source>
+        <translation>会话</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4375"/>
+        <source>Source &amp;Documentation</source>
+        <translation>源文档(&amp;D)</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4363"/>
+        <source>Debugger</source>
+        <translation>调试器</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4374"/>
+        <source>Pac&amp;kagers</source>
+        <translation>打包程序(&amp;K)</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4500"/>
+        <source>Project</source>
+        <translation>项目</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4566"/>
+        <source>&amp;Clear</source>
+        <translation>清除(&amp;C)</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4739"/>
+        <source>Search New Files</source>
+        <translation>搜索新文件</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4739"/>
+        <source>There were no new files found to be added.</source>
+        <translation>没有要添加的新文件。</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="4885"/>
+        <source>Version Control System</source>
+        <translation>版本控制系统</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="5015"/>
+        <source>Coverage Data</source>
+        <translation>覆盖率数据</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="5065"/>
+        <source>There is no main script defined for the current project. Aborting</source>
+        <translation>当前项目未定义主脚本。终止</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="5038"/>
+        <source>Code Coverage</source>
+        <translation>代码覆盖率</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="5038"/>
+        <source>Please select a coverage file</source>
+        <translation>请选择一个覆盖率文件</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="5088"/>
+        <source>Please select a profile file</source>
+        <translation>请选择一个剖析文件</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="5142"/>
+        <source>Include module names?</source>
+        <translation>包含模块名?</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="5286"/>
+        <source>&lt;p&gt;The file &lt;b&gt;PKGLIST&lt;/b&gt; already exists.&lt;/p&gt;&lt;p&gt;Overwrite it?&lt;/p&gt;</source>
+        <translation>&lt;p&gt;文件 &lt;b&gt;PKGLIST&lt;/b&gt; 已存在。&lt;/p&gt;&lt;p&gt;是否覆盖?&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="5354"/>
+        <source>The project does not have a main script defined. Aborting...</source>
+        <translation>项目未定义主脚本。终止…</translation>
+    </message>
+    <message>
         <location filename="../Project/Project.py" line="4054"/>
-        <source>Load the debugger properties</source>
-        <translation>载入调试器属性</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4055"/>
-        <source>&lt;b&gt;Load Debugger Properties&lt;/b&gt;&lt;p&gt;This loads the project specific debugger settings.&lt;/p&gt;</source>
-        <translation>&lt;b&gt;载入调试器属性&lt;/b&gt;&lt;p&gt;载入项目指定的调试器设定。&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4062"/>
-        <source>Save</source>
-        <translation>保存</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4066"/>
-        <source>Save the debugger properties</source>
-        <translation>保存调试器属性</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4067"/>
-        <source>&lt;b&gt;Save Debugger Properties&lt;/b&gt;&lt;p&gt;This saves the project specific debugger settings.&lt;/p&gt;</source>
-        <translation>&lt;b&gt;保存调试器属性&lt;/b&gt;&lt;p&gt;保存项目指定的调试器设置。&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4074"/>
-        <source>Delete</source>
-        <translation>删除</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4074"/>
-        <source>&amp;Delete</source>
-        <translation>删除(&amp;D)</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4078"/>
-        <source>Delete the debugger properties</source>
-        <translation>删除调试器属性</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4079"/>
-        <source>&lt;b&gt;Delete Debugger Properties&lt;/b&gt;&lt;p&gt;This deletes the file containing the project specific debugger settings.&lt;/p&gt;</source>
-        <translation>&lt;b&gt;删除调试器属性&lt;/b&gt;&lt;p&gt;删除包含项目指定调试器设置的文件。&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4087"/>
-        <source>Reset</source>
-        <translation>重置</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4087"/>
-        <source>&amp;Reset</source>
-        <translation>重置(&amp;R)</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4091"/>
-        <source>Reset the debugger properties</source>
-        <translation>重围调试器属性</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4092"/>
-        <source>&lt;b&gt;Reset Debugger Properties&lt;/b&gt;&lt;p&gt;This resets the project specific debugger settings.&lt;/p&gt;</source>
-        <translation>&lt;b&gt;重置调试器属性&lt;/b&gt;&lt;p&gt;重置项目指定的调试器设置。&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4101"/>
-        <source>Load session</source>
-        <translation>载入会话</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4105"/>
-        <source>Load the projects session file.</source>
-        <translation>载入项目会话文件。</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4106"/>
-        <source>&lt;b&gt;Load session&lt;/b&gt;&lt;p&gt;This loads the projects session file. The session consists of the following data.&lt;br&gt;- all open source files&lt;br&gt;- all breakpoint&lt;br&gt;- the commandline arguments&lt;br&gt;- the working directory&lt;br&gt;- the exception reporting flag&lt;/p&gt;</source>
-        <translation>&lt;b&gt;载入会话&lt;/b&gt;&lt;p&gt;载入项目会话文件。会话包括如下数据。&lt;br&gt;- 所有打开的源文件&lt;br&gt;- 所有断点&lt;br&gt;- 命令行参数&lt;br&gt;- 工作文件夹&lt;br&gt;- 异常报告标志&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4119"/>
-        <source>Save session</source>
-        <translation>保存会话</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4123"/>
-        <source>Save the projects session file.</source>
-        <translation>保存项目会话文件。</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4124"/>
-        <source>&lt;b&gt;Save session&lt;/b&gt;&lt;p&gt;This saves the projects session file. The session consists of the following data.&lt;br&gt;- all open source files&lt;br&gt;- all breakpoint&lt;br&gt;- the commandline arguments&lt;br&gt;- the working directory&lt;br&gt;- the exception reporting flag&lt;/p&gt;</source>
-        <translation>&lt;b&gt;保存会话&lt;/b&gt;&lt;p&gt;保存项目会话文件。会话包括如下数据。&lt;br&gt;- 所有打开的源文件&lt;br&gt;- 所有断点&lt;br&gt;- 命令行参数&lt;br&gt;- 工作文件夹&lt;br&gt;- 异常报告标志&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4137"/>
-        <source>Delete session</source>
-        <translation>删除会话</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4141"/>
-        <source>Delete the projects session file.</source>
-        <translation>删除项目会话文件。</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4142"/>
-        <source>&lt;b&gt;Delete session&lt;/b&gt;&lt;p&gt;This deletes the projects session file&lt;/p&gt;</source>
-        <translation>&lt;b&gt;删除会话&lt;/b&gt;&lt;p&gt;删除项目会话文件&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4151"/>
-        <source>Code Metrics</source>
-        <translation>代码度量</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4151"/>
-        <source>&amp;Code Metrics...</source>
-        <translation>代码度量(&amp;C)…</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4155"/>
-        <source>Show some code metrics for the project.</source>
-        <translation>显示项目的部分代码度量。</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4157"/>
-        <source>&lt;b&gt;Code Metrics...&lt;/b&gt;&lt;p&gt;This shows some code metrics for all Python files in the project.&lt;/p&gt;</source>
-        <translation>&lt;b&gt;代码度量…&lt;/b&gt;&lt;p&gt;显示项目中所有 Python 文件的部分代码度量。&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4165"/>
-        <source>Python Code Coverage</source>
-        <translation>Python 代码覆盖率</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4165"/>
-        <source>Code Co&amp;verage...</source>
-        <translation>代码覆盖率(&amp;v)…</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4169"/>
-        <source>Show code coverage information for the project.</source>
-        <translation>显示项目的代码覆盖率信息。</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4171"/>
-        <source>&lt;b&gt;Code Coverage...&lt;/b&gt;&lt;p&gt;This shows the code coverage information for all Python files in the project.&lt;/p&gt;</source>
-        <translation>&lt;b&gt;代码覆盖率…&lt;/b&gt;&lt;p&gt;显示项目中所有 Python 文件的代码覆盖率。&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="5053"/>
-        <source>Profile Data</source>
-        <translation>剖析数据</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4179"/>
-        <source>&amp;Profile Data...</source>
-        <translation>剖析数据(&amp;P)…</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4183"/>
-        <source>Show profiling data for the project.</source>
-        <translation>显示项目的剖析数据。</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4185"/>
-        <source>&lt;b&gt;Profile Data...&lt;/b&gt;&lt;p&gt;This shows the profiling data for the project.&lt;/p&gt;</source>
-        <translation>&lt;b&gt;剖析数据…&lt;/b&gt;&lt;p&gt;显示项目的剖析数据。&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="5107"/>
-        <source>Application Diagram</source>
-        <translation>应用程序图</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4194"/>
-        <source>&amp;Application Diagram...</source>
-        <translation>应用程序(&amp;A)图…</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4198"/>
-        <source>Show a diagram of the project.</source>
-        <translation>显示项目图表。</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4200"/>
-        <source>&lt;b&gt;Application Diagram...&lt;/b&gt;&lt;p&gt;This shows a diagram of the project.&lt;/p&gt;</source>
-        <translation>&lt;b&gt;应用程序图…&lt;/b&gt;&lt;p&gt;显示项目的图表。&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="5300"/>
-        <source>Create Package List</source>
-        <translation>创建程序包列表</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4223"/>
-        <source>Create &amp;Package List</source>
-        <translation type="unfinished">创建插件存档(&amp;A)</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="5574"/>
-        <source>Create Plugin Archive</source>
-        <translation>创建插件存档</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4239"/>
-        <source>Create Plugin &amp;Archives</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4325"/>
-        <source>&amp;Project</source>
-        <translation>项目(&amp;P)</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4326"/>
-        <source>Open &amp;Recent Projects</source>
-        <translation>打开最近的项目</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4331"/>
-        <source>&amp;Version Control</source>
-        <translation>版本控制(&amp;V)</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4335"/>
-        <source>Chec&amp;k</source>
-        <translation>检查(&amp;K)</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4337"/>
-        <source>Sho&amp;w</source>
-        <translation>显示(&amp;W)</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4338"/>
-        <source>&amp;Diagrams</source>
-        <translation>图表(&amp;D)</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4327"/>
-        <source>Session</source>
-        <translation>会话</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4340"/>
-        <source>Source &amp;Documentation</source>
-        <translation>源文档(&amp;D)</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4328"/>
-        <source>Debugger</source>
-        <translation>调试器</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4339"/>
-        <source>Pac&amp;kagers</source>
-        <translation>打包程序(&amp;K)</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4465"/>
-        <source>Project</source>
-        <translation>项目</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4531"/>
-        <source>&amp;Clear</source>
-        <translation>清除(&amp;C)</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4704"/>
-        <source>Search New Files</source>
-        <translation>搜索新文件</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4704"/>
-        <source>There were no new files found to be added.</source>
-        <translation>没有要添加的新文件。</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4850"/>
-        <source>Version Control System</source>
-        <translation>版本控制系统</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4980"/>
-        <source>Coverage Data</source>
-        <translation>覆盖率数据</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="5030"/>
-        <source>There is no main script defined for the current project. Aborting</source>
-        <translation>当前项目未定义主脚本。终止</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="5003"/>
-        <source>Code Coverage</source>
-        <translation>代码覆盖率</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="5003"/>
-        <source>Please select a coverage file</source>
-        <translation>请选择一个覆盖率文件</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="5053"/>
-        <source>Please select a profile file</source>
-        <translation>请选择一个剖析文件</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="5107"/>
-        <source>Include module names?</source>
-        <translation>包含模块名?</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="5251"/>
-        <source>&lt;p&gt;The file &lt;b&gt;PKGLIST&lt;/b&gt; already exists.&lt;/p&gt;&lt;p&gt;Overwrite it?&lt;/p&gt;</source>
-        <translation>&lt;p&gt;文件 &lt;b&gt;PKGLIST&lt;/b&gt; 已存在。&lt;/p&gt;&lt;p&gt;是否覆盖?&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="5319"/>
-        <source>The project does not have a main script defined. Aborting...</source>
-        <translation>项目未定义主脚本。终止…</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="4019"/>
         <source>Lexer Associations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4019"/>
+        <location filename="../Project/Project.py" line="4054"/>
         <source>Lexer Associations...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4023"/>
+        <location filename="../Project/Project.py" line="4058"/>
         <source>Show the project lexer associations (overriding defaults)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4025"/>
+        <location filename="../Project/Project.py" line="4060"/>
         <source>&lt;b&gt;Lexer Associations...&lt;/b&gt;&lt;p&gt;This shows a dialog to edit the lexer associations of the project. These associations override the global lexer associations. Lexers are used to highlight the editor text.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -54209,112 +54789,112 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="805"/>
+        <location filename="../Project/Project.py" line="817"/>
         <source>&lt;p&gt;The project file &lt;b&gt;{0}&lt;/b&gt; could not be read.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="908"/>
+        <location filename="../Project/Project.py" line="920"/>
         <source>&lt;p&gt;The project file &lt;b&gt;{0}&lt;/b&gt; could not be written.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="944"/>
+        <location filename="../Project/Project.py" line="956"/>
         <source>&lt;p&gt;The user specific project properties file &lt;b&gt;{0}&lt;/b&gt; could not be read.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="968"/>
+        <location filename="../Project/Project.py" line="980"/>
         <source>&lt;p&gt;The user specific project properties file &lt;b&gt;{0}&lt;/b&gt; could not be written.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1026"/>
+        <location filename="../Project/Project.py" line="1038"/>
         <source>&lt;p&gt;The project session file &lt;b&gt;{0}&lt;/b&gt; could not be read.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1062"/>
+        <location filename="../Project/Project.py" line="1074"/>
         <source>&lt;p&gt;The project session file &lt;b&gt;{0}&lt;/b&gt; could not be written.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1091"/>
+        <location filename="../Project/Project.py" line="1103"/>
         <source>&lt;p&gt;The project session file &lt;b&gt;{0}&lt;/b&gt; could not be deleted.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1125"/>
+        <location filename="../Project/Project.py" line="1137"/>
         <source>&lt;p&gt;The tasks file &lt;b&gt;{0}&lt;/b&gt; could not be read.&lt;/p&gt;</source>
         <translation type="unfinished">&lt;p&gt;任务文件 &lt;b&gt;{0}&lt;/b&gt; 无法读取。&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1145"/>
+        <location filename="../Project/Project.py" line="1157"/>
         <source>&lt;p&gt;The tasks file &lt;b&gt;{0}&lt;/b&gt; could not be written.&lt;/p&gt;</source>
         <translation type="unfinished">&lt;p&gt;任务文件 &lt;b&gt;{0}&lt;/b&gt; 无法写入。&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1204"/>
+        <location filename="../Project/Project.py" line="1216"/>
         <source>&lt;p&gt;The project debugger properties file &lt;b&gt;{0}&lt;/b&gt; could not be read.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1239"/>
+        <location filename="../Project/Project.py" line="1251"/>
         <source>&lt;p&gt;The project debugger properties file &lt;b&gt;{0}&lt;/b&gt; could not be written.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1265"/>
+        <location filename="../Project/Project.py" line="1277"/>
         <source>&lt;p&gt;The project debugger properties file &lt;b&gt;{0}&lt;/b&gt; could not be deleted.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1748"/>
+        <location filename="../Project/Project.py" line="1760"/>
         <source>&lt;p&gt;The file &lt;b&gt;{0}&lt;/b&gt; already exists.&lt;/p&gt;&lt;p&gt;Overwrite it?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3130"/>
+        <location filename="../Project/Project.py" line="3147"/>
         <source>&lt;p&gt;The file &lt;b&gt;{0}&lt;/b&gt; already exists. Overwrite it?&lt;/p&gt;</source>
         <translation type="unfinished">&lt;p&gt;文件 &lt;b&gt;{0}&lt;/b&gt; 已经存在。是否覆盖?&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1988"/>
+        <location filename="../Project/Project.py" line="2000"/>
         <source>&lt;p&gt;The file &lt;b&gt;{0}&lt;/b&gt; could not be renamed.&lt;br /&gt;Reason: {1}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="2358"/>
+        <location filename="../Project/Project.py" line="2375"/>
         <source>&lt;p&gt;The project directory &lt;b&gt;{0}&lt;/b&gt; could not be created.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4850"/>
+        <location filename="../Project/Project.py" line="4885"/>
         <source>&lt;p&gt;The selected VCS &lt;b&gt;{0}&lt;/b&gt; could not be found.&lt;br/&gt;Disabling version control.&lt;/p&gt;&lt;p&gt;{1}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5300"/>
+        <location filename="../Project/Project.py" line="5335"/>
         <source>&lt;p&gt;The file &lt;b&gt;PKGLIST&lt;/b&gt; could not be created.&lt;/p&gt;&lt;p&gt;Reason: {0}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5460"/>
+        <location filename="../Project/Project.py" line="5495"/>
         <source>&lt;p&gt;The file &lt;b&gt;{0}&lt;/b&gt; could not be stored in the archive. Ignoring it.&lt;/p&gt;&lt;p&gt;Reason: {1}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5533"/>
+        <location filename="../Project/Project.py" line="5568"/>
         <source>&lt;p&gt;The plugin file &lt;b&gt;{0}&lt;/b&gt; could not be read.&lt;/p&gt;&lt;p&gt;Reason: {1}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1671"/>
+        <location filename="../Project/Project.py" line="1683"/>
         <source>&lt;p&gt;The selected file &lt;b&gt;{0}&lt;/b&gt; could not be added to &lt;b&gt;{1}&lt;/b&gt;.&lt;/p&gt;&lt;p&gt;Reason: {2}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1730"/>
+        <location filename="../Project/Project.py" line="1742"/>
         <source>&lt;p&gt;The target directory &lt;b&gt;{0}&lt;/b&gt; could not be created.&lt;/p&gt;&lt;p&gt;Reason: {1}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -54324,32 +54904,32 @@
         <translation>Python2 文件 (*.py2);;Python2 GUI 文件 (*.pyw2);;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="2441"/>
+        <location filename="../Project/Project.py" line="2458"/>
         <source>Create main script</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="2441"/>
+        <location filename="../Project/Project.py" line="2458"/>
         <source>&lt;p&gt;The mainscript &lt;b&gt;{0}&lt;/b&gt; could not be created.&lt;br/&gt;Reason: {1}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4208"/>
+        <location filename="../Project/Project.py" line="4243"/>
         <source>Load Diagram</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4208"/>
+        <location filename="../Project/Project.py" line="4243"/>
         <source>&amp;Load Diagram...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4212"/>
+        <location filename="../Project/Project.py" line="4247"/>
         <source>Load a diagram from file.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4214"/>
+        <location filename="../Project/Project.py" line="4249"/>
         <source>&lt;b&gt;Load Diagram...&lt;/b&gt;&lt;p&gt;This loads a diagram from file.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -54379,37 +54959,37 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4839"/>
+        <location filename="../Project/Project.py" line="4874"/>
         <source>&lt;p&gt;The selected VCS &lt;b&gt;{0}&lt;/b&gt; could not be found. &lt;br/&gt;Reverting override.&lt;/p&gt;&lt;p&gt;{1}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5574"/>
+        <location filename="../Project/Project.py" line="5609"/>
         <source>&lt;p&gt;The plugin file &lt;b&gt;{0}&lt;/b&gt; could not be read.&lt;/p&gt; &lt;p&gt;Reason: {1}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4228"/>
+        <location filename="../Project/Project.py" line="4263"/>
         <source>Create an initial PKGLIST file for an eric6 plugin.</source>
         <translation type="unfinished">创建一个 eric6 插件存档文件。</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4230"/>
+        <location filename="../Project/Project.py" line="4265"/>
         <source>&lt;b&gt;Create Package List&lt;/b&gt;&lt;p&gt;This creates an initial list of files to include in an eric6 plugin archive. The list is created from the project file.&lt;/p&gt;</source>
         <translation type="unfinished">&lt;b&gt;创建插件存档&lt;/b&gt;&lt;p&gt;通过 PKGLIST 文件给出的文件列表创建 Eric4 插件存档文件。存档名从主脚本名构建。&lt;/p&gt; {5 ?} {6 ?}</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4244"/>
+        <location filename="../Project/Project.py" line="4279"/>
         <source>Create eric6 plugin archive files.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4246"/>
+        <location filename="../Project/Project.py" line="4281"/>
         <source>&lt;b&gt;Create Plugin Archives&lt;/b&gt;&lt;p&gt;This creates eric6 plugin archive files using the list of files given in a PKGLIST* file. The archive name is built from the main script name if not designated in the package list file.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5424"/>
+        <location filename="../Project/Project.py" line="5459"/>
         <source>&lt;p&gt;The eric6 plugin archive file &lt;b&gt;{0}&lt;/b&gt; could not be created.&lt;/p&gt;&lt;p&gt;Reason: {1}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -54419,213 +54999,213 @@
         <translation>Eric6 插件</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="2933"/>
+        <location filename="../Project/Project.py" line="2950"/>
         <source>Create project management directory</source>
         <translation>创建项目管理目录</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="2933"/>
+        <location filename="../Project/Project.py" line="2950"/>
         <source>&lt;p&gt;The project directory &lt;b&gt;{0}&lt;/b&gt; is not writable.&lt;/p&gt;</source>
         <translation>&lt;p&gt;项目目录 &lt;b&gt;{0}&lt;/b&gt; 不可写。&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3958"/>
+        <location filename="../Project/Project.py" line="3993"/>
         <source>Alt+Ctrl+P</source>
         <comment>Project|Search Project File</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3964"/>
+        <location filename="../Project/Project.py" line="3999"/>
         <source>Search for a file in the project list of files.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3966"/>
+        <location filename="../Project/Project.py" line="4001"/>
         <source>&lt;b&gt;Search Project File&lt;/b&gt;&lt;p&gt;This searches for a file in the project list of files.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3958"/>
+        <location filename="../Project/Project.py" line="3993"/>
         <source>Search Project File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3958"/>
+        <location filename="../Project/Project.py" line="3993"/>
         <source>Search Project File...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5355"/>
+        <location filename="../Project/Project.py" line="5390"/>
         <source>Create Plugin Archives</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4256"/>
+        <location filename="../Project/Project.py" line="4291"/>
         <source>Create Plugin Archives (Snapshot)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4256"/>
+        <location filename="../Project/Project.py" line="4291"/>
         <source>Create Plugin Archives (&amp;Snapshot)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4261"/>
+        <location filename="../Project/Project.py" line="4296"/>
         <source>Create eric6 plugin archive files (snapshot releases).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4263"/>
+        <location filename="../Project/Project.py" line="4298"/>
         <source>&lt;b&gt;Create Plugin Archives (Snapshot)&lt;/b&gt;&lt;p&gt;This creates eric6 plugin archive files using the list of files given in the PKGLIST* file. The archive name is built from the main script name if not designated in the package list file. The version entry of the main script is modified to reflect a snapshot release.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5333"/>
-        <source>Select package lists:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="5351"/>
-        <source>Creating plugin archives...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="5351"/>
-        <source>Abort</source>
-        <translation type="unfinished">终止</translation>
-    </message>
-    <message>
-        <location filename="../Project/Project.py" line="5351"/>
-        <source>%v/%m Archives</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Project/Project.py" line="5368"/>
+        <source>Select package lists:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="5386"/>
+        <source>Creating plugin archives...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="5386"/>
+        <source>Abort</source>
+        <translation type="unfinished">终止</translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="5386"/>
+        <source>%v/%m Archives</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Project/Project.py" line="5403"/>
         <source>&lt;p&gt;The file &lt;b&gt;{0}&lt;/b&gt; could not be read.&lt;/p&gt;&lt;p&gt;Reason: {1}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5479"/>
+        <location filename="../Project/Project.py" line="5514"/>
         <source>&lt;p&gt;The eric6 plugin archive files were created with some errors.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5482"/>
+        <location filename="../Project/Project.py" line="5517"/>
         <source>&lt;p&gt;The eric6 plugin archive files were created successfully.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5344"/>
+        <location filename="../Project/Project.py" line="5379"/>
         <source>&lt;p&gt;No package list files (PKGLIST*) available or selected. Aborting...&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5396"/>
+        <location filename="../Project/Project.py" line="5431"/>
         <source>&lt;p&gt;The file &lt;b&gt;{0}&lt;/b&gt; is not ready yet.&lt;/p&gt;&lt;p&gt;Please rework it and delete the&apos;; initial_list&apos; line of the header.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="3949"/>
+        <location filename="../Project/Project.py" line="3984"/>
         <source>&lt;b&gt;Search new files...&lt;/b&gt;&lt;p&gt;This searches for new files (sources, *.ui, *.idl, *.proto) in the project directory and registered subdirectories.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4007"/>
+        <location filename="../Project/Project.py" line="4042"/>
         <source>&lt;b&gt;Filetype Associations...&lt;/b&gt;&lt;p&gt;This shows a dialog to edit the file type associations of the project. These associations determine the type (source, form, interface, protocol or others) with a filename pattern. They are used when adding a file to the project and when performing a search for new files.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="1519"/>
+        <location filename="../Project/Project.py" line="1531"/>
         <source>&lt;p&gt;The selected translation file &lt;b&gt;{0}&lt;/b&gt; could not be deleted.&lt;/p&gt;&lt;p&gt;Reason: {1}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="2233"/>
+        <location filename="../Project/Project.py" line="2250"/>
         <source>&lt;p&gt;The selected file &lt;b&gt;{0}&lt;/b&gt; could not be deleted.&lt;/p&gt;&lt;p&gt;Reason: {1}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="2263"/>
+        <location filename="../Project/Project.py" line="2280"/>
         <source>&lt;p&gt;The selected directory &lt;b&gt;{0}&lt;/b&gt; could not be deleted.&lt;/p&gt;&lt;p&gt;Reason: {1}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="2756"/>
+        <location filename="../Project/Project.py" line="2773"/>
         <source>Create Makefile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="2756"/>
+        <location filename="../Project/Project.py" line="2773"/>
         <source>&lt;p&gt;The makefile &lt;b&gt;{0}&lt;/b&gt; could not be created.&lt;br/&gt;Reason: {1}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5760"/>
+        <location filename="../Project/Project.py" line="5795"/>
         <source>Execute Make</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4277"/>
+        <location filename="../Project/Project.py" line="4312"/>
         <source>&amp;Execute Make</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4281"/>
+        <location filename="../Project/Project.py" line="4316"/>
         <source>Perform a &apos;make&apos; run.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4283"/>
+        <location filename="../Project/Project.py" line="4318"/>
         <source>&lt;b&gt;Execute Make&lt;/b&gt;&lt;p&gt;This performs a &apos;make&apos; run to rebuild the configured target.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5740"/>
+        <location filename="../Project/Project.py" line="5775"/>
         <source>Test for Changes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4291"/>
+        <location filename="../Project/Project.py" line="4326"/>
         <source>&amp;Test for Changes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4295"/>
+        <location filename="../Project/Project.py" line="4330"/>
         <source>Question &apos;make&apos;, if a rebuild is needed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4297"/>
+        <location filename="../Project/Project.py" line="4332"/>
         <source>&lt;b&gt;Test for Changes&lt;/b&gt;&lt;p&gt;This questions &apos;make&apos;, if a rebuild of the configured target is necessary.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4342"/>
+        <location filename="../Project/Project.py" line="4377"/>
         <source>Make</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5688"/>
+        <location filename="../Project/Project.py" line="5723"/>
         <source>The make process did not start.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5733"/>
+        <location filename="../Project/Project.py" line="5768"/>
         <source>The make process crashed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5743"/>
+        <location filename="../Project/Project.py" line="5778"/>
         <source>&lt;p&gt;There are changes that require the configured make target &lt;b&gt;{0}&lt;/b&gt; to be rebuilt.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5748"/>
+        <location filename="../Project/Project.py" line="5783"/>
         <source>&lt;p&gt;There are changes that require the default make target to be rebuilt.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="5760"/>
+        <location filename="../Project/Project.py" line="5795"/>
         <source>The makefile contains errors.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -54640,7 +55220,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Project/Project.py" line="4330"/>
+        <location filename="../Project/Project.py" line="4365"/>
         <source>Project-T&amp;ools</source>
         <translation type="unfinished"></translation>
     </message>
@@ -54744,7 +55324,7 @@
         <translation>版本控制系统状态</translation>
     </message>
     <message>
-        <location filename="../Project/ProjectBrowserModel.py" line="782"/>
+        <location filename="../Project/ProjectBrowserModel.py" line="798"/>
         <source>local</source>
         <translation>本地</translation>
     </message>
@@ -54759,7 +55339,7 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/ProjectBrowserPage.ui" line="37"/>
         <source>Colours</source>
-        <translation>颜色</translation>
+        <translation type="obsolete">颜色</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/ProjectBrowserPage.ui" line="43"/>
@@ -54769,7 +55349,7 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/ProjectBrowserPage.ui" line="56"/>
         <source>Select the colour for highlighted entries in the Others viewer.</source>
-        <translation>选择其它浏览器中高亮条目的颜色。</translation>
+        <translation type="obsolete">选择其它浏览器中高亮条目的颜色。</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/ProjectBrowserPage.ui" line="82"/>
@@ -54896,6 +55476,16 @@
         <source>Protocols (protobuf) Browser</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/ProjectBrowserPage.ui" line="37"/>
+        <source>Colors</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/ProjectBrowserPage.ui" line="56"/>
+        <source>Select the color for highlighted entries in the Others viewer.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ProjectFormsBrowser</name>
@@ -64731,34 +65321,34 @@
         <translation>配置…</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="767"/>
+        <location filename="../QScintilla/Shell.py" line="771"/>
         <source>Select History</source>
         <translation>选择历史</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="767"/>
+        <location filename="../QScintilla/Shell.py" line="771"/>
         <source>Select the history entry to execute (most recent shown last).</source>
         <translation>选择历史条目以执行(最常用的显示在最后)。</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="835"/>
+        <location filename="../QScintilla/Shell.py" line="839"/>
         <source>Passive Debug Mode</source>
         <translation>被动调试模式</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="836"/>
+        <location filename="../QScintilla/Shell.py" line="840"/>
         <source>
 Not connected</source>
         <translation>
 没有连接</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="839"/>
+        <location filename="../QScintilla/Shell.py" line="843"/>
         <source>No.</source>
         <translation>No.</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="2157"/>
+        <location filename="../QScintilla/Shell.py" line="2161"/>
         <source>Drop Error</source>
         <translation>降落误差</translation>
     </message>
@@ -64768,22 +65358,22 @@
         <translation>剪切</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="841"/>
+        <location filename="../QScintilla/Shell.py" line="845"/>
         <source>{0} on {1}, {2}</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="1030"/>
+        <location filename="../QScintilla/Shell.py" line="1034"/>
         <source>StdOut: {0}</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="1038"/>
+        <location filename="../QScintilla/Shell.py" line="1042"/>
         <source>StdErr: {0}</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="2157"/>
+        <location filename="../QScintilla/Shell.py" line="2161"/>
         <source>&lt;p&gt;&lt;b&gt;{0}&lt;/b&gt; is not a file.&lt;/p&gt;</source>
         <translation type="unfinished">&lt;p&gt;&lt;b&gt;{0}&lt;/b&gt; 不是一个文件。&lt;/p&gt;</translation>
     </message>
@@ -64793,7 +65383,7 @@
         <translation type="unfinished">查找</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="888"/>
+        <location filename="../QScintilla/Shell.py" line="892"/>
         <source>Exception &quot;{0}&quot;
 {1}
 File: {2}, Line: {3}
@@ -64801,32 +65391,32 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="923"/>
+        <location filename="../QScintilla/Shell.py" line="927"/>
         <source>Unspecified syntax error.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="898"/>
+        <location filename="../QScintilla/Shell.py" line="902"/>
         <source>Exception &quot;{0}&quot;
 {1}
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="925"/>
+        <location filename="../QScintilla/Shell.py" line="929"/>
         <source>Syntax error &quot;{1}&quot; in file {0} at line {2}, character {3}.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="948"/>
+        <location filename="../QScintilla/Shell.py" line="952"/>
         <source>Signal &quot;{0}&quot; generated in file {1} at line {2}.
 Function: {3}({4})</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="2015"/>
+        <location filename="../QScintilla/Shell.py" line="2019"/>
         <source>Project</source>
         <translation type="unfinished">项目</translation>
     </message>
@@ -64856,14 +65446,14 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="1835"/>
+        <location filename="../QScintilla/Shell.py" line="1839"/>
         <source>Available Virtual Environments:
 {0}
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="1876"/>
+        <location filename="../QScintilla/Shell.py" line="1880"/>
         <source>Current Virtual Environment: &apos;{0}&apos;
 </source>
         <translation type="unfinished"></translation>
@@ -73032,7 +73622,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/Sync/SyncCheckPage.py" line="56"/>
+        <location filename="../WebBrowser/Sync/SyncCheckPage.py" line="50"/>
         <source>Host:</source>
         <translation type="unfinished">主机:</translation>
     </message>
@@ -73062,22 +73652,22 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/Sync/SyncCheckPage.py" line="55"/>
+        <location filename="../WebBrowser/Sync/SyncCheckPage.py" line="49"/>
         <source>FTP</source>
         <translation type="unfinished">FTP</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/Sync/SyncCheckPage.py" line="68"/>
+        <location filename="../WebBrowser/Sync/SyncCheckPage.py" line="62"/>
         <source>No Synchronization</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/Sync/SyncCheckPage.py" line="211"/>
+        <location filename="../WebBrowser/Sync/SyncCheckPage.py" line="204"/>
         <source>&lt;font color=&quot;#FF0000&quot;&gt;&lt;b&gt;Error:&lt;/b&gt; {0}&lt;/font&gt;</source>
         <translation type="unfinished">&lt;font color=&quot;#FF0000&quot;&gt;&lt;b&gt;错误:&lt;/b&gt;{0}&lt;/font&gt;</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/Sync/SyncCheckPage.py" line="63"/>
+        <location filename="../WebBrowser/Sync/SyncCheckPage.py" line="57"/>
         <source>Shared Directory</source>
         <translation type="unfinished"></translation>
     </message>
@@ -73087,7 +73677,7 @@
         <translation>快速启动设置:</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/Sync/SyncCheckPage.py" line="64"/>
+        <location filename="../WebBrowser/Sync/SyncCheckPage.py" line="58"/>
         <source>Directory:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -74760,12 +75350,12 @@
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/TasksPage.ui" line="105"/>
-        <source>Tasks Background Colours</source>
+        <source>Tasks Background Colors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/TasksPage.ui" line="206"/>
-        <source>Select the background colour for these tasks.</source>
+        <source>Select the background color for these tasks.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -75825,27 +76415,27 @@
 <context>
     <name>Translator</name>
     <message>
-        <location filename="../Plugins/UiExtensionPlugins/Translator/Translator.py" line="52"/>
+        <location filename="../Plugins/UiExtensionPlugins/Translator/Translator.py" line="63"/>
         <source>Translator</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/UiExtensionPlugins/Translator/Translator.py" line="52"/>
+        <location filename="../Plugins/UiExtensionPlugins/Translator/Translator.py" line="63"/>
         <source>T&amp;ranslator</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/UiExtensionPlugins/Translator/Translator.py" line="52"/>
+        <location filename="../Plugins/UiExtensionPlugins/Translator/Translator.py" line="63"/>
         <source>Alt+Shift+R</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/UiExtensionPlugins/Translator/Translator.py" line="58"/>
+        <location filename="../Plugins/UiExtensionPlugins/Translator/Translator.py" line="69"/>
         <source>Switch the input focus to the Translator window.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/UiExtensionPlugins/Translator/Translator.py" line="60"/>
+        <location filename="../Plugins/UiExtensionPlugins/Translator/Translator.py" line="71"/>
         <source>&lt;b&gt;Activate Translator&lt;/b&gt;&lt;p&gt;This switches the input focus to the Translator window.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -75853,52 +76443,52 @@
 <context>
     <name>TranslatorEngines</name>
     <message>
-        <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorEngines/__init__.py" line="37"/>
+        <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorEngines/__init__.py" line="39"/>
         <source>Google V.1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorEngines/__init__.py" line="39"/>
-        <source>MyMemory</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorEngines/__init__.py" line="41"/>
-        <source>Glosbe</source>
+        <source>MyMemory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorEngines/__init__.py" line="43"/>
-        <source>PROMT</source>
+        <source>Glosbe</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorEngines/__init__.py" line="45"/>
-        <source>Yandex</source>
+        <source>PROMT</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorEngines/__init__.py" line="47"/>
-        <source>Google V.2</source>
+        <source>Yandex</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorEngines/__init__.py" line="49"/>
+        <source>Google V.2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorEngines/__init__.py" line="51"/>
         <source>Microsoft</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorEngines/__init__.py" line="57"/>
+        <source>Unknow translation service name ({0})</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorEngines/__init__.py" line="55"/>
-        <source>Unknow translation service name ({0})</source>
+        <source>IBM Watson</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorEngines/__init__.py" line="53"/>
-        <source>IBM Watson</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorEngines/__init__.py" line="51"/>
         <source>DeepL Pro</source>
         <translation type="unfinished"></translation>
     </message>
@@ -76147,12 +76737,12 @@
     </message>
     <message>
         <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorLanguagesDb.py" line="79"/>
-        <source>Chinese S</source>
+        <source>Chinese (China)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorLanguagesDb.py" line="80"/>
-        <source>Chinese T</source>
+        <source>Chinese (Taiwan)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -76332,7 +76922,7 @@
 <context>
     <name>TranslatorPlugin</name>
     <message>
-        <location filename="../Plugins/PluginTranslator.py" line="65"/>
+        <location filename="../Plugins/PluginTranslator.py" line="71"/>
         <source>Translator</source>
         <translation type="unfinished"></translation>
     </message>
@@ -78457,7 +79047,7 @@
         <translation>&lt;b&gt;键盘快捷键&lt;/b&gt;&lt;p&gt;将程序的键盘快捷键设置成你喜欢的按键。&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="6329"/>
+        <location filename="../UI/UserInterface.py" line="6327"/>
         <source>Export Keyboard Shortcuts</source>
         <translation>导出键盘快捷键</translation>
     </message>
@@ -78477,7 +79067,7 @@
         <translation>&lt;b&gt;导出键盘快捷键&lt;/b&gt;&lt;p&gt;导出程序的键盘快捷键。&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="6353"/>
+        <location filename="../UI/UserInterface.py" line="6351"/>
         <source>Import Keyboard Shortcuts</source>
         <translation>导入键盘快捷键</translation>
     </message>
@@ -78757,7 +79347,7 @@
         <translation type="obsolete">&lt;h3&gt;版本号&lt;/h3&gt;&lt;table&gt;</translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="7326"/>
+        <location filename="../UI/UserInterface.py" line="7324"/>
         <source>&lt;/table&gt;</source>
         <translation>&lt;/table&gt;</translation>
     </message>
@@ -78822,12 +79412,12 @@
         <translation>进程生成错误</translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="6121"/>
+        <location filename="../UI/UserInterface.py" line="6119"/>
         <source>Open Browser</source>
         <translation>打开浏览器</translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="6121"/>
+        <location filename="../UI/UserInterface.py" line="6119"/>
         <source>Could not start a web browser</source>
         <translation>无法启动网络浏览器</translation>
     </message>
@@ -78862,57 +79452,57 @@
         <translation>&lt;p&gt;未配置 PyQt4 文档起点。&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="6523"/>
+        <location filename="../UI/UserInterface.py" line="6521"/>
         <source>Save tasks</source>
         <translation>保存任务</translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="6552"/>
+        <location filename="../UI/UserInterface.py" line="6550"/>
         <source>Read tasks</source>
         <translation>读取任务</translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="6648"/>
+        <location filename="../UI/UserInterface.py" line="6646"/>
         <source>Save session</source>
         <translation>保存会话</translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="6632"/>
+        <location filename="../UI/UserInterface.py" line="6630"/>
         <source>Read session</source>
         <translation>读取会话</translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="6916"/>
+        <location filename="../UI/UserInterface.py" line="6914"/>
         <source>Drop Error</source>
         <translation>降落误差</translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="7287"/>
+        <location filename="../UI/UserInterface.py" line="7285"/>
         <source>Error during updates check</source>
         <translation>检查更新时出错</translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="7101"/>
+        <location filename="../UI/UserInterface.py" line="7099"/>
         <source>&amp;Cancel</source>
         <translation>取消(&amp;C)</translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="7268"/>
+        <location filename="../UI/UserInterface.py" line="7266"/>
         <source>Update available</source>
         <translation>可用更新</translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="7287"/>
+        <location filename="../UI/UserInterface.py" line="7285"/>
         <source>Could not perform updates check.</source>
         <translation>无法完成更新检查。</translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="7311"/>
+        <location filename="../UI/UserInterface.py" line="7309"/>
         <source>&lt;h3&gt;Available versions&lt;/h3&gt;&lt;table&gt;</source>
         <translation>&lt;h3&gt;可用版本&lt;/h3&gt;&lt;table&gt;</translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="7363"/>
+        <location filename="../UI/UserInterface.py" line="7361"/>
         <source>First time usage</source>
         <translation>第一次使用</translation>
     </message>
@@ -79106,32 +79696,32 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="6523"/>
+        <location filename="../UI/UserInterface.py" line="6521"/>
         <source>&lt;p&gt;The tasks file &lt;b&gt;{0}&lt;/b&gt; could not be written.&lt;/p&gt;</source>
         <translation>&lt;p&gt;任务文件 &lt;b&gt;{0}&lt;/b&gt; 无法写入。&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="6552"/>
+        <location filename="../UI/UserInterface.py" line="6550"/>
         <source>&lt;p&gt;The tasks file &lt;b&gt;{0}&lt;/b&gt; could not be read.&lt;/p&gt;</source>
         <translation>&lt;p&gt;任务文件 &lt;b&gt;{0}&lt;/b&gt; 无法读取。&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="6586"/>
+        <location filename="../UI/UserInterface.py" line="6584"/>
         <source>&lt;p&gt;The session file &lt;b&gt;{0}&lt;/b&gt; could not be written.&lt;/p&gt;</source>
         <translation>&lt;p&gt;会话文件 &lt;b&gt;{0}&lt;/b&gt; 无法写入。&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="6632"/>
+        <location filename="../UI/UserInterface.py" line="6630"/>
         <source>&lt;p&gt;The session file &lt;b&gt;{0}&lt;/b&gt; could not be read.&lt;/p&gt;</source>
         <translation>&lt;p&gt;会话文件 &lt;b&gt;{0}&lt;/b&gt; 无法读取。&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="6916"/>
+        <location filename="../UI/UserInterface.py" line="6914"/>
         <source>&lt;p&gt;&lt;b&gt;{0}&lt;/b&gt; is not a file.&lt;/p&gt;</source>
         <translation>&lt;p&gt;&lt;b&gt;{0}&lt;/b&gt; 不是一个文件。&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="7110"/>
+        <location filename="../UI/UserInterface.py" line="7108"/>
         <source>Trying host {0}</source>
         <translation>正在尝试主机 {0}</translation>
     </message>
@@ -79166,7 +79756,7 @@
         <translation>Alt+Shift+B</translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="6353"/>
+        <location filename="../UI/UserInterface.py" line="6351"/>
         <source>Keyboard shortcut file (*.e4k)</source>
         <translation>键盘快捷键文件 (*.e4k)</translation>
     </message>
@@ -79206,17 +79796,17 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="7176"/>
+        <location filename="../UI/UserInterface.py" line="7174"/>
         <source>Error getting versions information</source>
         <translation>获取版本信息出错</translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="7169"/>
+        <location filename="../UI/UserInterface.py" line="7167"/>
         <source>The versions information could not be downloaded. Please go online and try again.</source>
         <translation>无法获取版本信息。请连线并再试一次。</translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="7176"/>
+        <location filename="../UI/UserInterface.py" line="7174"/>
         <source>The versions information could not be downloaded for the last 7 days. Please go online and try again.</source>
         <translation>过去7天均无法获取版本信息。请连线并再试一次。</translation>
     </message>
@@ -79307,7 +79897,7 @@
         <translation>&lt;p&gt;无法启动快照工具。&lt;br&gt;请确保它作为 &lt;b&gt;{0}&lt;/b&gt; 可用。&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="7382"/>
+        <location filename="../UI/UserInterface.py" line="7380"/>
         <source>Select Workspace Directory</source>
         <translation>选择工作区目录</translation>
     </message>
@@ -79697,7 +80287,7 @@
         <translation>&lt;b&gt;Python 3 文档&lt;/b&gt;&lt;p&gt;显示 Python 3 文档。如果尚未配置文档目录,则在 Windows 系统上,文档位置将默认为 Python 3 可执行文件所在目录下的 doc 目录;在类 Unix 系统上,则默认为 &lt;i&gt;/usr/share/doc/packages/python/html&lt;/i&gt;。请在环境中设置 PYTHON3DOCDIR 以覆盖默认行为。&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="7101"/>
+        <location filename="../UI/UserInterface.py" line="7099"/>
         <source>%v/%m</source>
         <translation type="unfinished"></translation>
     </message>
@@ -79717,7 +80307,7 @@
         <translation>&lt;b&gt;显示错误日志…&lt;/b&gt;&lt;p&gt;打开一个对话框显示最近的错误日志。&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="7105"/>
+        <location filename="../UI/UserInterface.py" line="7103"/>
         <source>Version Check</source>
         <translation>版本检查</translation>
     </message>
@@ -79792,22 +80382,22 @@
         <translation>Qt 版本3 不被 eric6 支持。</translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="7268"/>
+        <location filename="../UI/UserInterface.py" line="7266"/>
         <source>The update to &lt;b&gt;{0}&lt;/b&gt; of eric6 is available at &lt;b&gt;{1}&lt;/b&gt;. Would you like to get it?</source>
         <translation>eric6 的 &lt;b&gt;{0}&lt;/b&gt; 更新已经可用,位于 &lt;b&gt;{1}&lt;/b&gt;。您是否希望下载它?</translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="7280"/>
+        <location filename="../UI/UserInterface.py" line="7278"/>
         <source>Eric6 is up to date</source>
         <translation>Eric6 已是最新版本</translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="7280"/>
+        <location filename="../UI/UserInterface.py" line="7278"/>
         <source>You are using the latest version of eric6</source>
         <translation>您正在使用 eric6 的最新版本</translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="7363"/>
+        <location filename="../UI/UserInterface.py" line="7361"/>
         <source>eric6 has not been configured yet. The configuration dialog will be started.</source>
         <translation>尚未配置 eric6。将打开配置对话框。</translation>
     </message>
@@ -79827,7 +80417,7 @@
         <translation>没有配置的用户工具</translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="7121"/>
+        <location filename="../UI/UserInterface.py" line="7119"/>
         <source>The versions information cannot not be downloaded because you are &lt;b&gt;offline&lt;/b&gt;. Please go online and try again.</source>
         <translation>因为当前处在 &lt;b&gt;离线&lt;/b&gt; 状态,无法获取版本信息。请连线并再试一次。</translation>
     </message>
@@ -79872,7 +80462,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="6670"/>
+        <location filename="../UI/UserInterface.py" line="6668"/>
         <source>Load session</source>
         <translation type="unfinished">载入会话</translation>
     </message>
@@ -79887,17 +80477,17 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="6670"/>
+        <location filename="../UI/UserInterface.py" line="6668"/>
         <source>eric6 Session Files (*.e5s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="6721"/>
+        <location filename="../UI/UserInterface.py" line="6719"/>
         <source>Crash Session found!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="6721"/>
+        <location filename="../UI/UserInterface.py" line="6719"/>
         <source>A session file of a crashed session was found. Shall this session be restored?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -79912,17 +80502,17 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="7256"/>
+        <location filename="../UI/UserInterface.py" line="7254"/>
         <source>Update Check</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="7256"/>
+        <location filename="../UI/UserInterface.py" line="7254"/>
         <source>You installed eric directly from the source code. There is no possibility to check for the availability of an update.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/UserInterface.py" line="7246"/>
+        <location filename="../UI/UserInterface.py" line="7244"/>
         <source>You are using a snapshot release of eric6. A more up-to-date stable release might be available.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -80928,7 +81518,7 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="128"/>
         <source>Colours</source>
-        <translation>颜色</translation>
+        <translation type="obsolete">颜色</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="134"/>
@@ -80938,7 +81528,7 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="147"/>
         <source>Select the background colour for entries with VCS status &quot;added&quot;.</source>
-        <translation>为版本控制系统状态“已添加”条目选择背景色。</translation>
+        <translation type="obsolete">为版本控制系统状态“已添加”条目选择背景色。</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="157"/>
@@ -80948,7 +81538,7 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="170"/>
         <source>Select the background colour for entries with VCS status &quot;conflict&quot;.</source>
-        <translation>为版本控制系统状态“冲突”条目选择背景色。</translation>
+        <translation type="obsolete">为版本控制系统状态“冲突”条目选择背景色。</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="193"/>
@@ -80958,7 +81548,7 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="206"/>
         <source>Select the background colour for entries with VCS status &quot;modified&quot;.</source>
-        <translation>为版本控制系统状态“已修改”条目选择背景色。</translation>
+        <translation type="obsolete">为版本控制系统状态“已修改”条目选择背景色。</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="216"/>
@@ -80968,7 +81558,7 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="229"/>
         <source>Select the background colour for entries with VCS status &quot;replaced&quot;.</source>
-        <translation>为版本控制系统状态“已替换”条目选择背景色。</translation>
+        <translation type="obsolete">为版本控制系统状态“已替换”条目选择背景色。</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="239"/>
@@ -80978,7 +81568,7 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="252"/>
         <source>Select the background colour for entries with VCS status &quot;needs update&quot;.</source>
-        <translation>为版本控制系统状态“需更新”条目选择背景色。</translation>
+        <translation type="obsolete">为版本控制系统状态“需更新”条目选择背景色。</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="115"/>
@@ -80998,7 +81588,42 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="275"/>
         <source>Select the background colour for entries with VCS status &quot;removed&quot;.</source>
-        <translation>为版本控制系统状态“已删除”条目选择背景色。</translation>
+        <translation type="obsolete">为版本控制系统状态“已删除”条目选择背景色。</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="128"/>
+        <source>Colors</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="147"/>
+        <source>Select the background color for entries with VCS status &quot;added&quot;.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="170"/>
+        <source>Select the background color for entries with VCS status &quot;conflict&quot;.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="206"/>
+        <source>Select the background color for entries with VCS status &quot;modified&quot;.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="229"/>
+        <source>Select the background color for entries with VCS status &quot;replaced&quot;.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="252"/>
+        <source>Select the background color for entries with VCS status &quot;needs update&quot;.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="275"/>
+        <source>Select the background color for entries with VCS status &quot;removed&quot;.</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -85924,17 +86549,17 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="279"/>
         <source>Colours</source>
-        <translation type="unfinished">颜色</translation>
+        <translation type="obsolete">颜色</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="285"/>
         <source>Background colour of secure URLs:</source>
-        <translation type="unfinished">安全 URL 的背景色:</translation>
+        <translation type="obsolete">安全 URL 的背景色:</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="298"/>
         <source>Select the background colour for secure URLs.</source>
-        <translation type="unfinished">为安全的 URL 选择背景色。</translation>
+        <translation type="obsolete">为安全的 URL 选择背景色。</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="324"/>
@@ -86036,6 +86661,21 @@
         <source>Show Scrollbars</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="279"/>
+        <source>Colors</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="285"/>
+        <source>Background color of secure URLs:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="298"/>
+        <source>Select the background color for secure URLs.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>WebBrowserClearPrivateDataDialog</name>
@@ -86930,12 +87570,12 @@
         <translation type="unfinished"> 秒</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserPage.py" line="171"/>
+        <location filename="../WebBrowser/WebBrowserPage.py" line="172"/>
         <source>Suspicuous URL detected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserPage.py" line="171"/>
+        <location filename="../WebBrowser/WebBrowserPage.py" line="172"/>
         <source>&lt;p&gt;The URL &lt;b&gt;{0}&lt;/b&gt; was found in the Safe Browsing database.&lt;/p&gt;{1}</source>
         <translation type="unfinished"></translation>
     </message>
@@ -87220,112 +87860,112 @@
 <context>
     <name>WebBrowserTabWidget</name>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="124"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="122"/>
         <source>Show a navigation menu</source>
         <translation type="unfinished">显示导航菜单</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="137"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="135"/>
         <source>Show a navigation menu for closed tabs</source>
         <translation type="unfinished">为已关闭选项卡显示导航菜单</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="151"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="149"/>
         <source>Open a new web browser tab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="165"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="163"/>
         <source>New Tab</source>
         <translation type="unfinished">新建选项卡</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="169"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="167"/>
         <source>Move Left</source>
         <translation type="unfinished">左移</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="172"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="170"/>
         <source>Move Right</source>
         <translation type="unfinished">右移</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="176"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="174"/>
         <source>Duplicate Page</source>
         <translation type="unfinished">产生相同页面</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="179"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="177"/>
         <source>Close</source>
         <translation type="unfinished">关闭</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="182"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="180"/>
         <source>Close Others</source>
         <translation type="unfinished">关闭其它</translation>
     </message>
     <message>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="211"/>
+        <source>Close All</source>
+        <translation type="unfinished">全部关闭</translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="186"/>
+        <source>Print Preview</source>
+        <translation type="unfinished">打印预览</translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="189"/>
+        <source>Print</source>
+        <translation type="unfinished">打印</translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="192"/>
+        <source>Print as PDF</source>
+        <translation type="unfinished">打印为 PDF</translation>
+    </message>
+    <message>
         <location filename="../WebBrowser/WebBrowserTabWidget.py" line="213"/>
-        <source>Close All</source>
-        <translation type="unfinished">全部关闭</translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="188"/>
-        <source>Print Preview</source>
-        <translation type="unfinished">打印预览</translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="191"/>
-        <source>Print</source>
-        <translation type="unfinished">打印</translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="194"/>
-        <source>Print as PDF</source>
-        <translation type="unfinished">打印为 PDF</translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="215"/>
         <source>Reload All</source>
         <translation type="unfinished">重新载入所有内容</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="218"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="216"/>
         <source>Bookmark All Tabs</source>
         <translation type="unfinished">将所有选项卡加入书签</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="222"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="220"/>
         <source>Restore Closed Tab</source>
         <translation type="unfinished">恢复已关闭的选项卡</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="458"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="456"/>
         <source>...</source>
         <translation type="unfinished">…</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="898"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="892"/>
         <source>Loading...</source>
         <translation type="unfinished">正在加载…</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="918"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="912"/>
         <source>Finished loading</source>
         <translation type="unfinished">加载完成</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="920"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="914"/>
         <source>Failed to load</source>
         <translation type="unfinished">加载失败</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="961"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="955"/>
         <source>Are you sure you want to close the window?</source>
         <translation type="unfinished">确定要关闭窗口?</translation>
     </message>
     <message numerus="yes">
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="961"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="955"/>
         <source>Are you sure you want to close the window?
 You have %n tab(s) open.</source>
         <translation type="unfinished">
@@ -87334,47 +87974,47 @@
         </translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="968"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="962"/>
         <source>&amp;Quit</source>
         <translation type="unfinished">退出(&amp;Q)</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="971"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="965"/>
         <source>C&amp;lose Current Tab</source>
         <translation type="unfinished">关闭当前选项卡(&amp;C)</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="1152"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="1146"/>
         <source>Restore All Closed Tabs</source>
         <translation type="unfinished">恢复所有已关闭的选项卡</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="1154"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="1148"/>
         <source>Clear List</source>
         <translation type="unfinished">清空列表</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="252"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="250"/>
         <source>Unmute Tab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="256"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="254"/>
         <source>Mute Tab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="755"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="753"/>
         <source>Print to PDF</source>
         <translation type="unfinished">打印到 PDF</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="705"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="703"/>
         <source>&lt;p&gt;The file &lt;b&gt;{0}&lt;/b&gt; exists already. Shall it be overwritten?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="755"/>
+        <location filename="../WebBrowser/WebBrowserTabWidget.py" line="753"/>
         <source>&lt;p&gt;The PDF could not be written to file &lt;b&gt;{0}&lt;/b&gt;.&lt;/p&gt;&lt;p&gt;&lt;b&gt;Error:&lt;/b&gt; {1}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/eric6/icons/breeze-dark/calliope_mini.svg	Sat May 02 13:51:07 2020 +0200
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg id="svg8" width="48" height="48" version="1.1" viewBox="0 0 12.7 12.7" xmlns="http://www.w3.org/2000/svg">
+ <g id="layer1" transform="translate(0,-284.3)">
+  <g id="calliopemini" transform="matrix(.33591 0 0 .33591 -12.382 267.63)">
+   <g id="g915">
+    <path id="platine" d="m38.798 67.76c0.16655-0.36884 0.13639-0.31744 0.78203-0.85588s2.13-0.94191 3.2923-2.0634 2.6412-3.4107 3.1557-5.1168c0.51449-1.706 0.22218-3.5224 0.15452-4.6788-0.06765-1.1564 0.82562-1.4991 0.82562-1.4991s0.39807-0.27578 1.137-0.14823c0.73894 0.12756 0.96948 0.28462 1.8446 0.86531 0.8751 0.58068 2.1854 1.188 3.3079 1.4782 1.1225 0.29019 2.5572 0.35641 3.7706 0.21371 1.2134-0.1427 2.2616-0.78078 3.1435-1.2187 0.88195-0.4379 1.8228-1.2698 2.5131-1.4337 0.69031-0.16388 1.1315 0.0049 1.5602 0.21547 0.4287 0.21055 0.58639 0.381 0.82155 1.0126 0.23516 0.63165-0.02661 2.021 0.08822 3.1872 0.11483 1.1662 0.37648 2.5832 0.90806 3.7466 0.53158 1.1634 1.4626 2.1655 2.2986 2.9814s1.8155 1.4402 2.8207 1.929c1.0052 0.4888 1.1517 0.5548 1.4891 1.0236 0.33739 0.46884 0.41624 1.0274 0.186 1.6327-0.23025 0.60535-1.9239 1.3796-2.7725 1.8917-0.84866 0.51214-2.4034 1.8925-3.3778 3.3637-0.97437 1.4712-1.2709 3.701-1.4377 5.1008-0.16684 1.3998 0.41985 2.3275 0.02475 3.0778-0.39509 0.75026-1.032 1.0483-1.7873 1.1132s-1.6942-0.72885-2.2072-1.0413c-0.51304-0.31241-1.3535-0.79254-2.0928-0.96544-0.73928-0.1729-1.7546-0.25-2.1638-0.55844-0.4092-0.30843-0.26974-0.53758-0.42563-0.72475-0.15589-0.18717-0.27842-0.33191-0.46973-0.40616-0.19131-0.07425-0.37465-0.08732-0.55733-0.02498-0.18268 0.06234-0.35439 0.16138-0.4765 0.35499-0.12211 0.1936 0.0109 0.38462-0.29873 0.67729s-0.85168 0.16943-1.5996 0.44295c-0.74792 0.27352-2.0844 0.88026-2.833 1.3029-0.74857 0.42264-1.083 1-1.687 1.1465s-1.1856-0.0329-1.6588-0.37621c-0.47319-0.3433-0.69523-1.5039-0.69454-1.8484 6.87e-4 -0.34444 0.15832-2.1253-0.13233-3.4795-0.29066-1.3542-0.77801-2.7839-1.4721-3.8512-0.69412-1.0673-1.6371-1.8297-2.4927-2.4801-0.85555-0.65035-1.9588-0.95914-2.5482-1.4493-0.5894-0.49021-0.93222-0.80777-1.0752-1.2759s-0.03019-0.8929 0.13636-1.2617z" fill="#eff0f1" stroke-width=".051193px"></path>
+    <ellipse id="ecke_minus" cx="47.8" cy="54.944" rx="1.7186" ry="1.6918" fill="#eee489" stroke-width=".088711"></ellipse>
+    <ellipse id="path4302-6" cx="47.774" cy="54.905" rx=".77659" ry=".76448" fill="#232629"/>
+    <ellipse id="ecke_plus" cx="63.398" cy="54.857" rx="1.7186" ry="1.6918" fill="#eee489" stroke-width=".088711"></ellipse>
+    <ellipse id="path4302-6-9" cx="63.371" cy="54.819" rx=".77659" ry=".76448" fill="#232629"/>
+    <ellipse id="ecke_p3" cx="71.374" cy="68.31" rx="1.7186" ry="1.6918" fill="#eee489" stroke-width=".088711"></ellipse>
+    <ellipse id="path4302-6-2" cx="71.348" cy="68.272" rx=".77659" ry=".76448" fill="#232629"/>
+    <ellipse id="ecke_p2" cx="63.748" cy="81.92" rx="1.7186" ry="1.6918" fill="#eee489" stroke-width=".088711"></ellipse>
+    <ellipse id="path4302-6-0" cx="63.722" cy="81.882" rx=".77659" ry=".76448" fill="#232629"/>
+    <ellipse id="ecke_p1" cx="48.2" cy="82.192" rx="1.7186" ry="1.6918" fill="#eee489" stroke-width=".088711"></ellipse>
+    <ellipse id="path4302-6-3" cx="48.173" cy="82.154" rx=".77659" ry=".76448" fill="#232629"/>
+    <ellipse id="ecke_p0" cx="40.155" cy="68.515" rx="1.7186" ry="1.6918" fill="#eee489" stroke-width=".088711"></ellipse>
+    <ellipse id="path4302-6-6" cx="40.128" cy="68.477" rx=".77659" ry=".76448" fill="#232629"/>
+    <rect id="usb" x="54.657" y="55.959" width="2.4755" height="2.5545" fill="#232629" stroke-width=".051193"></rect>
+    <g id="ledmatrix" transform="matrix(.19368 0 0 .19329 34.504 31.838)" fill="#232629">
+     <rect id="rect4410" x="110.41" y="152.09" width="1.0636" height="4.4517"/>
+     <rect id="rect4410-2" x="110.41" y="160.82" width="1.0636" height="4.4517"/>
+     <rect id="rect4410-6" x="110.41" y="169.8" width="1.0636" height="4.4517"/>
+     <rect id="rect4410-2-1" x="110.41" y="178.53" width="1.0636" height="4.4517"/>
+     <rect id="rect4410-2-1-8" x="110.41" y="187.33" width="1.0636" height="4.4517"/>
+     <rect id="rect4410-7" x="119.02" y="152.09" width="1.0636" height="4.4517"/>
+     <rect id="rect4410-2-9" x="119.02" y="160.82" width="1.0636" height="4.4517"/>
+     <rect id="rect4410-6-2" x="119.02" y="169.8" width="1.0636" height="4.4517"/>
+     <rect id="rect4410-2-1-0" x="119.02" y="178.53" width="1.0636" height="4.4517"/>
+     <rect id="rect4410-2-1-8-2" x="119.02" y="187.33" width="1.0636" height="4.4517"/>
+     <rect id="rect4410-7-3" x="101.41" y="152.09" width="1.0636" height="4.4517"/>
+     <rect id="rect4410-2-9-7" x="101.41" y="160.82" width="1.0636" height="4.4517"/>
+     <rect id="rect4410-6-2-5" x="101.41" y="169.8" width="1.0636" height="4.4517"/>
+     <rect id="rect4410-2-1-0-9" x="101.41" y="178.53" width="1.0636" height="4.4517"/>
+     <rect id="rect4410-2-1-8-2-2" x="101.41" y="187.33" width="1.0636" height="4.4517"/>
+     <rect id="rect4410-7-2" x="127.83" y="152.09" width="1.0636" height="4.4517"/>
+     <rect id="rect4410-2-9-8" x="127.83" y="160.82" width="1.0636" height="4.4517"/>
+     <rect id="rect4410-6-2-9" x="127.83" y="169.8" width="1.0636" height="4.4517"/>
+     <rect id="rect4410-2-1-0-7" x="127.83" y="178.53" width="1.0636" height="4.4517"/>
+     <rect id="rect4410-2-1-8-2-3" x="127.83" y="187.33" width="1.0636" height="4.4517"/>
+     <rect id="rect4410-7-2-6" x="92.604" y="152.09" width="1.0636" height="4.4517"/>
+     <rect id="rect4410-2-9-8-1" x="92.604" y="160.82" width="1.0636" height="4.4517"/>
+     <rect id="rect4410-6-2-9-2" x="92.604" y="169.8" width="1.0636" height="4.4517"/>
+     <rect id="rect4410-2-1-0-7-9" x="92.604" y="178.53" width="1.0636" height="4.4517"/>
+     <rect id="rect4410-2-1-8-2-3-3" x="92.604" y="187.33" width="1.0636" height="4.4517"/>
+    </g>
+   </g>
+  </g>
+ </g>
+</svg>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/eric6/icons/breeze-dark/loadingAnimation.svg	Sat May 02 13:51:07 2020 +0200
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="396" height="22" version="1.1" viewBox="0 0 396 22" xmlns="http://www.w3.org/2000/svg">
+ <defs>
+  <style type="text/css">.ColorScheme-Text {
+        color:#eff0f1;
+      }</style>
+ </defs>
+ <path class="ColorScheme-Text" d="m21 10.999c0 1.8021-0.47865 3.4866-1.3062 4.9438l-0.92285-0.92285 0.0025-0.0025-3.4717-3.4741 0.88379-0.88379 3.1006 3.103c0.29078-0.86953 0.4638-1.7936 0.4638-2.7637 0-4.8475-3.9025-8.75-8.75-8.75-1.4531 0-2.8174 0.35728-4.021 0.979l-0.92285-0.92285c1.4572-0.82756 3.1417-1.3062 4.9438-1.3062 5.54 0 10 4.46 10 10zm-5.0562 8.6938c-1.4573 0.82756-3.1417 1.3062-4.9438 1.3062-5.54 0-10-4.46-10-10 0-1.8021 0.47865-3.4866 1.3062-4.9438l0.85449 0.85449 0.0025-0.00244 3.5352 3.5352-0.88379 0.88379-3.0981-3.0981c-0.29246 0.87162-0.46637 1.7982-0.46637 2.771 0 4.8475 3.9025 8.75 8.75 8.75 1.4531 0 2.8174-0.35729 4.021-0.979z" color="#eff0f1" fill="#eff0f1" stroke-width="1.25"/>
+ <path class="ColorScheme-Text" d="m42.848 12.735c-0.31293 1.7747-1.0768 3.3505-2.1448 4.6419l-0.74858-1.0691 0.0029-2e-3 -2.8157-4.0242 1.0238-0.7169 2.5147 3.5943c0.43736-0.80583 0.76821-1.6858 0.93667-2.6412 0.84176-4.7739-2.3238-9.2948-7.0977-10.137-1.431-0.25233-2.8366-0.13738-4.1299 0.26589l-0.74858-1.0691c1.5788-0.56195 3.3208-0.74081 5.0955-0.42787 5.4558 0.96201 9.0736 6.1287 8.1116 11.585zm-6.489 7.6837c-1.5789 0.56193-3.3208 0.7408-5.0955 0.42787-5.4558-0.96201-9.0736-6.1287-8.1116-11.585 0.31293-1.7747 1.0768-3.3505 2.1448-4.6419l0.69313 0.98989 0.0029-0.00197 2.8676 4.0954-1.0238 0.7169-2.5131-3.589c-0.43937 0.80759-0.77154 1.6899-0.94046 2.6479-0.84176 4.7739 2.3238 9.2947 7.0976 10.136 1.431 0.25233 2.8366 0.13737 4.1299-0.26589z" color="#eff0f1" fill="#eff0f1" stroke-width="1.25"/>
+ <path class="ColorScheme-Text" d="m64.397 14.419c-0.61635 1.6934-1.6423 3.1126-2.9183 4.1989l-0.55156-1.1828 0.0032-0.0015-2.0741-4.452 1.1328-0.52822 1.8523 3.9763c0.57064-0.71764 1.0493-1.5268 1.3811-2.4384 1.6579-4.5552-0.67447-9.557-5.2296-11.215-1.3655-0.49699-2.7697-0.62787-4.1133-0.4553l-0.55156-1.1828c1.6524-0.27926 3.399-0.1529 5.0924 0.46345 5.2059 1.8948 7.8715 7.6112 5.9767 12.817zm-7.7247 6.4402c-1.6525 0.27923-3.399 0.1529-5.0924-0.46345-5.2059-1.8948-7.8715-7.6112-5.9767-12.817 0.61635-1.6934 1.6423-3.1126 2.9183-4.1989l0.5107 1.0952 0.0032-0.00144 2.1129 4.5311-1.1328 0.52822-1.8516-3.9709c-0.57293 0.71903-1.0533 1.5302-1.386 2.4444-1.6579 4.5552 0.67448 9.557 5.2296 11.215 1.3655 0.49699 2.7697 0.62786 4.1133 0.4553z" color="#eff0f1" fill="#eff0f1" stroke-width="1.25"/>
+ <path class="ColorScheme-Text" d="m85.66 15.999c-0.90105 1.5607-2.1578 2.7802-3.6031 3.6284l-0.33779-1.2606 0.0034-9.22e-4 -1.2695-4.7445 1.2073-0.32349 1.1337 4.2376c0.68659-0.60764 1.2985-1.3214 1.7835-2.1615 2.4238-4.1981 0.99535-9.529-3.2027-11.953-1.2584-0.72655-2.6186-1.0993-3.9718-1.1627l-0.33779-1.2606c1.6758 0.011912 3.3739 0.43965 4.9346 1.3407 4.7978 2.77 6.4303 8.8625 3.6603 13.66zm-8.7257 5.001c-1.6758-0.01196-3.3739-0.43965-4.9346-1.3407-4.7978-2.77-6.4303-8.8625-3.6603-13.66 0.90105-1.5607 2.1578-2.7802 3.6031-3.6284l0.31276 1.1673 0.0034-8.624e-4 1.294 4.8292-1.2073 0.32349-1.134-4.2321c-0.68909 0.60862-1.303 1.3241-1.7894 2.1666-2.4237 4.1981-0.99534 9.529 3.2027 11.953 1.2584 0.72655 2.6186 1.0993 3.9718 1.1627z" color="#eff0f1" fill="#eff0f1" stroke-width="1.25"/>
+ <path class="ColorScheme-Text" d="m106.66 17.427c-1.1584 1.3805-2.6078 2.3632-4.1784 2.9476l-0.11374-1.3001 2e-3 -9.33e-4 -0.42636-4.8929 1.2451-0.10894 0.38063 4.3701c0.78167-0.47919 1.5082-1.0758 2.1318-1.819 3.1166-3.7131 2.6356-9.2111-1.0778-12.327-1.1131-0.93403-2.3879-1.5373-3.7096-1.8347l-0.11348-1.3001c1.6482 0.30272 3.2463 1.0188 4.6268 2.1772 4.2439 3.561 4.7936 9.8444 1.2326 14.088zm-9.4616 3.4098c-1.6483-0.30278-3.2463-1.0188-4.6268-2.1772-4.2439-3.561-4.7936-9.8444-1.2326-14.088 1.1584-1.3805 2.6078-2.3632 4.1784-2.9476l0.10532 1.2038 0.0035-2.589e-4 0.43574 4.9805-1.2451 0.10893-0.38186-4.3647c-0.7843 0.47971-1.5131 1.0777-2.1384 1.8229-3.1159 3.7134-2.6349 9.2114 1.0785 12.327 1.1131 0.93403 2.3879 1.5373 3.7096 1.8347z" color="#eff0f1" fill="#eff0f1" stroke-width="1.25"/>
+ <path class="ColorScheme-Text" d="m127.43 18.659c-1.3805 1.1584-2.9786 1.8745-4.6268 2.1772l0.11375-1.3001 3e-3 -7.5e-5 0.42975-4.8926 1.2451 0.10893-0.38401 4.3698c0.85301-0.33617 1.6721-0.79761 2.4152-1.4212 3.7134-3.1159 4.1944-8.6139 1.0785-12.327-0.93403-1.1131-2.0847-1.9286-3.3346-2.451l0.11374-1.3001c1.5706 0.58433 3.0201 1.5671 4.1784 2.9476 3.561 4.2439 3.0113 10.527-1.2326 14.088zm-9.9099 1.715c-1.5707-0.58441-3.02-1.5671-4.1784-2.9476-3.561-4.2439-3.0113-10.527 1.2326-14.088 1.3805-1.1584 2.9786-1.8745 4.6268-2.1772l-0.10532 1.2038 3e-3 -3.63e-5 -0.43573 4.9805-1.2451-0.10893 0.38187-4.3647c-0.85569 0.33623-1.6773 0.7986-2.4225 1.4239-3.7134 3.1159-4.1944 8.6139-1.0785 12.327 0.93404 1.1131 2.0847 1.9286 3.3346 2.451z" color="#eff0f1" fill="#eff0f1" stroke-width="1.25"/>
+ <path class="ColorScheme-Text" d="m148 19.659c-1.5607 0.90105-3.2588 1.3288-4.9346 1.3407l0.33779-1.2606 3e-3 4.82e-4 1.2728-4.7436 1.2073 0.32349-1.137 4.2367c0.89843-0.18294 1.7852-0.49514 2.6253-0.98019 4.1981-2.4238 5.6265-7.7547 3.2027-11.953-0.72655-1.2584-1.7181-2.2613-2.8583-2.9928l0.33779-1.2606c1.4453 0.84819 2.702 2.0677 3.6031 3.6284 2.77 4.7978 1.1375 10.89-3.6602 13.66zm-10.057-0.0319c-1.4453-0.84828-2.7021-2.0677-3.6031-3.6284-2.77-4.7978-1.1375-10.89 3.6603-13.66 1.5607-0.90105 3.2588-1.3288 4.9346-1.3407l-0.31276 1.1673 3e-3 5.12e-4 -1.294 4.8292-1.2073-0.32349 1.134-4.2321c-0.90107 0.18253-1.7905 0.49521-2.6329 0.98161-4.1981 2.4238-5.6265 7.7547-3.2027 11.953 0.72655 1.2584 1.7181 2.2613 2.8583 2.9928z" color="#eff0f1" fill="#eff0f1" stroke-width="1.25"/>
+ <path class="ColorScheme-Text" d="m168.42 20.395c-1.6934 0.61636-3.44 0.7427-5.0924 0.46345l0.55156-1.1828 3e-3 2e-3 2.0772-4.4505 1.1328 0.52822-1.8554 3.9749c0.91654-0.02415 1.8441-0.17762 2.7557-0.50941 4.5552-1.6579 6.8876-6.6598 5.2296-11.215-0.49699-1.3655-1.2993-2.5253-2.2952-3.4437l0.55156-1.1828c1.276 1.0863 2.302 2.5055 2.9183 4.1989 1.8948 5.2059-0.77083 10.922-5.9767 12.817zm-9.8988-1.7778c-1.2761-1.0864-2.302-2.5055-2.9183-4.1989-1.8948-5.2059 0.77083-10.922 5.9767-12.817 1.6934-0.61635 3.44-0.7427 5.0924-0.46345l-0.51071 1.0952 3e-3 0.00104-2.1129 4.5311-1.1328-0.52822 1.8516-3.9709c-0.91908 0.023289-1.8493 0.17678-2.7634 0.50949-4.5552 1.6579-6.8876 6.6598-5.2296 11.215 0.49699 1.3655 1.2994 2.5253 2.2952 3.4437z" color="#eff0f1" fill="#eff0f1" stroke-width="1.25"/>
+ <path class="ColorScheme-Text" d="m188.74 20.847c-1.7747 0.31293-3.5168 0.13406-5.0955-0.42787l0.74857-1.0691 3e-3 0.0015 2.8185-4.0222 1.0238 0.7169-2.5174 3.5923c0.90681 0.13537 1.8469 0.1453 2.8022-0.02316 4.7738-0.84176 7.9394-5.3626 7.0976-10.136-0.25233-1.431-0.84109-2.7126-1.6624-3.7899l0.74858-1.0691c1.068 1.2914 1.8319 2.8672 2.1448 4.6419 0.96201 5.4558-2.6558 10.623-8.1116 11.585zm-9.4397-3.4697c-1.068-1.2915-1.8319-2.8672-2.1448-4.6419-0.96201-5.4558 2.6558-10.623 8.1116-11.585 1.7747-0.31293 3.5168-0.13406 5.0955 0.42787l-0.69313 0.98989 3e-3 0.00253-2.8676 4.0954-1.0238-0.71689 2.513-3.589c-0.90916-0.13666-1.8519-0.14703-2.8099 0.021894-4.7739 0.84176-7.9394 5.3626-7.0976 10.136 0.25233 1.431 0.8411 2.7126 1.6624 3.7899z" color="#eff0f1" fill="#eff0f1" stroke-width="1.25"/>
+ <path class="ColorScheme-Text" d="m209 20.999c-1.8021 0-3.4866-0.47865-4.9438-1.3062l0.92285-0.92285 2e-3 2e-3 3.4741-3.4717 0.88379 0.88379-3.103 3.1006c0.86953 0.29078 1.7936 0.4638 2.7637 0.4638 4.8475 0 8.75-3.9025 8.75-8.75 0-1.4531-0.35728-2.8174-0.979-4.021l0.92285-0.92285c0.82756 1.4572 1.3062 3.1417 1.3062 4.9438 0 5.54-4.46 10-10 10zm-8.6938-5.0562c-0.82756-1.4573-1.3062-3.1417-1.3062-4.9438 0-5.54 4.46-10 10-10 1.8021 0 3.4866 0.47865 4.9438 1.3062l-0.85449 0.85449 2e-3 2e-3 -3.5352 3.5352-0.88379-0.88379 3.0981-3.0981c-0.87162-0.29246-1.7982-0.46637-2.771-0.46637-4.8475 0-8.75 3.9025-8.75 8.75 0 1.4531 0.35729 2.8174 0.979 4.021z" color="#eff0f1" fill="#eff0f1" stroke-width="1.25"/>
+ <path class="ColorScheme-Text" d="m229.26 20.847c-1.7747-0.31293-3.3505-1.0768-4.6419-2.1448l1.0691-0.74858 2e-3 0.0024 4.0242-2.8157 0.7169 1.0238-3.5943 2.5147c0.80583 0.43736 1.6858 0.76821 2.6412 0.93666 4.7739 0.84176 9.2947-2.3238 10.136-7.0976 0.25233-1.431 0.13738-2.8366-0.26589-4.1299l1.0691-0.74858c0.56195 1.5788 0.74081 3.3208 0.42788 5.0955-0.96201 5.4558-6.1287 9.0736-11.585 8.1116zm-7.6837-6.489c-0.56193-1.5789-0.7408-3.3208-0.42787-5.0955 0.96201-5.4558 6.1287-9.0736 11.585-8.1116 1.7747 0.31293 3.3505 1.0768 4.6419 2.1448l-0.98989 0.69313 2e-3 0.00239-4.0954 2.8676-0.71689-1.0238 3.589-2.5131c-0.80759-0.43937-1.6899-0.77154-2.6479-0.94046-4.7738-0.84176-9.2947 2.3238-10.136 7.0976-0.25232 1.431-0.13737 2.8366 0.26589 4.1299z" color="#eff0f1" fill="#eff0f1" stroke-width="1.25"/>
+ <path class="ColorScheme-Text" d="m249.58 20.395c-1.6934-0.61635-3.1126-1.6423-4.1989-2.9183l1.1828-0.55156 1e-3 0.0037 4.452-2.0741 0.52822 1.1328-3.9763 1.8523c0.71764 0.57064 1.5268 1.0493 2.4384 1.3811 4.5552 1.6579 9.557-0.67447 11.215-5.2296 0.49699-1.3655 0.62788-2.7697 0.45531-4.1133l1.1832-0.55159c0.27926 1.6524 0.1529 3.399-0.46346 5.0924-1.8948 5.2059-7.6112 7.8715-12.817 5.9767zm-6.4402-7.7247c-0.27922-1.6525-0.1529-3.399 0.46346-5.0924 1.8948-5.2059 7.6112-7.8715 12.817-5.9767 1.6934 0.61635 3.1126 1.6423 4.1989 2.9183l-1.0952 0.51071 2e-3 0.00271-4.5311 2.1129-0.52822-1.1328 3.9709-1.8516c-0.71902-0.57293-1.5302-1.0533-2.4444-1.386-4.5552-1.6579-9.557 0.67447-11.215 5.2296-0.49699 1.3655-0.62787 2.7697-0.45531 4.1133z" color="#eff0f1" fill="#eff0f1" stroke-width="1.25"/>
+ <path class="ColorScheme-Text" d="m270 19.659c-1.5607-0.90105-2.7802-2.1578-3.6284-3.6031l1.2606-0.33779 1e-3 3e-3 4.7445-1.2695 0.32349 1.2073-4.2376 1.1337c0.60765 0.68659 1.3214 1.2985 2.1615 1.7835 4.1981 2.4238 9.529 0.99534 11.953-3.2027 0.72655-1.2584 1.0993-2.6186 1.1627-3.9718l1.2606-0.33779c-0.0119 1.6758-0.43965 3.3739-1.3407 4.9346-2.77 4.7978-8.8625 6.4303-13.66 3.6603zm-5.001-8.7257c0.012-1.6758 0.43964-3.3739 1.3407-4.9346 2.77-4.7978 8.8625-6.4303 13.66-3.6603 1.5607 0.90105 2.7802 2.1578 3.6284 3.6031l-1.1672 0.31276 1e-3 0.00295-4.8292 1.294-0.32349-1.2073 4.2321-1.134c-0.60861-0.68909-1.3241-1.303-2.1666-1.7894-4.1981-2.4237-9.529-0.99534-11.953 3.2027-0.72655 1.2584-1.0993 2.6186-1.1627 3.9718z" color="#eff0f1" fill="#eff0f1" stroke-width="1.25"/>
+ <path class="ColorScheme-Text" d="m290.57 18.659c-1.3805-1.1584-2.3632-2.6078-2.9476-4.1784l1.3001-0.11375 6.3e-4 0.0031 4.8929-0.42637 0.10893 1.2451-4.3701 0.38063c0.47919 0.78167 1.0758 1.5082 1.819 2.1318 3.7134 3.1159 9.2114 2.6349 12.327-1.0785 0.93404-1.1131 1.5373-2.3879 1.8347-3.7096l1.3002-0.11375c-0.30273 1.6482-1.0188 3.2463-2.1772 4.6268-3.561 4.2439-9.8444 4.7936-14.088 1.2326zm-3.4098-9.4615c0.30278-1.6483 1.0188-3.2463 2.1772-4.6268 3.561-4.2439 9.8444-4.7936 14.088-1.2326 1.3805 1.1584 2.3632 2.6078 2.9476 4.1784l-1.2038 0.10532-6e-5 0.00387-4.9805 0.43574-0.10893-1.2451 4.3647-0.38186c-0.47971-0.7843-1.0777-1.5131-1.8229-2.1384-3.7134-3.1159-9.2114-2.6349-12.327 1.0785-0.93404 1.1131-1.5373 2.3879-1.8347 3.7096z" color="#eff0f1" fill="#eff0f1" stroke-width="1.25"/>
+ <path class="ColorScheme-Text" d="m311.34 17.426c-1.1584-1.3805-1.8745-2.9786-2.1772-4.6268l1.3001 0.11375 7e-5 0.0032 4.8926 0.42975-0.10893 1.2451-4.3698-0.38401c0.33617 0.85301 0.79761 1.6721 1.4212 2.4152 3.1159 3.7134 8.6139 4.1944 12.327 1.0785 1.1131-0.93403 1.9286-2.0847 2.451-3.3346l1.3001 0.11375c-0.58434 1.5706-1.5671 3.0201-2.9476 4.1784-4.2439 3.561-10.527 3.0113-14.088-1.2326zm-1.715-9.9099c0.58441-1.5707 1.5671-3.0201 2.9476-4.1784 4.2439-3.561 10.527-3.0113 14.088 1.2326 1.1584 1.3805 1.8745 2.9786 2.1772 4.6268l-1.2038-0.10532 3e-5 0.00315-4.9805-0.43574 0.10893-1.2451 4.3647 0.38186c-0.33623-0.85569-0.7986-1.6773-1.4239-2.4225-3.1159-3.7134-8.6139-4.1944-12.327-1.0785-1.1131 0.93403-1.9286 2.0847-2.451 3.3346z" color="#eff0f1" fill="#eff0f1" stroke-width="1.25"/>
+ <path class="ColorScheme-Text" d="m332.34 15.999c-0.90105-1.5607-1.3288-3.2588-1.3407-4.9346l1.2606 0.33779-4.8e-4 0.0032 4.7436 1.2728-0.32349 1.2073-4.2367-1.137c0.18294 0.89842 0.49514 1.7852 0.98019 2.6253 2.4238 4.1981 7.7547 5.6265 11.953 3.2027 1.2584-0.72655 2.2613-1.7181 2.9928-2.8583l1.2606 0.33779c-0.84819 1.4453-2.0677 2.7021-3.6284 3.6031-4.7978 2.77-10.89 1.1375-13.66-3.6603zm0.0319-10.057c0.84827-1.4453 2.0677-2.7021 3.6284-3.6031 4.7978-2.77 10.89-1.1375 13.66 3.6603 0.90105 1.5607 1.3288 3.2588 1.3407 4.9346l-1.1672-0.31276-5.1e-4 0.0031-4.8292-1.294 0.32349-1.2073 4.2321 1.134c-0.18254-0.90106-0.49521-1.7905-0.98161-2.6329-2.4238-4.1981-7.7547-5.6265-11.953-3.2027-1.2584 0.72655-2.2613 1.7181-2.9928 2.8583z" color="#eff0f1" fill="#eff0f1" stroke-width="1.25"/>
+ <path class="ColorScheme-Text" d="m353.6 14.419c-0.61635-1.6934-0.7427-3.44-0.46345-5.0924l1.1828 0.55156-1e-3 0.00303 4.4506 2.0772-0.52822 1.1328-3.9749-1.8554c0.0242 0.91654 0.17762 1.8441 0.50941 2.7557 1.6579 4.5552 6.6598 6.8876 11.215 5.2296 1.3655-0.49699 2.5253-1.2993 3.4437-2.2952l1.1828 0.55156c-1.0863 1.276-2.5055 2.302-4.1989 2.9183-5.2059 1.8948-10.922-0.77083-12.817-5.9767zm1.7778-9.8988c1.0864-1.2761 2.5055-2.302 4.1989-2.9183 5.2059-1.8948 10.922 0.77083 12.817 5.9767 0.61636 1.6934 0.74271 3.44 0.46346 5.0924l-1.0952-0.5107-1e-3 3e-3 -4.5311-2.1129 0.52822-1.1328 3.9709 1.8516c-0.0233-0.91908-0.17678-1.8493-0.50949-2.7634-1.6579-4.5552-6.6598-6.8876-11.215-5.2296-1.3655 0.49699-2.5253 1.2994-3.4437 2.2952z" color="#eff0f1" fill="#eff0f1" stroke-width="1.25"/>
+ <path class="ColorScheme-Text" d="m375.15 12.735c-0.31294-1.7747-0.13407-3.5167 0.42787-5.0955l1.0691 0.74858-2e-3 0.00281 4.0222 2.8185-0.71689 1.0238-3.5923-2.5174c-0.13537 0.90681-0.14529 1.8469 0.0232 2.8023 0.84176 4.7739 5.3626 7.9394 10.136 7.0976 1.431-0.25233 2.7126-0.84109 3.7899-1.6624l1.0691 0.74858c-1.2914 1.068-2.8672 1.8319-4.6419 2.1448-5.4558 0.96201-10.623-2.6558-11.585-8.1116zm3.4697-9.4397c1.2914-1.068 2.8672-1.8319 4.6419-2.1448 5.4558-0.96201 10.623 2.6558 11.585 8.1116 0.31293 1.7747 0.13406 3.5167-0.42787 5.0955l-0.98989-0.69313-2e-3 0.0028-4.0954-2.8676 0.71689-1.0238 3.589 2.5131c0.13666-0.90916 0.14703-1.8519-0.0219-2.8099-0.84176-4.7739-5.3626-7.9394-10.136-7.0976-1.431 0.25233-2.7126 0.8411-3.7899 1.6624z" color="#eff0f1" fill="#eff0f1" stroke-width="1.25"/>
+</svg>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/eric6/icons/breeze-light/calliope_mini.svg	Sat May 02 13:51:07 2020 +0200
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg id="svg8" width="48" height="48" version="1.1" viewBox="0 0 12.7 12.7" xmlns="http://www.w3.org/2000/svg">
+ <g id="layer1" transform="translate(0,-284.3)">
+  <g id="calliopemini" transform="matrix(.33591 0 0 .33591 -12.382 267.63)">
+   <g id="g973">
+    <path id="platine" d="m38.798 67.76c0.16655-0.36884 0.13639-0.31744 0.78203-0.85588s2.13-0.94191 3.2923-2.0634 2.6412-3.4107 3.1557-5.1168c0.51449-1.706 0.22218-3.5224 0.15452-4.6788-0.06765-1.1564 0.82562-1.4991 0.82562-1.4991s0.39807-0.27578 1.137-0.14823c0.73894 0.12756 0.96948 0.28462 1.8446 0.86531 0.8751 0.58068 2.1854 1.188 3.3079 1.4782 1.1225 0.29019 2.5572 0.35641 3.7706 0.21371 1.2134-0.1427 2.2616-0.78078 3.1435-1.2187 0.88195-0.4379 1.8228-1.2698 2.5131-1.4337 0.69031-0.16388 1.1315 0.0049 1.5602 0.21547 0.4287 0.21055 0.58639 0.381 0.82155 1.0126 0.23516 0.63165-0.02661 2.021 0.08822 3.1872 0.11483 1.1662 0.37648 2.5832 0.90806 3.7466 0.53158 1.1634 1.4626 2.1655 2.2986 2.9814s1.8155 1.4402 2.8207 1.929c1.0052 0.4888 1.1517 0.5548 1.4891 1.0236 0.33739 0.46884 0.41624 1.0274 0.186 1.6327-0.23025 0.60535-1.9239 1.3796-2.7725 1.8917-0.84866 0.51214-2.4034 1.8925-3.3778 3.3637-0.97437 1.4712-1.2709 3.701-1.4377 5.1008-0.16684 1.3998 0.41985 2.3275 0.02475 3.0778-0.39509 0.75026-1.032 1.0483-1.7873 1.1132s-1.6942-0.72885-2.2072-1.0413c-0.51304-0.31241-1.3535-0.79254-2.0928-0.96544-0.73928-0.1729-1.7546-0.25-2.1638-0.55844-0.4092-0.30843-0.26974-0.53758-0.42563-0.72475-0.15589-0.18717-0.27842-0.33191-0.46973-0.40616-0.19131-0.07425-0.37465-0.08732-0.55733-0.02498-0.18268 0.06234-0.35439 0.16138-0.4765 0.35499-0.12211 0.1936 0.0109 0.38462-0.29873 0.67729s-0.85168 0.16943-1.5996 0.44295c-0.74792 0.27352-2.0844 0.88026-2.833 1.3029-0.74857 0.42264-1.083 1-1.687 1.1465s-1.1856-0.0329-1.6588-0.37621c-0.47319-0.3433-0.69523-1.5039-0.69454-1.8484 6.87e-4 -0.34444 0.15832-2.1253-0.13233-3.4795-0.29066-1.3542-0.77801-2.7839-1.4721-3.8512-0.69412-1.0673-1.6371-1.8297-2.4927-2.4801-0.85555-0.65035-1.9588-0.95914-2.5482-1.4493-0.5894-0.49021-0.93222-0.80777-1.0752-1.2759s-0.03019-0.8929 0.13636-1.2617z" fill="#232629" stroke-width=".051193px"></path>
+    <ellipse id="ecke_minus" cx="47.8" cy="54.944" rx="1.7186" ry="1.6918" fill="#eee489" stroke-width=".088711"></ellipse>
+    <ellipse id="path4302-6" cx="47.774" cy="54.905" rx=".77659" ry=".76448" fill="#eff0f1"/>
+    <ellipse id="ecke_plus" cx="63.398" cy="54.857" rx="1.7186" ry="1.6918" fill="#eee489" stroke-width=".088711"></ellipse>
+    <ellipse id="path4302-6-9" cx="63.371" cy="54.819" rx=".77659" ry=".76448" fill="#eff0f1"/>
+    <ellipse id="ecke_p3" cx="71.374" cy="68.31" rx="1.7186" ry="1.6918" fill="#eee489" stroke-width=".088711"></ellipse>
+    <ellipse id="path4302-6-2" cx="71.348" cy="68.272" rx=".77659" ry=".76448" fill="#eff0f1"/>
+    <ellipse id="ecke_p2" cx="63.748" cy="81.92" rx="1.7186" ry="1.6918" fill="#eee489" stroke-width=".088711"></ellipse>
+    <ellipse id="path4302-6-0" cx="63.722" cy="81.882" rx=".77659" ry=".76448" fill="#eff0f1"/>
+    <ellipse id="ecke_p1" cx="48.2" cy="82.192" rx="1.7186" ry="1.6918" fill="#eee489" stroke-width=".088711"></ellipse>
+    <ellipse id="path4302-6-3" cx="48.173" cy="82.154" rx=".77659" ry=".76448" fill="#eff0f1"/>
+    <ellipse id="ecke_p0" cx="40.155" cy="68.515" rx="1.7186" ry="1.6918" fill="#eee489" stroke-width=".088711"></ellipse>
+    <ellipse id="path4302-6-6" cx="40.128" cy="68.477" rx=".77659" ry=".76448" fill="#eff0f1"/>
+    <rect id="usb" x="54.657" y="55.959" width="2.4755" height="2.5545" fill="#eff0f1" stroke-width=".051193"></rect>
+    <g id="ledmatrix" transform="matrix(.19368 0 0 .19329 34.504 31.838)" fill="#eff0f1">
+     <rect id="rect4410" x="110.41" y="152.09" width="1.0636" height="4.4517"/>
+     <rect id="rect4410-2" x="110.41" y="160.82" width="1.0636" height="4.4517"/>
+     <rect id="rect4410-6" x="110.41" y="169.8" width="1.0636" height="4.4517"/>
+     <rect id="rect4410-2-1" x="110.41" y="178.53" width="1.0636" height="4.4517"/>
+     <rect id="rect4410-2-1-8" x="110.41" y="187.33" width="1.0636" height="4.4517"/>
+     <rect id="rect4410-7" x="119.02" y="152.09" width="1.0636" height="4.4517"/>
+     <rect id="rect4410-2-9" x="119.02" y="160.82" width="1.0636" height="4.4517"/>
+     <rect id="rect4410-6-2" x="119.02" y="169.8" width="1.0636" height="4.4517"/>
+     <rect id="rect4410-2-1-0" x="119.02" y="178.53" width="1.0636" height="4.4517"/>
+     <rect id="rect4410-2-1-8-2" x="119.02" y="187.33" width="1.0636" height="4.4517"/>
+     <rect id="rect4410-7-3" x="101.41" y="152.09" width="1.0636" height="4.4517"/>
+     <rect id="rect4410-2-9-7" x="101.41" y="160.82" width="1.0636" height="4.4517"/>
+     <rect id="rect4410-6-2-5" x="101.41" y="169.8" width="1.0636" height="4.4517"/>
+     <rect id="rect4410-2-1-0-9" x="101.41" y="178.53" width="1.0636" height="4.4517"/>
+     <rect id="rect4410-2-1-8-2-2" x="101.41" y="187.33" width="1.0636" height="4.4517"/>
+     <rect id="rect4410-7-2" x="127.83" y="152.09" width="1.0636" height="4.4517"/>
+     <rect id="rect4410-2-9-8" x="127.83" y="160.82" width="1.0636" height="4.4517"/>
+     <rect id="rect4410-6-2-9" x="127.83" y="169.8" width="1.0636" height="4.4517"/>
+     <rect id="rect4410-2-1-0-7" x="127.83" y="178.53" width="1.0636" height="4.4517"/>
+     <rect id="rect4410-2-1-8-2-3" x="127.83" y="187.33" width="1.0636" height="4.4517"/>
+     <rect id="rect4410-7-2-6" x="92.604" y="152.09" width="1.0636" height="4.4517"/>
+     <rect id="rect4410-2-9-8-1" x="92.604" y="160.82" width="1.0636" height="4.4517"/>
+     <rect id="rect4410-6-2-9-2" x="92.604" y="169.8" width="1.0636" height="4.4517"/>
+     <rect id="rect4410-2-1-0-7-9" x="92.604" y="178.53" width="1.0636" height="4.4517"/>
+     <rect id="rect4410-2-1-8-2-3-3" x="92.604" y="187.33" width="1.0636" height="4.4517"/>
+    </g>
+   </g>
+  </g>
+ </g>
+</svg>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/eric6/icons/breeze-light/loadingAnimation.svg	Sat May 02 13:51:07 2020 +0200
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="396" height="22" version="1.1" viewBox="0 0 396 22" xmlns="http://www.w3.org/2000/svg">
+ <defs>
+  <style type="text/css">.ColorScheme-Text {
+        color:#eff0f1;
+      }</style>
+ </defs>
+ <path class="ColorScheme-Text" d="m21 10.999c0 1.8021-0.47865 3.4866-1.3062 4.9438l-0.92285-0.92285 0.0025-0.0025-3.4717-3.4741 0.88379-0.88379 3.1006 3.103c0.29078-0.86953 0.4638-1.7936 0.4638-2.7637 0-4.8475-3.9025-8.75-8.75-8.75-1.4531 0-2.8174 0.35728-4.021 0.979l-0.92285-0.92285c1.4572-0.82756 3.1417-1.3062 4.9438-1.3062 5.54 0 10 4.46 10 10zm-5.0562 8.6938c-1.4573 0.82756-3.1417 1.3062-4.9438 1.3062-5.54 0-10-4.46-10-10 0-1.8021 0.47865-3.4866 1.3062-4.9438l0.85449 0.85449 0.0025-0.00244 3.5352 3.5352-0.88379 0.88379-3.0981-3.0981c-0.29246 0.87162-0.46637 1.7982-0.46637 2.771 0 4.8475 3.9025 8.75 8.75 8.75 1.4531 0 2.8174-0.35729 4.021-0.979z" color="#eff0f1" fill="#232629" stroke-width="1.25"/>
+ <path class="ColorScheme-Text" d="m42.848 12.735c-0.31293 1.7747-1.0768 3.3505-2.1448 4.6419l-0.74858-1.0691 0.0029-2e-3 -2.8157-4.0242 1.0238-0.7169 2.5147 3.5943c0.43736-0.80583 0.76821-1.6858 0.93667-2.6412 0.84176-4.7739-2.3238-9.2948-7.0977-10.137-1.431-0.25233-2.8366-0.13738-4.1299 0.26589l-0.74858-1.0691c1.5788-0.56195 3.3208-0.74081 5.0955-0.42787 5.4558 0.96201 9.0736 6.1287 8.1116 11.585zm-6.489 7.6837c-1.5789 0.56193-3.3208 0.7408-5.0955 0.42787-5.4558-0.96201-9.0736-6.1287-8.1116-11.585 0.31293-1.7747 1.0768-3.3505 2.1448-4.6419l0.69313 0.98989 0.0029-0.00197 2.8676 4.0954-1.0238 0.7169-2.5131-3.589c-0.43937 0.80759-0.77154 1.6899-0.94046 2.6479-0.84176 4.7739 2.3238 9.2947 7.0976 10.136 1.431 0.25233 2.8366 0.13737 4.1299-0.26589z" color="#eff0f1" fill="#232629" stroke-width="1.25"/>
+ <path class="ColorScheme-Text" d="m64.397 14.419c-0.61635 1.6934-1.6423 3.1126-2.9183 4.1989l-0.55156-1.1828 0.0032-0.0015-2.0741-4.452 1.1328-0.52822 1.8523 3.9763c0.57064-0.71764 1.0493-1.5268 1.3811-2.4384 1.6579-4.5552-0.67447-9.557-5.2296-11.215-1.3655-0.49699-2.7697-0.62787-4.1133-0.4553l-0.55156-1.1828c1.6524-0.27926 3.399-0.1529 5.0924 0.46345 5.2059 1.8948 7.8715 7.6112 5.9767 12.817zm-7.7247 6.4402c-1.6525 0.27923-3.399 0.1529-5.0924-0.46345-5.2059-1.8948-7.8715-7.6112-5.9767-12.817 0.61635-1.6934 1.6423-3.1126 2.9183-4.1989l0.5107 1.0952 0.0032-0.00144 2.1129 4.5311-1.1328 0.52822-1.8516-3.9709c-0.57293 0.71903-1.0533 1.5302-1.386 2.4444-1.6579 4.5552 0.67448 9.557 5.2296 11.215 1.3655 0.49699 2.7697 0.62786 4.1133 0.4553z" color="#eff0f1" fill="#232629" stroke-width="1.25"/>
+ <path class="ColorScheme-Text" d="m85.66 15.999c-0.90105 1.5607-2.1578 2.7802-3.6031 3.6284l-0.33779-1.2606 0.0034-9.22e-4 -1.2695-4.7445 1.2073-0.32349 1.1337 4.2376c0.68659-0.60764 1.2985-1.3214 1.7835-2.1615 2.4238-4.1981 0.99535-9.529-3.2027-11.953-1.2584-0.72655-2.6186-1.0993-3.9718-1.1627l-0.33779-1.2606c1.6758 0.011912 3.3739 0.43965 4.9346 1.3407 4.7978 2.77 6.4303 8.8625 3.6603 13.66zm-8.7257 5.001c-1.6758-0.01196-3.3739-0.43965-4.9346-1.3407-4.7978-2.77-6.4303-8.8625-3.6603-13.66 0.90105-1.5607 2.1578-2.7802 3.6031-3.6284l0.31276 1.1673 0.0034-8.624e-4 1.294 4.8292-1.2073 0.32349-1.134-4.2321c-0.68909 0.60862-1.303 1.3241-1.7894 2.1666-2.4237 4.1981-0.99534 9.529 3.2027 11.953 1.2584 0.72655 2.6186 1.0993 3.9718 1.1627z" color="#eff0f1" fill="#232629" stroke-width="1.25"/>
+ <path class="ColorScheme-Text" d="m106.66 17.427c-1.1584 1.3805-2.6078 2.3632-4.1784 2.9476l-0.11374-1.3001 2e-3 -9.33e-4 -0.42636-4.8929 1.2451-0.10894 0.38063 4.3701c0.78167-0.47919 1.5082-1.0758 2.1318-1.819 3.1166-3.7131 2.6356-9.2111-1.0778-12.327-1.1131-0.93403-2.3879-1.5373-3.7096-1.8347l-0.11348-1.3001c1.6482 0.30272 3.2463 1.0188 4.6268 2.1772 4.2439 3.561 4.7936 9.8444 1.2326 14.088zm-9.4616 3.4098c-1.6483-0.30278-3.2463-1.0188-4.6268-2.1772-4.2439-3.561-4.7936-9.8444-1.2326-14.088 1.1584-1.3805 2.6078-2.3632 4.1784-2.9476l0.10532 1.2038 0.0035-2.589e-4 0.43574 4.9805-1.2451 0.10893-0.38186-4.3647c-0.7843 0.47971-1.5131 1.0777-2.1384 1.8229-3.1159 3.7134-2.6349 9.2114 1.0785 12.327 1.1131 0.93403 2.3879 1.5373 3.7096 1.8347z" color="#eff0f1" fill="#232629" stroke-width="1.25"/>
+ <path class="ColorScheme-Text" d="m127.43 18.659c-1.3805 1.1584-2.9786 1.8745-4.6268 2.1772l0.11375-1.3001 3e-3 -7.5e-5 0.42975-4.8926 1.2451 0.10893-0.38401 4.3698c0.85301-0.33617 1.6721-0.79761 2.4152-1.4212 3.7134-3.1159 4.1944-8.6139 1.0785-12.327-0.93403-1.1131-2.0847-1.9286-3.3346-2.451l0.11374-1.3001c1.5706 0.58433 3.0201 1.5671 4.1784 2.9476 3.561 4.2439 3.0113 10.527-1.2326 14.088zm-9.9099 1.715c-1.5707-0.58441-3.02-1.5671-4.1784-2.9476-3.561-4.2439-3.0113-10.527 1.2326-14.088 1.3805-1.1584 2.9786-1.8745 4.6268-2.1772l-0.10532 1.2038 3e-3 -3.63e-5 -0.43573 4.9805-1.2451-0.10893 0.38187-4.3647c-0.85569 0.33623-1.6773 0.7986-2.4225 1.4239-3.7134 3.1159-4.1944 8.6139-1.0785 12.327 0.93404 1.1131 2.0847 1.9286 3.3346 2.451z" color="#eff0f1" fill="#232629" stroke-width="1.25"/>
+ <path class="ColorScheme-Text" d="m148 19.659c-1.5607 0.90105-3.2588 1.3288-4.9346 1.3407l0.33779-1.2606 3e-3 4.82e-4 1.2728-4.7436 1.2073 0.32349-1.137 4.2367c0.89843-0.18294 1.7852-0.49514 2.6253-0.98019 4.1981-2.4238 5.6265-7.7547 3.2027-11.953-0.72655-1.2584-1.7181-2.2613-2.8583-2.9928l0.33779-1.2606c1.4453 0.84819 2.702 2.0677 3.6031 3.6284 2.77 4.7978 1.1375 10.89-3.6602 13.66zm-10.057-0.0319c-1.4453-0.84828-2.7021-2.0677-3.6031-3.6284-2.77-4.7978-1.1375-10.89 3.6603-13.66 1.5607-0.90105 3.2588-1.3288 4.9346-1.3407l-0.31276 1.1673 3e-3 5.12e-4 -1.294 4.8292-1.2073-0.32349 1.134-4.2321c-0.90107 0.18253-1.7905 0.49521-2.6329 0.98161-4.1981 2.4238-5.6265 7.7547-3.2027 11.953 0.72655 1.2584 1.7181 2.2613 2.8583 2.9928z" color="#eff0f1" fill="#232629" stroke-width="1.25"/>
+ <path class="ColorScheme-Text" d="m168.42 20.395c-1.6934 0.61636-3.44 0.7427-5.0924 0.46345l0.55156-1.1828 3e-3 2e-3 2.0772-4.4505 1.1328 0.52822-1.8554 3.9749c0.91654-0.02415 1.8441-0.17762 2.7557-0.50941 4.5552-1.6579 6.8876-6.6598 5.2296-11.215-0.49699-1.3655-1.2993-2.5253-2.2952-3.4437l0.55156-1.1828c1.276 1.0863 2.302 2.5055 2.9183 4.1989 1.8948 5.2059-0.77083 10.922-5.9767 12.817zm-9.8988-1.7778c-1.2761-1.0864-2.302-2.5055-2.9183-4.1989-1.8948-5.2059 0.77083-10.922 5.9767-12.817 1.6934-0.61635 3.44-0.7427 5.0924-0.46345l-0.51071 1.0952 3e-3 0.00104-2.1129 4.5311-1.1328-0.52822 1.8516-3.9709c-0.91908 0.023289-1.8493 0.17678-2.7634 0.50949-4.5552 1.6579-6.8876 6.6598-5.2296 11.215 0.49699 1.3655 1.2994 2.5253 2.2952 3.4437z" color="#eff0f1" fill="#232629" stroke-width="1.25"/>
+ <path class="ColorScheme-Text" d="m188.74 20.847c-1.7747 0.31293-3.5168 0.13406-5.0955-0.42787l0.74857-1.0691 3e-3 0.0015 2.8185-4.0222 1.0238 0.7169-2.5174 3.5923c0.90681 0.13537 1.8469 0.1453 2.8022-0.02316 4.7738-0.84176 7.9394-5.3626 7.0976-10.136-0.25233-1.431-0.84109-2.7126-1.6624-3.7899l0.74858-1.0691c1.068 1.2914 1.8319 2.8672 2.1448 4.6419 0.96201 5.4558-2.6558 10.623-8.1116 11.585zm-9.4397-3.4697c-1.068-1.2915-1.8319-2.8672-2.1448-4.6419-0.96201-5.4558 2.6558-10.623 8.1116-11.585 1.7747-0.31293 3.5168-0.13406 5.0955 0.42787l-0.69313 0.98989 3e-3 0.00253-2.8676 4.0954-1.0238-0.71689 2.513-3.589c-0.90916-0.13666-1.8519-0.14703-2.8099 0.021894-4.7739 0.84176-7.9394 5.3626-7.0976 10.136 0.25233 1.431 0.8411 2.7126 1.6624 3.7899z" color="#eff0f1" fill="#232629" stroke-width="1.25"/>
+ <path class="ColorScheme-Text" d="m209 20.999c-1.8021 0-3.4866-0.47865-4.9438-1.3062l0.92285-0.92285 2e-3 2e-3 3.4741-3.4717 0.88379 0.88379-3.103 3.1006c0.86953 0.29078 1.7936 0.4638 2.7637 0.4638 4.8475 0 8.75-3.9025 8.75-8.75 0-1.4531-0.35728-2.8174-0.979-4.021l0.92285-0.92285c0.82756 1.4572 1.3062 3.1417 1.3062 4.9438 0 5.54-4.46 10-10 10zm-8.6938-5.0562c-0.82756-1.4573-1.3062-3.1417-1.3062-4.9438 0-5.54 4.46-10 10-10 1.8021 0 3.4866 0.47865 4.9438 1.3062l-0.85449 0.85449 2e-3 2e-3 -3.5352 3.5352-0.88379-0.88379 3.0981-3.0981c-0.87162-0.29246-1.7982-0.46637-2.771-0.46637-4.8475 0-8.75 3.9025-8.75 8.75 0 1.4531 0.35729 2.8174 0.979 4.021z" color="#eff0f1" fill="#232629" stroke-width="1.25"/>
+ <path class="ColorScheme-Text" d="m229.26 20.847c-1.7747-0.31293-3.3505-1.0768-4.6419-2.1448l1.0691-0.74858 2e-3 0.0024 4.0242-2.8157 0.7169 1.0238-3.5943 2.5147c0.80583 0.43736 1.6858 0.76821 2.6412 0.93666 4.7739 0.84176 9.2947-2.3238 10.136-7.0976 0.25233-1.431 0.13738-2.8366-0.26589-4.1299l1.0691-0.74858c0.56195 1.5788 0.74081 3.3208 0.42788 5.0955-0.96201 5.4558-6.1287 9.0736-11.585 8.1116zm-7.6837-6.489c-0.56193-1.5789-0.7408-3.3208-0.42787-5.0955 0.96201-5.4558 6.1287-9.0736 11.585-8.1116 1.7747 0.31293 3.3505 1.0768 4.6419 2.1448l-0.98989 0.69313 2e-3 0.00239-4.0954 2.8676-0.71689-1.0238 3.589-2.5131c-0.80759-0.43937-1.6899-0.77154-2.6479-0.94046-4.7738-0.84176-9.2947 2.3238-10.136 7.0976-0.25232 1.431-0.13737 2.8366 0.26589 4.1299z" color="#eff0f1" fill="#232629" stroke-width="1.25"/>
+ <path class="ColorScheme-Text" d="m249.58 20.395c-1.6934-0.61635-3.1126-1.6423-4.1989-2.9183l1.1828-0.55156 1e-3 0.0037 4.452-2.0741 0.52822 1.1328-3.9763 1.8523c0.71764 0.57064 1.5268 1.0493 2.4384 1.3811 4.5552 1.6579 9.557-0.67447 11.215-5.2296 0.49699-1.3655 0.62788-2.7697 0.45531-4.1133l1.1832-0.55159c0.27926 1.6524 0.1529 3.399-0.46346 5.0924-1.8948 5.2059-7.6112 7.8715-12.817 5.9767zm-6.4402-7.7247c-0.27922-1.6525-0.1529-3.399 0.46346-5.0924 1.8948-5.2059 7.6112-7.8715 12.817-5.9767 1.6934 0.61635 3.1126 1.6423 4.1989 2.9183l-1.0952 0.51071 2e-3 0.00271-4.5311 2.1129-0.52822-1.1328 3.9709-1.8516c-0.71902-0.57293-1.5302-1.0533-2.4444-1.386-4.5552-1.6579-9.557 0.67447-11.215 5.2296-0.49699 1.3655-0.62787 2.7697-0.45531 4.1133z" color="#eff0f1" fill="#232629" stroke-width="1.25"/>
+ <path class="ColorScheme-Text" d="m270 19.659c-1.5607-0.90105-2.7802-2.1578-3.6284-3.6031l1.2606-0.33779 1e-3 3e-3 4.7445-1.2695 0.32349 1.2073-4.2376 1.1337c0.60765 0.68659 1.3214 1.2985 2.1615 1.7835 4.1981 2.4238 9.529 0.99534 11.953-3.2027 0.72655-1.2584 1.0993-2.6186 1.1627-3.9718l1.2606-0.33779c-0.0119 1.6758-0.43965 3.3739-1.3407 4.9346-2.77 4.7978-8.8625 6.4303-13.66 3.6603zm-5.001-8.7257c0.012-1.6758 0.43964-3.3739 1.3407-4.9346 2.77-4.7978 8.8625-6.4303 13.66-3.6603 1.5607 0.90105 2.7802 2.1578 3.6284 3.6031l-1.1672 0.31276 1e-3 0.00295-4.8292 1.294-0.32349-1.2073 4.2321-1.134c-0.60861-0.68909-1.3241-1.303-2.1666-1.7894-4.1981-2.4237-9.529-0.99534-11.953 3.2027-0.72655 1.2584-1.0993 2.6186-1.1627 3.9718z" color="#eff0f1" fill="#232629" stroke-width="1.25"/>
+ <path class="ColorScheme-Text" d="m290.57 18.659c-1.3805-1.1584-2.3632-2.6078-2.9476-4.1784l1.3001-0.11375 6.3e-4 0.0031 4.8929-0.42637 0.10893 1.2451-4.3701 0.38063c0.47919 0.78167 1.0758 1.5082 1.819 2.1318 3.7134 3.1159 9.2114 2.6349 12.327-1.0785 0.93404-1.1131 1.5373-2.3879 1.8347-3.7096l1.3002-0.11375c-0.30273 1.6482-1.0188 3.2463-2.1772 4.6268-3.561 4.2439-9.8444 4.7936-14.088 1.2326zm-3.4098-9.4615c0.30278-1.6483 1.0188-3.2463 2.1772-4.6268 3.561-4.2439 9.8444-4.7936 14.088-1.2326 1.3805 1.1584 2.3632 2.6078 2.9476 4.1784l-1.2038 0.10532-6e-5 0.00387-4.9805 0.43574-0.10893-1.2451 4.3647-0.38186c-0.47971-0.7843-1.0777-1.5131-1.8229-2.1384-3.7134-3.1159-9.2114-2.6349-12.327 1.0785-0.93404 1.1131-1.5373 2.3879-1.8347 3.7096z" color="#eff0f1" fill="#232629" stroke-width="1.25"/>
+ <path class="ColorScheme-Text" d="m311.34 17.426c-1.1584-1.3805-1.8745-2.9786-2.1772-4.6268l1.3001 0.11375 7e-5 0.0032 4.8926 0.42975-0.10893 1.2451-4.3698-0.38401c0.33617 0.85301 0.79761 1.6721 1.4212 2.4152 3.1159 3.7134 8.6139 4.1944 12.327 1.0785 1.1131-0.93403 1.9286-2.0847 2.451-3.3346l1.3001 0.11375c-0.58434 1.5706-1.5671 3.0201-2.9476 4.1784-4.2439 3.561-10.527 3.0113-14.088-1.2326zm-1.715-9.9099c0.58441-1.5707 1.5671-3.0201 2.9476-4.1784 4.2439-3.561 10.527-3.0113 14.088 1.2326 1.1584 1.3805 1.8745 2.9786 2.1772 4.6268l-1.2038-0.10532 3e-5 0.00315-4.9805-0.43574 0.10893-1.2451 4.3647 0.38186c-0.33623-0.85569-0.7986-1.6773-1.4239-2.4225-3.1159-3.7134-8.6139-4.1944-12.327-1.0785-1.1131 0.93403-1.9286 2.0847-2.451 3.3346z" color="#eff0f1" fill="#232629" stroke-width="1.25"/>
+ <path class="ColorScheme-Text" d="m332.34 15.999c-0.90105-1.5607-1.3288-3.2588-1.3407-4.9346l1.2606 0.33779-4.8e-4 0.0032 4.7436 1.2728-0.32349 1.2073-4.2367-1.137c0.18294 0.89842 0.49514 1.7852 0.98019 2.6253 2.4238 4.1981 7.7547 5.6265 11.953 3.2027 1.2584-0.72655 2.2613-1.7181 2.9928-2.8583l1.2606 0.33779c-0.84819 1.4453-2.0677 2.7021-3.6284 3.6031-4.7978 2.77-10.89 1.1375-13.66-3.6603zm0.0319-10.057c0.84827-1.4453 2.0677-2.7021 3.6284-3.6031 4.7978-2.77 10.89-1.1375 13.66 3.6603 0.90105 1.5607 1.3288 3.2588 1.3407 4.9346l-1.1672-0.31276-5.1e-4 0.0031-4.8292-1.294 0.32349-1.2073 4.2321 1.134c-0.18254-0.90106-0.49521-1.7905-0.98161-2.6329-2.4238-4.1981-7.7547-5.6265-11.953-3.2027-1.2584 0.72655-2.2613 1.7181-2.9928 2.8583z" color="#eff0f1" fill="#232629" stroke-width="1.25"/>
+ <path class="ColorScheme-Text" d="m353.6 14.419c-0.61635-1.6934-0.7427-3.44-0.46345-5.0924l1.1828 0.55156-1e-3 0.00303 4.4506 2.0772-0.52822 1.1328-3.9749-1.8554c0.0242 0.91654 0.17762 1.8441 0.50941 2.7557 1.6579 4.5552 6.6598 6.8876 11.215 5.2296 1.3655-0.49699 2.5253-1.2993 3.4437-2.2952l1.1828 0.55156c-1.0863 1.276-2.5055 2.302-4.1989 2.9183-5.2059 1.8948-10.922-0.77083-12.817-5.9767zm1.7778-9.8988c1.0864-1.2761 2.5055-2.302 4.1989-2.9183 5.2059-1.8948 10.922 0.77083 12.817 5.9767 0.61636 1.6934 0.74271 3.44 0.46346 5.0924l-1.0952-0.5107-1e-3 3e-3 -4.5311-2.1129 0.52822-1.1328 3.9709 1.8516c-0.0233-0.91908-0.17678-1.8493-0.50949-2.7634-1.6579-4.5552-6.6598-6.8876-11.215-5.2296-1.3655 0.49699-2.5253 1.2994-3.4437 2.2952z" color="#eff0f1" fill="#232629" stroke-width="1.25"/>
+ <path class="ColorScheme-Text" d="m375.15 12.735c-0.31294-1.7747-0.13407-3.5167 0.42787-5.0955l1.0691 0.74858-2e-3 0.00281 4.0222 2.8185-0.71689 1.0238-3.5923-2.5174c-0.13537 0.90681-0.14529 1.8469 0.0232 2.8023 0.84176 4.7739 5.3626 7.9394 10.136 7.0976 1.431-0.25233 2.7126-0.84109 3.7899-1.6624l1.0691 0.74858c-1.2914 1.068-2.8672 1.8319-4.6419 2.1448-5.4558 0.96201-10.623-2.6558-11.585-8.1116zm3.4697-9.4397c1.2914-1.068 2.8672-1.8319 4.6419-2.1448 5.4558-0.96201 10.623 2.6558 11.585 8.1116 0.31293 1.7747 0.13406 3.5167-0.42787 5.0955l-0.98989-0.69313-2e-3 0.0028-4.0954-2.8676 0.71689-1.0238 3.589 2.5131c0.13666-0.90916 0.14703-1.8519-0.0219-2.8099-0.84176-4.7739-5.3626-7.9394-10.136-7.0976-1.431 0.25233-2.7126 0.8411-3.7899 1.6624z" color="#eff0f1" fill="#232629" stroke-width="1.25"/>
+</svg>
Binary file eric6/icons/default/1downarrow.png has changed
Binary file eric6/icons/default/1leftarrow.png has changed
Binary file eric6/icons/default/1rightarrow.png has changed
Binary file eric6/icons/default/1uparrow.png has changed
Binary file eric6/icons/default/2downarrow.png has changed
Binary file eric6/icons/default/2leftarrow.png has changed
Binary file eric6/icons/default/2rightarrow.png has changed
Binary file eric6/icons/default/2uparrow.png has changed
--- a/eric6/icons/default/LICENSE.oxygen	Sun Apr 05 18:17:08 2020 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,48 +0,0 @@
-The Oxygen Icon Theme
-    Copyright (C) 2007 David Vignoni <david@icon-king.com>
-    Copyright (C) 2007 Johann Ollivier Lapeyre <johann@oxygen-icons.org>
-    Copyright (C) 2007 Kenneth Wimer <kwwii@bootsplash.org>
-    Copyright (C) 2007 Nuno Fernades Pinheiro <nf.pinheiro@gmail.com>
-    Copyright (C) 2007 Riccardo Iaconelli <riccardo@oxygen-icons.org>
-    Copyright (C) 2007 David Miller <miller@oxygen-icons.org>
-
-and others
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Library General Public
-    License as published by the Free Software Foundation; either
-    version 3 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Library General Public License for more details.
-
-    You should have received a copy of the GNU Library General Public
-    License along with this library. If not, see <http://www.gnu.org/licenses/>.
-
-Clarification:
-
-  The GNU Lesser General Public License or LGPL is written for
-  software libraries in the first place. We expressly want the LGPL to
-  be valid for this artwork library too.
-
-  KDE Oxygen theme icons is a special kind of software library, it is an
-  artwork library, it's elements can be used in a Graphical User Interface, or
-  GUI.
-
-  Source code, for this library means:
-   - where they exist, SVG;
-   - otherwise, if applicable, the multi-layered formats xcf or psd, or
-  otherwise png.
-
-  The LGPL in some sections obliges you to make the files carry
-  notices. With images this is in some cases impossible or hardly useful.
-
-  With this library a notice is placed at a prominent place in the directory
-  containing the elements. You may follow this practice.
-
-  The exception in section 5 of the GNU Lesser General Public License covers
-  the use of elements of this art library in a GUI.
-
-  kde-artists [at] kde.org
Binary file eric6/icons/default/actionsToolButton.png has changed
Binary file eric6/icons/default/adBlockAction.png has changed
Binary file eric6/icons/default/adBlockPlus.png has changed
Binary file eric6/icons/default/adBlockPlus48.png has changed
Binary file eric6/icons/default/adBlockPlusDisabled.png has changed
Binary file eric6/icons/default/adBlockPlusDisabled16.png has changed
Binary file eric6/icons/default/adBlockPlusGreen.png has changed
Binary file eric6/icons/default/adBlockPlusGreen16.png has changed
Binary file eric6/icons/default/adBlockPlusGreen48.png has changed
Binary file eric6/icons/default/addBookmark.png has changed
Binary file eric6/icons/default/addUser.png has changed
Binary file eric6/icons/default/altn.png has changed
Binary file eric6/icons/default/anychar.png has changed
Binary file eric6/icons/default/astTree.png has changed
Binary file eric6/icons/default/atomicgroup.png has changed
Binary file eric6/icons/default/attribute.png has changed
Binary file eric6/icons/default/attribute_class.png has changed
Binary file eric6/icons/default/attribute_private.png has changed
Binary file eric6/icons/default/attribute_protected.png has changed
Binary file eric6/icons/default/attributes.png has changed
Binary file eric6/icons/default/attributes_class.png has changed
Binary file eric6/icons/default/audio-video.png has changed
Binary file eric6/icons/default/audioMuted.png has changed
Binary file eric6/icons/default/audioPlaying.png has changed
Binary file eric6/icons/default/audioVolumeHigh.png has changed
Binary file eric6/icons/default/audioVolumeMuted.png has changed
Binary file eric6/icons/default/audiocapture.png has changed
Binary file eric6/icons/default/autoHideOff.png has changed
Binary file eric6/icons/default/autoHideOn.png has changed
Binary file eric6/icons/default/autospellchecking.png has changed
Binary file eric6/icons/default/back.png has changed
Binary file eric6/icons/default/begline.png has changed
Binary file eric6/icons/default/bookmark16.png has changed
Binary file eric6/icons/default/bookmark22.png has changed
Binary file eric6/icons/default/bookmark32.png has changed
Binary file eric6/icons/default/bookmarkNext.png has changed
Binary file eric6/icons/default/bookmarkPrevious.png has changed
Binary file eric6/icons/default/bookmarkToggle.png has changed
Binary file eric6/icons/default/break.png has changed
Binary file eric6/icons/default/breakDisabled.png has changed
Binary file eric6/icons/default/breakpointNext.png has changed
Binary file eric6/icons/default/breakpointPrevious.png has changed
Binary file eric6/icons/default/breakpointToggle.png has changed
Binary file eric6/icons/default/breakpoints.png has changed
Binary file eric6/icons/default/browser.png has changed
Binary file eric6/icons/default/cBreak.png has changed
Binary file eric6/icons/default/cBreakpointToggle.png has changed
Binary file eric6/icons/default/callReturn.png has changed
Binary file eric6/icons/default/callStack.png has changed
Binary file eric6/icons/default/callTrace.png has changed
Binary file eric6/icons/default/callTraceStart.png has changed
Binary file eric6/icons/default/callTraceStop.png has changed
Binary file eric6/icons/default/camera.png has changed
Binary file eric6/icons/default/cameraPhoto.png has changed
Binary file eric6/icons/default/certificateDelete.png has changed
Binary file eric6/icons/default/certificateExport.png has changed
Binary file eric6/icons/default/certificateImport.png has changed
Binary file eric6/icons/default/certificates.png has changed
Binary file eric6/icons/default/changeNext.png has changed
Binary file eric6/icons/default/changePrev.png has changed
Binary file eric6/icons/default/changesetSign.png has changed
Binary file eric6/icons/default/changesetSignList.png has changed
Binary file eric6/icons/default/changesetSignVerify.png has changed
Binary file eric6/icons/default/characters.png has changed
--- a/eric6/icons/default/chart.svg	Sun Apr 05 18:17:08 2020 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg viewBox="0 0 22 22" xmlns="http://www.w3.org/2000/svg">
- <defs>
-  <style type="text/css">.ColorScheme-Text {
-        color:#232629;
-      }
-      .ColorScheme-Highlight {
-        color:#3daee9;
-      }</style>
- </defs>
- <path class="ColorScheme-Text" d="m4 3v6 1 5 1 1h-1v1h1v1h1v-1h13.293 0.70703v-0.70703-0.29297h-0.29297l-3.5762-3.5762-0.003906 0.003906-0.005859-0.003906-2.123 2.123-4.123-4.123h-0.0019531-1.873-1-1v-0.42383-1h1 1 1.873 0.0019531l4.123-4.123 2.123 2.123 0.005859-0.0039062 0.003906 0.0039062 3.8691-3.8691-0.70703-0.70703-3.166 3.166-2.127-2.125-0.001953 0.0019531-0.001953-0.0019531-1.5273 1.5273h-6.4688v-0.99219-2h-1zm1 3h6.4609l-3 3h-1.4609-1-1v-3zm0 6.4238h1 1 1.4609l3 3h-6.4609v-0.42383-2.5762zm10.127 2.4102 2.166 2.166h-12.293v-1-0.56836h6.4688l1.5273 1.5273 0.001953-0.001953 0.001953 0.001953 2.127-2.125z" fill="currentColor"/>
-</svg>
Binary file eric6/icons/default/chatBanKickUser.png has changed
Binary file eric6/icons/default/chatBanUser.png has changed
Binary file eric6/icons/default/chatKickUser.png has changed
Binary file eric6/icons/default/chatUser.png has changed
Binary file eric6/icons/default/chatUser1.png has changed
Binary file eric6/icons/default/chatUser2.png has changed
Binary file eric6/icons/default/chatUser3.png has changed
Binary file eric6/icons/default/chatUser4.png has changed
Binary file eric6/icons/default/chatUser5.png has changed
Binary file eric6/icons/default/chatUser6.png has changed
Binary file eric6/icons/default/chrome.png has changed
Binary file eric6/icons/default/chromium.png has changed
Binary file eric6/icons/default/circuitPythonDevice.png has changed
Binary file eric6/icons/default/class.png has changed
Binary file eric6/icons/default/class_private.png has changed
Binary file eric6/icons/default/class_protected.png has changed
Binary file eric6/icons/default/clearLeft.png has changed
Binary file eric6/icons/default/clearPrivateData.png has changed
Binary file eric6/icons/default/clearRight.png has changed
Binary file eric6/icons/default/close.png has changed
Binary file eric6/icons/default/closeEditor.png has changed
Binary file eric6/icons/default/closehead.png has changed
Binary file eric6/icons/default/codeDocuViewer.png has changed
Binary file eric6/icons/default/colorPicker.png has changed
Binary file eric6/icons/default/comment.png has changed
Binary file eric6/icons/default/compareFiles.png has changed
Binary file eric6/icons/default/configure.png has changed
Binary file eric6/icons/default/configureExport.png has changed
Binary file eric6/icons/default/configureImport.png has changed
Binary file eric6/icons/default/configureShortcuts.png has changed
Binary file eric6/icons/default/configureViewProfiles.png has changed
Binary file eric6/icons/default/continue.png has changed
Binary file eric6/icons/default/continueToCursor.png has changed
Binary file eric6/icons/default/cookie.png has changed
Binary file eric6/icons/default/cooperation.png has changed
Binary file eric6/icons/default/cooperation48.png has changed
Binary file eric6/icons/default/corba48.png has changed
Binary file eric6/icons/default/coverageProject.png has changed
Binary file eric6/icons/default/coverageScript.png has changed
Binary file eric6/icons/default/currentLineMarker.png has changed
Binary file eric6/icons/default/databaseConnection.png has changed
Binary file eric6/icons/default/debug48.png has changed
Binary file eric6/icons/default/debugProject.png has changed
Binary file eric6/icons/default/debugRestart.png has changed
Binary file eric6/icons/default/debugScript.png has changed
Binary file eric6/icons/default/debugViewer.png has changed
Binary file eric6/icons/default/defaultIcon.png has changed
Binary file eric6/icons/default/deleteBookmark.png has changed
Binary file eric6/icons/default/deleteShape.png has changed
Binary file eric6/icons/default/designer4.png has changed
Binary file eric6/icons/default/designer48.png has changed
Binary file eric6/icons/default/desktopAudioVideoCapture.png has changed
Binary file eric6/icons/default/desktopVideoCapture.png has changed
Binary file eric6/icons/default/diffFiles.png has changed
Binary file eric6/icons/default/dirClosed.png has changed
Binary file eric6/icons/default/dirOpen.png has changed
Binary file eric6/icons/default/docstringError.png has changed
Binary file eric6/icons/default/documentFind.png has changed
Binary file eric6/icons/default/documentNewView.png has changed
Binary file eric6/icons/default/download.png has changed
Binary file eric6/icons/default/downloads.png has changed
Binary file eric6/icons/default/downloads48.png has changed
Binary file eric6/icons/default/drawBrush.png has changed
Binary file eric6/icons/default/drawCircle.png has changed
Binary file eric6/icons/default/drawCircleFilled.png has changed
Binary file eric6/icons/default/drawEllipse.png has changed
Binary file eric6/icons/default/drawEllipseFilled.png has changed
Binary file eric6/icons/default/drawEraser.png has changed
Binary file eric6/icons/default/drawFill.png has changed
Binary file eric6/icons/default/drawLine.png has changed
Binary file eric6/icons/default/drawRectangle.png has changed
Binary file eric6/icons/default/drawRectangleFilled.png has changed
Binary file eric6/icons/default/edit.png has changed
Binary file eric6/icons/default/editBookmarks.png has changed
Binary file eric6/icons/default/editComment.png has changed
Binary file eric6/icons/default/editCopy.png has changed
Binary file eric6/icons/default/editCut.png has changed
Binary file eric6/icons/default/editDelete.png has changed
Binary file eric6/icons/default/editIndent.png has changed
Binary file eric6/icons/default/editPaste.png has changed
Binary file eric6/icons/default/editRedo.png has changed
Binary file eric6/icons/default/editRename.png has changed
Binary file eric6/icons/default/editReplace.png has changed
Binary file eric6/icons/default/editReplaceAll.png has changed
Binary file eric6/icons/default/editReplaceSearch.png has changed
Binary file eric6/icons/default/editSelectAll.png has changed
Binary file eric6/icons/default/editSmartIndent.png has changed
Binary file eric6/icons/default/editToggleComment.png has changed
Binary file eric6/icons/default/editUncomment.png has changed
Binary file eric6/icons/default/editUndo.png has changed
Binary file eric6/icons/default/editUnindent.png has changed
Binary file eric6/icons/default/editor.png has changed
Binary file eric6/icons/default/empty.png has changed
Binary file eric6/icons/default/endline.png has changed
Binary file eric6/icons/default/enum.png has changed
Binary file eric6/icons/default/eolLinux.png has changed
Binary file eric6/icons/default/eolMac.png has changed
Binary file eric6/icons/default/eolWindows.png has changed
Binary file eric6/icons/default/eric.png has changed
Binary file eric6/icons/default/eric256.png has changed
Binary file eric6/icons/default/ericSnap.png has changed
Binary file eric6/icons/default/ericSnap48.png has changed
Binary file eric6/icons/default/ericWeb.png has changed
Binary file eric6/icons/default/ericWeb48.png has changed
Binary file eric6/icons/default/eric_2.png has changed
Binary file eric6/icons/default/erict-bw.png has changed
Binary file eric6/icons/default/erict-bwi.png has changed
Binary file eric6/icons/default/erict-hc.png has changed
Binary file eric6/icons/default/erict.png has changed
Binary file eric6/icons/default/errorLineMarker.png has changed
Binary file eric6/icons/default/esp32Device.png has changed
Binary file eric6/icons/default/exceptions.png has changed
Binary file eric6/icons/default/exit.png has changed
Binary file eric6/icons/default/exportShortcuts.png has changed
Binary file eric6/icons/default/featurePermission.png has changed
Binary file eric6/icons/default/fileD.png has changed
Binary file eric6/icons/default/fileDelete.png has changed
Binary file eric6/icons/default/fileDeleteList.png has changed
Binary file eric6/icons/default/fileDesigner.png has changed
Binary file eric6/icons/default/fileIDL.png has changed
Binary file eric6/icons/default/fileJavascript.png has changed
Binary file eric6/icons/default/fileLinguist.png has changed
Binary file eric6/icons/default/fileLinguist2.png has changed
Binary file eric6/icons/default/fileMisc.png has changed
Binary file eric6/icons/default/fileModified.png has changed
Binary file eric6/icons/default/fileMultiProject.png has changed
Binary file eric6/icons/default/filePixmap.png has changed
Binary file eric6/icons/default/fileProject.png has changed
Binary file eric6/icons/default/filePython.png has changed
Binary file eric6/icons/default/filePython2.png has changed
Binary file eric6/icons/default/fileResource.png has changed
Binary file eric6/icons/default/fileRuby.png has changed
Binary file eric6/icons/default/fileSave.png has changed
Binary file eric6/icons/default/fileSaveAll.png has changed
Binary file eric6/icons/default/fileSaveAs.png has changed
Binary file eric6/icons/default/fileSaveCopy.png has changed
Binary file eric6/icons/default/fileSavePixmap.png has changed
Binary file eric6/icons/default/fileSaveProject.png has changed
Binary file eric6/icons/default/fileSaveVisiblePixmap.png has changed
Binary file eric6/icons/default/fileShortcuts.png has changed
Binary file eric6/icons/default/fileSvg.png has changed
Binary file eric6/icons/default/fileText.png has changed
--- a/eric6/icons/default/filemanager.svg	Sun Apr 05 18:17:08 2020 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="22" height="22" version="1.1" viewBox="0 0 22 22" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
- <defs>
-  <linearGradient id="linearGradient4399" x1="419.46" x2="432.57" y1="499.24" y2="523.8" gradientTransform="matrix(.34617 0 0 .34617 -141.2 864.54)" gradientUnits="userSpaceOnUse">
-   <stop offset="0"/>
-   <stop stop-opacity="0" offset="1"/>
-  </linearGradient>
-  <linearGradient id="linearGradient4178" x1="434.16" x2="397.23" y1="548.89" y2="495.31" gradientTransform="matrix(.34617 0 0 .34606 -133.24 862.87)" gradientUnits="userSpaceOnUse">
-   <stop stop-color="#127bdc" offset="0"/>
-   <stop stop-color="#64b4f4" offset="1"/>
-  </linearGradient>
-  <linearGradient id="linearGradient4225" x1="396.57" x2="426.57" y1="498.8" y2="511.8" gradientTransform="matrix(.34617 0 0 .34617 -133.24 864.5)" gradientUnits="userSpaceOnUse">
-   <stop stop-color="#f5f5f5" offset="0"/>
-   <stop stop-color="#f9f9f9" offset="1"/>
-  </linearGradient>
-  <linearGradient id="linearGradient4297" x1="388.57" x2="416.57" y1="487.8" y2="507.8" gradientTransform="matrix(.34617 0 0 .34617 -133.24 862.81)" gradientUnits="userSpaceOnUse">
-   <stop stop-color="#1d5e8c" offset="0"/>
-   <stop stop-color="#2675a7" offset="1"/>
-  </linearGradient>
-  <linearGradient id="linearGradient8603" x1="390.57" x2="442.57" y1="498.3" y2="498.3" gradientTransform="matrix(.34617 0 0 .34617 -133.24 2893)" gradientUnits="userSpaceOnUse">
-   <stop stop-color="#fff" offset="0"/>
-   <stop stop-color="#fff" stop-opacity=".4876" offset="1"/>
-  </linearGradient>
- </defs>
- <g transform="translate(0 -1030.4)">
-  <path d="m1 1042.4 20 0.501v-8.501h-10l-1.5885-2.0013h-8.4115z" fill="url(#linearGradient4297)"/>
-  <rect x="2" y="1036.4" width="18" height="5" rx=".91287" ry="1" color="#000000" color-rendering="auto" fill="url(#linearGradient4225)" image-rendering="auto" shape-rendering="auto" solid-color="#000000" style="isolation:auto;mix-blend-mode:normal"/>
-  <path d="m9 1038.4-2 1h-6l-0.089587 1.0011-5e-7 9.5003c0 0.2699 0.24435 0.4954 0.49194 0.4954l19.011 0.01c0.25539 0.01 0.50006-0.1978 0.50006-0.5l0.087-11.507z" fill="url(#linearGradient4178)"/>
-  <path d="m1 1039.4-0.089587 1.0011h7.0896l1-2-2 0.9989z" fill="#fff" fill-rule="evenodd" opacity=".3"/>
-  <path d="m9.4115 1032.4 0.58849 3h11v-1h-10z" fill="#fff" fill-rule="evenodd" opacity=".3"/>
-  <path d="m0.91041 1040.4h7.0896l1-2h12v11.656h-10.385z" fill="url(#linearGradient4399)" fill-rule="evenodd" opacity=".099"/>
-  <path d="m2.9121 1036.4c-0.50573 0-0.91211 0.446-0.91211 1v1c0-0.554 0.40638-1 0.91211-1h16.088c0.50573 0 0.91211 0.446 0.91211 1v-1c0-0.554-0.40638-1-0.91211-1z" color="#000000" color-rendering="auto" fill="url(#linearGradient8603)" image-rendering="auto" opacity=".85" shape-rendering="auto" solid-color="#000000" style="isolation:auto;mix-blend-mode:normal"/>
-  <path transform="translate(0 1030.4)" d="m20.992 8-0.080079 10.506c0 0.3022-0.24461 0.51-0.5 0.5l-19.01-0.009765c-0.24759 0-0.49219-0.22424-0.49219-0.49414v1c0 0.2699 0.2446 0.49414 0.49219 0.49414l19.01 0.009765c0.25539 0.01 0.5-0.1978 0.5-0.5l0.087891-11.506h-0.007812z" color="#000000" color-rendering="auto" image-rendering="auto" opacity=".3" shape-rendering="auto" solid-color="#000000" style="filter-blend-mode:normal;filter-gaussianBlur-deviation:0;isolation:auto;mix-blend-mode:normal"/>
- </g>
-</svg>
Binary file eric6/icons/default/find.png has changed
Binary file eric6/icons/default/findClear.png has changed
Binary file eric6/icons/default/findNext.png has changed
Binary file eric6/icons/default/findPrev.png has changed
Binary file eric6/icons/default/findWordNext.png has changed
Binary file eric6/icons/default/findWordPrev.png has changed
Binary file eric6/icons/default/firefox.png has changed
Binary file eric6/icons/default/flag.png has changed
Binary file eric6/icons/default/flagBlack.png has changed
Binary file eric6/icons/default/flagGreen.png has changed
Binary file eric6/icons/default/flagYellow.png has changed
Binary file eric6/icons/default/flashCookie.png has changed
Binary file eric6/icons/default/flashCookie128.png has changed
Binary file eric6/icons/default/flashCookie16.png has changed
Binary file eric6/icons/default/flashCookie48.png has changed
Binary file eric6/icons/default/formatTextBold.png has changed
Binary file eric6/icons/default/formatTextBulletedList.png has changed
Binary file eric6/icons/default/formatTextCodeBlock.png has changed
Binary file eric6/icons/default/formatTextHeader.png has changed
Binary file eric6/icons/default/formatTextHeader1.png has changed
Binary file eric6/icons/default/formatTextHeader2.png has changed
Binary file eric6/icons/default/formatTextHeader3.png has changed
Binary file eric6/icons/default/formatTextHorizontalLine.png has changed
Binary file eric6/icons/default/formatTextHyperlink.png has changed
Binary file eric6/icons/default/formatTextImage.png has changed
Binary file eric6/icons/default/formatTextInlineCode.png has changed
Binary file eric6/icons/default/formatTextItalic.png has changed
Binary file eric6/icons/default/formatTextNumberedList.png has changed
Binary file eric6/icons/default/formatTextQuote.png has changed
Binary file eric6/icons/default/formatTextStrikethrough.png has changed
Binary file eric6/icons/default/forward.png has changed
Binary file eric6/icons/default/gRPC48.png has changed
Binary file eric6/icons/default/geolocation.png has changed
Binary file eric6/icons/default/getAs.png has changed
Binary file eric6/icons/default/globalVariables.png has changed
Binary file eric6/icons/default/google.png has changed
Binary file eric6/icons/default/goto.png has changed
Binary file eric6/icons/default/gotoBrace.png has changed
Binary file eric6/icons/default/gotoLastEditPosition.png has changed
Binary file eric6/icons/default/grayscale.png has changed
Binary file eric6/icons/default/greaseMonkey.png has changed
Binary file eric6/icons/default/greaseMonkey48.png has changed
Binary file eric6/icons/default/greaseMonkeyScript.png has changed
Binary file eric6/icons/default/greaseMonkeyTrash.png has changed
Binary file eric6/icons/default/grid.png has changed
Binary file eric6/icons/default/group.png has changed
Binary file eric6/icons/default/help.png has changed
Binary file eric6/icons/default/helpAbout.png has changed
Binary file eric6/icons/default/helpAboutQt.png has changed
Binary file eric6/icons/default/hexEditor.png has changed
Binary file eric6/icons/default/hidePassword.png has changed
Binary file eric6/icons/default/history.png has changed
Binary file eric6/icons/default/historyClear.png has changed
Binary file eric6/icons/default/home.png has changed
Binary file eric6/icons/default/html.png has changed
Binary file eric6/icons/default/iconEditor.png has changed
Binary file eric6/icons/default/icons.png has changed
Binary file eric6/icons/default/importShortcuts.png has changed
Binary file eric6/icons/default/importedModule.png has changed
Binary file eric6/icons/default/importedName.png has changed
Binary file eric6/icons/default/imports.png has changed
Binary file eric6/icons/default/incomingBookmark.png has changed
Binary file eric6/icons/default/info.png has changed
Binary file eric6/icons/default/internet_explorer.png has changed
Binary file eric6/icons/default/irc.png has changed
Binary file eric6/icons/default/irc128.png has changed
Binary file eric6/icons/default/irc48.png has changed
Binary file eric6/icons/default/ircAdmin.png has changed
Binary file eric6/icons/default/ircAway.png has changed
Binary file eric6/icons/default/ircCloseChannel.png has changed
Binary file eric6/icons/default/ircConfigure.png has changed
Binary file eric6/icons/default/ircConnect.png has changed
Binary file eric6/icons/default/ircDisconnect.png has changed
Binary file eric6/icons/default/ircEditTopic.png has changed
Binary file eric6/icons/default/ircHalfop.png has changed
Binary file eric6/icons/default/ircJoinChannel.png has changed
Binary file eric6/icons/default/ircNormal.png has changed
Binary file eric6/icons/default/ircOp.png has changed
Binary file eric6/icons/default/ircOwner.png has changed
Binary file eric6/icons/default/ircUserAway.png has changed
Binary file eric6/icons/default/ircUserPresent.png has changed
Binary file eric6/icons/default/ircVoice.png has changed
Binary file eric6/icons/default/issueFixable.png has changed
Binary file eric6/icons/default/issueFixed.png has changed
Binary file eric6/icons/default/keywords.png has changed
Binary file eric6/icons/default/konqueror.png has changed
Binary file eric6/icons/default/languages/lexerBash.png has changed
Binary file eric6/icons/default/languages/lexerBatch.png has changed
Binary file eric6/icons/default/languages/lexerCMake.png has changed
Binary file eric6/icons/default/languages/lexerCPP.png has changed
Binary file eric6/icons/default/languages/lexerCSS.png has changed
Binary file eric6/icons/default/languages/lexerCoffeeScript.png has changed
Binary file eric6/icons/default/languages/lexerCsharp.png has changed
Binary file eric6/icons/default/languages/lexerCython.png has changed
Binary file eric6/icons/default/languages/lexerD.png has changed
Binary file eric6/icons/default/languages/lexerDiff.png has changed
Binary file eric6/icons/default/languages/lexerFortran.png has changed
Binary file eric6/icons/default/languages/lexerGettext.png has changed
Binary file eric6/icons/default/languages/lexerHTML.png has changed
Binary file eric6/icons/default/languages/lexerIDL.png has changed
Binary file eric6/icons/default/languages/lexerJSON.png has changed
Binary file eric6/icons/default/languages/lexerJava.png has changed
Binary file eric6/icons/default/languages/lexerJavaScript.png has changed
Binary file eric6/icons/default/languages/lexerLua.png has changed
Binary file eric6/icons/default/languages/lexerMakefile.png has changed
Binary file eric6/icons/default/languages/lexerMarkdown.png has changed
Binary file eric6/icons/default/languages/lexerMatlab.png has changed
Binary file eric6/icons/default/languages/lexerOctave.png has changed
Binary file eric6/icons/default/languages/lexerPHP.png has changed
Binary file eric6/icons/default/languages/lexerPOV.png has changed
Binary file eric6/icons/default/languages/lexerPascal.png has changed
Binary file eric6/icons/default/languages/lexerPerl.png has changed
Binary file eric6/icons/default/languages/lexerPostscript.png has changed
Binary file eric6/icons/default/languages/lexerProperties.png has changed
Binary file eric6/icons/default/languages/lexerPython.png has changed
Binary file eric6/icons/default/languages/lexerPython3.png has changed
Binary file eric6/icons/default/languages/lexerRuby.png has changed
Binary file eric6/icons/default/languages/lexerSQL.png has changed
Binary file eric6/icons/default/languages/lexerTCL.png has changed
Binary file eric6/icons/default/languages/lexerTeX.png has changed
Binary file eric6/icons/default/languages/lexerVHDL.png has changed
Binary file eric6/icons/default/languages/lexerXML.png has changed
Binary file eric6/icons/default/languages/lexerYAML.png has changed
--- a/eric6/icons/default/languages/readme.txt	Sun Apr 05 18:17:08 2020 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-Icons where downloaded from official sites of the languages and various other places.
Binary file eric6/icons/default/linguist4.png has changed
Binary file eric6/icons/default/linguist48.png has changed
--- a/eric6/icons/default/linkConnect.svg	Sun Apr 05 18:17:08 2020 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg viewBox="0 0 22 22" xmlns="http://www.w3.org/2000/svg">
- <defs>
-  <style type="text/css">.ColorScheme-Text {
-        color:#232629;
-      }</style>
- </defs>
- <path class="ColorScheme-Text" d="m18.293 3-3.5 3.5-1.5-1.5-7.293 7.293 1.5 1.5-4.5 4.5 0.70703 0.70703 4.5-4.5 1.5 1.5 7.293-7.293-1.5-1.5 3.5-3.5-0.70703-0.70703z" fill="currentColor"/>
-</svg>
--- a/eric6/icons/default/linkDisconnect.svg	Sun Apr 05 18:17:08 2020 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg viewBox="0 0 22 22" xmlns="http://www.w3.org/2000/svg">
- <defs>
-  <style type="text/css">.ColorScheme-Text {
-        color:#232629;
-      }
-      .ColorScheme-NegativeText {
-        color:#da4453;
-      }</style>
- </defs>
- <path class="ColorScheme-Text" d="m18.293 3-3.5 3.5-1.5-1.5-3.793 3.793 3.707 3.707 3.793-3.793-1.5-1.5 3.5-3.5-0.70703-0.70703zm-9.5 6.5-2.793 2.793 1.5 1.5-4.5 4.5 0.70703 0.70703 4.5-4.5 1.5 1.5 2.793-2.793-3.707-3.707z" fill="currentColor"/>
- <path class="ColorScheme-NegativeText" d="m14.834 14-0.83398 0.83398 1.666 1.666-1.666 1.666 0.83398 0.83398 1.666-1.666 1.666 1.666 0.83398-0.83398-1.666-1.666 1.666-1.666-0.83398-0.83398-1.666 1.666-1.666-1.666z" fill="currentColor"/>
-</svg>
Binary file eric6/icons/default/listBookmarks.png has changed
Binary file eric6/icons/default/listSelection.png has changed
Binary file eric6/icons/default/loading.png has changed
Binary file eric6/icons/default/localVariables.png has changed
Binary file eric6/icons/default/logViewer.png has changed
Binary file eric6/icons/default/mailSend.png has changed
Binary file eric6/icons/default/makefile.png has changed
Binary file eric6/icons/default/makefile48.png has changed
Binary file eric6/icons/default/masterProject.png has changed
Binary file eric6/icons/default/mediaPlaybackPause.png has changed
Binary file eric6/icons/default/mediaPlaybackStart.png has changed
Binary file eric6/icons/default/method.png has changed
Binary file eric6/icons/default/method_class.png has changed
Binary file eric6/icons/default/method_private.png has changed
Binary file eric6/icons/default/method_protected.png has changed
Binary file eric6/icons/default/method_static.png has changed
Binary file eric6/icons/default/microbitDevice.png has changed
Binary file eric6/icons/default/micropython.png has changed
Binary file eric6/icons/default/micropython48.png has changed
--- a/eric6/icons/default/miniconda.svg	Sun Apr 05 18:17:08 2020 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="22" height="22" version="1.1" viewBox="0 0 22 22" xmlns="http://www.w3.org/2000/svg">
- <style>.st0{fill:#43b02a}</style>
- <path class="st0" d="m2.3887 14.044c-0.36349 0.72642-0.65775 1.4874-0.90008 2.2657 0.81353 0.22484 1.6271 0.3805 2.4579 0.44968 0.017304-0.65723 0.069237-1.2799 0.15578-1.9025-0.58851-0.22484-1.1597-0.50157-1.7136-0.81289zm3.3234-8.3711c-0.48466 0-0.952 0.03459-1.4367 0.10377 0.069237 0.48428 0.13847 0.95126 0.25964 1.4355 0.32887-0.55346 0.72699-1.055 1.177-1.5047zm-3.8946 11.398c0.62313 0.95126 1.402 1.7987 2.2848 2.5079-0.086546-0.74371-0.15578-1.4528-0.15578-2.162-0.72699-0.06918-1.4367-0.19025-2.129-0.34591zm5.6255-16.483c-0.86546 0.29403-1.6617 0.69182-2.4233 1.1761 0.5712 0.10377 1.1251 0.22484 1.679 0.3978 0.20771-0.53616 0.46735-1.055 0.74429-1.5739zm3.5657-0.58805c-0.43273 0-0.84815 0.034592-1.2636 0.069182 0.58851 0.41509 1.1424 0.84748 1.679 1.3318l0.43273 0.3978-0.43273 0.43239c-0.36349 0.34591-0.70968 0.70912-1.0386 1.1069v0.017297s-0.06924 0.069182-0.17309 0.19025c0.25964-0.034588 0.51928-0.034588 0.79622-0.034588 4.1369 0 7.4949 3.3553 7.4949 7.489s-3.358 7.489-7.4949 7.489c-1.4367 0-2.7868-0.3978-3.9292-1.1069-0.5712 0.06918-1.1251 0.10377-1.6963 0.10377-0.25964 0-0.51928 0-0.79622-0.0173 0.017311 0.84748 0.10386 1.7296 0.24233 2.6462 1.7655 1.1934 3.8773 1.8852 6.1621 1.8852 6.0755 0 11.009-4.9292 11.009-11 0.017309-6.0708-4.9158-11-10.991-11z" stroke-width=".17302"/>
- <path class="st0" d="m9.5374 2.5943c0.22502-0.25943 0.45004-0.51887 0.67506-0.76101-0.51928-0.43239-1.0559-0.84748-1.6271-1.1934-0.34618 0.58805-0.65775 1.2107-0.91739 1.8333 0.50197 0.19025 0.98662 0.3978 1.454 0.62264 0.22502-0.27673 0.3808-0.44969 0.41542-0.50157zm-6.1794 3.3035c-0.81353 0.13836-1.6098 0.36321-2.3887 0.63994 0.31157 0.7956 0.70968 1.5739 1.1597 2.3003 0.51928-0.36321 1.0559-0.70912 1.6098-1.0031-0.17309-0.63994-0.29426-1.2799-0.3808-1.9371zm-1.4367 4.1509c-0.58851 0.48428-1.1424 1.0031-1.6617 1.5912 0.5712 0.50157 1.177 0.95126 1.8175 1.3664 0.29426-0.51887 0.62313-1.0377 0.96931-1.522-0.3808-0.44968-0.7616-0.93396-1.1251-1.4355zm2.8041 5.0503c-0.069236 0.55346-0.12116 1.1242-0.13847 1.7123 0.55389 0.03459 1.1078 0.03459 1.6617 0-0.58851-0.48428-1.1078-1.055-1.5232-1.7123zm1.6098-11.969c-0.69237-0.19025-1.402-0.34591-2.1117-0.43239-0.069237 0.72642-0.069237 1.4355-0.017311 2.1447 0.5712-0.069182 1.1251-0.10377 1.6963-0.10377 0.10386-0.55346 0.25964-1.0896 0.43273-1.6085zm0.98662 0.31132c-0.13847 0.41509-0.25964 0.83019-0.36349 1.2453 0.48466-0.31132 1.0039-0.57076 1.5405-0.76101-0.3808-0.17296-0.77891-0.32862-1.177-0.48428zm-7.2352 9.0283c0.13847 1.0723 0.43273 2.0928 0.86546 3.0267 0.22502-0.62264 0.48466-1.2453 0.77891-1.8333-0.5712-0.36321-1.1078-0.76101-1.6444-1.1934zm3.1676-9.2704c-0.65775 0.65723-1.229 1.3836-1.7136 2.1792 0.5712-0.17296 1.1424-0.31132 1.7309-0.41509-0.034616-0.58805-0.051927-1.1761-0.017311-1.7642zm-0.65775 6.3475c0.27695 0.3978 0.58851 0.7956 0.91739 1.1761 0.034616-0.69182 0.13847-1.3491 0.34618-1.989-0.43273 0.24214-0.86546 0.51887-1.2636 0.81289zm0.13847 3.8223c0.46735 0.25943 0.93469 0.50157 1.4367 0.70912-0.29426-0.63994-0.48466-1.3145-0.58851-2.0409-0.31157 0.43239-0.58851 0.88208-0.84815 1.3318zm-1.2809-4.0126c-0.34618-0.55346-0.65775-1.1242-0.9347-1.7296-0.31156 0.96855-0.50197 2.0063-0.51928 3.0613 0.46735-0.48428 0.952-0.93396 1.454-1.3318z" stroke-width=".17302"/>
-</svg>
--- a/eric6/icons/default/miniconda48.svg	Sun Apr 05 18:17:08 2020 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="48" height="48" version="1.1" viewBox="0 0 48 48" xmlns="http://www.w3.org/2000/svg">
- <style>.st0{fill:#43b02a}</style>
- <path class="st0" d="m5.2116 30.642c-0.79307 1.5849-1.4351 3.2453-1.9638 4.9434 1.775 0.49057 3.55 0.83019 5.3627 0.98113 0.03776-1.434 0.15106-2.7925 0.33989-4.1509-1.284-0.49057-2.5303-1.0943-3.7388-1.7736zm7.251-18.264c-1.0574 0-2.0771 0.07547-3.1345 0.22642 0.15106 1.0566 0.30212 2.0755 0.56648 3.1321 0.71754-1.2075 1.5861-2.3019 2.5681-3.283zm-8.4972 24.868c1.3596 2.0755 3.059 3.9245 4.985 5.4717-0.18883-1.6226-0.33989-3.1698-0.33989-4.717-1.5862-0.15094-3.1345-0.41509-4.6452-0.75472zm12.274-35.962c-1.8883 0.64151-3.6255 1.5094-5.2872 2.566 1.2463 0.22642 2.4548 0.49057 3.6632 0.86792 0.45319-1.1698 1.0197-2.3019 1.6239-3.434zm7.7797-1.283c-0.94414 0-1.8505 0.075472-2.7569 0.15094 1.284 0.90566 2.4925 1.8491 3.6632 2.9057l0.94414 0.86792-0.94414 0.9434c-0.79308 0.75472-1.5484 1.5472-2.2659 2.4151v0.03774s-0.15106 0.15094-0.37765 0.41509c0.56648-0.07547 1.133-0.07547 1.7372-0.07547 9.0259 0 16.352 7.3208 16.352 16.34s-7.3265 16.34-16.352 16.34c-3.1345 0-6.0802-0.86792-8.5728-2.4151-1.2463 0.15094-2.4548 0.22642-3.701 0.22642-0.56648 0-1.133 0-1.7372-0.03774 0.03777 1.8491 0.22659 3.7736 0.52872 5.7736 3.8521 2.6038 8.4595 4.1132 13.445 4.1132 13.256 0 24.019-10.755 24.019-24 0.037765-13.245-10.725-24-23.981-24z" stroke-width=".37751"/>
- <path class="st0" d="m20.809 5.6604c0.49095-0.56604 0.9819-1.1321 1.4729-1.6604-1.133-0.9434-2.3037-1.8491-3.55-2.6038-0.75531 1.283-1.4351 2.6415-2.0016 4 1.0952 0.4151 2.1526 0.86792 3.1723 1.3585 0.49095-0.60377 0.83084-0.98113 0.90637-1.0943zm-13.482 7.2075c-1.775 0.30189-3.5122 0.79245-5.2116 1.3962 0.67978 1.7358 1.5484 3.434 2.5303 5.0189 1.133-0.79245 2.3037-1.5472 3.5122-2.1887-0.37765-1.3962-0.64201-2.7925-0.83084-4.2264zm-3.1345 9.0566c-1.284 1.0566-2.4925 2.1887-3.6255 3.4717 1.2463 1.0943 2.5681 2.0755 3.9654 2.9811 0.64201-1.1321 1.3596-2.2642 2.1149-3.3208-0.83084-0.98113-1.6617-2.0377-2.4548-3.1321zm6.118 11.019c-0.15106 1.2075-0.26436 2.4528-0.30212 3.7358 1.2085 0.07547 2.417 0.07547 3.6255 0-1.284-1.0566-2.417-2.3019-3.3234-3.7358zm3.5122-26.113c-1.5106-0.4151-3.059-0.75472-4.6074-0.9434-0.15106 1.5849-0.15106 3.1321-0.03777 4.6792 1.2463-0.15094 2.4548-0.22642 3.701-0.22642 0.22659-1.2075 0.56648-2.3774 0.94414-3.5094zm2.1526 0.67924c-0.30212 0.90566-0.56648 1.8113-0.79308 2.717 1.0574-0.67924 2.1904-1.2453 3.3611-1.6604-0.83084-0.37736-1.6994-0.71698-2.5681-1.0566zm-15.786 19.698c0.30212 2.3396 0.94414 4.566 1.8883 6.6038 0.49095-1.3585 1.0574-2.717 1.6994-4-1.2463-0.79245-2.417-1.6604-3.5877-2.6038zm6.9111-20.226c-1.4351 1.434-2.6813 3.0189-3.7388 4.7547 1.2463-0.37736 2.4925-0.67924 3.7765-0.90566-0.07553-1.283-0.1133-2.566-0.03777-3.8491zm-1.4351 13.849c0.60425 0.86792 1.284 1.7358 2.0016 2.566 0.07553-1.5094 0.30212-2.9434 0.75531-4.3396-0.94414 0.5283-1.8883 1.1321-2.7569 1.7736zm0.30212 8.3396c1.0197 0.56604 2.0393 1.0943 3.1345 1.5472-0.64201-1.3962-1.0574-2.8679-1.284-4.4528-0.67978 0.9434-1.284 1.9245-1.8505 2.9057zm-2.7946-8.7547c-0.75531-1.2075-1.4351-2.4528-2.0393-3.7736-0.67978 2.1132-1.0952 4.3774-1.133 6.6792 1.0197-1.0566 2.0771-2.0377 3.1723-2.9057z" stroke-width=".37751"/>
-</svg>
Binary file eric6/icons/default/minus.png has changed
Binary file eric6/icons/default/module.png has changed
Binary file eric6/icons/default/mouse.png has changed
Binary file eric6/icons/default/moveBookmark.png has changed
Binary file eric6/icons/default/moveInstructionPointer.png has changed
Binary file eric6/icons/default/multiProjectClose.png has changed
Binary file eric6/icons/default/multiProjectNew.png has changed
Binary file eric6/icons/default/multiProjectOpen.png has changed
Binary file eric6/icons/default/multiProjectProps.png has changed
Binary file eric6/icons/default/multiProjectSave.png has changed
Binary file eric6/icons/default/multiProjectSaveAs.png has changed
Binary file eric6/icons/default/multiProjectViewer.png has changed
Binary file eric6/icons/default/namedgroup.png has changed
Binary file eric6/icons/default/namedreference.png has changed
Binary file eric6/icons/default/namingError.png has changed
Binary file eric6/icons/default/neglookahead.png has changed
Binary file eric6/icons/default/neglookbehind.png has changed
Binary file eric6/icons/default/network-offline.png has changed
Binary file eric6/icons/default/network-online.png has changed
Binary file eric6/icons/default/network-server.png has changed
Binary file eric6/icons/default/new.png has changed
Binary file eric6/icons/default/newWindow.png has changed
Binary file eric6/icons/default/nongroup.png has changed
Binary file eric6/icons/default/nonwordboundary.png has changed
Binary file eric6/icons/default/notcovered.png has changed
Binary file eric6/icons/default/notcoveredNext.png has changed
Binary file eric6/icons/default/notcoveredPrev.png has changed
Binary file eric6/icons/default/notification.png has changed
Binary file eric6/icons/default/notification48.png has changed
Binary file eric6/icons/default/numbers.png has changed
Binary file eric6/icons/default/open.png has changed
Binary file eric6/icons/default/openNewTab.png has changed
Binary file eric6/icons/default/openQM.png has changed
Binary file eric6/icons/default/openUI.png has changed
Binary file eric6/icons/default/opera.png has changed
Binary file eric6/icons/default/outgoingBookmark.png has changed
Binary file eric6/icons/default/passwords.png has changed
Binary file eric6/icons/default/pause.png has changed
Binary file eric6/icons/default/pim.png has changed
Binary file eric6/icons/default/pim48.png has changed
Binary file eric6/icons/default/plugin.png has changed
Binary file eric6/icons/default/plugin48.png has changed
Binary file eric6/icons/default/pluginArchive.png has changed
Binary file eric6/icons/default/pluginArchive48.png has changed
Binary file eric6/icons/default/pluginArchiveList.png has changed
Binary file eric6/icons/default/pluginArchiveSnapshot.png has changed
Binary file eric6/icons/default/pluginInstall.png has changed
Binary file eric6/icons/default/pluginRepository.png has changed
Binary file eric6/icons/default/pluginUninstall.png has changed
Binary file eric6/icons/default/plus.png has changed
Binary file eric6/icons/default/poslookahead.png has changed
Binary file eric6/icons/default/poslookbehind.png has changed
Binary file eric6/icons/default/preferences-api.png has changed
Binary file eric6/icons/default/preferences-application.png has changed
Binary file eric6/icons/default/preferences-autocompletion.png has changed
Binary file eric6/icons/default/preferences-calltips.png has changed
Binary file eric6/icons/default/preferences-colours.png has changed
Binary file eric6/icons/default/preferences-cooperation.png has changed
Binary file eric6/icons/default/preferences-debugger.png has changed
Binary file eric6/icons/default/preferences-editor.png has changed
Binary file eric6/icons/default/preferences-exporters.png has changed
Binary file eric6/icons/default/preferences-filehandling.png has changed
Binary file eric6/icons/default/preferences-general.png has changed
Binary file eric6/icons/default/preferences-graphics.png has changed
Binary file eric6/icons/default/preferences-help.png has changed
Binary file eric6/icons/default/preferences-helpdocumentation.png has changed
Binary file eric6/icons/default/preferences-helpviewers.png has changed
Binary file eric6/icons/default/preferences-highlighter-association.png has changed
Binary file eric6/icons/default/preferences-highlighting-styles.png has changed
Binary file eric6/icons/default/preferences-html5.png has changed
Binary file eric6/icons/default/preferences-icons.png has changed
Binary file eric6/icons/default/preferences-interface.png has changed
Binary file eric6/icons/default/preferences-keywords.png has changed
Binary file eric6/icons/default/preferences-logviewer.png has changed
Binary file eric6/icons/default/preferences-mail_generic.png has changed
Binary file eric6/icons/default/preferences-mimetypes.png has changed
Binary file eric6/icons/default/preferences-mouse-click-handler.png has changed
Binary file eric6/icons/default/preferences-multiproject.png has changed
Binary file eric6/icons/default/preferences-network.png has changed
Binary file eric6/icons/default/preferences-notifications.png has changed
Binary file eric6/icons/default/preferences-orbit.png has changed
Binary file eric6/icons/default/preferences-pluginmanager.png has changed
Binary file eric6/icons/default/preferences-printer.png has changed
Binary file eric6/icons/default/preferences-project.png has changed
Binary file eric6/icons/default/preferences-properties.png has changed
Binary file eric6/icons/default/preferences-pyDebugger.png has changed
Binary file eric6/icons/default/preferences-python.png has changed
Binary file eric6/icons/default/preferences-qtlogo.png has changed
Binary file eric6/icons/default/preferences-search.png has changed
Binary file eric6/icons/default/preferences-security.png has changed
Binary file eric6/icons/default/preferences-shell.png has changed
Binary file eric6/icons/default/preferences-spellchecking.png has changed
Binary file eric6/icons/default/preferences-styles.png has changed
Binary file eric6/icons/default/preferences-template.png has changed
Binary file eric6/icons/default/preferences-typing.png has changed
Binary file eric6/icons/default/preferences-vcs.png has changed
Binary file eric6/icons/default/preferences-viewmanager.png has changed
Binary file eric6/icons/default/previewer.png has changed
Binary file eric6/icons/default/print.png has changed
Binary file eric6/icons/default/printPdf.png has changed
Binary file eric6/icons/default/printPreview.png has changed
Binary file eric6/icons/default/privateBrowsing.png has changed
Binary file eric6/icons/default/privateMode.png has changed
Binary file eric6/icons/default/profileProject.png has changed
Binary file eric6/icons/default/profileScript.png has changed
Binary file eric6/icons/default/projectClose.png has changed
Binary file eric6/icons/default/projectFind.png has changed
Binary file eric6/icons/default/projectForms.png has changed
Binary file eric6/icons/default/projectInterfaces.png has changed
Binary file eric6/icons/default/projectNew.png has changed
Binary file eric6/icons/default/projectOpen.png has changed
Binary file eric6/icons/default/projectOthers.png has changed
Binary file eric6/icons/default/projectProps.png has changed
Binary file eric6/icons/default/projectResources.png has changed
Binary file eric6/icons/default/projectSave.png has changed
Binary file eric6/icons/default/projectSaveAs.png has changed
Binary file eric6/icons/default/projectSources.png has changed
Binary file eric6/icons/default/projectSourcesJavaScript.png has changed
Binary file eric6/icons/default/projectSourcesPy.png has changed
Binary file eric6/icons/default/projectSourcesPyMixed.png has changed
Binary file eric6/icons/default/projectSourcesRb.png has changed
Binary file eric6/icons/default/projectSourcesRbMixed.png has changed
Binary file eric6/icons/default/projectTranslations.png has changed
Binary file eric6/icons/default/projectUserProps.png has changed
Binary file eric6/icons/default/projectViewer.png has changed
Binary file eric6/icons/default/protobuf.png has changed
Binary file eric6/icons/default/protobuf48.png has changed
Binary file eric6/icons/default/pullBookmark.png has changed
Binary file eric6/icons/default/pushBookmark.png has changed
Binary file eric6/icons/default/putAs.png has changed
--- a/eric6/icons/default/pypi.svg	Sun Apr 05 18:17:08 2020 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="5.8208mm" height="5.8208mm" version="1.1" viewBox="0 0 5.8208 5.8208" xmlns="http://www.w3.org/2000/svg">
- <g transform="translate(-111.24 -145.92)">
-  <g transform="matrix(.011642 0 0 .013265 111.24 145.92)">
-   <path d="m208 437.76c-7.6057-2.2404-205.58-74.059-206.75-75.002-0.96412-0.77704-1.25-10.601-1.25-42.956 0-32.227 0.28971-42.238 1.25-43.197 0.6875-0.68665 14.075-5.8825 29.75-11.546 15.675-5.6638 30.862-11.177 33.75-12.252l5.25-1.954v-41.306c0-31.838 0.28652-41.538 1.25-42.318 0.6875-0.55698 15.2-6.0574 32.25-12.223s32.462-11.817 34.25-12.559l3.25-1.3482v-15.429c0-11.156 0.34617-15.699 1.25-16.404 0.6875-0.53659 15.875-6.2714 33.75-12.744 17.875-6.4726 33.288-12.18 34.25-12.682 1.5509-0.80969 1.75-2.6589 1.75-16.256 0-11.069 0.34814-15.623 1.25-16.351 1.6771-1.3531 132.84-48.665 139.45-50.302 4.2356-1.0485 5.9983-1.0492 9.5-0.003731 9.1438 2.73 63.416 22.338 65.524 23.673 2.1233 1.3449 2.2372 2.1206 2.5 17.035l0.27536 15.626 32.477 11.82c17.862 6.5012 33.5 12.368 34.75 13.037l2.273 1.2165v125.9c0 99.397-0.26316 126.16-1.25 127.14-1.0708 1.0576-54.404 20.565-238.25 87.141-44.675 16.178-45.334 16.357-52.5 14.246zm41.389-14.374c17.661-6.385 32.674-12.065 33.361-12.622 0.96068-0.77875 1.25-9.8959 1.25-39.391 0-35.904-0.11279-38.374-1.75-38.323-0.9625 0.0299-16.15 5.3174-33.75 11.75l-32 11.696-0.26161 39.25c-0.14388 21.588 0.0311 39.25 0.38896 39.25 0.35781 0 15.101-5.2241 32.762-11.609zm215.36-78.039 32.25-11.683v-39.441c0-31.14-0.2631-39.341-1.25-38.966-0.6875 0.2614-13.4 4.8623-28.25 10.224s-29.362 10.629-32.25 11.704l-5.25 1.9547v38.928c0 30.467 0.2717 38.932 1.25 38.945 0.6875 9e-3 15.762-5.2401 33.5-11.666zm-60.106-5.4407c4.7499-2.9356 8.4021-9.5777 8.5209-15.497 0.0818-4.0741-0.32443-5.1545-2.7093-7.2059-2.2364-1.9236-3.526-2.2963-6.3572-1.8368-9.4634 1.5357-17.478 14.47-14.068 22.703 2.209 5.3329 7.8158 6.0374 14.613 1.8364zm-336.86-71.809-0.28498-9.8982-15 5.5064c-8.25 3.0285-19.95 7.3065-26 9.5065s-11.382 4.3558-11.849 4.7906c-0.46686 0.43476 0.64337 1.1182 2.4672 1.5188 1.8238 0.40058 4.0058 1.0933 4.8488 1.5393 0.84305 0.44604 11.433 4.4085 23.533 8.8055l22 7.9945 0.28498-9.9327c0.15674-5.463 0.15674-14.387 0-19.831zm71-57.97-0.28498-9.8681-7.5 2.7939c-4.125 1.5366-15.934 5.8648-26.243 9.6181-10.309 3.7533-18.746 7.0712-18.75 7.3731-0.0037 0.30191 5.9558 2.7062 13.243 5.3429 7.2875 2.6367 14.825 5.3986 16.75 6.1377s7.775 2.9016 13 4.8055l9.5 3.4617 0.28498-9.8984c0.15674-5.4441 0.15674-14.339 0-19.766zm-0.12054-60.801c-0.20834-0.20835-5.5056 1.478-11.772 3.7473-30.462 11.033-41.842 15.305-41.548 15.599 0.17684 0.17683 11.489 4.3871 25.139 9.3562 13.649 4.9691 25.537 9.438 26.417 9.9309 1.4387 0.80597 1.6273-1.0758 1.8715-18.679 0.1494-10.767 0.10117-19.746-0.10718-19.954zm71.336-38.831c0-10.725-0.1281-19.5-0.28466-19.5-0.5525 0-12.427 4.2439-30.715 10.977-10.175 3.7463-19.805 7.2189-21.4 7.717-2.7122 0.84701-2.292 1.1111 6.5 4.0847 5.1698 1.7485 17.275 6.0965 26.9 9.6622 9.625 3.5657 17.838 6.5001 18.25 6.521 0.4125 0.0209 0.75-8.737 0.75-19.462zm105.16 10.037c3.8637-2.6254 8.8402-11.229 8.8402-15.283 0-3.5142-2.6277-7.9234-5.1086-8.5722-10.022-2.6208-22.593 13.417-17.742 22.634 0.63234 1.2013 1.6448 2.5149 2.25 2.919 2.3399 1.5624 8.2098 0.71519 11.76-1.6973z" fill="#ecebe8"/>
-   <path d="m210.47 437.65c-1.709-1.1698-46.702-17.767-65.473-24.151-3.575-1.216-10.325-3.6679-15-5.4487-4.675-1.7808-22-8.105-38.5-14.054-16.5-5.9488-43.115-15.582-59.146-21.406-16.03-5.8245-29.868-10.59-30.75-10.59-1.4474 0-1.6045-4.1591-1.6045-42.5v-42.5h2.6398c1.4519 0 3.1394 0.64898 3.75 1.4422 1.3767 1.7883 61.636 23.755 63.36 23.098 1.5954-0.60878 1.8266-46.065 0.23928-47.046-0.64217-0.39688-0.4753-1.3891 0.45763-2.721 1.2308-1.7572 1.4744-8.6375 1.506-42.522 0.02068-22.234 0.29131-40.836 0.60139-41.338 0.88561-1.433 4.4458-1.0656 4.4458 0.45868 0 1.6609 61.32 24.104 63.535 23.254 1.2281-0.47125 1.4652-4.2799 1.4652-23.535 0-15.173-0.36163-23.196-1.0651-23.631-0.70809-0.43762-0.54957-1.228 0.47287-2.3578 1.2157-1.3433 1.5961-4.935 1.8151-17.138 0.24895-13.869 0.45777-15.473 2.0534-15.78 0.97693-0.18754 2.5519 0.53891 3.5 1.6144 1.7017 1.9303 58.981 23.201 62.477 23.201 1.6009 0 1.7192-2.8174 1.6864-40.167-0.029-32.968 0.21349-40.415 1.3529-41.555 0.76353-0.76353 29.923-11.734 64.798-24.379 80.59-29.22 77.488-28.162 80.17-27.349 10.092 3.0568 66.614 24.014 67.965 25.2 1.4692 1.2903 1.7661 3.8104 2 16.979l0.27472 15.464 70 25.445 0.25385 126.18c0.16887 83.945-0.08217 126.18-0.75 126.18-0.65548 0-1.0038-14.229-1.0038-41 0-34.162-0.2298-41-1.3778-41-1.0428 0-55.408 19.417-65.904 23.539-1.6752 0.65776-1.7647 3.1692-1.5 42.051l0.28156 41.352-71.781 26.029c-39.479 14.316-71.992 26.029-72.25 26.029-0.25807 0-0.46922-18.198-0.46922-40.441 0-23.822-0.38177-40.677-0.92903-41.015-1.0049-0.62103-66.73 22.928-68.81 24.655-0.97438 0.80867-1.2605 9.8579-1.2605 39.867 0 37.972 0.0447 38.852 2.0451 40.253 1.7913 1.2547 1.8432 1.5099 0.41821 2.0567-2.4339 0.93396-3.8094 0.76728-5.9908-0.72596zm2.2891-41.372c0.248-37.162 0.16629-39.246-1.5756-40.178-4.3705-2.339-65.482-24.035-66.291-23.534-1.2168 0.75202-1.1359 76.504 0.0837 78.435 1.0142 1.6052 63.505 24.932 66.022 24.644 1.2999-0.14842 1.5349-5.3993 1.7616-39.366zm-71.762-26.155v-39.877l-33.225-12.044c-18.274-6.6239-33.574-11.828-34-11.564-0.42649 0.26359-0.77543 17.948-0.77543 39.298 0 31.913 0.24719 39.024 1.3894 39.972 1.4869 1.2341 63.264 23.957 65.361 24.042 0.97994 0.0393 1.25-8.5651 1.25-39.827zm-71-25.501c0-30.327-0.28731-39.597-1.25-40.331-1.8618-1.4207-62.966-23.335-65-23.311-1.6365 0.0188-1.749 2.5338-1.7347 38.77 0.00842 21.312 0.36403 39.299 0.79023 39.97 0.82488 1.2982 62.484 24.117 65.444 24.22 1.6381 0.0568 1.75-2.458 1.75-39.317zm335.62-4.1481c9.1482-6.9777 11.844-20.232 5.0784-24.971-5.7021-3.9939-15.661 0.76266-20.054 9.5781-3.6482 7.3209-3.5268 12.193 0.40145 16.121 2.657 2.657 3.5603 2.9796 7.0374 2.5132 2.194-0.29428 5.5856-1.7527 7.5369-3.241zm-264.62-53.852c0-30.318-0.28758-39.601-1.25-40.347-1.8214-1.4128-62.93-23.309-65-23.291-1.6364 0.0146-1.75 2.5395-1.75 38.893 0 31.173 0.26417 39.097 1.333 39.984 1.4583 1.2103 63.39 24.02 65.417 24.093 0.9796 0.0354 1.25-8.4729 1.25-39.332zm0.76924-66.066c0.14808-12.605-0.13031-23.317-0.61865-23.806-1.3201-1.3201-63.651 21.497-63.651 23.3 0 0.96401 9.9298 5.0621 30.5 12.588 16.775 6.1371 31.175 11.086 32 10.997 1.2763-0.13736 1.5402-3.5799 1.7692-23.079zm-36.346-13.849c17.008-6.1847 31.081-11.719 31.274-12.299 0.42655-1.2796-61.208-23.828-62.668-22.926-1.7306 1.0696-1.3483 46.992 0.3871 46.494 0.04583-0.0131 13.999-5.0841 31.006-11.269zm71.697-58.669c16.575-6.0287 30.379-11.204 30.675-11.5s0.32953-0.74781 0.0739-1.0034c-1.2792-1.2792-61.44-22.53-62.563-22.099-1.0209 0.39175-1.3058 5.4167-1.3058 23.032 0 19.304 0.21362 22.531 1.4915 22.531 0.82035 0 15.053-4.9326 31.628-10.961zm136.6-25.708c7.1133-3.3755 12.455-14.257 10.261-20.904-1.3129-3.978-3.4957-5.4288-8.1602-5.4235-9.4005 0.0106-18.805 13.438-15.797 22.554 1.8496 5.6045 6.9034 6.9969 13.696 3.7735z" fill="#d5d6d6"/>
-   <path d="m286.23 369.5c0.14938-22.825 0.15298-41.5 8e-3 -41.5-0.14496 1.8e-4 -1.045 0.4475-2 0.99404-3.509 2.0081-68.367 25.006-70.516 25.004-1.2214-0.00115-17.521-5.5483-36.221-12.327l-34-12.325-0.21619-82.923-0.21619-82.923 2.2362-1.6232c1.2299-0.89276 15.952-6.5842 32.716-12.648s31.717-11.593 33.23-12.287l2.75-1.2628v-81.516l3.25-1.9992c1.7875-1.0995 17.875-7.2212 35.75-13.604 39.041-13.94 31.893-11.343 69.5-25.251 17.115-6.33 32.568-11.478 34.5-11.493 4.14-0.033519 66.343 22.28 69.123 24.796 1.6773 1.5179 1.8786 3.3073 1.89 16.794l0.01266 15.095 33.237 11.9c18.281 6.5448 34.246 12.807 35.478 13.916l2.2409 2.0162 3.2e-4 82.304c3e-4 77.21-0.10745 82.36-1.7409 83.219-2.3776 1.2503-65.287 23.884-67.559 24.307-1.7243 0.32076-1.8127 2.4764-1.7199 41.941 0.0769 32.705-0.17593 41.818-1.1823 42.612-1.0906 0.85993-44.394 16.783-64.78 23.82-3.575 1.234-21.35 7.6907-39.5 14.348-18.15 6.6574-33.797 12.107-34.772 12.111-1.6714 6e-3 -1.7562-2.3392-1.5-41.494zm119.39-29.025c9.1482-6.9777 11.844-20.232 5.0784-24.971-5.7021-3.9939-15.661 0.76266-20.054 9.5781-3.6482 7.3209-3.5268 12.193 0.40145 16.121 2.657 2.657 3.5603 2.9796 7.0374 2.5132 2.194-0.29428 5.5856-1.7527 7.5369-3.241zm-118.1-96.281c-0.30789-0.30789-1.1148-6.4e-4 -1.7931 0.68278-0.98026 0.98762-0.8654 1.1025 0.5598 0.5598 0.98622-0.37553 1.5412-0.93469 1.2333-1.2426zm141.47-51.423c0-0.58531-0.63541-0.48812-1.5 0.22943-0.825 0.68469-1.5 1.4007-1.5 1.5911s0.675 0.0872 1.5-0.22943c0.825-0.31659 1.5-1.0326 1.5-1.5911zm-112.97-70.79c8.444-6.0126 11.927-19.117 6.5179-24.526-8.9441-8.9441-27.163 7.4812-23.403 21.099 0.51443 1.8631 1.9304 4.1066 3.1465 4.9854 2.9692 2.1457 9.5915 1.3944 13.739-1.5586z" fill="#e1cf92"/>
-   <path d="m287.46 408.75c-0.26432-0.68882-0.3627-18.772-0.21861-40.185l0.26197-38.933 32.5-11.807c17.875-6.494 33.288-11.811 34.25-11.815 1.6372-7e-3 1.75 2.5312 1.75 39.37 0 30.318-0.2876 39.601-1.25 40.348-1.0995 0.85386-65.097 24.274-66.331 24.274-0.26489 0-0.69788-0.56358-0.96221-1.2524zm70.543-64.125c0-30.282 0.28872-39.617 1.25-40.415 1.522-1.2627 64.432-24.208 66.372-24.208 1.9368 0 2.062 78.187 0.1278 79.792-1.522 1.2627-64.432 24.208-66.372 24.208-1.1471 0-1.3778-6.5941-1.3778-39.378zm41.831-0.23858c4.044-0.8088 10.735-6.6115 13.204-11.451 1.196-2.3443 1.9655-5.8561 1.9655-8.9695 0-4.322-0.45401-5.5708-2.9231-8.0398-1.873-1.873-3.9386-2.9152-5.75-2.9011-4.788 0.0372-11.003 3.5478-14.273 8.0629-6.133 8.4664-6.4957 16.682-0.94277 21.355 3.2574 2.7409 3.9567 2.8968 8.72 1.9441zm-222.83-2.7979-33.5-12.236-0.21619-82.925-0.21619-82.925 2.2362-1.6232c1.2299-0.89276 15.952-6.5842 32.716-12.648s31.717-11.593 33.23-12.287l2.75-1.2628v-81.516l3.25-1.9992c1.7875-1.0995 17.875-7.2212 35.75-13.604 39.041-13.94 31.893-11.343 69.5-25.251 17.115-6.33 32.568-11.478 34.5-11.493 4.3592-0.035293 66.713 22.453 69.227 24.967 1.7139 1.7139 1.8061 6.0366 1.7851 83.732-0.0173 64.069-0.29348 82.169-1.267 83.047-1.1055 0.99687-23.632 9.3552-59.245 21.982-6.6 2.3401-26.85 9.6494-45 16.243s-33.809 12.151-34.798 12.351c-1.6968 0.34251-1.7937 2.6983-1.7294 42.041 0.0534 32.671-0.2065 41.853-1.2025 42.486-3.2511 2.0656-69.189 25.326-71.57 25.247-1.4852-0.04899-17.775-5.5952-36.2-12.325zm139.03-219.61c8.444-6.0126 11.927-19.117 6.5179-24.526-8.9441-8.9441-27.163 7.4812-23.403 21.099 0.51443 1.8631 1.9304 4.1066 3.1465 4.9854 2.9692 2.1457 9.5915 1.3944 13.739-1.5586zm-29.028 164.64c0-30.291 0.28845-39.613 1.25-40.399 1.462-1.1945 64.702-24.224 66.521-24.224 1.876 0 1.7748 78.303-0.10323 79.861-1.6305 1.3532-64.102 24.139-66.182 24.139-1.289 0-1.4856-5.2117-1.4856-39.378zm71-26c0-30.337 0.28699-39.592 1.25-40.312 0.6875-0.51417 16.029-6.2665 34.092-12.783 26.794-9.6664 33.006-11.588 33.735-10.438 1.4764 2.3322 1.1678 76.209-0.32641 78.163-1.3009 1.7015-63.575 24.747-66.872 24.747-1.8053 0-1.8778-1.5208-1.8778-39.378zm71.496 13.229c-0.28622-0.74588-0.40252-18.905-0.25843-40.354l0.26197-38.998 33.437-12.193c18.39-6.7064 33.803-11.967 34.25-11.691 0.44708 0.2763 0.81287 18.235 0.81287 39.908 0 37.624-0.0855 39.452-1.8909 40.418-1.04 0.55658-15.686 5.9945-32.546 12.084s-31.306 11.322-32.101 11.627c-0.79512 0.30512-1.6798-0.0555-1.9661-0.80139zm0.22811-83.46c-1.1458-1.1458-0.87929-77.234 0.27813-79.396 0.67028-1.2524 0.67028-2.079 0-2.4933-1.1767-0.72723-1.4177-47.127-0.2485-47.85 1.1675-0.72156 64.48 22.717 64.419 23.848-0.0295 0.55 0.81941 1.323 1.8866 1.7178 1.8755 0.69378 1.9403 2.035 1.9403 40.128 0 30.326-0.28813 39.641-1.25 40.414-1.0588 0.85021-60.303 22.755-64.775 23.949-0.83898 0.22414-1.8515 0.0815-2.25-0.31705z" fill="#edce6d"/>
-   <path d="m288.45 407.72c-0.2583-0.67311-0.35161-18.312-0.20737-39.198l0.26227-37.974 32-11.71c17.6-6.4404 32.562-11.738 33.25-11.773 0.97965-0.0493 1.25 8.3489 1.25 38.83 0 36.111-0.12518 38.942-1.75 39.584-1.5716 0.62062-51.204 18.737-60.543 22.099-2.9492 1.0616-3.8971 1.0931-4.2623 0.14146zm70.793-63.839 0.26161-39.121 31-11.233c17.05-6.1784 32.018-11.556 33.262-11.95l2.2617-0.71641-0.52334 78.521-32.5 11.793c-17.875 6.4863-32.843 11.801-33.262 11.81-0.41888 9e-3 -0.64388-17.588-0.5-39.104zm47.107-1.6502c8.8766-6.0768 12.557-19.626 7.0946-26.118-6.5045-7.7301-19.215-2.9672-25.056 9.3893-2.7391 5.7939-2.9609 9.1819-0.92072 14.065 2.814 6.7348 11.206 7.9188 18.882 2.6639zm-229.35-0.64252-33.5-12.236-0.21619-82.925-0.21619-82.925 2.2362-1.6232c1.2299-0.89276 15.952-6.5842 32.716-12.648s31.717-11.593 33.23-12.287l2.75-1.2628v-81.516l3.25-1.9992c1.7875-1.0995 17.875-7.2212 35.75-13.604 39.041-13.94 31.893-11.343 69.5-25.251 17.115-6.33 32.568-11.478 34.5-11.493 4.3592-0.035293 66.713 22.453 69.227 24.967 1.7139 1.7139 1.8061 6.0366 1.7851 83.732-0.0173 64.069-0.29348 82.169-1.267 83.047-1.1055 0.99687-23.632 9.3552-59.245 21.982-6.6 2.3401-26.85 9.6494-45 16.243s-33.809 12.151-34.798 12.351c-1.6968 0.34251-1.7937 2.6983-1.7294 42.041 0.0534 32.671-0.2065 41.853-1.2025 42.486-3.2511 2.0656-69.189 25.326-71.57 25.247-1.4852-0.04899-17.775-5.5952-36.2-12.325zm139.03-219.61c8.444-6.0126 11.927-19.117 6.5179-24.526-8.9441-8.9441-27.163 7.4812-23.403 21.099 0.51443 1.8631 1.9304 4.1066 3.1465 4.9854 2.9692 2.1457 9.5915 1.3944 13.739-1.5586zm-27.789 163.88 0.26161-39.138 31-11.217c17.05-6.1692 32.018-11.539 33.262-11.933l2.2617-0.7166-0.52334 78.521-32.5 11.793c-17.875 6.4863-32.843 11.801-33.262 11.81-0.41888 9e-3 -0.64388-17.595-0.5-39.121zm70.762-25.753v-38.891l11.25-4.1069c39.614-14.462 54.77-19.758 55.228-19.299 0.28689 0.28689 0.52162 17.756 0.52162 38.82 0 35.455-0.1299 38.367-1.75 39.223-2.5284 1.3366-63.075 23.145-64.257 23.145-0.63983 0-0.99263-13.823-0.99263-38.891zm71-25.574c0-36.117 0.11066-38.524 1.8127-39.435 2.6397-1.4127 62.824-23.1 64.105-23.1 0.75784 0 1.0823 11.655 1.0823 38.877v38.877l-32.088 11.623c-17.648 6.3926-32.723 11.623-33.5 11.623-1.1913 0-1.4118-6.008-1.4118-38.465zm0.4451-45.818c-0.2583-0.67311-0.35161-18.312-0.20737-39.198l0.26227-37.974 32-11.71c17.6-6.4404 32.562-11.738 33.25-11.773 0.97966-0.04927 1.25 8.3528 1.25 38.85v38.913l-6.75 2.5457c-5.4217 2.0448-33.872 12.394-55.543 20.204-2.9487 1.0627-3.8971 1.0945-4.2623 0.14303zm-0.4451-104.78c0-21.524 0.11711-23.028 1.75-22.486 16.065 5.3349 60.568 22.312 60.432 23.054-0.18412 1.0068-58.283 22.5-60.821 22.5-1.1087 0-1.361-4.2766-1.361-23.067z" fill="#fdd042"/>
-   <path d="m177 341.59-33.5-12.236-0.21619-82.925-0.21619-82.925 2.2362-1.6232c1.2299-0.89276 15.952-6.5842 32.716-12.648s31.717-11.593 33.23-12.287l2.75-1.2628v-81.516l3.25-1.9992c1.7875-1.0995 17.875-7.2212 35.75-13.604 39.041-13.94 31.893-11.343 69.5-25.251 17.115-6.33 32.568-11.478 34.5-11.493 4.3592-0.035293 66.713 22.453 69.227 24.967 1.7139 1.7139 1.8061 6.0366 1.7851 83.732-0.0173 64.069-0.29348 82.169-1.267 83.047-1.1055 0.99687-23.632 9.3552-59.245 21.982-6.6 2.3401-26.85 9.6494-45 16.243s-33.809 12.151-34.798 12.351c-1.6968 0.34251-1.7937 2.6983-1.7294 42.041 0.0534 32.671-0.2065 41.853-1.2025 42.486-3.2511 2.0656-69.189 25.326-71.57 25.247-1.4852-0.04899-17.775-5.5952-36.2-12.325zm139.03-219.61c8.444-6.0126 11.927-19.117 6.5179-24.526-8.9441-8.9441-27.163 7.4812-23.403 21.099 0.51443 1.8631 1.9304 4.1066 3.1465 4.9854 2.9692 2.1457 9.5915 1.3944 13.739-1.5586zm114.64-16.647c-0.92391-0.9239-0.84346-42.11 0.0833-42.661 0.55979-0.3325 36.098 12.197 59.143 20.851 0.76622 0.28775 1.1661 0.75022 0.88861 1.0277-0.60649 0.60651-57.658 21.448-58.712 21.448-0.40492 0-1.0362-0.3-1.4029-0.66667z" fill="#92a7b6"/>
-   <path d="m178 340.64-33.5-12.175-0.26134-40.232c-0.23661-36.423-0.10894-40.232 1.3485-40.232 1.6512 0 61.311 21.373 64.913 23.254 1.1 0.57474 2.31 1.5222 2.689 2.1055 0.4554 0.70102 1.3029 0.50794 2.5-0.56958 2.0288-1.8261 64.495-24.79 67.433-24.79 1.8053 0 1.8778 1.5208 1.8778 39.378 0 30.31-0.28783 39.604-1.25 40.362-2.7425 2.1593-66.144 24.391-68.101 23.879-1.1249-0.29415-2.5186-0.14554-3.0972 0.33026-0.633 0.52051-14.396-3.9843-34.552-11.31zm0.47484-83.438c-17.614-6.4353-32.576-12.065-33.25-12.51-0.93251-0.61592-1.2248-10.342-1.2248-40.75 0-39.274 0.03338-39.941 2-39.941 1.1 0 2-0.63098 2-1.4022 0-0.7712 1.2375-1.8451 2.75-2.3864s16.645-6.0197 33.628-12.174c22.08-8.0012 31.625-11.022 33.5-10.6 2.3878 0.53731 2.4432 0.48484 0.62159-0.58836-1.1-0.64805-2.3306-1.6667-2.7347-2.2637-0.40408-0.597-0.74158-18.762-0.75-40.367-0.0142-36.502 0.1085-39.328 1.7347-39.938 0.9625-0.36115 2.2-1.2241 2.75-1.9177 1.3998-1.7652 64.357-24.355 67.89-24.359 1.5894-2e-3 3.3894-0.6534 4-1.4475 0.98048-1.275 63.378-24.556 65.815-24.556 1.2208 0 61.525 21.785 64.06 23.142 1.0396 0.5564 1.6758 1.5705 1.4137 2.2535-0.29242 0.76205 0.35375 1.2154 1.6724 1.1733l2.149-0.068548 0.26136 39.618c0.20404 30.929-0.0153 39.844-1 40.649-1.4695 1.2008-64.705 24.233-66.532 24.233-0.67622 0-1.2395-0.5625-1.2517-1.25-0.0122-0.6875-0.82029-0.2128-1.7957 1.0549-2.4246 3.1512-66.923 26.795-69.232 25.379-1.0422-0.63909-2.138-0.51979-3.3472 0.36439-0.98876 0.723-2.5415 1.0362-3.4506 0.696-1.4215-0.532-1.4658-0.38858-0.31671 1.0249 0.73485 0.90389 1.0458 2.1131 0.69098 2.6872-0.38392 0.6212 0.39095 1.0438 1.9139 1.0438h2.559v39.378c0 32.98-0.23301 39.571-1.4343 40.568-0.78886 0.65469-16.187 6.5336-34.218 13.064-24.763 8.969-33.108 11.605-34.108 10.774-0.96668-0.80227-1.6375-0.78653-2.4823 0.0582-0.63669 0.63669-1.4051 1.1354-1.7076 1.1082-0.3025-0.0272-14.961-5.3147-32.575-11.75zm37.296-69.013c0.21982-0.65946-0.5166-1.1875-1.6561-1.1875-1.4381 0-1.8749 0.46137-1.4601 1.5423 0.65496 1.7068 2.499 1.4968 3.1162-0.35476zm61.229-30.097c-0.825-0.46674-2.625-1.1236-4-1.4597-2.0838-0.50933-2.0006-0.37052 0.5 0.83393 3.2047 1.5436 6.0083 2.0448 3.5 0.62574zm-11-4c-0.825-0.46674-2.625-1.1236-4-1.4597-2.0838-0.50933-2.0006-0.37052 0.5 0.83393 3.2047 1.5436 6.0083 2.0448 3.5 0.62574zm-10-3.4966c0-0.60605-9.2758-3.6515-9.7321-3.1952-0.21611 0.2161 1.5477 1.0793 3.9196 1.9181 4.6746 1.6533 5.8125 1.9033 5.8125 1.2771zm-15-5.5034c-0.825-0.46674-2.625-1.1236-4-1.4597-2.0838-0.50933-2.0006-0.37052 0.5 0.83393 3.2047 1.5436 6.0083 2.0448 3.5 0.62574zm-11-4c-0.825-0.46674-2.625-1.1236-4-1.4597-2.0838-0.50933-2.0006-0.37052 0.5 0.83393 3.2047 1.5436 6.0083 2.0448 3.5 0.62574zm83.541-16.97c7.3743-3.3497 12.459-11.375 12.459-19.665 0-3.7609-0.53791-5.147-2.9231-7.5321-4.9762-4.9762-12.153-3.7331-18.715 3.2416-4.5006 4.7836-6.362 9.0443-6.362 14.563 0 9.6638 6.4124 13.539 15.541 9.3925zm-27.695-46.951c-2.699-0.44236-3.4109 0.44596-1.8575 2.3177 1.1379 1.3711 1.4133 1.3469 2.575-0.22583 1.123-1.5204 1.025-1.8063-0.71751-2.0919zm73.835-25.763c-0.0999-0.06787-1.8691-0.3838-3.9316-0.70207-3.0897-0.47678-3.75-0.27932-3.75 1.1213 0 0.935 1.0125 2.1715 2.25 2.7478 1.8382 0.856 2.5578 0.67338 3.9316-0.99793 0.92488-1.1251 1.5999-2.1012 1.5-2.1691zm-72.554 190.32c-0.7971-0.7971-1.1278-12.178-1.1278-38.817 0-34.467 0.1496-37.86 1.75-39.686 2.5691-2.9309 66.109-25.766 67.585-24.29 0.82218 0.82218 1.5185 0.5853 2.6406-0.89833 1.6427-2.1719 66.591-26.423 68.163-25.451 0.47339 0.29257 0.86072 18.265 0.86072 39.938 0 37.127-0.10556 39.462-1.8256 40.383-1.0041 0.53736-16.16 6.1875-33.679 12.556-21.667 7.8761-32.18 11.252-32.874 10.558-1.4829-1.4829-2.3252-1.2588-2.8529 0.75906-0.34169 1.3066-7.3515 4.2704-26.367 11.148-14.246 5.1524-29.331 10.619-33.523 12.148-5.6571 2.0632-7.913 2.4892-8.75 1.6522zm143.54-136.39c-0.92391-0.9239-0.84346-42.11 0.0833-42.661 0.55979-0.3325 36.098 12.197 59.143 20.851 0.76622 0.28775 1.1661 0.75022 0.88861 1.0277-0.60649 0.60651-57.658 21.448-58.712 21.448-0.40492 0-1.0362-0.3-1.4029-0.66667z" fill="#fdc81e"/>
-   <path d="m178 340.64-33.5-12.175-0.26134-40.232c-0.23661-36.423-0.10894-40.232 1.3485-40.232 1.6512 0 61.311 21.373 64.913 23.254 1.1 0.57474 2.31 1.5222 2.689 2.1055 0.4554 0.70102 1.3029 0.50794 2.5-0.56958 2.0288-1.8261 64.495-24.79 67.433-24.79 1.8053 0 1.8778 1.5208 1.8778 39.378 0 30.31-0.28783 39.604-1.25 40.362-2.7425 2.1593-66.144 24.391-68.101 23.879-1.1249-0.29415-2.5186-0.14554-3.0972 0.33026-0.633 0.52051-14.396-3.9843-34.552-11.31zm0.47484-83.438c-17.614-6.4353-32.576-12.065-33.25-12.51-0.93251-0.61592-1.2248-10.342-1.2248-40.75 0-39.274 0.03338-39.941 2-39.941 1.1 0 2-0.63098 2-1.4022 0-0.7712 1.2375-1.8451 2.75-2.3864s16.645-6.0197 33.628-12.174c22.08-8.0012 31.625-11.022 33.5-10.6 2.3878 0.53731 2.4432 0.48484 0.62159-0.58836-1.1-0.64805-2.3306-1.6667-2.7347-2.2637-0.40408-0.597-0.74158-18.762-0.75-40.367-0.0142-36.502 0.1085-39.328 1.7347-39.938 0.9625-0.36115 2.2-1.2241 2.75-1.9177 1.3998-1.7652 64.357-24.355 67.89-24.359 1.5894-2e-3 3.3894-0.6534 4-1.4475 0.98048-1.275 63.378-24.556 65.815-24.556 1.2208 0 61.525 21.785 64.06 23.142 1.0396 0.5564 1.6758 1.5705 1.4137 2.2535-0.29242 0.76205 0.35375 1.2154 1.6724 1.1733l2.149-0.068548 0.26136 39.618c0.20404 30.929-0.0153 39.844-1 40.649-1.4695 1.2008-64.705 24.233-66.532 24.233-0.67622 0-1.2395-0.5625-1.2517-1.25-0.0122-0.6875-0.82029-0.2128-1.7957 1.0549-2.4246 3.1512-66.923 26.795-69.232 25.379-1.0422-0.63909-2.138-0.51979-3.3472 0.36439-0.98876 0.723-2.5415 1.0362-3.4506 0.696-1.4215-0.532-1.4658-0.38858-0.31671 1.0249 0.73485 0.90389 1.0458 2.1131 0.69098 2.6872-0.38392 0.6212 0.39095 1.0438 1.9139 1.0438h2.559v39.378c0 32.98-0.23301 39.571-1.4343 40.568-0.78886 0.65469-16.187 6.5336-34.218 13.064-24.763 8.969-33.108 11.605-34.108 10.774-0.96668-0.80227-1.6375-0.78653-2.4823 0.0582-0.63669 0.63669-1.4051 1.1354-1.7076 1.1082-0.3025-0.0272-14.961-5.3147-32.575-11.75zm37.296-69.013c0.21982-0.65946-0.5166-1.1875-1.6561-1.1875-1.4381 0-1.8749 0.46137-1.4601 1.5423 0.65496 1.7068 2.499 1.4968 3.1162-0.35476zm61.229-30.097c-0.825-0.46674-2.625-1.1236-4-1.4597-2.0838-0.50933-2.0006-0.37052 0.5 0.83393 3.2047 1.5436 6.0083 2.0448 3.5 0.62574zm-11-4c-0.825-0.46674-2.625-1.1236-4-1.4597-2.0838-0.50933-2.0006-0.37052 0.5 0.83393 3.2047 1.5436 6.0083 2.0448 3.5 0.62574zm-10-3.4966c0-0.60605-9.2758-3.6515-9.7321-3.1952-0.21611 0.2161 1.5477 1.0793 3.9196 1.9181 4.6746 1.6533 5.8125 1.9033 5.8125 1.2771zm-15-5.5034c-0.825-0.46674-2.625-1.1236-4-1.4597-2.0838-0.50933-2.0006-0.37052 0.5 0.83393 3.2047 1.5436 6.0083 2.0448 3.5 0.62574zm-11-4c-0.825-0.46674-2.625-1.1236-4-1.4597-2.0838-0.50933-2.0006-0.37052 0.5 0.83393 3.2047 1.5436 6.0083 2.0448 3.5 0.62574zm83.541-16.97c7.3743-3.3497 12.459-11.375 12.459-19.665 0-3.7609-0.53791-5.147-2.9231-7.5321-4.9762-4.9762-12.153-3.7331-18.715 3.2416-4.5006 4.7836-6.362 9.0443-6.362 14.563 0 9.6638 6.4124 13.539 15.541 9.3925zm-27.695-46.951c-2.699-0.44236-3.4109 0.44596-1.8575 2.3177 1.1379 1.3711 1.4133 1.3469 2.575-0.22583 1.123-1.5204 1.025-1.8063-0.71751-2.0919zm73.835-25.763c-0.0999-0.06787-1.8691-0.3838-3.9316-0.70207-3.0897-0.47678-3.75-0.27932-3.75 1.1213 0 0.935 1.0125 2.1715 2.25 2.7478 1.8382 0.856 2.5578 0.67338 3.9316-0.99793 0.92488-1.1251 1.5999-2.1012 1.5-2.1691zm-72.554 190.32c-0.7971-0.7971-1.1278-12.178-1.1278-38.817 0-34.467 0.1496-37.86 1.75-39.686 2.5691-2.9309 66.109-25.766 67.585-24.29 0.82218 0.82218 1.5185 0.5853 2.6406-0.89833 1.6427-2.1719 66.591-26.423 68.163-25.451 0.47339 0.29257 0.86072 18.265 0.86072 39.938 0 37.127-0.10556 39.462-1.8256 40.383-1.0041 0.53736-16.16 6.1875-33.679 12.556-21.667 7.8761-32.18 11.252-32.874 10.558-1.4829-1.4829-2.3252-1.2588-2.8529 0.75906-0.34169 1.3066-7.3515 4.2704-26.367 11.148-14.246 5.1524-29.331 10.619-33.523 12.148-5.6571 2.0632-7.913 2.4892-8.75 1.6522z" fill="#6a8fae"/>
-   <path d="m182 341.42c-15.675-5.7232-30.412-11.121-32.75-11.996l-4.25-1.5902v-39.417c0-31.128 0.26618-39.417 1.2657-39.417 1.3958 0 61.019 21.547 63.922 23.1 1.7033 0.91158 1.8127 3.3525 1.8127 40.435 0 21.706-0.3375 39.426-0.75 39.378-0.4125-0.0476-13.575-4.7693-29.25-10.493zm34.238-29.622 0.26161-39.201 32.5-11.798c17.875-6.4891 33.068-11.799 33.762-11.799 0.99845-5.6e-4 1.207 8.1617 1 39.131l-0.26161 39.131-32.5 11.85c-17.875 6.5177-33.068 11.859-33.762 11.869-0.99871 0.0145-1.2071-8.1503-1-39.182zm-38.738-55.771-32-11.759-0.26147-39.634c-0.20708-31.389 9.5e-4 -39.625 1-39.591 0.69381 0.0236 15.661 5.3111 33.261 11.75l32 11.707 0.26147 39.75c0.20727 31.509-6e-5 39.728-1 39.644-0.69381-0.05856-15.661-5.3981-33.261-11.866zm38.738-28.124 0.26161-39.097 31.477-11.441c17.312-6.2927 32.505-11.699 33.762-12.015l2.2852-0.57353-0.52342 78.723-32 11.707c-17.6 6.4389-32.793 11.726-33.762 11.75-1.6572 0.0403-1.7461-2.2747-1.5-39.054zm72-26.025 0.26161-39.121 31-11.233c17.05-6.1784 32.012-11.554 33.25-11.946l2.25-0.71271v38.945c0 29.981-0.28773 39.164-1.25 39.899-1.5898 1.2131-62.819 23.338-64.512 23.311-0.99816-0.0159-1.207-8.1892-1-39.141zm70.762-25.243v-39.364l4.25-1.5903c2.3375-0.87464 16.625-6.0729 31.75-11.552 15.125-5.4788 28.288-10.273 29.25-10.653 1.6488-0.65109 1.75 1.5933 1.75 38.809 0 36.691-0.12447 39.549-1.75 40.187-4.1232 1.6196-64.529 23.527-64.872 23.527-0.20779 0-0.3778-17.714-0.3778-39.364zm-177.47-2.1238c-17.031-6.2174-31.11-11.738-31.286-12.268-0.1766-0.5298 14.321-6.2764 32.218-12.77l32.539-11.807 31.694 11.506c17.432 6.3282 31.834 11.927 32.006 12.441 0.29413 0.88239-63.071 24.492-65.205 24.295-0.55-0.0508-14.934-5.1793-31.965-11.397zm67.465-27.849c-16.775-6.158-31.062-11.553-31.75-11.989-0.96557-0.61224-1.25-9.7916-1.25-40.341 0-31.216 0.26336-39.452 1.25-39.091 0.6875 0.2516 15.353 5.5475 32.59 11.769 17.237 6.2212 31.98 11.951 32.762 12.733 1.1884 1.1884 1.3786 7.6795 1.1597 39.588-0.25616 37.344-0.30489 38.171-2.2618 38.347-1.1 0.099-15.725-4.8584-32.5-11.016zm38-27.605c0-28.999 0.30342-39.129 1.1885-39.676 2.4997-1.5449 65.349-24.073 66.062-23.68 0.4125 0.22794 0.75 17.883 0.75 39.234v38.82l-2.75 1.098c-6.1385 2.451-63.804 23.142-64.5 23.143-0.4125 7e-4 -0.75-17.522-0.75-38.94zm28.15 5.3468c4.0909-2.0895 9.4795-9.0094 10.863-13.95 4.3502-15.537-9.7175-23.214-21.526-11.746-14.446 14.029-6.06 34.237 10.663 25.696zm43.85-31.347c0-30.064 0.28495-39.121 1.25-39.732 1.91-1.2093 63.073-23.324 64.512-23.325 0.99848-0.0011 1.207 8.1721 1 39.188l-0.26161 39.19-32.5 11.793c-17.875 6.4863-32.838 11.801-33.25 11.81-0.4125 9e-3 -0.75-17.506-0.75-38.924zm-107.23-28.376c-16.903-6.1509-30.594-11.625-30.423-12.165 0.39652-1.2533 61.318-23.522 64.656-23.633 2.2573-0.07554 62.446 21.227 63.799 22.58 0.31212 0.31212 0.14749 0.94995-0.36585 1.4174-1.5412 1.4034-62.772 23.153-64.933 23.065-1.1-0.04484-15.83-5.1141-32.733-11.265zm72-26c-16.903-6.1509-30.591-11.633-30.418-12.183 0.38904-1.2333 61.317-23.518 64.127-23.454 2.9912 0.0675 64.057 22.54 63.839 23.493-0.25024 1.0941-62.263 23.479-64.809 23.394-1.1026-0.03664-15.835-5.0991-32.738-11.25z" fill="#4779a3"/>
-   <path d="m179.55 339.48c-17.023-6.186-31.76-11.753-32.75-12.371-1.681-1.0498-1.7998-3.5951-1.7998-38.556 0-24.407 0.35553-37.652 1.0217-38.064 0.92381-0.57094 62.433 20.966 64.24 22.493 0.41905 0.35409 0.64405 17.992 0.5 39.195l-0.26192 38.551zm37.45-27.851v-38.373l32.25-11.641c17.738-6.4025 32.588-11.635 33-11.627 0.4125 8e-3 0.75 17.261 0.75 38.341v38.327l-32.298 11.673c-17.764 6.4199-32.614 11.673-33 11.673s-0.70229-17.268-0.70229-38.373zm-39-56.35c-17.325-6.3312-31.831-12.021-32.235-12.644-1.0622-1.6384-0.94029-75.407 0.12572-76.066 0.49007-0.30288 15.34 4.6757 33 11.063l32.109 11.614v38.878c0 21.383-0.3375 38.83-0.75 38.772-0.4125-0.058-14.925-5.2856-32.25-11.617zm39-27.053v-38.726l31.75-11.428c17.462-6.2852 32.312-11.621 33-11.856 0.98578-0.33797 1.25 7.7114 1.25 38.081v38.509l-2.75 0.98909c-8.7438 3.1449-58.198 21.206-60.5 22.095l-2.75 1.0622zm72-26.525v-38.301l31.646-11.449c17.405-6.2972 32.035-11.601 32.512-11.787 0.48206-0.18768 0.75018 16.852 0.60449 38.415l-0.26182 38.752-31 11.284c-17.05 6.2063-31.562 11.307-32.25 11.335-0.97913 0.0399-1.25-8.2487-1.25-38.25zm71.238-25.446 0.26174-38.734 25.5-9.2112c14.025-5.0662 28.538-10.331 32.25-11.7l6.75-2.4884-0.012 77.379-24.744 8.9141c-13.609 4.9028-28.237 10.187-32.506 11.744l-7.7617 2.8297 0.26174-38.734zm-177.99-2.5086c-16.638-6.0949-30.25-11.363-30.25-11.707 0-0.64917 61.152-23.039 62.925-23.039 0.55284 0 13.508 4.5489 28.79 10.109 15.282 5.5598 29.056 10.566 30.611 11.124 1.5542 0.55853 2.4542 1.3816 2 1.829-0.96225 0.94797-61.66 22.98-62.955 22.852-0.47897-0.0476-14.483-5.0733-31.121-11.168zm66.25-28.265-31-11.343-0.52314-78.057 3.7616 1.3543c35.221 12.681 59.987 21.922 60.997 22.76 0.97926 0.81271 1.265 9.6058 1.265 38.927 0 35.441-0.11257 37.872-1.75 37.789-0.9625-0.0487-15.7-5.1927-32.75-11.431zm39.738-27.049 0.26174-38.569 65-23.571 0.26206 38.043c0.14413 20.923-0.0895 38.394-0.51921 38.824-0.65916 0.65916-63.744 23.843-64.879 23.843-0.2132 0-0.26985-17.356-0.12589-38.569zm25.086 7.6362c9.7626-3.7117 16.911-17.783 13.356-26.291-5.5301-13.235-24.697-6.8016-29.724 9.9777-2.6425 8.8199 2.1957 17.246 9.9023 17.246 2.2065 0 5.1161-0.41986 6.4658-0.93301zm46.914-33.552 0.26185-38.708 31.373-11.403c17.255-6.2719 31.767-11.403 32.25-11.403 0.48802 0 0.87746 17.013 0.87746 38.332v38.332l-31.25 11.321c-17.188 6.2268-31.818 11.528-32.512 11.78-1.0048 0.36494-1.2085-7.4268-1-38.25zm-107.24-28.453c-16.225-5.9236-29.415-11.135-29.31-11.581 0.10443-0.44609 14.187-5.899 31.295-12.118l31.105-11.307 30.951 11.222c17.023 6.1721 30.953 11.499 30.955 11.838 5e-3 0.93934-61.21 22.939-63.497 22.82-1.1-0.05735-15.275-4.9508-31.5-10.874zm72.182-25.962c-16.125-5.8978-29.253-11.145-29.174-11.661 0.17315-1.1238 58.33-22.438 61.223-22.438 1.8339 0 58.375 20.121 61.578 21.913 1.5038 0.84158-58.962 23.15-62.335 22.998-1.0857-0.04886-15.167-4.9143-31.292-10.812z" fill="#3674a8"/>
-   <path d="m179.55 339.48c-17.023-6.186-31.76-11.753-32.75-12.371-1.681-1.0498-1.7998-3.5951-1.7998-38.556 0-24.407 0.35553-37.652 1.0217-38.064 0.92381-0.57094 62.433 20.966 64.24 22.493 0.41905 0.35409 0.64405 17.992 0.5 39.195l-0.26192 38.551zm-1.5498-84.201c-17.325-6.3312-31.831-12.021-32.235-12.644-1.0622-1.6384-0.94029-75.407 0.12572-76.066 0.49007-0.30288 15.34 4.6757 33 11.063l32.109 11.614v38.878c0 21.383-0.3375 38.83-0.75 38.772-0.4125-0.058-14.925-5.2856-32.25-11.617zm4.25-81.532c-16.638-6.0949-30.25-11.363-30.25-11.707 0-0.64917 61.152-23.039 62.925-23.039 0.55284 0 13.508 4.5489 28.79 10.109 15.282 5.5598 29.056 10.566 30.611 11.124 1.5542 0.55853 2.4542 1.3816 2 1.829-0.96225 0.94797-61.66 22.98-62.955 22.852-0.47897-0.0476-14.483-5.0733-31.121-11.168zm66.25-28.265-31-11.343-0.52314-78.057 3.7616 1.3543c35.221 12.681 59.987 21.922 60.997 22.76 0.97926 0.81271 1.265 9.6058 1.265 38.927 0 35.441-0.11257 37.872-1.75 37.789-0.9625-0.0487-15.7-5.1927-32.75-11.431zm4.5-81.419c-16.225-5.9236-29.415-11.135-29.31-11.581 0.10443-0.44609 14.187-5.899 31.295-12.118l31.105-11.307 30.951 11.222c17.023 6.1721 30.953 11.499 30.955 11.838 5e-3 0.93934-61.21 22.939-63.497 22.82-1.1-0.05735-15.275-4.9508-31.5-10.874zm72.182-25.962c-16.125-5.8978-29.253-11.145-29.174-11.661 0.17315-1.1238 58.33-22.438 61.223-22.438 1.8339 0 58.375 20.121 61.578 21.913 1.5038 0.84158-58.962 23.15-62.335 22.998-1.0857-0.04886-15.167-4.9143-31.292-10.812z" fill="#2e6390"/>
-  </g>
-  <path d="m113.77 151.17c0-0.29037 5e-3 -0.52796 0.011-0.52796s0.1782-0.0679 0.38251-0.15099l0.37147-0.15098v1.026l-0.11459 0.0546c-0.063 0.03-0.23515 0.10469-0.38251 0.16597l-0.26792 0.11142z" fill="#fff" stroke-width=".035506"/>
-  <path d="m116.26 150.13v-0.50745l0.34093-0.14219c0.18752-0.0782 0.36008-0.15034 0.38348-0.16029 0.0335-0.0143 0.0406 0.093 0.0333 0.50679l-9e-3 0.52488-0.33262 0.13963c-0.18294 0.0768-0.35133 0.14108-0.37419 0.14285-0.0313 2e-3 -0.0416-0.12181-0.0416-0.50422z" fill="#fff" stroke-width=".035506"/>
-  <path d="m111.73 149.75c-0.14635-0.0621-0.28065-0.11957-0.29844-0.12761-0.0243-0.011 0.0354-0.043 0.24115-0.12919 0.15042-0.063 0.29033-0.12049 0.31092-0.12774l0.0374-0.0132v0.2571c0 0.14141-6e-3 0.25632-0.0125 0.25535-7e-3 -9.6e-4 -0.13221-0.0526-0.27857-0.11473z" fill="#fff" stroke-width=".017753"/>
-  <path d="m112.54 148.97c-0.14635-0.0624-0.27225-0.12042-0.27976-0.12888-8e-3 -8e-3 0.10848-0.0669 0.25778-0.12986 0.14929-0.063 0.28454-0.12039 0.30055-0.12763 0.0269-0.0121 0.0291 7e-3 0.0291 0.2447 0 0.19437-5e-3 0.25752-0.0208 0.25651-0.0114-7.5e-4 -0.14053-0.0524-0.28688-0.11484z" fill="#fff" stroke-width=".017753"/>
-  <path d="m112.53 148.29c-0.15386-0.066-0.28286-0.12348-0.28666-0.12782-4e-3 -4e-3 0.0472-0.0301 0.11343-0.0572 0.0662-0.0271 0.20455-0.0839 0.30745-0.12628l0.1871-0.077v0.25553c0 0.19254-5e-3 0.25517-0.0208 0.25409-0.0114-7.8e-4 -0.14667-0.0554-0.30053-0.12135z" fill="#fff" stroke-width=".017753"/>
-  <path d="m113.35 147.51c-0.15321-0.0631-0.27854-0.11986-0.27851-0.12611 4e-5 -0.0112 0.57842-0.24985 0.60282-0.24878 7e-3 3e-4 0.0125 0.1114 0.0125 0.2469 0 0.22267-3e-3 0.24618-0.0291 0.24454-0.016-9.9e-4 -0.15446-0.0534-0.30768-0.11655z" fill="#fff" stroke-width=".017753"/>
-  <path d="m114.76 147.52c-0.0332-0.054-0.0342-0.0977-4e-3 -0.16443 0.047-0.10297 0.15552-0.1786 0.20282-0.14137 0.0499 0.0392 0.0585 0.0986 0.0264 0.18044-0.0383 0.0976-0.0803 0.14244-0.14761 0.15778-0.041 9e-3 -0.0561 3e-3 -0.0779-0.0324z" fill="#fff" stroke-width=".017753"/>
-  <path d="m115.81 150.44c-0.0507-0.0502-0.0544-0.10156-0.0139-0.1932 0.0257-0.058 0.0571-0.0955 0.10026-0.11954 0.0584-0.0325 0.0658-0.0328 0.10395-4e-3 0.049 0.0366 0.0545 0.11519 0.0147 0.2106-0.0444 0.10649-0.14972 0.16118-0.20507 0.10644z" fill="#fff" stroke-width=".017753"/>
- </g>
-</svg>
Binary file eric6/icons/default/qscintilla.png has changed
Binary file eric6/icons/default/qthelp.png has changed
--- a/eric6/icons/default/question.svg	Sun Apr 05 18:17:08 2020 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg viewBox="0 0 22 22" xmlns="http://www.w3.org/2000/svg">
- <defs>
-  <style type="text/css">.ColorScheme-Text {
-        color:#232629;
-      }</style>
- </defs>
- <path class="ColorScheme-Text" d="m10.969 3c-1.7509 0-3.4069 0.4216-4.9688 1.2637l0.77734 1.7871c0.78092-0.38352 1.4827-0.65748 2.1074-0.82422 0.63297-0.16673 1.2779-0.25 1.9355-0.25 0.98644 0 1.7434 0.22025 2.2695 0.66211 0.5261 0.44187 0.78906 1.075 0.78906 1.9004 0 0.44187-0.056795 0.83056-0.17188 1.1641-0.11508 0.33348-0.31231 0.66651-0.5918 1-0.27948 0.33349-0.86767 0.88335-1.7637 1.6504-1.1001 1.0033-2.2511 2.7855-2.3516 4.6465h2l-0.005859-0.03125c0-0.75868 0.13147-1.3676 0.39453-1.8262 0.27128-0.46689 0.81313-1.055 1.627-1.7637 0.99467-0.84207 1.6575-1.4752 1.9863-1.9004 0.33704-0.4252 0.58755-0.87438 0.75195-1.3496 0.1645-0.47523 0.24609-1.0217 0.24609-1.6387 0-1.4173-0.44773-2.519-1.3438-3.3027-0.89601-0.79204-2.1256-1.1875-3.6875-1.1875zm-1.9688 14v2h2v-2h-2z" fill="currentColor"/>
-</svg>
Binary file eric6/icons/default/quickFindExtend.png has changed
Binary file eric6/icons/default/quickFindNext.png has changed
Binary file eric6/icons/default/quickFindPrev.png has changed
Binary file eric6/icons/default/relayout.png has changed
Binary file eric6/icons/default/reload.png has changed
Binary file eric6/icons/default/remsplitHorizontal.png has changed
Binary file eric6/icons/default/remsplitVertical.png has changed
Binary file eric6/icons/default/renameBookmark.png has changed
Binary file eric6/icons/default/repeat.png has changed
Binary file eric6/icons/default/rescan.png has changed
Binary file eric6/icons/default/resizeColumns.png has changed
Binary file eric6/icons/default/resourcesCompiler48.png has changed
Binary file eric6/icons/default/restart.png has changed
Binary file eric6/icons/default/restartDelete.png has changed
Binary file eric6/icons/default/rss16.png has changed
Binary file eric6/icons/default/rss22.png has changed
Binary file eric6/icons/default/rss48.png has changed
Binary file eric6/icons/default/runProject.png has changed
Binary file eric6/icons/default/runScript.png has changed
Binary file eric6/icons/default/safari.png has changed
Binary file eric6/icons/default/safeBrowsing.png has changed
Binary file eric6/icons/default/safeBrowsing48.png has changed
Binary file eric6/icons/default/sceneHeightDec.png has changed
Binary file eric6/icons/default/sceneHeightInc.png has changed
Binary file eric6/icons/default/sceneSize.png has changed
Binary file eric6/icons/default/sceneWidthDec.png has changed
Binary file eric6/icons/default/sceneWidthInc.png has changed
Binary file eric6/icons/default/screenCapture.png has changed
Binary file eric6/icons/default/scrollAll.png has changed
Binary file eric6/icons/default/scrollHorizontal.png has changed
Binary file eric6/icons/default/scrollVertical.png has changed
Binary file eric6/icons/default/securityHigh.png has changed
Binary file eric6/icons/default/securityHigh32.png has changed
Binary file eric6/icons/default/securityLow.png has changed
Binary file eric6/icons/default/securityLow32.png has changed
Binary file eric6/icons/default/securityMedium.png has changed
Binary file eric6/icons/default/securityMedium32.png has changed
Binary file eric6/icons/default/select.png has changed
Binary file eric6/icons/default/selectCircle.png has changed
Binary file eric6/icons/default/selectRectangle.png has changed
Binary file eric6/icons/default/shapesAlignBottom.png has changed
Binary file eric6/icons/default/shapesAlignHCenter.png has changed
Binary file eric6/icons/default/shapesAlignLeft.png has changed
Binary file eric6/icons/default/shapesAlignRight.png has changed
Binary file eric6/icons/default/shapesAlignTop.png has changed
Binary file eric6/icons/default/shapesAlignVCenter.png has changed
Binary file eric6/icons/default/sharedEditCancel.png has changed
Binary file eric6/icons/default/sharedEditConnected.png has changed
Binary file eric6/icons/default/sharedEditDisconnected.png has changed
Binary file eric6/icons/default/sharedEditSend.png has changed
Binary file eric6/icons/default/sharedEditStart.png has changed
Binary file eric6/icons/default/shell.png has changed
Binary file eric6/icons/default/showPassword.png has changed
Binary file eric6/icons/default/showPrograms.png has changed
Binary file eric6/icons/default/siteinfo-databases.png has changed
Binary file eric6/icons/default/siteinfo-general.png has changed
Binary file eric6/icons/default/siteinfo-media.png has changed
Binary file eric6/icons/default/siteinfo-security.png has changed
Binary file eric6/icons/default/spellchecking.png has changed
Binary file eric6/icons/default/spellchecking48.png has changed
Binary file eric6/icons/default/splitHorizontal.png has changed
Binary file eric6/icons/default/splitVertical.png has changed
Binary file eric6/icons/default/sqlBrowser.png has changed
--- a/eric6/icons/default/start.svg	Sun Apr 05 18:17:08 2020 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg viewBox="0 0 22 22" xmlns="http://www.w3.org/2000/svg">
- <defs>
-  <style type="text/css">.ColorScheme-Text {
-        color:#232629;
-      }</style>
- </defs>
- <path class="ColorScheme-Text" d="m4 4v14l14-7z" fill="currentColor"/>
-</svg>
Binary file eric6/icons/default/step.png has changed
Binary file eric6/icons/default/stepOut.png has changed
Binary file eric6/icons/default/stepOver.png has changed
Binary file eric6/icons/default/stepQuit.png has changed
Binary file eric6/icons/default/stopLoading.png has changed
Binary file eric6/icons/default/stopScript.png has changed
Binary file eric6/icons/default/superMenu.png has changed
Binary file eric6/icons/default/symbols.png has changed
Binary file eric6/icons/default/symlink.png has changed
Binary file eric6/icons/default/sync.png has changed
Binary file eric6/icons/default/syncCompleted.png has changed
Binary file eric6/icons/default/syncFailed.png has changed
Binary file eric6/icons/default/syncNo.png has changed
Binary file eric6/icons/default/syncToc.png has changed
Binary file eric6/icons/default/syntaxError.png has changed
Binary file eric6/icons/default/syntaxError22.png has changed
Binary file eric6/icons/default/syntaxErrorGoto.png has changed
Binary file eric6/icons/default/tBreak.png has changed
Binary file eric6/icons/default/tCBreak.png has changed
Binary file eric6/icons/default/tabClose.png has changed
Binary file eric6/icons/default/tabCloseOther.png has changed
Binary file eric6/icons/default/tabDuplicate.png has changed
Binary file eric6/icons/default/tabManager.png has changed
Binary file eric6/icons/default/tabNew.png has changed
Binary file eric6/icons/default/task.png has changed
Binary file eric6/icons/default/taskCompleted.png has changed
Binary file eric6/icons/default/taskFixme.png has changed
Binary file eric6/icons/default/taskNext.png has changed
Binary file eric6/icons/default/taskNote.png has changed
Binary file eric6/icons/default/taskPrev.png has changed
Binary file eric6/icons/default/taskPrioHigh.png has changed
Binary file eric6/icons/default/taskPrioLow.png has changed
Binary file eric6/icons/default/taskPriority.png has changed
Binary file eric6/icons/default/taskTodo.png has changed
Binary file eric6/icons/default/taskWarning.png has changed
Binary file eric6/icons/default/templateViewer.png has changed
--- a/eric6/icons/default/terminal.svg	Sun Apr 05 18:17:08 2020 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="16px" height="16px" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
- <defs>
-  <linearGradient id="linearGradient2880" x1="16.143" x2="16.143" y1="4" y2="44" gradientTransform="matrix(.23078 0 0 .15386 2.4612 4.8074)" gradientUnits="userSpaceOnUse">
-   <stop stop-color="#fff" offset="0"/>
-   <stop stop-color="#fff" stop-opacity="0" offset="1"/>
-  </linearGradient>
-  <linearGradient id="linearGradient2883" x1="16.626" x2="20.055" y1="15.298" y2="24.628" gradientTransform="matrix(.30476 0 0 .32156 .68572 1.0807)" gradientUnits="userSpaceOnUse">
-   <stop stop-color="#fff" offset="0"/>
-   <stop stop-color="#fff" stop-opacity="0" offset="1"/>
-  </linearGradient>
-  <linearGradient id="linearGradient2886" x1="16" x2="16" y1="27.045" y2="16" gradientTransform="matrix(.34286 0 0 .36364 -.42808 -.81818)" gradientUnits="userSpaceOnUse" xlink:href="#linearGradient3680-6"/>
-  <linearGradient id="linearGradient3680-6">
-   <stop stop-color="#dcdcdc" offset="0"/>
-   <stop stop-color="#fff" offset="1"/>
-  </linearGradient>
-  <linearGradient id="linearGradient2890" x1="20" x2="20" y1="28" y2="26" gradientTransform="matrix(.375 0 0 .375 -.74978 -.5)" gradientUnits="userSpaceOnUse" xlink:href="#linearGradient3680-6"/>
-  <linearGradient id="linearGradient2894" x1="12.579" x2="12.213" y1="2.9165" y2="47.279" gradientTransform="matrix(.28855 0 0 .25608 1.0743 2.6116)" gradientUnits="userSpaceOnUse">
-   <stop stop-color="#fff" offset="0"/>
-   <stop stop-color="#fff" stop-opacity="0" offset="1"/>
-  </linearGradient>
-  <linearGradient id="linearGradient2897" x1="23.071" x2="23.071" y1="36.047" y2="33.296" gradientTransform="matrix(.33032 0 0 .32624 .074248 1.9649)" gradientUnits="userSpaceOnUse">
-   <stop stop-color="#fff" offset="0"/>
-   <stop stop-color="#fff" stop-opacity="0" offset="1"/>
-  </linearGradient>
-  <radialGradient id="radialGradient2900" cx="7.4957" cy="8.4498" r="20" gradientTransform="matrix(0 .47178 -.86826 -1.9907e-8 15.337 1.0829)" gradientUnits="userSpaceOnUse">
-   <stop stop-color="#505050" offset="0"/>
-   <stop stop-color="#141414" offset="1"/>
-  </radialGradient>
-  <linearGradient id="linearGradient2902" x1="16.143" x2="16.143" y1="4" y2="44" gradientTransform="matrix(.28207 0 0 .20514 1.2304 3.5766)" gradientUnits="userSpaceOnUse">
-   <stop stop-color="#323232" offset="0"/>
-   <stop offset="1"/>
-  </linearGradient>
-  <linearGradient id="linearGradient2983" x1="24" x2="24" y1="7.96" y2="43.865" gradientTransform="matrix(.3333 0 0 .32429 .00075427 .06858)" gradientUnits="userSpaceOnUse">
-   <stop stop-color="#f0f0f0" offset="0"/>
-   <stop stop-color="#d7d7d8" offset=".085525"/>
-   <stop stop-color="#b2b2b3" offset=".92166"/>
-   <stop stop-color="#979798" offset="1"/>
-  </linearGradient>
-  <linearGradient id="linearGradient2985" x1="10.014" x2="10.014" y1="44.96" y2="2.8765" gradientTransform="matrix(.31912 0 0 .29298 .34112 1.4648)" gradientUnits="userSpaceOnUse">
-   <stop stop-color="#595959" offset="0"/>
-   <stop stop-color="#b3b3b3" offset="1"/>
-  </linearGradient>
- </defs>
- <rect x=".50107" y="2.5011" width="14.998" height="11.998" rx="1" ry="1" fill="url(#linearGradient2983)" fill-rule="evenodd" stroke="url(#linearGradient2985)" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.0021"/>
- <rect x="2.5" y="4.5" width="11" height="8" rx="0" ry="0" color="#000000" fill="url(#radialGradient2900)" stroke="url(#linearGradient2902)" stroke-linecap="round" stroke-linejoin="round"/>
- <rect x="1.501" y="3.5011" width="12.998" height="9.9979" rx="0" ry="0" fill="none" opacity=".4" stroke="url(#linearGradient2897)" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.0021"/>
- <rect x="1.5019" y="3.5019" width="12.996" height="9.9963" fill="none" opacity=".8" stroke="url(#linearGradient2894)" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.0037"/>
- <path d="m9.0002 10v-0.75h-3v0.75h3z" fill="url(#linearGradient2890)"/>
- <path d="m3.6862 9-0.68571-0.72727 1.5429-1.2727-1.5429-1.2727 0.68571-0.72727 2.3143 2-2.3143 2z" fill="url(#linearGradient2886)"/>
- <path d="m1.6667 3c-0.36824 0-0.66667 0.31488-0.66667 0.70342v5.145c9.545e-4 0.043283 0.018837 0.084214 0.049602 0.11286 0.030769 0.028643 0.071495 0.04238 0.1123 0.037874l13.714-2.2911c0.070547-0.011738 0.12282-0.075385 0.12381-0.15073v-2.8539c0-0.38854-0.29843-0.70342-0.66667-0.70342h-12.667z" fill="url(#linearGradient2883)" fill-rule="evenodd" opacity=".2"/>
- <rect x="3.5" y="5.5" width="9" height="6" rx="0" ry="0" color="#000000" fill="none" opacity=".1" stroke="url(#linearGradient2880)" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
Binary file eric6/icons/default/textencoding.png has changed
Binary file eric6/icons/default/tineye.png has changed
Binary file eric6/icons/default/toolbarsConfigure.png has changed
Binary file eric6/icons/default/trPreviewer.png has changed
Binary file eric6/icons/default/transformResize.png has changed
Binary file eric6/icons/default/translate.png has changed
Binary file eric6/icons/default/trash.png has changed
Binary file eric6/icons/default/uiPreviewer.png has changed
Binary file eric6/icons/default/unhighlight.png has changed
Binary file eric6/icons/default/unittest.png has changed
Binary file eric6/icons/default/unittestProject.png has changed
Binary file eric6/icons/default/unittestRerunFailed.png has changed
Binary file eric6/icons/default/unittestRestart.png has changed
Binary file eric6/icons/default/unittestScript.png has changed
Binary file eric6/icons/default/updateLocal.png has changed
Binary file eric6/icons/default/updateRemote.png has changed
Binary file eric6/icons/default/vcsAdd.png has changed
Binary file eric6/icons/default/vcsAddRemove.png has changed
Binary file eric6/icons/default/vcsApplyChangegroup.png has changed
Binary file eric6/icons/default/vcsBranch.png has changed
Binary file eric6/icons/default/vcsChangeLists.png has changed
Binary file eric6/icons/default/vcsCheckout.png has changed
Binary file eric6/icons/default/vcsCommit.png has changed
Binary file eric6/icons/default/vcsCreateChangegroup.png has changed
Binary file eric6/icons/default/vcsDiff.png has changed
Binary file eric6/icons/default/vcsEditHistory.png has changed
Binary file eric6/icons/default/vcsExport.png has changed
Binary file eric6/icons/default/vcsExportPatch.png has changed
Binary file eric6/icons/default/vcsGraft.png has changed
Binary file eric6/icons/default/vcsImportPatch.png has changed
Binary file eric6/icons/default/vcsLock.png has changed
Binary file eric6/icons/default/vcsLog.png has changed
Binary file eric6/icons/default/vcsLogin.png has changed
Binary file eric6/icons/default/vcsLogout.png has changed
Binary file eric6/icons/default/vcsMerge.png has changed
Binary file eric6/icons/default/vcsPreviewChangegroup.png has changed
Binary file eric6/icons/default/vcsRebase.png has changed
Binary file eric6/icons/default/vcsRemove.png has changed
Binary file eric6/icons/default/vcsRepo.png has changed
Binary file eric6/icons/default/vcsRepoBrowser.png has changed
Binary file eric6/icons/default/vcsRevert.png has changed
Binary file eric6/icons/default/vcsSbsDiff.png has changed
Binary file eric6/icons/default/vcsStatus.png has changed
Binary file eric6/icons/default/vcsSummary.png has changed
Binary file eric6/icons/default/vcsSwitch.png has changed
Binary file eric6/icons/default/vcsTag.png has changed
Binary file eric6/icons/default/vcsTagGlobal.png has changed
Binary file eric6/icons/default/vcsTagLocal.png has changed
Binary file eric6/icons/default/vcsTransplant.png has changed
Binary file eric6/icons/default/vcsUnlock.png has changed
Binary file eric6/icons/default/vcsUpdate.png has changed
Binary file eric6/icons/default/viewProfileDebug.png has changed
Binary file eric6/icons/default/viewProfileEdit.png has changed
Binary file eric6/icons/default/virtualenv.png has changed
Binary file eric6/icons/default/virtualenvConfig.png has changed
Binary file eric6/icons/default/virustotal.png has changed
Binary file eric6/icons/default/w3.png has changed
Binary file eric6/icons/default/warning.png has changed
Binary file eric6/icons/default/warning22.png has changed
Binary file eric6/icons/default/warningNext.png has changed
Binary file eric6/icons/default/warningPrev.png has changed
Binary file eric6/icons/default/watchpoints.png has changed
Binary file eric6/icons/default/webInspector.png has changed
Binary file eric6/icons/default/webSearch.png has changed
Binary file eric6/icons/default/whatsThis.png has changed
Binary file eric6/icons/default/wikipedia.png has changed
Binary file eric6/icons/default/windowFullscreen.png has changed
Binary file eric6/icons/default/windowRestore.png has changed
Binary file eric6/icons/default/wordboundary.png has changed
Binary file eric6/icons/default/xbel.png has changed
Binary file eric6/icons/default/yahoo.png has changed
Binary file eric6/icons/default/yandex.png has changed
Binary file eric6/icons/default/zoomIn.png has changed
Binary file eric6/icons/default/zoomOut.png has changed
Binary file eric6/icons/default/zoomReset.png has changed
Binary file eric6/icons/default/zoomTo.png has changed
Binary file eric6/icons/oxygen/1downarrow.png has changed
Binary file eric6/icons/oxygen/1leftarrow.png has changed
Binary file eric6/icons/oxygen/1rightarrow.png has changed
Binary file eric6/icons/oxygen/1uparrow.png has changed
Binary file eric6/icons/oxygen/2downarrow.png has changed
Binary file eric6/icons/oxygen/2leftarrow.png has changed
Binary file eric6/icons/oxygen/2rightarrow.png has changed
Binary file eric6/icons/oxygen/2uparrow.png has changed
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/eric6/icons/oxygen/LICENSE.oxygen	Sat May 02 13:51:07 2020 +0200
@@ -0,0 +1,48 @@
+The Oxygen Icon Theme
+    Copyright (C) 2007 David Vignoni <david@icon-king.com>
+    Copyright (C) 2007 Johann Ollivier Lapeyre <johann@oxygen-icons.org>
+    Copyright (C) 2007 Kenneth Wimer <kwwii@bootsplash.org>
+    Copyright (C) 2007 Nuno Fernades Pinheiro <nf.pinheiro@gmail.com>
+    Copyright (C) 2007 Riccardo Iaconelli <riccardo@oxygen-icons.org>
+    Copyright (C) 2007 David Miller <miller@oxygen-icons.org>
+
+and others
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Library General Public
+    License as published by the Free Software Foundation; either
+    version 3 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Library General Public License for more details.
+
+    You should have received a copy of the GNU Library General Public
+    License along with this library. If not, see <http://www.gnu.org/licenses/>.
+
+Clarification:
+
+  The GNU Lesser General Public License or LGPL is written for
+  software libraries in the first place. We expressly want the LGPL to
+  be valid for this artwork library too.
+
+  KDE Oxygen theme icons is a special kind of software library, it is an
+  artwork library, it's elements can be used in a Graphical User Interface, or
+  GUI.
+
+  Source code, for this library means:
+   - where they exist, SVG;
+   - otherwise, if applicable, the multi-layered formats xcf or psd, or
+  otherwise png.
+
+  The LGPL in some sections obliges you to make the files carry
+  notices. With images this is in some cases impossible or hardly useful.
+
+  With this library a notice is placed at a prominent place in the directory
+  containing the elements. You may follow this practice.
+
+  The exception in section 5 of the GNU Lesser General Public License covers
+  the use of elements of this art library in a GUI.
+
+  kde-artists [at] kde.org
Binary file eric6/icons/oxygen/actionsToolButton.png has changed
Binary file eric6/icons/oxygen/adBlockAction.png has changed
Binary file eric6/icons/oxygen/adBlockPlus.png has changed
Binary file eric6/icons/oxygen/adBlockPlus48.png has changed
Binary file eric6/icons/oxygen/adBlockPlusDisabled.png has changed
Binary file eric6/icons/oxygen/adBlockPlusDisabled16.png has changed
Binary file eric6/icons/oxygen/adBlockPlusGreen.png has changed
Binary file eric6/icons/oxygen/adBlockPlusGreen16.png has changed
Binary file eric6/icons/oxygen/adBlockPlusGreen48.png has changed
Binary file eric6/icons/oxygen/addBookmark.png has changed
Binary file eric6/icons/oxygen/addUser.png has changed
Binary file eric6/icons/oxygen/altn.png has changed
Binary file eric6/icons/oxygen/anychar.png has changed
Binary file eric6/icons/oxygen/astTree.png has changed
Binary file eric6/icons/oxygen/atomicgroup.png has changed
Binary file eric6/icons/oxygen/attribute.png has changed
Binary file eric6/icons/oxygen/attribute_class.png has changed
Binary file eric6/icons/oxygen/attribute_private.png has changed
Binary file eric6/icons/oxygen/attribute_protected.png has changed
Binary file eric6/icons/oxygen/attributes.png has changed
Binary file eric6/icons/oxygen/attributes_class.png has changed
Binary file eric6/icons/oxygen/audio-video.png has changed
Binary file eric6/icons/oxygen/audioMuted.png has changed
Binary file eric6/icons/oxygen/audioPlaying.png has changed
Binary file eric6/icons/oxygen/audioVolumeHigh.png has changed
Binary file eric6/icons/oxygen/audioVolumeMuted.png has changed
Binary file eric6/icons/oxygen/audiocapture.png has changed
Binary file eric6/icons/oxygen/autoHideOff.png has changed
Binary file eric6/icons/oxygen/autoHideOn.png has changed
Binary file eric6/icons/oxygen/autospellchecking.png has changed
Binary file eric6/icons/oxygen/back.png has changed
Binary file eric6/icons/oxygen/begline.png has changed
Binary file eric6/icons/oxygen/bookmark16.png has changed
Binary file eric6/icons/oxygen/bookmark22.png has changed
Binary file eric6/icons/oxygen/bookmark32.png has changed
Binary file eric6/icons/oxygen/bookmarkNext.png has changed
Binary file eric6/icons/oxygen/bookmarkPrevious.png has changed
Binary file eric6/icons/oxygen/bookmarkToggle.png has changed
Binary file eric6/icons/oxygen/break.png has changed
Binary file eric6/icons/oxygen/breakDisabled.png has changed
Binary file eric6/icons/oxygen/breakpointNext.png has changed
Binary file eric6/icons/oxygen/breakpointPrevious.png has changed
Binary file eric6/icons/oxygen/breakpointToggle.png has changed
Binary file eric6/icons/oxygen/breakpoints.png has changed
Binary file eric6/icons/oxygen/browser.png has changed
Binary file eric6/icons/oxygen/cBreak.png has changed
Binary file eric6/icons/oxygen/cBreakpointToggle.png has changed
Binary file eric6/icons/oxygen/callReturn.png has changed
Binary file eric6/icons/oxygen/callStack.png has changed
Binary file eric6/icons/oxygen/callTrace.png has changed
Binary file eric6/icons/oxygen/callTraceStart.png has changed
Binary file eric6/icons/oxygen/callTraceStop.png has changed
Binary file eric6/icons/oxygen/camera.png has changed
Binary file eric6/icons/oxygen/cameraPhoto.png has changed
Binary file eric6/icons/oxygen/certificateDelete.png has changed
Binary file eric6/icons/oxygen/certificateExport.png has changed
Binary file eric6/icons/oxygen/certificateImport.png has changed
Binary file eric6/icons/oxygen/certificates.png has changed
Binary file eric6/icons/oxygen/changeNext.png has changed
Binary file eric6/icons/oxygen/changePrev.png has changed
Binary file eric6/icons/oxygen/changesetSign.png has changed
Binary file eric6/icons/oxygen/changesetSignList.png has changed
Binary file eric6/icons/oxygen/changesetSignVerify.png has changed
Binary file eric6/icons/oxygen/characters.png has changed
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/eric6/icons/oxygen/chart.svg	Sat May 02 13:51:07 2020 +0200
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg viewBox="0 0 22 22" xmlns="http://www.w3.org/2000/svg">
+ <defs>
+  <style type="text/css">.ColorScheme-Text {
+        color:#232629;
+      }
+      .ColorScheme-Highlight {
+        color:#3daee9;
+      }</style>
+ </defs>
+ <path class="ColorScheme-Text" d="m4 3v6 1 5 1 1h-1v1h1v1h1v-1h13.293 0.70703v-0.70703-0.29297h-0.29297l-3.5762-3.5762-0.003906 0.003906-0.005859-0.003906-2.123 2.123-4.123-4.123h-0.0019531-1.873-1-1v-0.42383-1h1 1 1.873 0.0019531l4.123-4.123 2.123 2.123 0.005859-0.0039062 0.003906 0.0039062 3.8691-3.8691-0.70703-0.70703-3.166 3.166-2.127-2.125-0.001953 0.0019531-0.001953-0.0019531-1.5273 1.5273h-6.4688v-0.99219-2h-1zm1 3h6.4609l-3 3h-1.4609-1-1v-3zm0 6.4238h1 1 1.4609l3 3h-6.4609v-0.42383-2.5762zm10.127 2.4102 2.166 2.166h-12.293v-1-0.56836h6.4688l1.5273 1.5273 0.001953-0.001953 0.001953 0.001953 2.127-2.125z" fill="currentColor"/>
+</svg>
Binary file eric6/icons/oxygen/chatBanKickUser.png has changed
Binary file eric6/icons/oxygen/chatBanUser.png has changed
Binary file eric6/icons/oxygen/chatKickUser.png has changed
Binary file eric6/icons/oxygen/chatUser.png has changed
Binary file eric6/icons/oxygen/chatUser1.png has changed
Binary file eric6/icons/oxygen/chatUser2.png has changed
Binary file eric6/icons/oxygen/chatUser3.png has changed
Binary file eric6/icons/oxygen/chatUser4.png has changed
Binary file eric6/icons/oxygen/chatUser5.png has changed
Binary file eric6/icons/oxygen/chatUser6.png has changed
Binary file eric6/icons/oxygen/chrome.png has changed
Binary file eric6/icons/oxygen/chromium.png has changed
Binary file eric6/icons/oxygen/circuitPythonDevice.png has changed
Binary file eric6/icons/oxygen/class.png has changed
Binary file eric6/icons/oxygen/class_private.png has changed
Binary file eric6/icons/oxygen/class_protected.png has changed
Binary file eric6/icons/oxygen/clearLeft.png has changed
Binary file eric6/icons/oxygen/clearPrivateData.png has changed
Binary file eric6/icons/oxygen/clearRight.png has changed
Binary file eric6/icons/oxygen/close.png has changed
Binary file eric6/icons/oxygen/closeEditor.png has changed
Binary file eric6/icons/oxygen/closehead.png has changed
Binary file eric6/icons/oxygen/codeDocuViewer.png has changed
Binary file eric6/icons/oxygen/colorPicker.png has changed
Binary file eric6/icons/oxygen/comment.png has changed
Binary file eric6/icons/oxygen/compareFiles.png has changed
Binary file eric6/icons/oxygen/configure.png has changed
Binary file eric6/icons/oxygen/configureExport.png has changed
Binary file eric6/icons/oxygen/configureImport.png has changed
Binary file eric6/icons/oxygen/configureShortcuts.png has changed
Binary file eric6/icons/oxygen/configureViewProfiles.png has changed
Binary file eric6/icons/oxygen/continue.png has changed
Binary file eric6/icons/oxygen/continueToCursor.png has changed
Binary file eric6/icons/oxygen/cookie.png has changed
Binary file eric6/icons/oxygen/cooperation.png has changed
Binary file eric6/icons/oxygen/cooperation48.png has changed
Binary file eric6/icons/oxygen/corba48.png has changed
Binary file eric6/icons/oxygen/coverageProject.png has changed
Binary file eric6/icons/oxygen/coverageScript.png has changed
Binary file eric6/icons/oxygen/currentLineMarker.png has changed
Binary file eric6/icons/oxygen/databaseConnection.png has changed
Binary file eric6/icons/oxygen/debug48.png has changed
Binary file eric6/icons/oxygen/debugProject.png has changed
Binary file eric6/icons/oxygen/debugRestart.png has changed
Binary file eric6/icons/oxygen/debugScript.png has changed
Binary file eric6/icons/oxygen/debugViewer.png has changed
Binary file eric6/icons/oxygen/defaultIcon.png has changed
Binary file eric6/icons/oxygen/deleteBookmark.png has changed
Binary file eric6/icons/oxygen/deleteShape.png has changed
Binary file eric6/icons/oxygen/designer4.png has changed
Binary file eric6/icons/oxygen/designer48.png has changed
Binary file eric6/icons/oxygen/desktopAudioVideoCapture.png has changed
Binary file eric6/icons/oxygen/desktopVideoCapture.png has changed
Binary file eric6/icons/oxygen/diffFiles.png has changed
Binary file eric6/icons/oxygen/dirClosed.png has changed
Binary file eric6/icons/oxygen/dirOpen.png has changed
Binary file eric6/icons/oxygen/docstringError.png has changed
Binary file eric6/icons/oxygen/documentFind.png has changed
Binary file eric6/icons/oxygen/documentNewView.png has changed
Binary file eric6/icons/oxygen/download.png has changed
Binary file eric6/icons/oxygen/downloads.png has changed
Binary file eric6/icons/oxygen/downloads48.png has changed
Binary file eric6/icons/oxygen/drawBrush.png has changed
Binary file eric6/icons/oxygen/drawCircle.png has changed
Binary file eric6/icons/oxygen/drawCircleFilled.png has changed
Binary file eric6/icons/oxygen/drawEllipse.png has changed
Binary file eric6/icons/oxygen/drawEllipseFilled.png has changed
Binary file eric6/icons/oxygen/drawEraser.png has changed
Binary file eric6/icons/oxygen/drawFill.png has changed
Binary file eric6/icons/oxygen/drawLine.png has changed
Binary file eric6/icons/oxygen/drawRectangle.png has changed
Binary file eric6/icons/oxygen/drawRectangleFilled.png has changed
Binary file eric6/icons/oxygen/edit.png has changed
Binary file eric6/icons/oxygen/editBookmarks.png has changed
Binary file eric6/icons/oxygen/editComment.png has changed
Binary file eric6/icons/oxygen/editCopy.png has changed
Binary file eric6/icons/oxygen/editCut.png has changed
Binary file eric6/icons/oxygen/editDelete.png has changed
Binary file eric6/icons/oxygen/editIndent.png has changed
Binary file eric6/icons/oxygen/editPaste.png has changed
Binary file eric6/icons/oxygen/editRedo.png has changed
Binary file eric6/icons/oxygen/editRename.png has changed
Binary file eric6/icons/oxygen/editReplace.png has changed
Binary file eric6/icons/oxygen/editReplaceAll.png has changed
Binary file eric6/icons/oxygen/editReplaceSearch.png has changed
Binary file eric6/icons/oxygen/editSelectAll.png has changed
Binary file eric6/icons/oxygen/editSmartIndent.png has changed
Binary file eric6/icons/oxygen/editToggleComment.png has changed
Binary file eric6/icons/oxygen/editUncomment.png has changed
Binary file eric6/icons/oxygen/editUndo.png has changed
Binary file eric6/icons/oxygen/editUnindent.png has changed
Binary file eric6/icons/oxygen/editor.png has changed
Binary file eric6/icons/oxygen/empty.png has changed
Binary file eric6/icons/oxygen/endline.png has changed
Binary file eric6/icons/oxygen/enum.png has changed
Binary file eric6/icons/oxygen/eolLinux.png has changed
Binary file eric6/icons/oxygen/eolMac.png has changed
Binary file eric6/icons/oxygen/eolWindows.png has changed
Binary file eric6/icons/oxygen/eric.png has changed
Binary file eric6/icons/oxygen/eric256.png has changed
Binary file eric6/icons/oxygen/ericSnap.png has changed
Binary file eric6/icons/oxygen/ericSnap48.png has changed
Binary file eric6/icons/oxygen/ericWeb.png has changed
Binary file eric6/icons/oxygen/ericWeb48.png has changed
Binary file eric6/icons/oxygen/eric_2.png has changed
Binary file eric6/icons/oxygen/erict-bw.png has changed
Binary file eric6/icons/oxygen/erict-bwi.png has changed
Binary file eric6/icons/oxygen/erict-hc.png has changed
Binary file eric6/icons/oxygen/erict.png has changed
Binary file eric6/icons/oxygen/errorLineMarker.png has changed
Binary file eric6/icons/oxygen/esp32Device.png has changed
Binary file eric6/icons/oxygen/exceptions.png has changed
Binary file eric6/icons/oxygen/exit.png has changed
Binary file eric6/icons/oxygen/exportShortcuts.png has changed
Binary file eric6/icons/oxygen/featurePermission.png has changed
Binary file eric6/icons/oxygen/fileD.png has changed
Binary file eric6/icons/oxygen/fileDelete.png has changed
Binary file eric6/icons/oxygen/fileDeleteList.png has changed
Binary file eric6/icons/oxygen/fileDesigner.png has changed
Binary file eric6/icons/oxygen/fileIDL.png has changed
Binary file eric6/icons/oxygen/fileJavascript.png has changed
Binary file eric6/icons/oxygen/fileLinguist.png has changed
Binary file eric6/icons/oxygen/fileLinguist2.png has changed
Binary file eric6/icons/oxygen/fileMisc.png has changed
Binary file eric6/icons/oxygen/fileModified.png has changed
Binary file eric6/icons/oxygen/fileMultiProject.png has changed
Binary file eric6/icons/oxygen/filePixmap.png has changed
Binary file eric6/icons/oxygen/fileProject.png has changed
Binary file eric6/icons/oxygen/filePython.png has changed
Binary file eric6/icons/oxygen/filePython2.png has changed
Binary file eric6/icons/oxygen/fileResource.png has changed
Binary file eric6/icons/oxygen/fileRuby.png has changed
Binary file eric6/icons/oxygen/fileSave.png has changed
Binary file eric6/icons/oxygen/fileSaveAll.png has changed
Binary file eric6/icons/oxygen/fileSaveAs.png has changed
Binary file eric6/icons/oxygen/fileSaveCopy.png has changed
Binary file eric6/icons/oxygen/fileSavePixmap.png has changed
Binary file eric6/icons/oxygen/fileSaveProject.png has changed
Binary file eric6/icons/oxygen/fileSaveVisiblePixmap.png has changed
Binary file eric6/icons/oxygen/fileShortcuts.png has changed
Binary file eric6/icons/oxygen/fileSvg.png has changed
Binary file eric6/icons/oxygen/fileText.png has changed
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/eric6/icons/oxygen/filemanager.svg	Sat May 02 13:51:07 2020 +0200
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="22" height="22" version="1.1" viewBox="0 0 22 22" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <defs>
+  <linearGradient id="linearGradient4399" x1="419.46" x2="432.57" y1="499.24" y2="523.8" gradientTransform="matrix(.34617 0 0 .34617 -141.2 864.54)" gradientUnits="userSpaceOnUse">
+   <stop offset="0"/>
+   <stop stop-opacity="0" offset="1"/>
+  </linearGradient>
+  <linearGradient id="linearGradient4178" x1="434.16" x2="397.23" y1="548.89" y2="495.31" gradientTransform="matrix(.34617 0 0 .34606 -133.24 862.87)" gradientUnits="userSpaceOnUse">
+   <stop stop-color="#127bdc" offset="0"/>
+   <stop stop-color="#64b4f4" offset="1"/>
+  </linearGradient>
+  <linearGradient id="linearGradient4225" x1="396.57" x2="426.57" y1="498.8" y2="511.8" gradientTransform="matrix(.34617 0 0 .34617 -133.24 864.5)" gradientUnits="userSpaceOnUse">
+   <stop stop-color="#f5f5f5" offset="0"/>
+   <stop stop-color="#f9f9f9" offset="1"/>
+  </linearGradient>
+  <linearGradient id="linearGradient4297" x1="388.57" x2="416.57" y1="487.8" y2="507.8" gradientTransform="matrix(.34617 0 0 .34617 -133.24 862.81)" gradientUnits="userSpaceOnUse">
+   <stop stop-color="#1d5e8c" offset="0"/>
+   <stop stop-color="#2675a7" offset="1"/>
+  </linearGradient>
+  <linearGradient id="linearGradient8603" x1="390.57" x2="442.57" y1="498.3" y2="498.3" gradientTransform="matrix(.34617 0 0 .34617 -133.24 2893)" gradientUnits="userSpaceOnUse">
+   <stop stop-color="#fff" offset="0"/>
+   <stop stop-color="#fff" stop-opacity=".4876" offset="1"/>
+  </linearGradient>
+ </defs>
+ <g transform="translate(0 -1030.4)">
+  <path d="m1 1042.4 20 0.501v-8.501h-10l-1.5885-2.0013h-8.4115z" fill="url(#linearGradient4297)"/>
+  <rect x="2" y="1036.4" width="18" height="5" rx=".91287" ry="1" color="#000000" color-rendering="auto" fill="url(#linearGradient4225)" image-rendering="auto" shape-rendering="auto" solid-color="#000000" style="isolation:auto;mix-blend-mode:normal"/>
+  <path d="m9 1038.4-2 1h-6l-0.089587 1.0011-5e-7 9.5003c0 0.2699 0.24435 0.4954 0.49194 0.4954l19.011 0.01c0.25539 0.01 0.50006-0.1978 0.50006-0.5l0.087-11.507z" fill="url(#linearGradient4178)"/>
+  <path d="m1 1039.4-0.089587 1.0011h7.0896l1-2-2 0.9989z" fill="#fff" fill-rule="evenodd" opacity=".3"/>
+  <path d="m9.4115 1032.4 0.58849 3h11v-1h-10z" fill="#fff" fill-rule="evenodd" opacity=".3"/>
+  <path d="m0.91041 1040.4h7.0896l1-2h12v11.656h-10.385z" fill="url(#linearGradient4399)" fill-rule="evenodd" opacity=".099"/>
+  <path d="m2.9121 1036.4c-0.50573 0-0.91211 0.446-0.91211 1v1c0-0.554 0.40638-1 0.91211-1h16.088c0.50573 0 0.91211 0.446 0.91211 1v-1c0-0.554-0.40638-1-0.91211-1z" color="#000000" color-rendering="auto" fill="url(#linearGradient8603)" image-rendering="auto" opacity=".85" shape-rendering="auto" solid-color="#000000" style="isolation:auto;mix-blend-mode:normal"/>
+  <path transform="translate(0 1030.4)" d="m20.992 8-0.080079 10.506c0 0.3022-0.24461 0.51-0.5 0.5l-19.01-0.009765c-0.24759 0-0.49219-0.22424-0.49219-0.49414v1c0 0.2699 0.2446 0.49414 0.49219 0.49414l19.01 0.009765c0.25539 0.01 0.5-0.1978 0.5-0.5l0.087891-11.506h-0.007812z" color="#000000" color-rendering="auto" image-rendering="auto" opacity=".3" shape-rendering="auto" solid-color="#000000" style="filter-blend-mode:normal;filter-gaussianBlur-deviation:0;isolation:auto;mix-blend-mode:normal"/>
+ </g>
+</svg>
Binary file eric6/icons/oxygen/find.png has changed
Binary file eric6/icons/oxygen/findClear.png has changed
Binary file eric6/icons/oxygen/findNext.png has changed
Binary file eric6/icons/oxygen/findPrev.png has changed
Binary file eric6/icons/oxygen/findWordNext.png has changed
Binary file eric6/icons/oxygen/findWordPrev.png has changed
Binary file eric6/icons/oxygen/firefox.png has changed
Binary file eric6/icons/oxygen/flag.png has changed
Binary file eric6/icons/oxygen/flagBlack.png has changed
Binary file eric6/icons/oxygen/flagGreen.png has changed
Binary file eric6/icons/oxygen/flagYellow.png has changed
Binary file eric6/icons/oxygen/flashCookie.png has changed
Binary file eric6/icons/oxygen/flashCookie128.png has changed
Binary file eric6/icons/oxygen/flashCookie16.png has changed
Binary file eric6/icons/oxygen/flashCookie48.png has changed
Binary file eric6/icons/oxygen/formatTextBold.png has changed
Binary file eric6/icons/oxygen/formatTextBulletedList.png has changed
Binary file eric6/icons/oxygen/formatTextCodeBlock.png has changed
Binary file eric6/icons/oxygen/formatTextHeader.png has changed
Binary file eric6/icons/oxygen/formatTextHeader1.png has changed
Binary file eric6/icons/oxygen/formatTextHeader2.png has changed
Binary file eric6/icons/oxygen/formatTextHeader3.png has changed
Binary file eric6/icons/oxygen/formatTextHorizontalLine.png has changed
Binary file eric6/icons/oxygen/formatTextHyperlink.png has changed
Binary file eric6/icons/oxygen/formatTextImage.png has changed
Binary file eric6/icons/oxygen/formatTextInlineCode.png has changed
Binary file eric6/icons/oxygen/formatTextItalic.png has changed
Binary file eric6/icons/oxygen/formatTextNumberedList.png has changed
Binary file eric6/icons/oxygen/formatTextQuote.png has changed
Binary file eric6/icons/oxygen/formatTextStrikethrough.png has changed
Binary file eric6/icons/oxygen/forward.png has changed
Binary file eric6/icons/oxygen/gRPC48.png has changed
Binary file eric6/icons/oxygen/geolocation.png has changed
Binary file eric6/icons/oxygen/getAs.png has changed
Binary file eric6/icons/oxygen/globalVariables.png has changed
Binary file eric6/icons/oxygen/google.png has changed
Binary file eric6/icons/oxygen/goto.png has changed
Binary file eric6/icons/oxygen/gotoBrace.png has changed
Binary file eric6/icons/oxygen/gotoLastEditPosition.png has changed
Binary file eric6/icons/oxygen/grayscale.png has changed
Binary file eric6/icons/oxygen/greaseMonkey.png has changed
Binary file eric6/icons/oxygen/greaseMonkey48.png has changed
Binary file eric6/icons/oxygen/greaseMonkeyScript.png has changed
Binary file eric6/icons/oxygen/greaseMonkeyTrash.png has changed
Binary file eric6/icons/oxygen/grid.png has changed
Binary file eric6/icons/oxygen/group.png has changed
Binary file eric6/icons/oxygen/help.png has changed
Binary file eric6/icons/oxygen/helpAbout.png has changed
Binary file eric6/icons/oxygen/helpAboutQt.png has changed
Binary file eric6/icons/oxygen/hexEditor.png has changed
Binary file eric6/icons/oxygen/hidePassword.png has changed
Binary file eric6/icons/oxygen/history.png has changed
Binary file eric6/icons/oxygen/historyClear.png has changed
Binary file eric6/icons/oxygen/home.png has changed
Binary file eric6/icons/oxygen/html.png has changed
Binary file eric6/icons/oxygen/iconEditor.png has changed
Binary file eric6/icons/oxygen/icons.png has changed
Binary file eric6/icons/oxygen/importShortcuts.png has changed
Binary file eric6/icons/oxygen/importedModule.png has changed
Binary file eric6/icons/oxygen/importedName.png has changed
Binary file eric6/icons/oxygen/imports.png has changed
Binary file eric6/icons/oxygen/incomingBookmark.png has changed
Binary file eric6/icons/oxygen/info.png has changed
Binary file eric6/icons/oxygen/internet_explorer.png has changed
Binary file eric6/icons/oxygen/irc.png has changed
Binary file eric6/icons/oxygen/irc128.png has changed
Binary file eric6/icons/oxygen/irc48.png has changed
Binary file eric6/icons/oxygen/ircAdmin.png has changed
Binary file eric6/icons/oxygen/ircAway.png has changed
Binary file eric6/icons/oxygen/ircCloseChannel.png has changed
Binary file eric6/icons/oxygen/ircConfigure.png has changed
Binary file eric6/icons/oxygen/ircConnect.png has changed
Binary file eric6/icons/oxygen/ircDisconnect.png has changed
Binary file eric6/icons/oxygen/ircEditTopic.png has changed
Binary file eric6/icons/oxygen/ircHalfop.png has changed
Binary file eric6/icons/oxygen/ircJoinChannel.png has changed
Binary file eric6/icons/oxygen/ircNormal.png has changed
Binary file eric6/icons/oxygen/ircOp.png has changed
Binary file eric6/icons/oxygen/ircOwner.png has changed
Binary file eric6/icons/oxygen/ircUserAway.png has changed
Binary file eric6/icons/oxygen/ircUserPresent.png has changed
Binary file eric6/icons/oxygen/ircVoice.png has changed
Binary file eric6/icons/oxygen/issueFixable.png has changed
Binary file eric6/icons/oxygen/issueFixed.png has changed
Binary file eric6/icons/oxygen/keywords.png has changed
Binary file eric6/icons/oxygen/konqueror.png has changed
Binary file eric6/icons/oxygen/languages/lexerBash.png has changed
Binary file eric6/icons/oxygen/languages/lexerBatch.png has changed
Binary file eric6/icons/oxygen/languages/lexerCMake.png has changed
Binary file eric6/icons/oxygen/languages/lexerCPP.png has changed
Binary file eric6/icons/oxygen/languages/lexerCSS.png has changed
Binary file eric6/icons/oxygen/languages/lexerCoffeeScript.png has changed
Binary file eric6/icons/oxygen/languages/lexerCsharp.png has changed
Binary file eric6/icons/oxygen/languages/lexerCython.png has changed
Binary file eric6/icons/oxygen/languages/lexerD.png has changed
Binary file eric6/icons/oxygen/languages/lexerDiff.png has changed
Binary file eric6/icons/oxygen/languages/lexerFortran.png has changed
Binary file eric6/icons/oxygen/languages/lexerGettext.png has changed
Binary file eric6/icons/oxygen/languages/lexerHTML.png has changed
Binary file eric6/icons/oxygen/languages/lexerIDL.png has changed
Binary file eric6/icons/oxygen/languages/lexerJSON.png has changed
Binary file eric6/icons/oxygen/languages/lexerJava.png has changed
Binary file eric6/icons/oxygen/languages/lexerJavaScript.png has changed
Binary file eric6/icons/oxygen/languages/lexerLua.png has changed
Binary file eric6/icons/oxygen/languages/lexerMakefile.png has changed
Binary file eric6/icons/oxygen/languages/lexerMarkdown.png has changed
Binary file eric6/icons/oxygen/languages/lexerMatlab.png has changed
Binary file eric6/icons/oxygen/languages/lexerOctave.png has changed
Binary file eric6/icons/oxygen/languages/lexerPHP.png has changed
Binary file eric6/icons/oxygen/languages/lexerPOV.png has changed
Binary file eric6/icons/oxygen/languages/lexerPascal.png has changed
Binary file eric6/icons/oxygen/languages/lexerPerl.png has changed
Binary file eric6/icons/oxygen/languages/lexerPostscript.png has changed
Binary file eric6/icons/oxygen/languages/lexerProperties.png has changed
Binary file eric6/icons/oxygen/languages/lexerPython.png has changed
Binary file eric6/icons/oxygen/languages/lexerPython3.png has changed
Binary file eric6/icons/oxygen/languages/lexerRuby.png has changed
Binary file eric6/icons/oxygen/languages/lexerSQL.png has changed
Binary file eric6/icons/oxygen/languages/lexerTCL.png has changed
Binary file eric6/icons/oxygen/languages/lexerTeX.png has changed
Binary file eric6/icons/oxygen/languages/lexerVHDL.png has changed
Binary file eric6/icons/oxygen/languages/lexerXML.png has changed
Binary file eric6/icons/oxygen/languages/lexerYAML.png has changed
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/eric6/icons/oxygen/languages/readme.txt	Sat May 02 13:51:07 2020 +0200
@@ -0,0 +1,1 @@
+Icons where downloaded from official sites of the languages and various other places.
Binary file eric6/icons/oxygen/linguist4.png has changed
Binary file eric6/icons/oxygen/linguist48.png has changed
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/eric6/icons/oxygen/linkConnect.svg	Sat May 02 13:51:07 2020 +0200
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg viewBox="0 0 22 22" xmlns="http://www.w3.org/2000/svg">
+ <defs>
+  <style type="text/css">.ColorScheme-Text {
+        color:#232629;
+      }</style>
+ </defs>
+ <path class="ColorScheme-Text" d="m18.293 3-3.5 3.5-1.5-1.5-7.293 7.293 1.5 1.5-4.5 4.5 0.70703 0.70703 4.5-4.5 1.5 1.5 7.293-7.293-1.5-1.5 3.5-3.5-0.70703-0.70703z" fill="currentColor"/>
+</svg>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/eric6/icons/oxygen/linkDisconnect.svg	Sat May 02 13:51:07 2020 +0200
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg viewBox="0 0 22 22" xmlns="http://www.w3.org/2000/svg">
+ <defs>
+  <style type="text/css">.ColorScheme-Text {
+        color:#232629;
+      }
+      .ColorScheme-NegativeText {
+        color:#da4453;
+      }</style>
+ </defs>
+ <path class="ColorScheme-Text" d="m18.293 3-3.5 3.5-1.5-1.5-3.793 3.793 3.707 3.707 3.793-3.793-1.5-1.5 3.5-3.5-0.70703-0.70703zm-9.5 6.5-2.793 2.793 1.5 1.5-4.5 4.5 0.70703 0.70703 4.5-4.5 1.5 1.5 2.793-2.793-3.707-3.707z" fill="currentColor"/>
+ <path class="ColorScheme-NegativeText" d="m14.834 14-0.83398 0.83398 1.666 1.666-1.666 1.666 0.83398 0.83398 1.666-1.666 1.666 1.666 0.83398-0.83398-1.666-1.666 1.666-1.666-0.83398-0.83398-1.666 1.666-1.666-1.666z" fill="currentColor"/>
+</svg>
Binary file eric6/icons/oxygen/listBookmarks.png has changed
Binary file eric6/icons/oxygen/listSelection.png has changed
Binary file eric6/icons/oxygen/loading.png has changed
Binary file eric6/icons/oxygen/localVariables.png has changed
Binary file eric6/icons/oxygen/logViewer.png has changed
Binary file eric6/icons/oxygen/mailSend.png has changed
Binary file eric6/icons/oxygen/makefile.png has changed
Binary file eric6/icons/oxygen/makefile48.png has changed
Binary file eric6/icons/oxygen/masterProject.png has changed
Binary file eric6/icons/oxygen/mediaPlaybackPause.png has changed
Binary file eric6/icons/oxygen/mediaPlaybackStart.png has changed
Binary file eric6/icons/oxygen/method.png has changed
Binary file eric6/icons/oxygen/method_class.png has changed
Binary file eric6/icons/oxygen/method_private.png has changed
Binary file eric6/icons/oxygen/method_protected.png has changed
Binary file eric6/icons/oxygen/method_static.png has changed
Binary file eric6/icons/oxygen/microbitDevice.png has changed
Binary file eric6/icons/oxygen/micropython.png has changed
Binary file eric6/icons/oxygen/micropython48.png has changed
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/eric6/icons/oxygen/miniconda.svg	Sat May 02 13:51:07 2020 +0200
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="22" height="22" version="1.1" viewBox="0 0 22 22" xmlns="http://www.w3.org/2000/svg">
+ <style>.st0{fill:#43b02a}</style>
+ <path class="st0" d="m2.3887 14.044c-0.36349 0.72642-0.65775 1.4874-0.90008 2.2657 0.81353 0.22484 1.6271 0.3805 2.4579 0.44968 0.017304-0.65723 0.069237-1.2799 0.15578-1.9025-0.58851-0.22484-1.1597-0.50157-1.7136-0.81289zm3.3234-8.3711c-0.48466 0-0.952 0.03459-1.4367 0.10377 0.069237 0.48428 0.13847 0.95126 0.25964 1.4355 0.32887-0.55346 0.72699-1.055 1.177-1.5047zm-3.8946 11.398c0.62313 0.95126 1.402 1.7987 2.2848 2.5079-0.086546-0.74371-0.15578-1.4528-0.15578-2.162-0.72699-0.06918-1.4367-0.19025-2.129-0.34591zm5.6255-16.483c-0.86546 0.29403-1.6617 0.69182-2.4233 1.1761 0.5712 0.10377 1.1251 0.22484 1.679 0.3978 0.20771-0.53616 0.46735-1.055 0.74429-1.5739zm3.5657-0.58805c-0.43273 0-0.84815 0.034592-1.2636 0.069182 0.58851 0.41509 1.1424 0.84748 1.679 1.3318l0.43273 0.3978-0.43273 0.43239c-0.36349 0.34591-0.70968 0.70912-1.0386 1.1069v0.017297s-0.06924 0.069182-0.17309 0.19025c0.25964-0.034588 0.51928-0.034588 0.79622-0.034588 4.1369 0 7.4949 3.3553 7.4949 7.489s-3.358 7.489-7.4949 7.489c-1.4367 0-2.7868-0.3978-3.9292-1.1069-0.5712 0.06918-1.1251 0.10377-1.6963 0.10377-0.25964 0-0.51928 0-0.79622-0.0173 0.017311 0.84748 0.10386 1.7296 0.24233 2.6462 1.7655 1.1934 3.8773 1.8852 6.1621 1.8852 6.0755 0 11.009-4.9292 11.009-11 0.017309-6.0708-4.9158-11-10.991-11z" stroke-width=".17302"/>
+ <path class="st0" d="m9.5374 2.5943c0.22502-0.25943 0.45004-0.51887 0.67506-0.76101-0.51928-0.43239-1.0559-0.84748-1.6271-1.1934-0.34618 0.58805-0.65775 1.2107-0.91739 1.8333 0.50197 0.19025 0.98662 0.3978 1.454 0.62264 0.22502-0.27673 0.3808-0.44969 0.41542-0.50157zm-6.1794 3.3035c-0.81353 0.13836-1.6098 0.36321-2.3887 0.63994 0.31157 0.7956 0.70968 1.5739 1.1597 2.3003 0.51928-0.36321 1.0559-0.70912 1.6098-1.0031-0.17309-0.63994-0.29426-1.2799-0.3808-1.9371zm-1.4367 4.1509c-0.58851 0.48428-1.1424 1.0031-1.6617 1.5912 0.5712 0.50157 1.177 0.95126 1.8175 1.3664 0.29426-0.51887 0.62313-1.0377 0.96931-1.522-0.3808-0.44968-0.7616-0.93396-1.1251-1.4355zm2.8041 5.0503c-0.069236 0.55346-0.12116 1.1242-0.13847 1.7123 0.55389 0.03459 1.1078 0.03459 1.6617 0-0.58851-0.48428-1.1078-1.055-1.5232-1.7123zm1.6098-11.969c-0.69237-0.19025-1.402-0.34591-2.1117-0.43239-0.069237 0.72642-0.069237 1.4355-0.017311 2.1447 0.5712-0.069182 1.1251-0.10377 1.6963-0.10377 0.10386-0.55346 0.25964-1.0896 0.43273-1.6085zm0.98662 0.31132c-0.13847 0.41509-0.25964 0.83019-0.36349 1.2453 0.48466-0.31132 1.0039-0.57076 1.5405-0.76101-0.3808-0.17296-0.77891-0.32862-1.177-0.48428zm-7.2352 9.0283c0.13847 1.0723 0.43273 2.0928 0.86546 3.0267 0.22502-0.62264 0.48466-1.2453 0.77891-1.8333-0.5712-0.36321-1.1078-0.76101-1.6444-1.1934zm3.1676-9.2704c-0.65775 0.65723-1.229 1.3836-1.7136 2.1792 0.5712-0.17296 1.1424-0.31132 1.7309-0.41509-0.034616-0.58805-0.051927-1.1761-0.017311-1.7642zm-0.65775 6.3475c0.27695 0.3978 0.58851 0.7956 0.91739 1.1761 0.034616-0.69182 0.13847-1.3491 0.34618-1.989-0.43273 0.24214-0.86546 0.51887-1.2636 0.81289zm0.13847 3.8223c0.46735 0.25943 0.93469 0.50157 1.4367 0.70912-0.29426-0.63994-0.48466-1.3145-0.58851-2.0409-0.31157 0.43239-0.58851 0.88208-0.84815 1.3318zm-1.2809-4.0126c-0.34618-0.55346-0.65775-1.1242-0.9347-1.7296-0.31156 0.96855-0.50197 2.0063-0.51928 3.0613 0.46735-0.48428 0.952-0.93396 1.454-1.3318z" stroke-width=".17302"/>
+</svg>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/eric6/icons/oxygen/miniconda48.svg	Sat May 02 13:51:07 2020 +0200
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="48" height="48" version="1.1" viewBox="0 0 48 48" xmlns="http://www.w3.org/2000/svg">
+ <style>.st0{fill:#43b02a}</style>
+ <path class="st0" d="m5.2116 30.642c-0.79307 1.5849-1.4351 3.2453-1.9638 4.9434 1.775 0.49057 3.55 0.83019 5.3627 0.98113 0.03776-1.434 0.15106-2.7925 0.33989-4.1509-1.284-0.49057-2.5303-1.0943-3.7388-1.7736zm7.251-18.264c-1.0574 0-2.0771 0.07547-3.1345 0.22642 0.15106 1.0566 0.30212 2.0755 0.56648 3.1321 0.71754-1.2075 1.5861-2.3019 2.5681-3.283zm-8.4972 24.868c1.3596 2.0755 3.059 3.9245 4.985 5.4717-0.18883-1.6226-0.33989-3.1698-0.33989-4.717-1.5862-0.15094-3.1345-0.41509-4.6452-0.75472zm12.274-35.962c-1.8883 0.64151-3.6255 1.5094-5.2872 2.566 1.2463 0.22642 2.4548 0.49057 3.6632 0.86792 0.45319-1.1698 1.0197-2.3019 1.6239-3.434zm7.7797-1.283c-0.94414 0-1.8505 0.075472-2.7569 0.15094 1.284 0.90566 2.4925 1.8491 3.6632 2.9057l0.94414 0.86792-0.94414 0.9434c-0.79308 0.75472-1.5484 1.5472-2.2659 2.4151v0.03774s-0.15106 0.15094-0.37765 0.41509c0.56648-0.07547 1.133-0.07547 1.7372-0.07547 9.0259 0 16.352 7.3208 16.352 16.34s-7.3265 16.34-16.352 16.34c-3.1345 0-6.0802-0.86792-8.5728-2.4151-1.2463 0.15094-2.4548 0.22642-3.701 0.22642-0.56648 0-1.133 0-1.7372-0.03774 0.03777 1.8491 0.22659 3.7736 0.52872 5.7736 3.8521 2.6038 8.4595 4.1132 13.445 4.1132 13.256 0 24.019-10.755 24.019-24 0.037765-13.245-10.725-24-23.981-24z" stroke-width=".37751"/>
+ <path class="st0" d="m20.809 5.6604c0.49095-0.56604 0.9819-1.1321 1.4729-1.6604-1.133-0.9434-2.3037-1.8491-3.55-2.6038-0.75531 1.283-1.4351 2.6415-2.0016 4 1.0952 0.4151 2.1526 0.86792 3.1723 1.3585 0.49095-0.60377 0.83084-0.98113 0.90637-1.0943zm-13.482 7.2075c-1.775 0.30189-3.5122 0.79245-5.2116 1.3962 0.67978 1.7358 1.5484 3.434 2.5303 5.0189 1.133-0.79245 2.3037-1.5472 3.5122-2.1887-0.37765-1.3962-0.64201-2.7925-0.83084-4.2264zm-3.1345 9.0566c-1.284 1.0566-2.4925 2.1887-3.6255 3.4717 1.2463 1.0943 2.5681 2.0755 3.9654 2.9811 0.64201-1.1321 1.3596-2.2642 2.1149-3.3208-0.83084-0.98113-1.6617-2.0377-2.4548-3.1321zm6.118 11.019c-0.15106 1.2075-0.26436 2.4528-0.30212 3.7358 1.2085 0.07547 2.417 0.07547 3.6255 0-1.284-1.0566-2.417-2.3019-3.3234-3.7358zm3.5122-26.113c-1.5106-0.4151-3.059-0.75472-4.6074-0.9434-0.15106 1.5849-0.15106 3.1321-0.03777 4.6792 1.2463-0.15094 2.4548-0.22642 3.701-0.22642 0.22659-1.2075 0.56648-2.3774 0.94414-3.5094zm2.1526 0.67924c-0.30212 0.90566-0.56648 1.8113-0.79308 2.717 1.0574-0.67924 2.1904-1.2453 3.3611-1.6604-0.83084-0.37736-1.6994-0.71698-2.5681-1.0566zm-15.786 19.698c0.30212 2.3396 0.94414 4.566 1.8883 6.6038 0.49095-1.3585 1.0574-2.717 1.6994-4-1.2463-0.79245-2.417-1.6604-3.5877-2.6038zm6.9111-20.226c-1.4351 1.434-2.6813 3.0189-3.7388 4.7547 1.2463-0.37736 2.4925-0.67924 3.7765-0.90566-0.07553-1.283-0.1133-2.566-0.03777-3.8491zm-1.4351 13.849c0.60425 0.86792 1.284 1.7358 2.0016 2.566 0.07553-1.5094 0.30212-2.9434 0.75531-4.3396-0.94414 0.5283-1.8883 1.1321-2.7569 1.7736zm0.30212 8.3396c1.0197 0.56604 2.0393 1.0943 3.1345 1.5472-0.64201-1.3962-1.0574-2.8679-1.284-4.4528-0.67978 0.9434-1.284 1.9245-1.8505 2.9057zm-2.7946-8.7547c-0.75531-1.2075-1.4351-2.4528-2.0393-3.7736-0.67978 2.1132-1.0952 4.3774-1.133 6.6792 1.0197-1.0566 2.0771-2.0377 3.1723-2.9057z" stroke-width=".37751"/>
+</svg>
Binary file eric6/icons/oxygen/minus.png has changed
Binary file eric6/icons/oxygen/module.png has changed
Binary file eric6/icons/oxygen/mouse.png has changed
Binary file eric6/icons/oxygen/moveBookmark.png has changed
Binary file eric6/icons/oxygen/moveInstructionPointer.png has changed
Binary file eric6/icons/oxygen/multiProjectClose.png has changed
Binary file eric6/icons/oxygen/multiProjectNew.png has changed
Binary file eric6/icons/oxygen/multiProjectOpen.png has changed
Binary file eric6/icons/oxygen/multiProjectProps.png has changed
Binary file eric6/icons/oxygen/multiProjectSave.png has changed
Binary file eric6/icons/oxygen/multiProjectSaveAs.png has changed
Binary file eric6/icons/oxygen/multiProjectViewer.png has changed
Binary file eric6/icons/oxygen/namedgroup.png has changed
Binary file eric6/icons/oxygen/namedreference.png has changed
Binary file eric6/icons/oxygen/namingError.png has changed
Binary file eric6/icons/oxygen/neglookahead.png has changed
Binary file eric6/icons/oxygen/neglookbehind.png has changed
Binary file eric6/icons/oxygen/network-offline.png has changed
Binary file eric6/icons/oxygen/network-online.png has changed
Binary file eric6/icons/oxygen/network-server.png has changed
Binary file eric6/icons/oxygen/new.png has changed
Binary file eric6/icons/oxygen/newWindow.png has changed
Binary file eric6/icons/oxygen/nongroup.png has changed
Binary file eric6/icons/oxygen/nonwordboundary.png has changed
Binary file eric6/icons/oxygen/notcovered.png has changed
Binary file eric6/icons/oxygen/notcoveredNext.png has changed
Binary file eric6/icons/oxygen/notcoveredPrev.png has changed
Binary file eric6/icons/oxygen/notification.png has changed
Binary file eric6/icons/oxygen/notification48.png has changed
Binary file eric6/icons/oxygen/numbers.png has changed
Binary file eric6/icons/oxygen/open.png has changed
Binary file eric6/icons/oxygen/openNewTab.png has changed
Binary file eric6/icons/oxygen/openQM.png has changed
Binary file eric6/icons/oxygen/openUI.png has changed
Binary file eric6/icons/oxygen/opera.png has changed
Binary file eric6/icons/oxygen/outgoingBookmark.png has changed
Binary file eric6/icons/oxygen/passwords.png has changed
Binary file eric6/icons/oxygen/pause.png has changed
Binary file eric6/icons/oxygen/pim.png has changed
Binary file eric6/icons/oxygen/pim48.png has changed
Binary file eric6/icons/oxygen/plugin.png has changed
Binary file eric6/icons/oxygen/plugin48.png has changed
Binary file eric6/icons/oxygen/pluginArchive.png has changed
Binary file eric6/icons/oxygen/pluginArchive48.png has changed
Binary file eric6/icons/oxygen/pluginArchiveList.png has changed
Binary file eric6/icons/oxygen/pluginArchiveSnapshot.png has changed
Binary file eric6/icons/oxygen/pluginInstall.png has changed
Binary file eric6/icons/oxygen/pluginRepository.png has changed
Binary file eric6/icons/oxygen/pluginUninstall.png has changed
Binary file eric6/icons/oxygen/plus.png has changed
Binary file eric6/icons/oxygen/poslookahead.png has changed
Binary file eric6/icons/oxygen/poslookbehind.png has changed
Binary file eric6/icons/oxygen/preferences-api.png has changed
Binary file eric6/icons/oxygen/preferences-application.png has changed
Binary file eric6/icons/oxygen/preferences-autocompletion.png has changed
Binary file eric6/icons/oxygen/preferences-calltips.png has changed
Binary file eric6/icons/oxygen/preferences-colours.png has changed
Binary file eric6/icons/oxygen/preferences-cooperation.png has changed
Binary file eric6/icons/oxygen/preferences-debugger.png has changed
Binary file eric6/icons/oxygen/preferences-editor.png has changed
Binary file eric6/icons/oxygen/preferences-exporters.png has changed
Binary file eric6/icons/oxygen/preferences-filehandling.png has changed
Binary file eric6/icons/oxygen/preferences-general.png has changed
Binary file eric6/icons/oxygen/preferences-graphics.png has changed
Binary file eric6/icons/oxygen/preferences-help.png has changed
Binary file eric6/icons/oxygen/preferences-helpdocumentation.png has changed
Binary file eric6/icons/oxygen/preferences-helpviewers.png has changed
Binary file eric6/icons/oxygen/preferences-highlighter-association.png has changed
Binary file eric6/icons/oxygen/preferences-highlighting-styles.png has changed
Binary file eric6/icons/oxygen/preferences-html5.png has changed
Binary file eric6/icons/oxygen/preferences-icons.png has changed
Binary file eric6/icons/oxygen/preferences-interface.png has changed
Binary file eric6/icons/oxygen/preferences-keywords.png has changed
Binary file eric6/icons/oxygen/preferences-logviewer.png has changed
Binary file eric6/icons/oxygen/preferences-mail_generic.png has changed
Binary file eric6/icons/oxygen/preferences-mimetypes.png has changed
Binary file eric6/icons/oxygen/preferences-mouse-click-handler.png has changed
Binary file eric6/icons/oxygen/preferences-multiproject.png has changed
Binary file eric6/icons/oxygen/preferences-network.png has changed
Binary file eric6/icons/oxygen/preferences-notifications.png has changed
Binary file eric6/icons/oxygen/preferences-orbit.png has changed
Binary file eric6/icons/oxygen/preferences-pluginmanager.png has changed
Binary file eric6/icons/oxygen/preferences-printer.png has changed
Binary file eric6/icons/oxygen/preferences-project.png has changed
Binary file eric6/icons/oxygen/preferences-properties.png has changed
Binary file eric6/icons/oxygen/preferences-pyDebugger.png has changed
Binary file eric6/icons/oxygen/preferences-python.png has changed
Binary file eric6/icons/oxygen/preferences-qtlogo.png has changed
Binary file eric6/icons/oxygen/preferences-search.png has changed
Binary file eric6/icons/oxygen/preferences-security.png has changed
Binary file eric6/icons/oxygen/preferences-shell.png has changed
Binary file eric6/icons/oxygen/preferences-spellchecking.png has changed
Binary file eric6/icons/oxygen/preferences-styles.png has changed
Binary file eric6/icons/oxygen/preferences-template.png has changed
Binary file eric6/icons/oxygen/preferences-typing.png has changed
Binary file eric6/icons/oxygen/preferences-vcs.png has changed
Binary file eric6/icons/oxygen/preferences-viewmanager.png has changed
Binary file eric6/icons/oxygen/previewer.png has changed
Binary file eric6/icons/oxygen/print.png has changed
Binary file eric6/icons/oxygen/printPdf.png has changed
Binary file eric6/icons/oxygen/printPreview.png has changed
Binary file eric6/icons/oxygen/privateBrowsing.png has changed
Binary file eric6/icons/oxygen/privateMode.png has changed
Binary file eric6/icons/oxygen/profileProject.png has changed
Binary file eric6/icons/oxygen/profileScript.png has changed
Binary file eric6/icons/oxygen/projectClose.png has changed
Binary file eric6/icons/oxygen/projectFind.png has changed
Binary file eric6/icons/oxygen/projectForms.png has changed
Binary file eric6/icons/oxygen/projectInterfaces.png has changed
Binary file eric6/icons/oxygen/projectNew.png has changed
Binary file eric6/icons/oxygen/projectOpen.png has changed
Binary file eric6/icons/oxygen/projectOthers.png has changed
Binary file eric6/icons/oxygen/projectProps.png has changed
Binary file eric6/icons/oxygen/projectResources.png has changed
Binary file eric6/icons/oxygen/projectSave.png has changed
Binary file eric6/icons/oxygen/projectSaveAs.png has changed
Binary file eric6/icons/oxygen/projectSources.png has changed
Binary file eric6/icons/oxygen/projectSourcesJavaScript.png has changed
Binary file eric6/icons/oxygen/projectSourcesPy.png has changed
Binary file eric6/icons/oxygen/projectSourcesPyMixed.png has changed
Binary file eric6/icons/oxygen/projectSourcesRb.png has changed
Binary file eric6/icons/oxygen/projectSourcesRbMixed.png has changed
Binary file eric6/icons/oxygen/projectTranslations.png has changed
Binary file eric6/icons/oxygen/projectUserProps.png has changed
Binary file eric6/icons/oxygen/projectViewer.png has changed
Binary file eric6/icons/oxygen/protobuf.png has changed
Binary file eric6/icons/oxygen/protobuf48.png has changed
Binary file eric6/icons/oxygen/pullBookmark.png has changed
Binary file eric6/icons/oxygen/pushBookmark.png has changed
Binary file eric6/icons/oxygen/putAs.png has changed
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/eric6/icons/oxygen/pypi.svg	Sat May 02 13:51:07 2020 +0200
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="5.8208mm" height="5.8208mm" version="1.1" viewBox="0 0 5.8208 5.8208" xmlns="http://www.w3.org/2000/svg">
+ <g transform="translate(-111.24 -145.92)">
+  <g transform="matrix(.011642 0 0 .013265 111.24 145.92)">
+   <path d="m208 437.76c-7.6057-2.2404-205.58-74.059-206.75-75.002-0.96412-0.77704-1.25-10.601-1.25-42.956 0-32.227 0.28971-42.238 1.25-43.197 0.6875-0.68665 14.075-5.8825 29.75-11.546 15.675-5.6638 30.862-11.177 33.75-12.252l5.25-1.954v-41.306c0-31.838 0.28652-41.538 1.25-42.318 0.6875-0.55698 15.2-6.0574 32.25-12.223s32.462-11.817 34.25-12.559l3.25-1.3482v-15.429c0-11.156 0.34617-15.699 1.25-16.404 0.6875-0.53659 15.875-6.2714 33.75-12.744 17.875-6.4726 33.288-12.18 34.25-12.682 1.5509-0.80969 1.75-2.6589 1.75-16.256 0-11.069 0.34814-15.623 1.25-16.351 1.6771-1.3531 132.84-48.665 139.45-50.302 4.2356-1.0485 5.9983-1.0492 9.5-0.003731 9.1438 2.73 63.416 22.338 65.524 23.673 2.1233 1.3449 2.2372 2.1206 2.5 17.035l0.27536 15.626 32.477 11.82c17.862 6.5012 33.5 12.368 34.75 13.037l2.273 1.2165v125.9c0 99.397-0.26316 126.16-1.25 127.14-1.0708 1.0576-54.404 20.565-238.25 87.141-44.675 16.178-45.334 16.357-52.5 14.246zm41.389-14.374c17.661-6.385 32.674-12.065 33.361-12.622 0.96068-0.77875 1.25-9.8959 1.25-39.391 0-35.904-0.11279-38.374-1.75-38.323-0.9625 0.0299-16.15 5.3174-33.75 11.75l-32 11.696-0.26161 39.25c-0.14388 21.588 0.0311 39.25 0.38896 39.25 0.35781 0 15.101-5.2241 32.762-11.609zm215.36-78.039 32.25-11.683v-39.441c0-31.14-0.2631-39.341-1.25-38.966-0.6875 0.2614-13.4 4.8623-28.25 10.224s-29.362 10.629-32.25 11.704l-5.25 1.9547v38.928c0 30.467 0.2717 38.932 1.25 38.945 0.6875 9e-3 15.762-5.2401 33.5-11.666zm-60.106-5.4407c4.7499-2.9356 8.4021-9.5777 8.5209-15.497 0.0818-4.0741-0.32443-5.1545-2.7093-7.2059-2.2364-1.9236-3.526-2.2963-6.3572-1.8368-9.4634 1.5357-17.478 14.47-14.068 22.703 2.209 5.3329 7.8158 6.0374 14.613 1.8364zm-336.86-71.809-0.28498-9.8982-15 5.5064c-8.25 3.0285-19.95 7.3065-26 9.5065s-11.382 4.3558-11.849 4.7906c-0.46686 0.43476 0.64337 1.1182 2.4672 1.5188 1.8238 0.40058 4.0058 1.0933 4.8488 1.5393 0.84305 0.44604 11.433 4.4085 23.533 8.8055l22 7.9945 0.28498-9.9327c0.15674-5.463 0.15674-14.387 0-19.831zm71-57.97-0.28498-9.8681-7.5 2.7939c-4.125 1.5366-15.934 5.8648-26.243 9.6181-10.309 3.7533-18.746 7.0712-18.75 7.3731-0.0037 0.30191 5.9558 2.7062 13.243 5.3429 7.2875 2.6367 14.825 5.3986 16.75 6.1377s7.775 2.9016 13 4.8055l9.5 3.4617 0.28498-9.8984c0.15674-5.4441 0.15674-14.339 0-19.766zm-0.12054-60.801c-0.20834-0.20835-5.5056 1.478-11.772 3.7473-30.462 11.033-41.842 15.305-41.548 15.599 0.17684 0.17683 11.489 4.3871 25.139 9.3562 13.649 4.9691 25.537 9.438 26.417 9.9309 1.4387 0.80597 1.6273-1.0758 1.8715-18.679 0.1494-10.767 0.10117-19.746-0.10718-19.954zm71.336-38.831c0-10.725-0.1281-19.5-0.28466-19.5-0.5525 0-12.427 4.2439-30.715 10.977-10.175 3.7463-19.805 7.2189-21.4 7.717-2.7122 0.84701-2.292 1.1111 6.5 4.0847 5.1698 1.7485 17.275 6.0965 26.9 9.6622 9.625 3.5657 17.838 6.5001 18.25 6.521 0.4125 0.0209 0.75-8.737 0.75-19.462zm105.16 10.037c3.8637-2.6254 8.8402-11.229 8.8402-15.283 0-3.5142-2.6277-7.9234-5.1086-8.5722-10.022-2.6208-22.593 13.417-17.742 22.634 0.63234 1.2013 1.6448 2.5149 2.25 2.919 2.3399 1.5624 8.2098 0.71519 11.76-1.6973z" fill="#ecebe8"/>
+   <path d="m210.47 437.65c-1.709-1.1698-46.702-17.767-65.473-24.151-3.575-1.216-10.325-3.6679-15-5.4487-4.675-1.7808-22-8.105-38.5-14.054-16.5-5.9488-43.115-15.582-59.146-21.406-16.03-5.8245-29.868-10.59-30.75-10.59-1.4474 0-1.6045-4.1591-1.6045-42.5v-42.5h2.6398c1.4519 0 3.1394 0.64898 3.75 1.4422 1.3767 1.7883 61.636 23.755 63.36 23.098 1.5954-0.60878 1.8266-46.065 0.23928-47.046-0.64217-0.39688-0.4753-1.3891 0.45763-2.721 1.2308-1.7572 1.4744-8.6375 1.506-42.522 0.02068-22.234 0.29131-40.836 0.60139-41.338 0.88561-1.433 4.4458-1.0656 4.4458 0.45868 0 1.6609 61.32 24.104 63.535 23.254 1.2281-0.47125 1.4652-4.2799 1.4652-23.535 0-15.173-0.36163-23.196-1.0651-23.631-0.70809-0.43762-0.54957-1.228 0.47287-2.3578 1.2157-1.3433 1.5961-4.935 1.8151-17.138 0.24895-13.869 0.45777-15.473 2.0534-15.78 0.97693-0.18754 2.5519 0.53891 3.5 1.6144 1.7017 1.9303 58.981 23.201 62.477 23.201 1.6009 0 1.7192-2.8174 1.6864-40.167-0.029-32.968 0.21349-40.415 1.3529-41.555 0.76353-0.76353 29.923-11.734 64.798-24.379 80.59-29.22 77.488-28.162 80.17-27.349 10.092 3.0568 66.614 24.014 67.965 25.2 1.4692 1.2903 1.7661 3.8104 2 16.979l0.27472 15.464 70 25.445 0.25385 126.18c0.16887 83.945-0.08217 126.18-0.75 126.18-0.65548 0-1.0038-14.229-1.0038-41 0-34.162-0.2298-41-1.3778-41-1.0428 0-55.408 19.417-65.904 23.539-1.6752 0.65776-1.7647 3.1692-1.5 42.051l0.28156 41.352-71.781 26.029c-39.479 14.316-71.992 26.029-72.25 26.029-0.25807 0-0.46922-18.198-0.46922-40.441 0-23.822-0.38177-40.677-0.92903-41.015-1.0049-0.62103-66.73 22.928-68.81 24.655-0.97438 0.80867-1.2605 9.8579-1.2605 39.867 0 37.972 0.0447 38.852 2.0451 40.253 1.7913 1.2547 1.8432 1.5099 0.41821 2.0567-2.4339 0.93396-3.8094 0.76728-5.9908-0.72596zm2.2891-41.372c0.248-37.162 0.16629-39.246-1.5756-40.178-4.3705-2.339-65.482-24.035-66.291-23.534-1.2168 0.75202-1.1359 76.504 0.0837 78.435 1.0142 1.6052 63.505 24.932 66.022 24.644 1.2999-0.14842 1.5349-5.3993 1.7616-39.366zm-71.762-26.155v-39.877l-33.225-12.044c-18.274-6.6239-33.574-11.828-34-11.564-0.42649 0.26359-0.77543 17.948-0.77543 39.298 0 31.913 0.24719 39.024 1.3894 39.972 1.4869 1.2341 63.264 23.957 65.361 24.042 0.97994 0.0393 1.25-8.5651 1.25-39.827zm-71-25.501c0-30.327-0.28731-39.597-1.25-40.331-1.8618-1.4207-62.966-23.335-65-23.311-1.6365 0.0188-1.749 2.5338-1.7347 38.77 0.00842 21.312 0.36403 39.299 0.79023 39.97 0.82488 1.2982 62.484 24.117 65.444 24.22 1.6381 0.0568 1.75-2.458 1.75-39.317zm335.62-4.1481c9.1482-6.9777 11.844-20.232 5.0784-24.971-5.7021-3.9939-15.661 0.76266-20.054 9.5781-3.6482 7.3209-3.5268 12.193 0.40145 16.121 2.657 2.657 3.5603 2.9796 7.0374 2.5132 2.194-0.29428 5.5856-1.7527 7.5369-3.241zm-264.62-53.852c0-30.318-0.28758-39.601-1.25-40.347-1.8214-1.4128-62.93-23.309-65-23.291-1.6364 0.0146-1.75 2.5395-1.75 38.893 0 31.173 0.26417 39.097 1.333 39.984 1.4583 1.2103 63.39 24.02 65.417 24.093 0.9796 0.0354 1.25-8.4729 1.25-39.332zm0.76924-66.066c0.14808-12.605-0.13031-23.317-0.61865-23.806-1.3201-1.3201-63.651 21.497-63.651 23.3 0 0.96401 9.9298 5.0621 30.5 12.588 16.775 6.1371 31.175 11.086 32 10.997 1.2763-0.13736 1.5402-3.5799 1.7692-23.079zm-36.346-13.849c17.008-6.1847 31.081-11.719 31.274-12.299 0.42655-1.2796-61.208-23.828-62.668-22.926-1.7306 1.0696-1.3483 46.992 0.3871 46.494 0.04583-0.0131 13.999-5.0841 31.006-11.269zm71.697-58.669c16.575-6.0287 30.379-11.204 30.675-11.5s0.32953-0.74781 0.0739-1.0034c-1.2792-1.2792-61.44-22.53-62.563-22.099-1.0209 0.39175-1.3058 5.4167-1.3058 23.032 0 19.304 0.21362 22.531 1.4915 22.531 0.82035 0 15.053-4.9326 31.628-10.961zm136.6-25.708c7.1133-3.3755 12.455-14.257 10.261-20.904-1.3129-3.978-3.4957-5.4288-8.1602-5.4235-9.4005 0.0106-18.805 13.438-15.797 22.554 1.8496 5.6045 6.9034 6.9969 13.696 3.7735z" fill="#d5d6d6"/>
+   <path d="m286.23 369.5c0.14938-22.825 0.15298-41.5 8e-3 -41.5-0.14496 1.8e-4 -1.045 0.4475-2 0.99404-3.509 2.0081-68.367 25.006-70.516 25.004-1.2214-0.00115-17.521-5.5483-36.221-12.327l-34-12.325-0.21619-82.923-0.21619-82.923 2.2362-1.6232c1.2299-0.89276 15.952-6.5842 32.716-12.648s31.717-11.593 33.23-12.287l2.75-1.2628v-81.516l3.25-1.9992c1.7875-1.0995 17.875-7.2212 35.75-13.604 39.041-13.94 31.893-11.343 69.5-25.251 17.115-6.33 32.568-11.478 34.5-11.493 4.14-0.033519 66.343 22.28 69.123 24.796 1.6773 1.5179 1.8786 3.3073 1.89 16.794l0.01266 15.095 33.237 11.9c18.281 6.5448 34.246 12.807 35.478 13.916l2.2409 2.0162 3.2e-4 82.304c3e-4 77.21-0.10745 82.36-1.7409 83.219-2.3776 1.2503-65.287 23.884-67.559 24.307-1.7243 0.32076-1.8127 2.4764-1.7199 41.941 0.0769 32.705-0.17593 41.818-1.1823 42.612-1.0906 0.85993-44.394 16.783-64.78 23.82-3.575 1.234-21.35 7.6907-39.5 14.348-18.15 6.6574-33.797 12.107-34.772 12.111-1.6714 6e-3 -1.7562-2.3392-1.5-41.494zm119.39-29.025c9.1482-6.9777 11.844-20.232 5.0784-24.971-5.7021-3.9939-15.661 0.76266-20.054 9.5781-3.6482 7.3209-3.5268 12.193 0.40145 16.121 2.657 2.657 3.5603 2.9796 7.0374 2.5132 2.194-0.29428 5.5856-1.7527 7.5369-3.241zm-118.1-96.281c-0.30789-0.30789-1.1148-6.4e-4 -1.7931 0.68278-0.98026 0.98762-0.8654 1.1025 0.5598 0.5598 0.98622-0.37553 1.5412-0.93469 1.2333-1.2426zm141.47-51.423c0-0.58531-0.63541-0.48812-1.5 0.22943-0.825 0.68469-1.5 1.4007-1.5 1.5911s0.675 0.0872 1.5-0.22943c0.825-0.31659 1.5-1.0326 1.5-1.5911zm-112.97-70.79c8.444-6.0126 11.927-19.117 6.5179-24.526-8.9441-8.9441-27.163 7.4812-23.403 21.099 0.51443 1.8631 1.9304 4.1066 3.1465 4.9854 2.9692 2.1457 9.5915 1.3944 13.739-1.5586z" fill="#e1cf92"/>
+   <path d="m287.46 408.75c-0.26432-0.68882-0.3627-18.772-0.21861-40.185l0.26197-38.933 32.5-11.807c17.875-6.494 33.288-11.811 34.25-11.815 1.6372-7e-3 1.75 2.5312 1.75 39.37 0 30.318-0.2876 39.601-1.25 40.348-1.0995 0.85386-65.097 24.274-66.331 24.274-0.26489 0-0.69788-0.56358-0.96221-1.2524zm70.543-64.125c0-30.282 0.28872-39.617 1.25-40.415 1.522-1.2627 64.432-24.208 66.372-24.208 1.9368 0 2.062 78.187 0.1278 79.792-1.522 1.2627-64.432 24.208-66.372 24.208-1.1471 0-1.3778-6.5941-1.3778-39.378zm41.831-0.23858c4.044-0.8088 10.735-6.6115 13.204-11.451 1.196-2.3443 1.9655-5.8561 1.9655-8.9695 0-4.322-0.45401-5.5708-2.9231-8.0398-1.873-1.873-3.9386-2.9152-5.75-2.9011-4.788 0.0372-11.003 3.5478-14.273 8.0629-6.133 8.4664-6.4957 16.682-0.94277 21.355 3.2574 2.7409 3.9567 2.8968 8.72 1.9441zm-222.83-2.7979-33.5-12.236-0.21619-82.925-0.21619-82.925 2.2362-1.6232c1.2299-0.89276 15.952-6.5842 32.716-12.648s31.717-11.593 33.23-12.287l2.75-1.2628v-81.516l3.25-1.9992c1.7875-1.0995 17.875-7.2212 35.75-13.604 39.041-13.94 31.893-11.343 69.5-25.251 17.115-6.33 32.568-11.478 34.5-11.493 4.3592-0.035293 66.713 22.453 69.227 24.967 1.7139 1.7139 1.8061 6.0366 1.7851 83.732-0.0173 64.069-0.29348 82.169-1.267 83.047-1.1055 0.99687-23.632 9.3552-59.245 21.982-6.6 2.3401-26.85 9.6494-45 16.243s-33.809 12.151-34.798 12.351c-1.6968 0.34251-1.7937 2.6983-1.7294 42.041 0.0534 32.671-0.2065 41.853-1.2025 42.486-3.2511 2.0656-69.189 25.326-71.57 25.247-1.4852-0.04899-17.775-5.5952-36.2-12.325zm139.03-219.61c8.444-6.0126 11.927-19.117 6.5179-24.526-8.9441-8.9441-27.163 7.4812-23.403 21.099 0.51443 1.8631 1.9304 4.1066 3.1465 4.9854 2.9692 2.1457 9.5915 1.3944 13.739-1.5586zm-29.028 164.64c0-30.291 0.28845-39.613 1.25-40.399 1.462-1.1945 64.702-24.224 66.521-24.224 1.876 0 1.7748 78.303-0.10323 79.861-1.6305 1.3532-64.102 24.139-66.182 24.139-1.289 0-1.4856-5.2117-1.4856-39.378zm71-26c0-30.337 0.28699-39.592 1.25-40.312 0.6875-0.51417 16.029-6.2665 34.092-12.783 26.794-9.6664 33.006-11.588 33.735-10.438 1.4764 2.3322 1.1678 76.209-0.32641 78.163-1.3009 1.7015-63.575 24.747-66.872 24.747-1.8053 0-1.8778-1.5208-1.8778-39.378zm71.496 13.229c-0.28622-0.74588-0.40252-18.905-0.25843-40.354l0.26197-38.998 33.437-12.193c18.39-6.7064 33.803-11.967 34.25-11.691 0.44708 0.2763 0.81287 18.235 0.81287 39.908 0 37.624-0.0855 39.452-1.8909 40.418-1.04 0.55658-15.686 5.9945-32.546 12.084s-31.306 11.322-32.101 11.627c-0.79512 0.30512-1.6798-0.0555-1.9661-0.80139zm0.22811-83.46c-1.1458-1.1458-0.87929-77.234 0.27813-79.396 0.67028-1.2524 0.67028-2.079 0-2.4933-1.1767-0.72723-1.4177-47.127-0.2485-47.85 1.1675-0.72156 64.48 22.717 64.419 23.848-0.0295 0.55 0.81941 1.323 1.8866 1.7178 1.8755 0.69378 1.9403 2.035 1.9403 40.128 0 30.326-0.28813 39.641-1.25 40.414-1.0588 0.85021-60.303 22.755-64.775 23.949-0.83898 0.22414-1.8515 0.0815-2.25-0.31705z" fill="#edce6d"/>
+   <path d="m288.45 407.72c-0.2583-0.67311-0.35161-18.312-0.20737-39.198l0.26227-37.974 32-11.71c17.6-6.4404 32.562-11.738 33.25-11.773 0.97965-0.0493 1.25 8.3489 1.25 38.83 0 36.111-0.12518 38.942-1.75 39.584-1.5716 0.62062-51.204 18.737-60.543 22.099-2.9492 1.0616-3.8971 1.0931-4.2623 0.14146zm70.793-63.839 0.26161-39.121 31-11.233c17.05-6.1784 32.018-11.556 33.262-11.95l2.2617-0.71641-0.52334 78.521-32.5 11.793c-17.875 6.4863-32.843 11.801-33.262 11.81-0.41888 9e-3 -0.64388-17.588-0.5-39.104zm47.107-1.6502c8.8766-6.0768 12.557-19.626 7.0946-26.118-6.5045-7.7301-19.215-2.9672-25.056 9.3893-2.7391 5.7939-2.9609 9.1819-0.92072 14.065 2.814 6.7348 11.206 7.9188 18.882 2.6639zm-229.35-0.64252-33.5-12.236-0.21619-82.925-0.21619-82.925 2.2362-1.6232c1.2299-0.89276 15.952-6.5842 32.716-12.648s31.717-11.593 33.23-12.287l2.75-1.2628v-81.516l3.25-1.9992c1.7875-1.0995 17.875-7.2212 35.75-13.604 39.041-13.94 31.893-11.343 69.5-25.251 17.115-6.33 32.568-11.478 34.5-11.493 4.3592-0.035293 66.713 22.453 69.227 24.967 1.7139 1.7139 1.8061 6.0366 1.7851 83.732-0.0173 64.069-0.29348 82.169-1.267 83.047-1.1055 0.99687-23.632 9.3552-59.245 21.982-6.6 2.3401-26.85 9.6494-45 16.243s-33.809 12.151-34.798 12.351c-1.6968 0.34251-1.7937 2.6983-1.7294 42.041 0.0534 32.671-0.2065 41.853-1.2025 42.486-3.2511 2.0656-69.189 25.326-71.57 25.247-1.4852-0.04899-17.775-5.5952-36.2-12.325zm139.03-219.61c8.444-6.0126 11.927-19.117 6.5179-24.526-8.9441-8.9441-27.163 7.4812-23.403 21.099 0.51443 1.8631 1.9304 4.1066 3.1465 4.9854 2.9692 2.1457 9.5915 1.3944 13.739-1.5586zm-27.789 163.88 0.26161-39.138 31-11.217c17.05-6.1692 32.018-11.539 33.262-11.933l2.2617-0.7166-0.52334 78.521-32.5 11.793c-17.875 6.4863-32.843 11.801-33.262 11.81-0.41888 9e-3 -0.64388-17.595-0.5-39.121zm70.762-25.753v-38.891l11.25-4.1069c39.614-14.462 54.77-19.758 55.228-19.299 0.28689 0.28689 0.52162 17.756 0.52162 38.82 0 35.455-0.1299 38.367-1.75 39.223-2.5284 1.3366-63.075 23.145-64.257 23.145-0.63983 0-0.99263-13.823-0.99263-38.891zm71-25.574c0-36.117 0.11066-38.524 1.8127-39.435 2.6397-1.4127 62.824-23.1 64.105-23.1 0.75784 0 1.0823 11.655 1.0823 38.877v38.877l-32.088 11.623c-17.648 6.3926-32.723 11.623-33.5 11.623-1.1913 0-1.4118-6.008-1.4118-38.465zm0.4451-45.818c-0.2583-0.67311-0.35161-18.312-0.20737-39.198l0.26227-37.974 32-11.71c17.6-6.4404 32.562-11.738 33.25-11.773 0.97966-0.04927 1.25 8.3528 1.25 38.85v38.913l-6.75 2.5457c-5.4217 2.0448-33.872 12.394-55.543 20.204-2.9487 1.0627-3.8971 1.0945-4.2623 0.14303zm-0.4451-104.78c0-21.524 0.11711-23.028 1.75-22.486 16.065 5.3349 60.568 22.312 60.432 23.054-0.18412 1.0068-58.283 22.5-60.821 22.5-1.1087 0-1.361-4.2766-1.361-23.067z" fill="#fdd042"/>
+   <path d="m177 341.59-33.5-12.236-0.21619-82.925-0.21619-82.925 2.2362-1.6232c1.2299-0.89276 15.952-6.5842 32.716-12.648s31.717-11.593 33.23-12.287l2.75-1.2628v-81.516l3.25-1.9992c1.7875-1.0995 17.875-7.2212 35.75-13.604 39.041-13.94 31.893-11.343 69.5-25.251 17.115-6.33 32.568-11.478 34.5-11.493 4.3592-0.035293 66.713 22.453 69.227 24.967 1.7139 1.7139 1.8061 6.0366 1.7851 83.732-0.0173 64.069-0.29348 82.169-1.267 83.047-1.1055 0.99687-23.632 9.3552-59.245 21.982-6.6 2.3401-26.85 9.6494-45 16.243s-33.809 12.151-34.798 12.351c-1.6968 0.34251-1.7937 2.6983-1.7294 42.041 0.0534 32.671-0.2065 41.853-1.2025 42.486-3.2511 2.0656-69.189 25.326-71.57 25.247-1.4852-0.04899-17.775-5.5952-36.2-12.325zm139.03-219.61c8.444-6.0126 11.927-19.117 6.5179-24.526-8.9441-8.9441-27.163 7.4812-23.403 21.099 0.51443 1.8631 1.9304 4.1066 3.1465 4.9854 2.9692 2.1457 9.5915 1.3944 13.739-1.5586zm114.64-16.647c-0.92391-0.9239-0.84346-42.11 0.0833-42.661 0.55979-0.3325 36.098 12.197 59.143 20.851 0.76622 0.28775 1.1661 0.75022 0.88861 1.0277-0.60649 0.60651-57.658 21.448-58.712 21.448-0.40492 0-1.0362-0.3-1.4029-0.66667z" fill="#92a7b6"/>
+   <path d="m178 340.64-33.5-12.175-0.26134-40.232c-0.23661-36.423-0.10894-40.232 1.3485-40.232 1.6512 0 61.311 21.373 64.913 23.254 1.1 0.57474 2.31 1.5222 2.689 2.1055 0.4554 0.70102 1.3029 0.50794 2.5-0.56958 2.0288-1.8261 64.495-24.79 67.433-24.79 1.8053 0 1.8778 1.5208 1.8778 39.378 0 30.31-0.28783 39.604-1.25 40.362-2.7425 2.1593-66.144 24.391-68.101 23.879-1.1249-0.29415-2.5186-0.14554-3.0972 0.33026-0.633 0.52051-14.396-3.9843-34.552-11.31zm0.47484-83.438c-17.614-6.4353-32.576-12.065-33.25-12.51-0.93251-0.61592-1.2248-10.342-1.2248-40.75 0-39.274 0.03338-39.941 2-39.941 1.1 0 2-0.63098 2-1.4022 0-0.7712 1.2375-1.8451 2.75-2.3864s16.645-6.0197 33.628-12.174c22.08-8.0012 31.625-11.022 33.5-10.6 2.3878 0.53731 2.4432 0.48484 0.62159-0.58836-1.1-0.64805-2.3306-1.6667-2.7347-2.2637-0.40408-0.597-0.74158-18.762-0.75-40.367-0.0142-36.502 0.1085-39.328 1.7347-39.938 0.9625-0.36115 2.2-1.2241 2.75-1.9177 1.3998-1.7652 64.357-24.355 67.89-24.359 1.5894-2e-3 3.3894-0.6534 4-1.4475 0.98048-1.275 63.378-24.556 65.815-24.556 1.2208 0 61.525 21.785 64.06 23.142 1.0396 0.5564 1.6758 1.5705 1.4137 2.2535-0.29242 0.76205 0.35375 1.2154 1.6724 1.1733l2.149-0.068548 0.26136 39.618c0.20404 30.929-0.0153 39.844-1 40.649-1.4695 1.2008-64.705 24.233-66.532 24.233-0.67622 0-1.2395-0.5625-1.2517-1.25-0.0122-0.6875-0.82029-0.2128-1.7957 1.0549-2.4246 3.1512-66.923 26.795-69.232 25.379-1.0422-0.63909-2.138-0.51979-3.3472 0.36439-0.98876 0.723-2.5415 1.0362-3.4506 0.696-1.4215-0.532-1.4658-0.38858-0.31671 1.0249 0.73485 0.90389 1.0458 2.1131 0.69098 2.6872-0.38392 0.6212 0.39095 1.0438 1.9139 1.0438h2.559v39.378c0 32.98-0.23301 39.571-1.4343 40.568-0.78886 0.65469-16.187 6.5336-34.218 13.064-24.763 8.969-33.108 11.605-34.108 10.774-0.96668-0.80227-1.6375-0.78653-2.4823 0.0582-0.63669 0.63669-1.4051 1.1354-1.7076 1.1082-0.3025-0.0272-14.961-5.3147-32.575-11.75zm37.296-69.013c0.21982-0.65946-0.5166-1.1875-1.6561-1.1875-1.4381 0-1.8749 0.46137-1.4601 1.5423 0.65496 1.7068 2.499 1.4968 3.1162-0.35476zm61.229-30.097c-0.825-0.46674-2.625-1.1236-4-1.4597-2.0838-0.50933-2.0006-0.37052 0.5 0.83393 3.2047 1.5436 6.0083 2.0448 3.5 0.62574zm-11-4c-0.825-0.46674-2.625-1.1236-4-1.4597-2.0838-0.50933-2.0006-0.37052 0.5 0.83393 3.2047 1.5436 6.0083 2.0448 3.5 0.62574zm-10-3.4966c0-0.60605-9.2758-3.6515-9.7321-3.1952-0.21611 0.2161 1.5477 1.0793 3.9196 1.9181 4.6746 1.6533 5.8125 1.9033 5.8125 1.2771zm-15-5.5034c-0.825-0.46674-2.625-1.1236-4-1.4597-2.0838-0.50933-2.0006-0.37052 0.5 0.83393 3.2047 1.5436 6.0083 2.0448 3.5 0.62574zm-11-4c-0.825-0.46674-2.625-1.1236-4-1.4597-2.0838-0.50933-2.0006-0.37052 0.5 0.83393 3.2047 1.5436 6.0083 2.0448 3.5 0.62574zm83.541-16.97c7.3743-3.3497 12.459-11.375 12.459-19.665 0-3.7609-0.53791-5.147-2.9231-7.5321-4.9762-4.9762-12.153-3.7331-18.715 3.2416-4.5006 4.7836-6.362 9.0443-6.362 14.563 0 9.6638 6.4124 13.539 15.541 9.3925zm-27.695-46.951c-2.699-0.44236-3.4109 0.44596-1.8575 2.3177 1.1379 1.3711 1.4133 1.3469 2.575-0.22583 1.123-1.5204 1.025-1.8063-0.71751-2.0919zm73.835-25.763c-0.0999-0.06787-1.8691-0.3838-3.9316-0.70207-3.0897-0.47678-3.75-0.27932-3.75 1.1213 0 0.935 1.0125 2.1715 2.25 2.7478 1.8382 0.856 2.5578 0.67338 3.9316-0.99793 0.92488-1.1251 1.5999-2.1012 1.5-2.1691zm-72.554 190.32c-0.7971-0.7971-1.1278-12.178-1.1278-38.817 0-34.467 0.1496-37.86 1.75-39.686 2.5691-2.9309 66.109-25.766 67.585-24.29 0.82218 0.82218 1.5185 0.5853 2.6406-0.89833 1.6427-2.1719 66.591-26.423 68.163-25.451 0.47339 0.29257 0.86072 18.265 0.86072 39.938 0 37.127-0.10556 39.462-1.8256 40.383-1.0041 0.53736-16.16 6.1875-33.679 12.556-21.667 7.8761-32.18 11.252-32.874 10.558-1.4829-1.4829-2.3252-1.2588-2.8529 0.75906-0.34169 1.3066-7.3515 4.2704-26.367 11.148-14.246 5.1524-29.331 10.619-33.523 12.148-5.6571 2.0632-7.913 2.4892-8.75 1.6522zm143.54-136.39c-0.92391-0.9239-0.84346-42.11 0.0833-42.661 0.55979-0.3325 36.098 12.197 59.143 20.851 0.76622 0.28775 1.1661 0.75022 0.88861 1.0277-0.60649 0.60651-57.658 21.448-58.712 21.448-0.40492 0-1.0362-0.3-1.4029-0.66667z" fill="#fdc81e"/>
+   <path d="m178 340.64-33.5-12.175-0.26134-40.232c-0.23661-36.423-0.10894-40.232 1.3485-40.232 1.6512 0 61.311 21.373 64.913 23.254 1.1 0.57474 2.31 1.5222 2.689 2.1055 0.4554 0.70102 1.3029 0.50794 2.5-0.56958 2.0288-1.8261 64.495-24.79 67.433-24.79 1.8053 0 1.8778 1.5208 1.8778 39.378 0 30.31-0.28783 39.604-1.25 40.362-2.7425 2.1593-66.144 24.391-68.101 23.879-1.1249-0.29415-2.5186-0.14554-3.0972 0.33026-0.633 0.52051-14.396-3.9843-34.552-11.31zm0.47484-83.438c-17.614-6.4353-32.576-12.065-33.25-12.51-0.93251-0.61592-1.2248-10.342-1.2248-40.75 0-39.274 0.03338-39.941 2-39.941 1.1 0 2-0.63098 2-1.4022 0-0.7712 1.2375-1.8451 2.75-2.3864s16.645-6.0197 33.628-12.174c22.08-8.0012 31.625-11.022 33.5-10.6 2.3878 0.53731 2.4432 0.48484 0.62159-0.58836-1.1-0.64805-2.3306-1.6667-2.7347-2.2637-0.40408-0.597-0.74158-18.762-0.75-40.367-0.0142-36.502 0.1085-39.328 1.7347-39.938 0.9625-0.36115 2.2-1.2241 2.75-1.9177 1.3998-1.7652 64.357-24.355 67.89-24.359 1.5894-2e-3 3.3894-0.6534 4-1.4475 0.98048-1.275 63.378-24.556 65.815-24.556 1.2208 0 61.525 21.785 64.06 23.142 1.0396 0.5564 1.6758 1.5705 1.4137 2.2535-0.29242 0.76205 0.35375 1.2154 1.6724 1.1733l2.149-0.068548 0.26136 39.618c0.20404 30.929-0.0153 39.844-1 40.649-1.4695 1.2008-64.705 24.233-66.532 24.233-0.67622 0-1.2395-0.5625-1.2517-1.25-0.0122-0.6875-0.82029-0.2128-1.7957 1.0549-2.4246 3.1512-66.923 26.795-69.232 25.379-1.0422-0.63909-2.138-0.51979-3.3472 0.36439-0.98876 0.723-2.5415 1.0362-3.4506 0.696-1.4215-0.532-1.4658-0.38858-0.31671 1.0249 0.73485 0.90389 1.0458 2.1131 0.69098 2.6872-0.38392 0.6212 0.39095 1.0438 1.9139 1.0438h2.559v39.378c0 32.98-0.23301 39.571-1.4343 40.568-0.78886 0.65469-16.187 6.5336-34.218 13.064-24.763 8.969-33.108 11.605-34.108 10.774-0.96668-0.80227-1.6375-0.78653-2.4823 0.0582-0.63669 0.63669-1.4051 1.1354-1.7076 1.1082-0.3025-0.0272-14.961-5.3147-32.575-11.75zm37.296-69.013c0.21982-0.65946-0.5166-1.1875-1.6561-1.1875-1.4381 0-1.8749 0.46137-1.4601 1.5423 0.65496 1.7068 2.499 1.4968 3.1162-0.35476zm61.229-30.097c-0.825-0.46674-2.625-1.1236-4-1.4597-2.0838-0.50933-2.0006-0.37052 0.5 0.83393 3.2047 1.5436 6.0083 2.0448 3.5 0.62574zm-11-4c-0.825-0.46674-2.625-1.1236-4-1.4597-2.0838-0.50933-2.0006-0.37052 0.5 0.83393 3.2047 1.5436 6.0083 2.0448 3.5 0.62574zm-10-3.4966c0-0.60605-9.2758-3.6515-9.7321-3.1952-0.21611 0.2161 1.5477 1.0793 3.9196 1.9181 4.6746 1.6533 5.8125 1.9033 5.8125 1.2771zm-15-5.5034c-0.825-0.46674-2.625-1.1236-4-1.4597-2.0838-0.50933-2.0006-0.37052 0.5 0.83393 3.2047 1.5436 6.0083 2.0448 3.5 0.62574zm-11-4c-0.825-0.46674-2.625-1.1236-4-1.4597-2.0838-0.50933-2.0006-0.37052 0.5 0.83393 3.2047 1.5436 6.0083 2.0448 3.5 0.62574zm83.541-16.97c7.3743-3.3497 12.459-11.375 12.459-19.665 0-3.7609-0.53791-5.147-2.9231-7.5321-4.9762-4.9762-12.153-3.7331-18.715 3.2416-4.5006 4.7836-6.362 9.0443-6.362 14.563 0 9.6638 6.4124 13.539 15.541 9.3925zm-27.695-46.951c-2.699-0.44236-3.4109 0.44596-1.8575 2.3177 1.1379 1.3711 1.4133 1.3469 2.575-0.22583 1.123-1.5204 1.025-1.8063-0.71751-2.0919zm73.835-25.763c-0.0999-0.06787-1.8691-0.3838-3.9316-0.70207-3.0897-0.47678-3.75-0.27932-3.75 1.1213 0 0.935 1.0125 2.1715 2.25 2.7478 1.8382 0.856 2.5578 0.67338 3.9316-0.99793 0.92488-1.1251 1.5999-2.1012 1.5-2.1691zm-72.554 190.32c-0.7971-0.7971-1.1278-12.178-1.1278-38.817 0-34.467 0.1496-37.86 1.75-39.686 2.5691-2.9309 66.109-25.766 67.585-24.29 0.82218 0.82218 1.5185 0.5853 2.6406-0.89833 1.6427-2.1719 66.591-26.423 68.163-25.451 0.47339 0.29257 0.86072 18.265 0.86072 39.938 0 37.127-0.10556 39.462-1.8256 40.383-1.0041 0.53736-16.16 6.1875-33.679 12.556-21.667 7.8761-32.18 11.252-32.874 10.558-1.4829-1.4829-2.3252-1.2588-2.8529 0.75906-0.34169 1.3066-7.3515 4.2704-26.367 11.148-14.246 5.1524-29.331 10.619-33.523 12.148-5.6571 2.0632-7.913 2.4892-8.75 1.6522z" fill="#6a8fae"/>
+   <path d="m182 341.42c-15.675-5.7232-30.412-11.121-32.75-11.996l-4.25-1.5902v-39.417c0-31.128 0.26618-39.417 1.2657-39.417 1.3958 0 61.019 21.547 63.922 23.1 1.7033 0.91158 1.8127 3.3525 1.8127 40.435 0 21.706-0.3375 39.426-0.75 39.378-0.4125-0.0476-13.575-4.7693-29.25-10.493zm34.238-29.622 0.26161-39.201 32.5-11.798c17.875-6.4891 33.068-11.799 33.762-11.799 0.99845-5.6e-4 1.207 8.1617 1 39.131l-0.26161 39.131-32.5 11.85c-17.875 6.5177-33.068 11.859-33.762 11.869-0.99871 0.0145-1.2071-8.1503-1-39.182zm-38.738-55.771-32-11.759-0.26147-39.634c-0.20708-31.389 9.5e-4 -39.625 1-39.591 0.69381 0.0236 15.661 5.3111 33.261 11.75l32 11.707 0.26147 39.75c0.20727 31.509-6e-5 39.728-1 39.644-0.69381-0.05856-15.661-5.3981-33.261-11.866zm38.738-28.124 0.26161-39.097 31.477-11.441c17.312-6.2927 32.505-11.699 33.762-12.015l2.2852-0.57353-0.52342 78.723-32 11.707c-17.6 6.4389-32.793 11.726-33.762 11.75-1.6572 0.0403-1.7461-2.2747-1.5-39.054zm72-26.025 0.26161-39.121 31-11.233c17.05-6.1784 32.012-11.554 33.25-11.946l2.25-0.71271v38.945c0 29.981-0.28773 39.164-1.25 39.899-1.5898 1.2131-62.819 23.338-64.512 23.311-0.99816-0.0159-1.207-8.1892-1-39.141zm70.762-25.243v-39.364l4.25-1.5903c2.3375-0.87464 16.625-6.0729 31.75-11.552 15.125-5.4788 28.288-10.273 29.25-10.653 1.6488-0.65109 1.75 1.5933 1.75 38.809 0 36.691-0.12447 39.549-1.75 40.187-4.1232 1.6196-64.529 23.527-64.872 23.527-0.20779 0-0.3778-17.714-0.3778-39.364zm-177.47-2.1238c-17.031-6.2174-31.11-11.738-31.286-12.268-0.1766-0.5298 14.321-6.2764 32.218-12.77l32.539-11.807 31.694 11.506c17.432 6.3282 31.834 11.927 32.006 12.441 0.29413 0.88239-63.071 24.492-65.205 24.295-0.55-0.0508-14.934-5.1793-31.965-11.397zm67.465-27.849c-16.775-6.158-31.062-11.553-31.75-11.989-0.96557-0.61224-1.25-9.7916-1.25-40.341 0-31.216 0.26336-39.452 1.25-39.091 0.6875 0.2516 15.353 5.5475 32.59 11.769 17.237 6.2212 31.98 11.951 32.762 12.733 1.1884 1.1884 1.3786 7.6795 1.1597 39.588-0.25616 37.344-0.30489 38.171-2.2618 38.347-1.1 0.099-15.725-4.8584-32.5-11.016zm38-27.605c0-28.999 0.30342-39.129 1.1885-39.676 2.4997-1.5449 65.349-24.073 66.062-23.68 0.4125 0.22794 0.75 17.883 0.75 39.234v38.82l-2.75 1.098c-6.1385 2.451-63.804 23.142-64.5 23.143-0.4125 7e-4 -0.75-17.522-0.75-38.94zm28.15 5.3468c4.0909-2.0895 9.4795-9.0094 10.863-13.95 4.3502-15.537-9.7175-23.214-21.526-11.746-14.446 14.029-6.06 34.237 10.663 25.696zm43.85-31.347c0-30.064 0.28495-39.121 1.25-39.732 1.91-1.2093 63.073-23.324 64.512-23.325 0.99848-0.0011 1.207 8.1721 1 39.188l-0.26161 39.19-32.5 11.793c-17.875 6.4863-32.838 11.801-33.25 11.81-0.4125 9e-3 -0.75-17.506-0.75-38.924zm-107.23-28.376c-16.903-6.1509-30.594-11.625-30.423-12.165 0.39652-1.2533 61.318-23.522 64.656-23.633 2.2573-0.07554 62.446 21.227 63.799 22.58 0.31212 0.31212 0.14749 0.94995-0.36585 1.4174-1.5412 1.4034-62.772 23.153-64.933 23.065-1.1-0.04484-15.83-5.1141-32.733-11.265zm72-26c-16.903-6.1509-30.591-11.633-30.418-12.183 0.38904-1.2333 61.317-23.518 64.127-23.454 2.9912 0.0675 64.057 22.54 63.839 23.493-0.25024 1.0941-62.263 23.479-64.809 23.394-1.1026-0.03664-15.835-5.0991-32.738-11.25z" fill="#4779a3"/>
+   <path d="m179.55 339.48c-17.023-6.186-31.76-11.753-32.75-12.371-1.681-1.0498-1.7998-3.5951-1.7998-38.556 0-24.407 0.35553-37.652 1.0217-38.064 0.92381-0.57094 62.433 20.966 64.24 22.493 0.41905 0.35409 0.64405 17.992 0.5 39.195l-0.26192 38.551zm37.45-27.851v-38.373l32.25-11.641c17.738-6.4025 32.588-11.635 33-11.627 0.4125 8e-3 0.75 17.261 0.75 38.341v38.327l-32.298 11.673c-17.764 6.4199-32.614 11.673-33 11.673s-0.70229-17.268-0.70229-38.373zm-39-56.35c-17.325-6.3312-31.831-12.021-32.235-12.644-1.0622-1.6384-0.94029-75.407 0.12572-76.066 0.49007-0.30288 15.34 4.6757 33 11.063l32.109 11.614v38.878c0 21.383-0.3375 38.83-0.75 38.772-0.4125-0.058-14.925-5.2856-32.25-11.617zm39-27.053v-38.726l31.75-11.428c17.462-6.2852 32.312-11.621 33-11.856 0.98578-0.33797 1.25 7.7114 1.25 38.081v38.509l-2.75 0.98909c-8.7438 3.1449-58.198 21.206-60.5 22.095l-2.75 1.0622zm72-26.525v-38.301l31.646-11.449c17.405-6.2972 32.035-11.601 32.512-11.787 0.48206-0.18768 0.75018 16.852 0.60449 38.415l-0.26182 38.752-31 11.284c-17.05 6.2063-31.562 11.307-32.25 11.335-0.97913 0.0399-1.25-8.2487-1.25-38.25zm71.238-25.446 0.26174-38.734 25.5-9.2112c14.025-5.0662 28.538-10.331 32.25-11.7l6.75-2.4884-0.012 77.379-24.744 8.9141c-13.609 4.9028-28.237 10.187-32.506 11.744l-7.7617 2.8297 0.26174-38.734zm-177.99-2.5086c-16.638-6.0949-30.25-11.363-30.25-11.707 0-0.64917 61.152-23.039 62.925-23.039 0.55284 0 13.508 4.5489 28.79 10.109 15.282 5.5598 29.056 10.566 30.611 11.124 1.5542 0.55853 2.4542 1.3816 2 1.829-0.96225 0.94797-61.66 22.98-62.955 22.852-0.47897-0.0476-14.483-5.0733-31.121-11.168zm66.25-28.265-31-11.343-0.52314-78.057 3.7616 1.3543c35.221 12.681 59.987 21.922 60.997 22.76 0.97926 0.81271 1.265 9.6058 1.265 38.927 0 35.441-0.11257 37.872-1.75 37.789-0.9625-0.0487-15.7-5.1927-32.75-11.431zm39.738-27.049 0.26174-38.569 65-23.571 0.26206 38.043c0.14413 20.923-0.0895 38.394-0.51921 38.824-0.65916 0.65916-63.744 23.843-64.879 23.843-0.2132 0-0.26985-17.356-0.12589-38.569zm25.086 7.6362c9.7626-3.7117 16.911-17.783 13.356-26.291-5.5301-13.235-24.697-6.8016-29.724 9.9777-2.6425 8.8199 2.1957 17.246 9.9023 17.246 2.2065 0 5.1161-0.41986 6.4658-0.93301zm46.914-33.552 0.26185-38.708 31.373-11.403c17.255-6.2719 31.767-11.403 32.25-11.403 0.48802 0 0.87746 17.013 0.87746 38.332v38.332l-31.25 11.321c-17.188 6.2268-31.818 11.528-32.512 11.78-1.0048 0.36494-1.2085-7.4268-1-38.25zm-107.24-28.453c-16.225-5.9236-29.415-11.135-29.31-11.581 0.10443-0.44609 14.187-5.899 31.295-12.118l31.105-11.307 30.951 11.222c17.023 6.1721 30.953 11.499 30.955 11.838 5e-3 0.93934-61.21 22.939-63.497 22.82-1.1-0.05735-15.275-4.9508-31.5-10.874zm72.182-25.962c-16.125-5.8978-29.253-11.145-29.174-11.661 0.17315-1.1238 58.33-22.438 61.223-22.438 1.8339 0 58.375 20.121 61.578 21.913 1.5038 0.84158-58.962 23.15-62.335 22.998-1.0857-0.04886-15.167-4.9143-31.292-10.812z" fill="#3674a8"/>
+   <path d="m179.55 339.48c-17.023-6.186-31.76-11.753-32.75-12.371-1.681-1.0498-1.7998-3.5951-1.7998-38.556 0-24.407 0.35553-37.652 1.0217-38.064 0.92381-0.57094 62.433 20.966 64.24 22.493 0.41905 0.35409 0.64405 17.992 0.5 39.195l-0.26192 38.551zm-1.5498-84.201c-17.325-6.3312-31.831-12.021-32.235-12.644-1.0622-1.6384-0.94029-75.407 0.12572-76.066 0.49007-0.30288 15.34 4.6757 33 11.063l32.109 11.614v38.878c0 21.383-0.3375 38.83-0.75 38.772-0.4125-0.058-14.925-5.2856-32.25-11.617zm4.25-81.532c-16.638-6.0949-30.25-11.363-30.25-11.707 0-0.64917 61.152-23.039 62.925-23.039 0.55284 0 13.508 4.5489 28.79 10.109 15.282 5.5598 29.056 10.566 30.611 11.124 1.5542 0.55853 2.4542 1.3816 2 1.829-0.96225 0.94797-61.66 22.98-62.955 22.852-0.47897-0.0476-14.483-5.0733-31.121-11.168zm66.25-28.265-31-11.343-0.52314-78.057 3.7616 1.3543c35.221 12.681 59.987 21.922 60.997 22.76 0.97926 0.81271 1.265 9.6058 1.265 38.927 0 35.441-0.11257 37.872-1.75 37.789-0.9625-0.0487-15.7-5.1927-32.75-11.431zm4.5-81.419c-16.225-5.9236-29.415-11.135-29.31-11.581 0.10443-0.44609 14.187-5.899 31.295-12.118l31.105-11.307 30.951 11.222c17.023 6.1721 30.953 11.499 30.955 11.838 5e-3 0.93934-61.21 22.939-63.497 22.82-1.1-0.05735-15.275-4.9508-31.5-10.874zm72.182-25.962c-16.125-5.8978-29.253-11.145-29.174-11.661 0.17315-1.1238 58.33-22.438 61.223-22.438 1.8339 0 58.375 20.121 61.578 21.913 1.5038 0.84158-58.962 23.15-62.335 22.998-1.0857-0.04886-15.167-4.9143-31.292-10.812z" fill="#2e6390"/>
+  </g>
+  <path d="m113.77 151.17c0-0.29037 5e-3 -0.52796 0.011-0.52796s0.1782-0.0679 0.38251-0.15099l0.37147-0.15098v1.026l-0.11459 0.0546c-0.063 0.03-0.23515 0.10469-0.38251 0.16597l-0.26792 0.11142z" fill="#fff" stroke-width=".035506"/>
+  <path d="m116.26 150.13v-0.50745l0.34093-0.14219c0.18752-0.0782 0.36008-0.15034 0.38348-0.16029 0.0335-0.0143 0.0406 0.093 0.0333 0.50679l-9e-3 0.52488-0.33262 0.13963c-0.18294 0.0768-0.35133 0.14108-0.37419 0.14285-0.0313 2e-3 -0.0416-0.12181-0.0416-0.50422z" fill="#fff" stroke-width=".035506"/>
+  <path d="m111.73 149.75c-0.14635-0.0621-0.28065-0.11957-0.29844-0.12761-0.0243-0.011 0.0354-0.043 0.24115-0.12919 0.15042-0.063 0.29033-0.12049 0.31092-0.12774l0.0374-0.0132v0.2571c0 0.14141-6e-3 0.25632-0.0125 0.25535-7e-3 -9.6e-4 -0.13221-0.0526-0.27857-0.11473z" fill="#fff" stroke-width=".017753"/>
+  <path d="m112.54 148.97c-0.14635-0.0624-0.27225-0.12042-0.27976-0.12888-8e-3 -8e-3 0.10848-0.0669 0.25778-0.12986 0.14929-0.063 0.28454-0.12039 0.30055-0.12763 0.0269-0.0121 0.0291 7e-3 0.0291 0.2447 0 0.19437-5e-3 0.25752-0.0208 0.25651-0.0114-7.5e-4 -0.14053-0.0524-0.28688-0.11484z" fill="#fff" stroke-width=".017753"/>
+  <path d="m112.53 148.29c-0.15386-0.066-0.28286-0.12348-0.28666-0.12782-4e-3 -4e-3 0.0472-0.0301 0.11343-0.0572 0.0662-0.0271 0.20455-0.0839 0.30745-0.12628l0.1871-0.077v0.25553c0 0.19254-5e-3 0.25517-0.0208 0.25409-0.0114-7.8e-4 -0.14667-0.0554-0.30053-0.12135z" fill="#fff" stroke-width=".017753"/>
+  <path d="m113.35 147.51c-0.15321-0.0631-0.27854-0.11986-0.27851-0.12611 4e-5 -0.0112 0.57842-0.24985 0.60282-0.24878 7e-3 3e-4 0.0125 0.1114 0.0125 0.2469 0 0.22267-3e-3 0.24618-0.0291 0.24454-0.016-9.9e-4 -0.15446-0.0534-0.30768-0.11655z" fill="#fff" stroke-width=".017753"/>
+  <path d="m114.76 147.52c-0.0332-0.054-0.0342-0.0977-4e-3 -0.16443 0.047-0.10297 0.15552-0.1786 0.20282-0.14137 0.0499 0.0392 0.0585 0.0986 0.0264 0.18044-0.0383 0.0976-0.0803 0.14244-0.14761 0.15778-0.041 9e-3 -0.0561 3e-3 -0.0779-0.0324z" fill="#fff" stroke-width=".017753"/>
+  <path d="m115.81 150.44c-0.0507-0.0502-0.0544-0.10156-0.0139-0.1932 0.0257-0.058 0.0571-0.0955 0.10026-0.11954 0.0584-0.0325 0.0658-0.0328 0.10395-4e-3 0.049 0.0366 0.0545 0.11519 0.0147 0.2106-0.0444 0.10649-0.14972 0.16118-0.20507 0.10644z" fill="#fff" stroke-width=".017753"/>
+ </g>
+</svg>
Binary file eric6/icons/oxygen/qscintilla.png has changed
Binary file eric6/icons/oxygen/qthelp.png has changed
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/eric6/icons/oxygen/question.svg	Sat May 02 13:51:07 2020 +0200
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg viewBox="0 0 22 22" xmlns="http://www.w3.org/2000/svg">
+ <defs>
+  <style type="text/css">.ColorScheme-Text {
+        color:#232629;
+      }</style>
+ </defs>
+ <path class="ColorScheme-Text" d="m10.969 3c-1.7509 0-3.4069 0.4216-4.9688 1.2637l0.77734 1.7871c0.78092-0.38352 1.4827-0.65748 2.1074-0.82422 0.63297-0.16673 1.2779-0.25 1.9355-0.25 0.98644 0 1.7434 0.22025 2.2695 0.66211 0.5261 0.44187 0.78906 1.075 0.78906 1.9004 0 0.44187-0.056795 0.83056-0.17188 1.1641-0.11508 0.33348-0.31231 0.66651-0.5918 1-0.27948 0.33349-0.86767 0.88335-1.7637 1.6504-1.1001 1.0033-2.2511 2.7855-2.3516 4.6465h2l-0.005859-0.03125c0-0.75868 0.13147-1.3676 0.39453-1.8262 0.27128-0.46689 0.81313-1.055 1.627-1.7637 0.99467-0.84207 1.6575-1.4752 1.9863-1.9004 0.33704-0.4252 0.58755-0.87438 0.75195-1.3496 0.1645-0.47523 0.24609-1.0217 0.24609-1.6387 0-1.4173-0.44773-2.519-1.3438-3.3027-0.89601-0.79204-2.1256-1.1875-3.6875-1.1875zm-1.9688 14v2h2v-2h-2z" fill="currentColor"/>
+</svg>
Binary file eric6/icons/oxygen/quickFindExtend.png has changed
Binary file eric6/icons/oxygen/quickFindNext.png has changed
Binary file eric6/icons/oxygen/quickFindPrev.png has changed
Binary file eric6/icons/oxygen/relayout.png has changed
Binary file eric6/icons/oxygen/reload.png has changed
Binary file eric6/icons/oxygen/remsplitHorizontal.png has changed
Binary file eric6/icons/oxygen/remsplitVertical.png has changed
Binary file eric6/icons/oxygen/renameBookmark.png has changed
Binary file eric6/icons/oxygen/repeat.png has changed
Binary file eric6/icons/oxygen/rescan.png has changed
Binary file eric6/icons/oxygen/resizeColumns.png has changed
Binary file eric6/icons/oxygen/resourcesCompiler48.png has changed
Binary file eric6/icons/oxygen/restart.png has changed
Binary file eric6/icons/oxygen/restartDelete.png has changed
Binary file eric6/icons/oxygen/rss16.png has changed
Binary file eric6/icons/oxygen/rss22.png has changed
Binary file eric6/icons/oxygen/rss48.png has changed
Binary file eric6/icons/oxygen/runProject.png has changed
Binary file eric6/icons/oxygen/runScript.png has changed
Binary file eric6/icons/oxygen/safari.png has changed
Binary file eric6/icons/oxygen/safeBrowsing.png has changed
Binary file eric6/icons/oxygen/safeBrowsing48.png has changed
Binary file eric6/icons/oxygen/sceneHeightDec.png has changed
Binary file eric6/icons/oxygen/sceneHeightInc.png has changed
Binary file eric6/icons/oxygen/sceneSize.png has changed
Binary file eric6/icons/oxygen/sceneWidthDec.png has changed
Binary file eric6/icons/oxygen/sceneWidthInc.png has changed
Binary file eric6/icons/oxygen/screenCapture.png has changed
Binary file eric6/icons/oxygen/scrollAll.png has changed
Binary file eric6/icons/oxygen/scrollHorizontal.png has changed
Binary file eric6/icons/oxygen/scrollVertical.png has changed
Binary file eric6/icons/oxygen/securityHigh.png has changed
Binary file eric6/icons/oxygen/securityHigh32.png has changed
Binary file eric6/icons/oxygen/securityLow.png has changed
Binary file eric6/icons/oxygen/securityLow32.png has changed
Binary file eric6/icons/oxygen/securityMedium.png has changed
Binary file eric6/icons/oxygen/securityMedium32.png has changed
Binary file eric6/icons/oxygen/select.png has changed
Binary file eric6/icons/oxygen/selectCircle.png has changed
Binary file eric6/icons/oxygen/selectRectangle.png has changed
Binary file eric6/icons/oxygen/shapesAlignBottom.png has changed
Binary file eric6/icons/oxygen/shapesAlignHCenter.png has changed
Binary file eric6/icons/oxygen/shapesAlignLeft.png has changed
Binary file eric6/icons/oxygen/shapesAlignRight.png has changed
Binary file eric6/icons/oxygen/shapesAlignTop.png has changed
Binary file eric6/icons/oxygen/shapesAlignVCenter.png has changed
Binary file eric6/icons/oxygen/sharedEditCancel.png has changed
Binary file eric6/icons/oxygen/sharedEditConnected.png has changed
Binary file eric6/icons/oxygen/sharedEditDisconnected.png has changed
Binary file eric6/icons/oxygen/sharedEditSend.png has changed
Binary file eric6/icons/oxygen/sharedEditStart.png has changed
Binary file eric6/icons/oxygen/shell.png has changed
Binary file eric6/icons/oxygen/showPassword.png has changed
Binary file eric6/icons/oxygen/showPrograms.png has changed
Binary file eric6/icons/oxygen/siteinfo-databases.png has changed
Binary file eric6/icons/oxygen/siteinfo-general.png has changed
Binary file eric6/icons/oxygen/siteinfo-media.png has changed
Binary file eric6/icons/oxygen/siteinfo-security.png has changed
Binary file eric6/icons/oxygen/spellchecking.png has changed
Binary file eric6/icons/oxygen/spellchecking48.png has changed
Binary file eric6/icons/oxygen/splitHorizontal.png has changed
Binary file eric6/icons/oxygen/splitVertical.png has changed
Binary file eric6/icons/oxygen/sqlBrowser.png has changed
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/eric6/icons/oxygen/start.svg	Sat May 02 13:51:07 2020 +0200
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg viewBox="0 0 22 22" xmlns="http://www.w3.org/2000/svg">
+ <defs>
+  <style type="text/css">.ColorScheme-Text {
+        color:#232629;
+      }</style>
+ </defs>
+ <path class="ColorScheme-Text" d="m4 4v14l14-7z" fill="currentColor"/>
+</svg>
Binary file eric6/icons/oxygen/step.png has changed
Binary file eric6/icons/oxygen/stepOut.png has changed
Binary file eric6/icons/oxygen/stepOver.png has changed
Binary file eric6/icons/oxygen/stepQuit.png has changed
Binary file eric6/icons/oxygen/stopLoading.png has changed
Binary file eric6/icons/oxygen/stopScript.png has changed
Binary file eric6/icons/oxygen/superMenu.png has changed
Binary file eric6/icons/oxygen/symbols.png has changed
Binary file eric6/icons/oxygen/symlink.png has changed
Binary file eric6/icons/oxygen/sync.png has changed
Binary file eric6/icons/oxygen/syncCompleted.png has changed
Binary file eric6/icons/oxygen/syncFailed.png has changed
Binary file eric6/icons/oxygen/syncNo.png has changed
Binary file eric6/icons/oxygen/syncToc.png has changed
Binary file eric6/icons/oxygen/syntaxError.png has changed
Binary file eric6/icons/oxygen/syntaxError22.png has changed
Binary file eric6/icons/oxygen/syntaxErrorGoto.png has changed
Binary file eric6/icons/oxygen/tBreak.png has changed
Binary file eric6/icons/oxygen/tCBreak.png has changed
Binary file eric6/icons/oxygen/tabClose.png has changed
Binary file eric6/icons/oxygen/tabCloseOther.png has changed
Binary file eric6/icons/oxygen/tabDuplicate.png has changed
Binary file eric6/icons/oxygen/tabManager.png has changed
Binary file eric6/icons/oxygen/tabNew.png has changed
Binary file eric6/icons/oxygen/task.png has changed
Binary file eric6/icons/oxygen/taskCompleted.png has changed
Binary file eric6/icons/oxygen/taskFixme.png has changed
Binary file eric6/icons/oxygen/taskNext.png has changed
Binary file eric6/icons/oxygen/taskNote.png has changed
Binary file eric6/icons/oxygen/taskPrev.png has changed
Binary file eric6/icons/oxygen/taskPrioHigh.png has changed
Binary file eric6/icons/oxygen/taskPrioLow.png has changed
Binary file eric6/icons/oxygen/taskPriority.png has changed
Binary file eric6/icons/oxygen/taskTodo.png has changed
Binary file eric6/icons/oxygen/taskWarning.png has changed
Binary file eric6/icons/oxygen/templateViewer.png has changed
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/eric6/icons/oxygen/terminal.svg	Sat May 02 13:51:07 2020 +0200
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="16px" height="16px" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <defs>
+  <linearGradient id="linearGradient2880" x1="16.143" x2="16.143" y1="4" y2="44" gradientTransform="matrix(.23078 0 0 .15386 2.4612 4.8074)" gradientUnits="userSpaceOnUse">
+   <stop stop-color="#fff" offset="0"/>
+   <stop stop-color="#fff" stop-opacity="0" offset="1"/>
+  </linearGradient>
+  <linearGradient id="linearGradient2883" x1="16.626" x2="20.055" y1="15.298" y2="24.628" gradientTransform="matrix(.30476 0 0 .32156 .68572 1.0807)" gradientUnits="userSpaceOnUse">
+   <stop stop-color="#fff" offset="0"/>
+   <stop stop-color="#fff" stop-opacity="0" offset="1"/>
+  </linearGradient>
+  <linearGradient id="linearGradient2886" x1="16" x2="16" y1="27.045" y2="16" gradientTransform="matrix(.34286 0 0 .36364 -.42808 -.81818)" gradientUnits="userSpaceOnUse" xlink:href="#linearGradient3680-6"/>
+  <linearGradient id="linearGradient3680-6">
+   <stop stop-color="#dcdcdc" offset="0"/>
+   <stop stop-color="#fff" offset="1"/>
+  </linearGradient>
+  <linearGradient id="linearGradient2890" x1="20" x2="20" y1="28" y2="26" gradientTransform="matrix(.375 0 0 .375 -.74978 -.5)" gradientUnits="userSpaceOnUse" xlink:href="#linearGradient3680-6"/>
+  <linearGradient id="linearGradient2894" x1="12.579" x2="12.213" y1="2.9165" y2="47.279" gradientTransform="matrix(.28855 0 0 .25608 1.0743 2.6116)" gradientUnits="userSpaceOnUse">
+   <stop stop-color="#fff" offset="0"/>
+   <stop stop-color="#fff" stop-opacity="0" offset="1"/>
+  </linearGradient>
+  <linearGradient id="linearGradient2897" x1="23.071" x2="23.071" y1="36.047" y2="33.296" gradientTransform="matrix(.33032 0 0 .32624 .074248 1.9649)" gradientUnits="userSpaceOnUse">
+   <stop stop-color="#fff" offset="0"/>
+   <stop stop-color="#fff" stop-opacity="0" offset="1"/>
+  </linearGradient>
+  <radialGradient id="radialGradient2900" cx="7.4957" cy="8.4498" r="20" gradientTransform="matrix(0 .47178 -.86826 -1.9907e-8 15.337 1.0829)" gradientUnits="userSpaceOnUse">
+   <stop stop-color="#505050" offset="0"/>
+   <stop stop-color="#141414" offset="1"/>
+  </radialGradient>
+  <linearGradient id="linearGradient2902" x1="16.143" x2="16.143" y1="4" y2="44" gradientTransform="matrix(.28207 0 0 .20514 1.2304 3.5766)" gradientUnits="userSpaceOnUse">
+   <stop stop-color="#323232" offset="0"/>
+   <stop offset="1"/>
+  </linearGradient>
+  <linearGradient id="linearGradient2983" x1="24" x2="24" y1="7.96" y2="43.865" gradientTransform="matrix(.3333 0 0 .32429 .00075427 .06858)" gradientUnits="userSpaceOnUse">
+   <stop stop-color="#f0f0f0" offset="0"/>
+   <stop stop-color="#d7d7d8" offset=".085525"/>
+   <stop stop-color="#b2b2b3" offset=".92166"/>
+   <stop stop-color="#979798" offset="1"/>
+  </linearGradient>
+  <linearGradient id="linearGradient2985" x1="10.014" x2="10.014" y1="44.96" y2="2.8765" gradientTransform="matrix(.31912 0 0 .29298 .34112 1.4648)" gradientUnits="userSpaceOnUse">
+   <stop stop-color="#595959" offset="0"/>
+   <stop stop-color="#b3b3b3" offset="1"/>
+  </linearGradient>
+ </defs>
+ <rect x=".50107" y="2.5011" width="14.998" height="11.998" rx="1" ry="1" fill="url(#linearGradient2983)" fill-rule="evenodd" stroke="url(#linearGradient2985)" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.0021"/>
+ <rect x="2.5" y="4.5" width="11" height="8" rx="0" ry="0" color="#000000" fill="url(#radialGradient2900)" stroke="url(#linearGradient2902)" stroke-linecap="round" stroke-linejoin="round"/>
+ <rect x="1.501" y="3.5011" width="12.998" height="9.9979" rx="0" ry="0" fill="none" opacity=".4" stroke="url(#linearGradient2897)" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.0021"/>
+ <rect x="1.5019" y="3.5019" width="12.996" height="9.9963" fill="none" opacity=".8" stroke="url(#linearGradient2894)" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.0037"/>
+ <path d="m9.0002 10v-0.75h-3v0.75h3z" fill="url(#linearGradient2890)"/>
+ <path d="m3.6862 9-0.68571-0.72727 1.5429-1.2727-1.5429-1.2727 0.68571-0.72727 2.3143 2-2.3143 2z" fill="url(#linearGradient2886)"/>
+ <path d="m1.6667 3c-0.36824 0-0.66667 0.31488-0.66667 0.70342v5.145c9.545e-4 0.043283 0.018837 0.084214 0.049602 0.11286 0.030769 0.028643 0.071495 0.04238 0.1123 0.037874l13.714-2.2911c0.070547-0.011738 0.12282-0.075385 0.12381-0.15073v-2.8539c0-0.38854-0.29843-0.70342-0.66667-0.70342h-12.667z" fill="url(#linearGradient2883)" fill-rule="evenodd" opacity=".2"/>
+ <rect x="3.5" y="5.5" width="9" height="6" rx="0" ry="0" color="#000000" fill="none" opacity=".1" stroke="url(#linearGradient2880)" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
Binary file eric6/icons/oxygen/textencoding.png has changed
Binary file eric6/icons/oxygen/tineye.png has changed
Binary file eric6/icons/oxygen/toolbarsConfigure.png has changed
Binary file eric6/icons/oxygen/trPreviewer.png has changed
Binary file eric6/icons/oxygen/transformResize.png has changed
Binary file eric6/icons/oxygen/translate.png has changed
Binary file eric6/icons/oxygen/trash.png has changed
Binary file eric6/icons/oxygen/uiPreviewer.png has changed
Binary file eric6/icons/oxygen/unhighlight.png has changed
Binary file eric6/icons/oxygen/unittest.png has changed
Binary file eric6/icons/oxygen/unittestProject.png has changed
Binary file eric6/icons/oxygen/unittestRerunFailed.png has changed
Binary file eric6/icons/oxygen/unittestRestart.png has changed
Binary file eric6/icons/oxygen/unittestScript.png has changed
Binary file eric6/icons/oxygen/updateLocal.png has changed
Binary file eric6/icons/oxygen/updateRemote.png has changed
Binary file eric6/icons/oxygen/vcsAdd.png has changed
Binary file eric6/icons/oxygen/vcsAddRemove.png has changed
Binary file eric6/icons/oxygen/vcsApplyChangegroup.png has changed
Binary file eric6/icons/oxygen/vcsBranch.png has changed
Binary file eric6/icons/oxygen/vcsChangeLists.png has changed
Binary file eric6/icons/oxygen/vcsCheckout.png has changed
Binary file eric6/icons/oxygen/vcsCommit.png has changed
Binary file eric6/icons/oxygen/vcsCreateChangegroup.png has changed
Binary file eric6/icons/oxygen/vcsDiff.png has changed
Binary file eric6/icons/oxygen/vcsEditHistory.png has changed
Binary file eric6/icons/oxygen/vcsExport.png has changed
Binary file eric6/icons/oxygen/vcsExportPatch.png has changed
Binary file eric6/icons/oxygen/vcsGraft.png has changed
Binary file eric6/icons/oxygen/vcsImportPatch.png has changed
Binary file eric6/icons/oxygen/vcsLock.png has changed
Binary file eric6/icons/oxygen/vcsLog.png has changed
Binary file eric6/icons/oxygen/vcsLogin.png has changed
Binary file eric6/icons/oxygen/vcsLogout.png has changed
Binary file eric6/icons/oxygen/vcsMerge.png has changed
Binary file eric6/icons/oxygen/vcsPreviewChangegroup.png has changed
Binary file eric6/icons/oxygen/vcsRebase.png has changed
Binary file eric6/icons/oxygen/vcsRemove.png has changed
Binary file eric6/icons/oxygen/vcsRepo.png has changed
Binary file eric6/icons/oxygen/vcsRepoBrowser.png has changed
Binary file eric6/icons/oxygen/vcsRevert.png has changed
Binary file eric6/icons/oxygen/vcsSbsDiff.png has changed
Binary file eric6/icons/oxygen/vcsStatus.png has changed
Binary file eric6/icons/oxygen/vcsSummary.png has changed
Binary file eric6/icons/oxygen/vcsSwitch.png has changed
Binary file eric6/icons/oxygen/vcsTag.png has changed
Binary file eric6/icons/oxygen/vcsTagGlobal.png has changed
Binary file eric6/icons/oxygen/vcsTagLocal.png has changed
Binary file eric6/icons/oxygen/vcsTransplant.png has changed
Binary file eric6/icons/oxygen/vcsUnlock.png has changed
Binary file eric6/icons/oxygen/vcsUpdate.png has changed
Binary file eric6/icons/oxygen/viewProfileDebug.png has changed
Binary file eric6/icons/oxygen/viewProfileEdit.png has changed
Binary file eric6/icons/oxygen/virtualenv.png has changed
Binary file eric6/icons/oxygen/virtualenvConfig.png has changed
Binary file eric6/icons/oxygen/virustotal.png has changed
Binary file eric6/icons/oxygen/w3.png has changed
Binary file eric6/icons/oxygen/warning.png has changed
Binary file eric6/icons/oxygen/warning22.png has changed
Binary file eric6/icons/oxygen/warningNext.png has changed
Binary file eric6/icons/oxygen/warningPrev.png has changed
Binary file eric6/icons/oxygen/watchpoints.png has changed
Binary file eric6/icons/oxygen/webInspector.png has changed
Binary file eric6/icons/oxygen/webSearch.png has changed
Binary file eric6/icons/oxygen/whatsThis.png has changed
Binary file eric6/icons/oxygen/wikipedia.png has changed
Binary file eric6/icons/oxygen/windowFullscreen.png has changed
Binary file eric6/icons/oxygen/windowRestore.png has changed
Binary file eric6/icons/oxygen/wordboundary.png has changed
Binary file eric6/icons/oxygen/xbel.png has changed
Binary file eric6/icons/oxygen/yahoo.png has changed
Binary file eric6/icons/oxygen/yandex.png has changed
Binary file eric6/icons/oxygen/zoomIn.png has changed
Binary file eric6/icons/oxygen/zoomOut.png has changed
Binary file eric6/icons/oxygen/zoomReset.png has changed
Binary file eric6/icons/oxygen/zoomTo.png has changed
Binary file eric6/pixmaps/ericWeb48_icon.png has changed
Binary file eric6/pixmaps/eric_icon.png has changed
--- a/scripts/install.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/scripts/install.py	Sat May 02 13:51:07 2020 +0200
@@ -919,10 +919,10 @@
         if not os.path.exists(dst):
             os.makedirs(dst)
         shutilCopy(
-            os.path.join(eric6SourceDir, "icons", "default", "eric.png"),
+            os.path.join(eric6SourceDir, "pixmaps", "eric_icon.png"),
             os.path.join(dst, "eric.png"))
         shutilCopy(
-            os.path.join(eric6SourceDir, "icons", "default", "ericWeb48.png"),
+            os.path.join(eric6SourceDir, "pixmaps", "ericWeb48_icon.png"),
             os.path.join(dst, "ericWeb.png"))
         dst = os.path.normpath(
             os.path.join(distDir, "usr/share/applications"))
@@ -941,8 +941,8 @@
             os.path.join(sourceDir, "linux", "eric6.appdata.xml.in"),
             os.path.join(dst, "eric6.appdata.xml"))
     elif os.getuid() == 0:
-        shutilCopy(os.path.join(
-            eric6SourceDir, "icons", "default", "eric.png"),
+        shutilCopy(
+            os.path.join(eric6SourceDir, "pixmaps", "eric_icon.png"),
             "/usr/share/pixmaps/eric.png")
         copyDesktopFile(
             os.path.join(sourceDir, "linux", "eric6.desktop.in"),
@@ -955,8 +955,8 @@
             copyAppStreamFile(
                 os.path.join(sourceDir, "linux", "eric6.appdata.xml.in"),
                 "/usr/share/appdata/eric6.appdata.xml")
-        shutilCopy(os.path.join(
-            eric6SourceDir, "icons", "default", "ericWeb48.png"),
+        shutilCopy(
+            os.path.join(eric6SourceDir, "pixmaps", "ericWeb48_icon.png"),
             "/usr/share/pixmaps/ericWeb.png")
         copyDesktopFile(
             os.path.join(sourceDir, "linux", "eric6_browser.desktop.in"),
@@ -973,7 +973,7 @@
                 os.makedirs(directory)
         # now copy the files
         shutilCopy(
-            os.path.join(eric6SourceDir, "icons", "default", "eric.png"),
+            os.path.join(eric6SourceDir, "pixmaps", "eric_icon.png"),
             os.path.join(localPath, "pixmaps", "eric.png"))
         copyDesktopFile(
             os.path.join(sourceDir, "linux", "eric6.desktop.in"),
@@ -985,7 +985,7 @@
             os.path.join(sourceDir, "linux", "eric6.appdata.xml.in"),
             os.path.join(localPath, "appdata", "eric6.appdata.xml"))
         shutilCopy(
-            os.path.join(eric6SourceDir, "icons", "default", "ericWeb48.png"),
+            os.path.join(eric6SourceDir, "pixmaps", "ericWeb48_icon.png"),
             os.path.join(localPath, "pixmaps", "ericWeb.png"))
         copyDesktopFile(
             os.path.join(sourceDir, "linux", "eric6_browser.desktop.in"),
--- a/setup.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/setup.py	Sat May 02 13:51:07 2020 +0200
@@ -80,8 +80,8 @@
                 'linux/eric6_browser.desktop',
             ]),
             ('share/icons', [
-                'eric6/icons/default/eric.png',
-                'eric6/icons/default/ericWeb48.png'
+                'eric6/icons/breeze-dark/eric.svg',
+                'eric6/icons/breeze-dark/ericWeb48.svg'
             ]),
             ('share/appdata', ['linux/eric6.appdata.xml']),
             ('share/metainfo', ['linux/eric6.appdata.xml']),
@@ -307,11 +307,13 @@
     python_requires=">=3.5",
     install_requires=[
         "PyQt5>=5.12.1",
+        "PyQtChart>=5.12.1",
         "PyQtWebEngine>=5.12.1",
         "QScintilla>=2.11.1",
-        "pip",
+        "pip>=19.0",
         "docutils",
         "Markdown",
+        "wheel",
         "pywin32>=1.0;platform_system=='Windows'",
     ],
     data_files=getDataFiles(),

eric ide

mercurial