--- a/eric6/i18n/eric6_fr.ts Mon Apr 13 16:57:44 2020 +0200
+++ b/eric6/i18n/eric6_fr.ts Mon Apr 13 17:35:49 2020 +0200
@@ -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><p>The colour <b>{0}</b> is not valid.</p></source>
- <translation><p>La couleur <b>{0}</b> n'est pas valide.</p></translation>
+ <translation type="obsolete"><p>La couleur <b>{0}</b> n'est pas valide.</p></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><p>The color <b>{0}</b> is not valid.</p></source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>CompareDialog</name>
@@ -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><b>Configure Diff colours</b></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><b>Configure Diff colors</b></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>
@@ -11053,7 +11068,7 @@
<translation>Éditer le point d'arrêt...</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="5608"/>
+ <location filename="../QScintilla/Editor.py" line="5612"/>
<source>Enable breakpoint</source>
<translation>Activer le point d'arrêt</translation>
</message>
@@ -11118,97 +11133,97 @@
<translation>Fichier Modifié</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="4773"/>
+ <location filename="../QScintilla/Editor.py" line="4777"/>
<source>Autocompletion</source>
<translation>Autocompletion</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="4773"/>
+ <location filename="../QScintilla/Editor.py" line="4777"/>
<source>Autocompletion is not available because there is no autocompletion source set.</source>
<translation>L'autocompletion n'est pas disponible car aucune source d'autocomplétion n'est définie.</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="5611"/>
+ <location filename="../QScintilla/Editor.py" line="5615"/>
<source>Disable breakpoint</source>
<translation>Désactiver le point d'arrêt</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="5986"/>
+ <location filename="../QScintilla/Editor.py" line="5990"/>
<source>Code Coverage</source>
<translation>Code Coverage</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="5986"/>
+ <location filename="../QScintilla/Editor.py" line="5990"/>
<source>Please select a coverage file</source>
<translation>Sélectionner un fichier coverage</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="6166"/>
+ <location filename="../QScintilla/Editor.py" line="6170"/>
<source>Profile Data</source>
<translation>Profiler de données</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="6166"/>
+ <location filename="../QScintilla/Editor.py" line="6170"/>
<source>Please select a profile file</source>
<translation>Sélectionner un fichier profile</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="6719"/>
+ <location filename="../QScintilla/Editor.py" line="6723"/>
<source>Macro Name</source>
<translation>Nom de la macro</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="6719"/>
+ <location filename="../QScintilla/Editor.py" line="6723"/>
<source>Select a macro name:</source>
<translation>Sélectionner un nom de macro:</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="6790"/>
+ <location filename="../QScintilla/Editor.py" line="6794"/>
<source>Macro files (*.macro)</source>
<translation>Fichier Macro (*.macro)</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="6747"/>
+ <location filename="../QScintilla/Editor.py" line="6751"/>
<source>Load macro file</source>
<translation>Charger un fichier macro</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="6770"/>
+ <location filename="../QScintilla/Editor.py" line="6774"/>
<source>Error loading macro</source>
<translation>Erreur lors du chargement de la macro</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="6790"/>
+ <location filename="../QScintilla/Editor.py" line="6794"/>
<source>Save macro file</source>
<translation>Enregistrer le fichier macro</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="6807"/>
+ <location filename="../QScintilla/Editor.py" line="6811"/>
<source>Save macro</source>
<translation>Enregistrer la macro</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="6823"/>
+ <location filename="../QScintilla/Editor.py" line="6827"/>
<source>Error saving macro</source>
<translation>Erreur lors de l'enregistrement de la macro</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="6836"/>
+ <location filename="../QScintilla/Editor.py" line="6840"/>
<source>Start Macro Recording</source>
<translation>Démarrer l'enregistrement de la macro</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="6862"/>
+ <location filename="../QScintilla/Editor.py" line="6866"/>
<source>Macro Recording</source>
<translation>Enregistrement de macro</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="6862"/>
+ <location filename="../QScintilla/Editor.py" line="6866"/>
<source>Enter name of the macro:</source>
<translation>Entrer le nom de la macro:</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="7002"/>
+ <location filename="../QScintilla/Editor.py" line="7006"/>
<source>File changed</source>
<translation>Fichier modifié</translation>
</message>
@@ -11228,7 +11243,7 @@
<translation>Supprimer les flags d'erreurs de syntaxe</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="7308"/>
+ <location filename="../QScintilla/Editor.py" line="7312"/>
<source>Drop Error</source>
<translation>Erreur de suppression</translation>
</message>
@@ -11238,12 +11253,12 @@
<translation>Afficher le message d'erreur de syntaxe</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="6328"/>
+ <location filename="../QScintilla/Editor.py" line="6332"/>
<source>Syntax Error</source>
<translation>Erreur de syntaxe</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="6328"/>
+ <location filename="../QScintilla/Editor.py" line="6332"/>
<source>No syntax error message available.</source>
<translation>Aucun message d'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="6049"/>
+ <location filename="../QScintilla/Editor.py" line="6053"/>
<source>Show Code Coverage Annotations</source>
<translation>Afficher les annotations de Code Coverage</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="6042"/>
+ <location filename="../QScintilla/Editor.py" line="6046"/>
<source>All lines have been covered.</source>
<translation>Toutes les lignes ont été executées.</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="6049"/>
+ <location filename="../QScintilla/Editor.py" line="6053"/>
<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="7329"/>
+ <location filename="../QScintilla/Editor.py" line="7333"/>
<source>Resources</source>
<translation>Ressources</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="7331"/>
- <source>Add file...</source>
- <translation>Ajouter un fichier...</translation>
- </message>
- <message>
- <location filename="../QScintilla/Editor.py" line="7333"/>
- <source>Add files...</source>
- <translation>Ajouter des fichiers...</translation>
- </message>
- <message>
<location filename="../QScintilla/Editor.py" line="7335"/>
+ <source>Add file...</source>
+ <translation>Ajouter un fichier...</translation>
+ </message>
+ <message>
+ <location filename="../QScintilla/Editor.py" line="7337"/>
+ <source>Add files...</source>
+ <translation>Ajouter des fichiers...</translation>
+ </message>
+ <message>
+ <location filename="../QScintilla/Editor.py" line="7339"/>
<source>Add aliased file...</source>
<translation>Ajouter un fichier alias...</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="7338"/>
- <source>Add localized resource...</source>
- <translation>Ajouter une ressource localisée...</translation>
- </message>
- <message>
- <location filename="../QScintilla/Editor.py" line="7361"/>
- <source>Add file resource</source>
- <translation>Ajoute un fichier ressource</translation>
- </message>
- <message>
- <location filename="../QScintilla/Editor.py" line="7377"/>
- <source>Add file resources</source>
- <translation>Ajoute des fichiers ressources</translation>
- </message>
- <message>
- <location filename="../QScintilla/Editor.py" line="7404"/>
- <source>Add aliased file resource</source>
- <translation>Ajoute un alias de fichier ressource</translation>
- </message>
- <message>
- <location filename="../QScintilla/Editor.py" line="7470"/>
- <source>Package Diagram</source>
- <translation>Diagramme de package</translation>
- </message>
- <message>
- <location filename="../QScintilla/Editor.py" line="7470"/>
- <source>Include class attributes?</source>
- <translation>Inclure les attributs de classes ?</translation>
- </message>
- <message>
- <location filename="../QScintilla/Editor.py" line="7506"/>
- <source>Application Diagram</source>
- <translation>Diagramme de l'application</translation>
- </message>
- <message>
- <location filename="../QScintilla/Editor.py" line="7506"/>
- <source>Include module names?</source>
- <translation>Inclure les noms de modules ?</translation>
- </message>
- <message>
<location filename="../QScintilla/Editor.py" line="7342"/>
+ <source>Add localized resource...</source>
+ <translation>Ajouter une ressource localisée...</translation>
+ </message>
+ <message>
+ <location filename="../QScintilla/Editor.py" line="7365"/>
+ <source>Add file resource</source>
+ <translation>Ajoute un fichier ressource</translation>
+ </message>
+ <message>
+ <location filename="../QScintilla/Editor.py" line="7381"/>
+ <source>Add file resources</source>
+ <translation>Ajoute des fichiers ressources</translation>
+ </message>
+ <message>
+ <location filename="../QScintilla/Editor.py" line="7408"/>
+ <source>Add aliased file resource</source>
+ <translation>Ajoute un alias de fichier ressource</translation>
+ </message>
+ <message>
+ <location filename="../QScintilla/Editor.py" line="7474"/>
+ <source>Package Diagram</source>
+ <translation>Diagramme de package</translation>
+ </message>
+ <message>
+ <location filename="../QScintilla/Editor.py" line="7474"/>
+ <source>Include class attributes?</source>
+ <translation>Inclure les attributs de classes ?</translation>
+ </message>
+ <message>
+ <location filename="../QScintilla/Editor.py" line="7510"/>
+ <source>Application Diagram</source>
+ <translation>Diagramme de l'application</translation>
+ </message>
+ <message>
+ <location filename="../QScintilla/Editor.py" line="7510"/>
+ <source>Include module names?</source>
+ <translation>Inclure les noms de modules ?</translation>
+ </message>
+ <message>
+ <location filename="../QScintilla/Editor.py" line="7346"/>
<source>Add resource frame</source>
<translation>Ajouter un cadre ressource</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="6836"/>
+ <location filename="../QScintilla/Editor.py" line="6840"/>
<source>Macro recording is already active. Start new?</source>
<translation>L'enregistrement de macro est déjà actif. En démarrer une nouvelle ?</translation>
</message>
@@ -11428,12 +11443,12 @@
<translation>Aucun format d'exportation indiqué. Abandon...</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="7492"/>
+ <location filename="../QScintilla/Editor.py" line="7496"/>
<source>Imports Diagram</source>
<translation>Diagramme des modules</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="7492"/>
+ <location filename="../QScintilla/Editor.py" line="7496"/>
<source>Include imports from external modules?</source>
<translation>Inclure l'importation de modules externes?</translation>
</message>
@@ -11503,7 +11518,7 @@
<translation>Sélectionne l'analyseur Pygments à appliquer.</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="7835"/>
+ <location filename="../QScintilla/Editor.py" line="7839"/>
<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="7838"/>
+ <location filename="../QScintilla/Editor.py" line="7842"/>
<source>Add to dictionary</source>
<translation>Ajouter au dictionnaire</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="7840"/>
+ <location filename="../QScintilla/Editor.py" line="7844"/>
<source>Ignore All</source>
<translation>Tout ignorer</translation>
</message>
@@ -11558,32 +11573,32 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="6761"/>
+ <location filename="../QScintilla/Editor.py" line="6765"/>
<source><p>The macro file <b>{0}</b> could not be read.</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="6770"/>
+ <location filename="../QScintilla/Editor.py" line="6774"/>
<source><p>The macro file <b>{0}</b> is corrupt.</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="6823"/>
+ <location filename="../QScintilla/Editor.py" line="6827"/>
<source><p>The macro file <b>{0}</b> could not be written.</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="7167"/>
+ <location filename="../QScintilla/Editor.py" line="7171"/>
<source>{0} (ro)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="7308"/>
+ <location filename="../QScintilla/Editor.py" line="7312"/>
<source><p><b>{0}</b> is not a file.</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="7404"/>
+ <location filename="../QScintilla/Editor.py" line="7408"/>
<source>Alias for file <b>{0}</b>:</source>
<translation type="unfinished"></translation>
</message>
@@ -11613,22 +11628,22 @@
<translation type="unfinished"><p>Le fichier <b>{0}</b>existe déjà. Écraser ?</p></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="6807"/>
+ <location filename="../QScintilla/Editor.py" line="6811"/>
<source><p>The macro file <b>{0}</b> already exists. Overwrite it?</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="6607"/>
+ <location filename="../QScintilla/Editor.py" line="6611"/>
<source>Warning: {0}</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="6614"/>
+ <location filename="../QScintilla/Editor.py" line="6618"/>
<source>Error: {0}</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="6998"/>
+ <location filename="../QScintilla/Editor.py" line="7002"/>
<source><br><b>Warning:</b> 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="8256"/>
+ <location filename="../QScintilla/Editor.py" line="8260"/>
<source>Sort Lines</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="8256"/>
+ <location filename="../QScintilla/Editor.py" line="8260"/>
<source>The selection contains illegal data for a numerical sort.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="6542"/>
+ <location filename="../QScintilla/Editor.py" line="6546"/>
<source>Warning</source>
<translation type="unfinished">Warning</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="6542"/>
+ <location filename="../QScintilla/Editor.py" line="6546"/>
<source>No warning messages available.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="6604"/>
+ <location filename="../QScintilla/Editor.py" line="6608"/>
<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="6992"/>
+ <location filename="../QScintilla/Editor.py" line="6996"/>
<source><p>The file <b>{0}</b> has been changed while it was opened in eric6. Reread it?</p></source>
<translation type="unfinished"></translation>
</message>
@@ -11713,32 +11728,32 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="4903"/>
+ <location filename="../QScintilla/Editor.py" line="4907"/>
<source>Auto-Completion Provider</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="4903"/>
+ <location filename="../QScintilla/Editor.py" line="4907"/>
<source>The completion list provider '{0}' was already registered. Ignoring duplicate request.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="5178"/>
+ <location filename="../QScintilla/Editor.py" line="5182"/>
<source>Call-Tips Provider</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="5178"/>
+ <location filename="../QScintilla/Editor.py" line="5182"/>
<source>The call-tips provider '{0}' was already registered. Ignoring duplicate request.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="8345"/>
+ <location filename="../QScintilla/Editor.py" line="8349"/>
<source>Register Mouse Click Handler</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="8345"/>
+ <location filename="../QScintilla/Editor.py" line="8349"/>
<source>A mouse click handler for "{0}" was already registered by "{1}". Aborting request by "{2}"...</source>
<translation type="unfinished"></translation>
</message>
@@ -11768,12 +11783,12 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="8466"/>
+ <location filename="../QScintilla/Editor.py" line="8470"/>
<source>EditorConfig Properties</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="8466"/>
+ <location filename="../QScintilla/Editor.py" line="8470"/>
<source><p>The EditorConfig properties for file <b>{0}</b> could not be loaded.</p></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'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'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 @@
<p>Enter the file extension of pure text files. The complete contents of files with these extensions will be checked.</p></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><b>Use custom selection colours</b><p>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.</p></source>
- <translation><b>Utiliser des couleurs personalisées pour la sélection</b><p>Cocher cette case pour utiliser des couleurs personalisées pour la sélection de texte dans l'éditeur et dans la fenêtre shell. Les couleurs de police et d'arrière plan pour la sélection sont définies dans la section Couleur.</p></translation>
+ <translation type="obsolete"><b>Utiliser des couleurs personalisées pour la sélection</b><p>Cocher cette case pour utiliser des couleurs personalisées pour la sélection de texte dans l'éditeur et dans la fenêtre shell. Les couleurs de police et d'arrière plan pour la sélection sont définies dans la section Couleur.</p></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'analyseur syntaxique.</translation>
+ <translation type="obsolete">Cocher si le texte sélectionné doit etre colorié par l'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><b>Note:</b> 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><b>Use custom selection colors</b><p>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.</p></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'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'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><?xml version="1.0" encoding="utf-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN""http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"><html><head><title></title></head><body style="background-color:{BodyBgColor};color:{BodyColor}"><h1 style="background-color:{Level1HeaderBgColor};color:{Level1HeaderColor}">Level 1 Header</h1><h3 style="background-color:{Level2HeaderBgColor};color:{Level2HeaderColor}">Level 2 Header</h3><h2 style="background-color:{CFBgColor};color:{CFColor}">Class and Function Header</h2>Standard body text with <a style="color:{LinkColor}">some links</a> embedded.</body></html></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>
@@ -29183,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>
@@ -29228,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>
@@ -29283,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>
@@ -39219,11 +39494,6 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationPages/IconsPreviewDialog.ui" line="71"/>
- <source>Select to invert the background colour</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
<location filename="../Preferences/ConfigurationPages/IconsPreviewDialog.ui" line="74"/>
<source>Invert Background</source>
<translation type="unfinished"></translation>
@@ -39238,6 +39508,11 @@
<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>
@@ -41462,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"/>
@@ -41470,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>
@@ -41685,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>
@@ -41714,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>
@@ -44405,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"/>
@@ -44449,6 +44724,16 @@
<source><b>Message Filters for both</b><p>This list shows the configured message filters used to suppress messages received via stdout or stderr.</p></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>
@@ -45518,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><p>The chart data could not be saved into file <b>{0}</b>.</p><p>Reason: {1}</p></source>
<translation type="unfinished"></translation>
</message>
@@ -45606,94 +45891,154 @@
<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="284"/>
+ <source>Documentation</source>
+ <translation type="unfinished">Documentation</translation>
+ </message>
+ <message>
+ <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="290"/>
+ <source>MicroPython:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="297"/>
+ <source>Enter the URL for the MicroPython documentation</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="304"/>
+ <source>CircuitPython:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="311"/>
+ <source>Enter the URL for the CircuitPython documentation</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="318"/>
+ <source>BBC micro:bit:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="325"/>
+ <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>
- <translation type="unfinished"></translation>
+ <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>
</context>
<context>
@@ -45737,17 +46082,17 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="420"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="442"/>
<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="245"/>
<source><h3>The QtSerialPort package is not available.<br/>MicroPython support is deactivated.</h3></source>
<translation type="unfinished"></translation>
</message>
<message numerus="yes">
- <location filename="../MicroPython/MicroPythonWidget.py" line="263"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="282"/>
<source>%n supported device(s) detected.</source>
<translation type="unfinished">
<numerusform></numerusform>
@@ -45755,42 +46100,42 @@
</translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="269"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="288"/>
<source>{0} at {1}</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="277"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="296"/>
<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="412"/>
<source>Clear</source>
<translation type="unfinished">Effacer</translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="392"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="414"/>
<source>Copy</source>
<translation type="unfinished">Copier</translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="393"/>
- <source>Paste</source>
- <translation type="unfinished">Coller</translation>
- </message>
- <message>
<location filename="../MicroPython/MicroPythonWidget.py" line="415"/>
+ <source>Paste</source>
+ <translation type="unfinished">Coller</translation>
+ </message>
+ <message>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="437"/>
<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="458"/>
<source>No device attached</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="436"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="458"/>
<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.
@@ -45799,217 +46144,217 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="463"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="485"/>
<source>Start REPL</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="463"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="485"/>
<source><p>The REPL cannot be started.</p><p>Reason: {0}</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="853"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="875"/>
<source>Serial Device Connect</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="853"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="875"/>
<source><p>Cannot connect to device at serial port <b>{0}</b>.</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="898"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="920"/>
<source>Run Script</source>
<translation type="unfinished">Lancer le script</translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="881"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="903"/>
<source>There is no editor open. Abort...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="889"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="911"/>
<source>The current editor does not contain a script. Abort...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="898"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="920"/>
<source><p>Cannot run script.</p><p>Reason: {0}</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="921"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="943"/>
<source>Open Python File</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="921"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="943"/>
<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="987"/>
<source>Start Chart</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="965"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="987"/>
<source><p>The Chart cannot be started.</p><p>Reason: {0}</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="994"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="1016"/>
<source>Unsaved Chart Data</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="994"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="1016"/>
<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="1067"/>
<source>Start File Manager</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="1045"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="1067"/>
<source><p>The File Manager cannot be started.</p><p>Reason: {0}</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="1096"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="1118"/>
<source>Show Version</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="1099"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="1121"/>
<source>Show Implementation</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="1210"/>
- <source>Synchronize Time</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="1107"/>
- <source>Show Device Time</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="1110"/>
- <source>Show Local Time</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="1421"/>
- <source>Compile Python File</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><h3>Device Version Information</h3></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><h3>Device Implementation Information</h3><p>This device contains <b>{0} {1}</b>.</p></source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="1210"/>
- <source><p>The time of the connected device was synchronized with the local time.</p></source>
- <translation type="unfinished"></translation>
- </message>
- <message>
<location filename="../MicroPython/MicroPythonWidget.py" line="1232"/>
- <source><h3>Device Date and Time</h3><table><tr><td><b>Date</b></td><td>{0}</td></tr><tr><td><b>Time</b></td><td>{1}</td></tr></table></source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="1240"/>
- <source><h3>Device Date and Time</h3><p>{0}</p></source>
+ <source>Synchronize Time</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="1129"/>
+ <source>Show Device Time</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="1132"/>
+ <source>Show Local Time</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="1443"/>
+ <source>Compile Python File</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="1463"/>
+ <source>Compile Current Editor</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="1170"/>
+ <source><h3>Device Version Information</h3></source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="1179"/>
+ <source>No version information available.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="1181"/>
+ <source>Device Version Information</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="1204"/>
+ <source>unknown</source>
+ <translation type="unfinished">inconnu</translation>
+ </message>
+ <message>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="1208"/>
+ <source>Device Implementation Information</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="1208"/>
+ <source><h3>Device Implementation Information</h3><p>This device contains <b>{0} {1}</b>.</p></source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="1232"/>
+ <source><p>The time of the connected device was synchronized with the local time.</p></source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../MicroPython/MicroPythonWidget.py" line="1254"/>
+ <source><h3>Device Date and Time</h3><table><tr><td><b>Date</b></td><td>{0}</td></tr><tr><td><b>Time</b></td><td>{1}</td></tr></table></source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="1262"/>
+ <source><h3>Device Date and Time</h3><p>{0}</p></source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="1276"/>
<source>Device Date and Time</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="1267"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="1289"/>
<source>Local Date and Time</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="1267"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="1289"/>
<source><h3>Local Date and Time</h3><table><tr><td><b>Date</b></td><td>{0}</td></tr><tr><td><b>Time</b></td><td>{1}</td></tr></table></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="1334"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="1356"/>
<source>Error handling device</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="1334"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="1356"/>
<source><p>There was an error communicating with the connected device.</p><p>Method: {0}</p><p>Message: {1}</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="1373"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="1395"/>
<source>The MicroPython cross compiler <b>mpy-cross</b> 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"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="1413"/>
<source>Python Files (*.py);;All Files (*)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="1401"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="1423"/>
<source>The Python file <b>{0}</b> does not exist. Aborting...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="1411"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="1433"/>
<source>'mpy-cross' Output</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="1434"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="1456"/>
<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="193"/>
<source>MicroPython Menu</source>
<translation type="unfinished"></translation>
</message>
@@ -46019,47 +46364,47 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="978"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="1000"/>
<source>µPy Chart</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="1058"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="1080"/>
<source>µPy Files</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="1134"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="1156"/>
<source>Show Documentation</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="1138"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="1160"/>
<source>Configure</source>
<translation type="unfinished">Configuration</translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="1113"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="1135"/>
<source>Show Time</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="1130"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="1152"/>
<source>Download Firmware</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="1310"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="1332"/>
<source>Date and Time</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="1293"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="1315"/>
<source><table><tr><th></th><th>Local Date and Time</th><th>Device Date and Time</th></tr><tr><td><b>Date</b></td><td align='center'>{0}</td><td align='center'>{2}</td></tr><tr><td><b>Time</b></td><td align='center'>{1}</td><td align='center'>{3}</td></tr></table></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="1310"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="1332"/>
<source><table><tr><th>Local Date and Time</th><th>Device Date and Time</th></tr><tr><td align='center'>{0} {1}</td><td align='center'>{2}</td></tr></table></source>
<translation type="unfinished"></translation>
</message>
@@ -51377,17 +51722,17 @@
<context>
<name>Preferences</name>
<message>
- <location filename="../Preferences/__init__.py" line="1630"/>
+ <location filename="../Preferences/__init__.py" line="1634"/>
<source>Export Preferences</source>
<translation>Export des préférences</translation>
</message>
<message>
- <location filename="../Preferences/__init__.py" line="1658"/>
+ <location filename="../Preferences/__init__.py" line="1662"/>
<source>Import Preferences</source>
<translation>Import des préférences</translation>
</message>
<message>
- <location filename="../Preferences/__init__.py" line="1658"/>
+ <location filename="../Preferences/__init__.py" line="1662"/>
<source>Properties File (*.ini);;All Files (*)</source>
<translation type="unfinished"></translation>
</message>
@@ -51589,7 +51934,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"/>
@@ -51629,7 +51974,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"/>
@@ -51686,6 +52031,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>
@@ -53296,7 +53651,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'une couleur pour les entrée sélectionées dans la section Autres.</translation>
+ <translation type="obsolete">Sélection d'une couleur pour les entrée sélectionées dans la section Autres.</translation>
</message>
<message>
<location filename="../Preferences/ConfigurationPages/ProjectBrowserPage.ui" line="43"/>
@@ -53311,7 +53666,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"/>
@@ -53438,6 +53793,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>
@@ -63210,12 +63575,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>
@@ -63225,7 +63590,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>
@@ -63245,17 +63610,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>
@@ -63271,22 +63636,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><p><b>{0}</b> is not a file.</p></source>
<translation type="unfinished"></translation>
</message>
@@ -63296,7 +63661,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Shell.py" line="888"/>
+ <location filename="../QScintilla/Shell.py" line="892"/>
<source>Exception "{0}"
{1}
File: {2}, Line: {3}
@@ -63304,32 +63669,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 "{0}"
{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 "{1}" 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 "{0}" 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>
@@ -63359,14 +63724,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: '{0}'
</source>
<translation type="unfinished"></translation>
@@ -73203,12 +73568,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>
@@ -79353,7 +79718,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"/>
@@ -79363,7 +79728,7 @@
<message>
<location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="206"/>
<source>Select the background colour for entries with VCS status "modified".</source>
- <translation>Sélection d'une couleur de fond pour les entrée ayant le statut VCS "modifié".</translation>
+ <translation type="obsolete">Sélection d'une couleur de fond pour les entrée ayant le statut VCS "modifié".</translation>
</message>
<message>
<location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="134"/>
@@ -79373,7 +79738,7 @@
<message>
<location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="147"/>
<source>Select the background colour for entries with VCS status "added".</source>
- <translation>Sélection d'une couleur de fond pour les entrée ayant le statut VCS "ajouté".</translation>
+ <translation type="obsolete">Sélection d'une couleur de fond pour les entrée ayant le statut VCS "ajouté".</translation>
</message>
<message>
<location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="239"/>
@@ -79383,7 +79748,7 @@
<message>
<location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="252"/>
<source>Select the background colour for entries with VCS status "needs update".</source>
- <translation>Sélection d'une couleur de fond pour le status VCS "besoin de mise à jour".</translation>
+ <translation type="obsolete">Sélection d'une couleur de fond pour le status VCS "besoin de mise à jour".</translation>
</message>
<message>
<location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="157"/>
@@ -79393,7 +79758,7 @@
<message>
<location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="170"/>
<source>Select the background colour for entries with VCS status "conflict".</source>
- <translation>Sélection d'une couleur de fond pour le status VCS "conflit".</translation>
+ <translation type="obsolete">Sélection d'une couleur de fond pour le status VCS "conflit".</translation>
</message>
<message>
<location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="216"/>
@@ -79403,7 +79768,7 @@
<message>
<location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="229"/>
<source>Select the background colour for entries with VCS status "replaced".</source>
- <translation>Sélection d'une couleur de fond pour les entrée ayant le statut VCS "remplacé".</translation>
+ <translation type="obsolete">Sélection d'une couleur de fond pour les entrée ayant le statut VCS "remplacé".</translation>
</message>
<message>
<location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="115"/>
@@ -79421,8 +79786,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 "added".</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 "conflict".</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 "modified".</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 "replaced".</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 "needs update".</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 "removed".</source>
+ <source>Select the background color for entries with VCS status "removed".</source>
<translation type="unfinished"></translation>
</message>
</context>
@@ -84361,17 +84756,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"/>
@@ -84468,6 +84863,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>
