--- a/i18n/eric5_fr.ts Thu May 26 19:37:00 2011 +0200
+++ b/i18n/eric5_fr.ts Fri May 27 18:22:07 2011 +0200
@@ -7666,7 +7666,7 @@
<translation>Éditer le point d'arrêt...</translation>
</message>
<message>
- <location filename="QScintilla/Editor.py" line="4073"/>
+ <location filename="QScintilla/Editor.py" line="4091"/>
<source>Enable breakpoint</source>
<translation>Activer le point d'arrêt</translation>
</message>
@@ -7751,82 +7751,82 @@
<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="4076"/>
+ <location filename="QScintilla/Editor.py" line="4094"/>
<source>Disable breakpoint</source>
<translation>Désactiver le point d'arrêt</translation>
</message>
<message>
- <location filename="QScintilla/Editor.py" line="4365"/>
+ <location filename="QScintilla/Editor.py" line="4383"/>
<source>Code Coverage</source>
<translation>Code Coverage</translation>
</message>
<message>
- <location filename="QScintilla/Editor.py" line="4365"/>
+ <location filename="QScintilla/Editor.py" line="4383"/>
<source>Please select a coverage file</source>
<translation>Sélectionner un fichier coverage</translation>
</message>
<message>
- <location filename="QScintilla/Editor.py" line="4503"/>
+ <location filename="QScintilla/Editor.py" line="4521"/>
<source>Profile Data</source>
<translation>Profiler de données</translation>
</message>
<message>
- <location filename="QScintilla/Editor.py" line="4503"/>
+ <location filename="QScintilla/Editor.py" line="4521"/>
<source>Please select a profile file</source>
<translation>Sélectionner un fichier profile</translation>
</message>
<message>
- <location filename="QScintilla/Editor.py" line="4858"/>
+ <location filename="QScintilla/Editor.py" line="4876"/>
<source>Macro Name</source>
<translation>Nom de la macro</translation>
</message>
<message>
- <location filename="QScintilla/Editor.py" line="4858"/>
+ <location filename="QScintilla/Editor.py" line="4876"/>
<source>Select a macro name:</source>
<translation>Sélectionner un nom de macro:</translation>
</message>
<message>
- <location filename="QScintilla/Editor.py" line="4926"/>
+ <location filename="QScintilla/Editor.py" line="4944"/>
<source>Macro files (*.macro)</source>
<translation>Fichier Macro (*.macro)</translation>
</message>
<message>
- <location filename="QScintilla/Editor.py" line="4886"/>
+ <location filename="QScintilla/Editor.py" line="4904"/>
<source>Load macro file</source>
<translation>Charger un fichier macro</translation>
</message>
<message>
- <location filename="QScintilla/Editor.py" line="4907"/>
+ <location filename="QScintilla/Editor.py" line="4925"/>
<source>Error loading macro</source>
<translation>Erreur lors du chargement de la macro</translation>
</message>
<message>
- <location filename="QScintilla/Editor.py" line="4926"/>
+ <location filename="QScintilla/Editor.py" line="4944"/>
<source>Save macro file</source>
<translation>Enregistrer le fichier macro</translation>
</message>
<message>
- <location filename="QScintilla/Editor.py" line="4943"/>
+ <location filename="QScintilla/Editor.py" line="4961"/>
<source>Save macro</source>
<translation>Enregistrer la macro</translation>
</message>
<message>
- <location filename="QScintilla/Editor.py" line="4958"/>
+ <location filename="QScintilla/Editor.py" line="4976"/>
<source>Error saving macro</source>
<translation>Erreur lors de l'enregistrement de la macro</translation>
</message>
<message>
- <location filename="QScintilla/Editor.py" line="4969"/>
+ <location filename="QScintilla/Editor.py" line="4987"/>
<source>Start Macro Recording</source>
<translation>Démarrer l'enregistrement de la macro</translation>
</message>
<message>
- <location filename="QScintilla/Editor.py" line="4994"/>
+ <location filename="QScintilla/Editor.py" line="5012"/>
<source>Macro Recording</source>
<translation>Enregistrement de macro</translation>
</message>
<message>
- <location filename="QScintilla/Editor.py" line="4994"/>
+ <location filename="QScintilla/Editor.py" line="5012"/>
<source>Enter name of the macro:</source>
<translation>Entrer le nom de la macro:</translation>
</message>
@@ -7836,7 +7836,7 @@
<translation type="obsolete"><br><b>Warning:</b> Toutes les modifications seront écrasées en réouvrant le fichier.</translation>
</message>
<message>
- <location filename="QScintilla/Editor.py" line="5116"/>
+ <location filename="QScintilla/Editor.py" line="5134"/>
<source>File changed</source>
<translation>Fichier modifié</translation>
</message>
@@ -7876,7 +7876,7 @@
<translation type="obsolete">Prière de sélectionner un rapport Cyclops à supprimer</translation>
</message>
<message>
- <location filename="QScintilla/Editor.py" line="5312"/>
+ <location filename="QScintilla/Editor.py" line="5330"/>
<source>Drop Error</source>
<translation>Erreur de suppression</translation>
</message>
@@ -7886,12 +7886,12 @@
<translation>Afficher le message d'erreur de syntaxe</translation>
</message>
<message>
- <location filename="QScintilla/Editor.py" line="4633"/>
+ <location filename="QScintilla/Editor.py" line="4651"/>
<source>Syntax Error</source>
<translation>Erreur de syntaxe</translation>
</message>
<message>
- <location filename="QScintilla/Editor.py" line="4633"/>
+ <location filename="QScintilla/Editor.py" line="4651"/>
<source>No syntax error message available.</source>
<translation>Aucun message d'erreur de syntaxe..</translation>
</message>
@@ -7921,17 +7921,17 @@
<translation>Ligne non executée précédente</translation>
</message>
<message>
- <location filename="QScintilla/Editor.py" line="4411"/>
+ <location filename="QScintilla/Editor.py" line="4429"/>
<source>Show Code Coverage Annotations</source>
<translation>Afficher les annotations de Code Coverage</translation>
</message>
<message>
- <location filename="QScintilla/Editor.py" line="4407"/>
+ <location filename="QScintilla/Editor.py" line="4425"/>
<source>All lines have been covered.</source>
<translation>Toutes les lignes ont été executées.</translation>
</message>
<message>
- <location filename="QScintilla/Editor.py" line="4411"/>
+ <location filename="QScintilla/Editor.py" line="4429"/>
<source>There is no coverage file available.</source>
<translation>Impossible de trouver le fichier de coverage.</translation>
</message>
@@ -8031,42 +8031,42 @@
<translation type="obsolete">%1 (ro)</translation>
</message>
<message>
- <location filename="QScintilla/Editor.py" line="5330"/>
+ <location filename="QScintilla/Editor.py" line="5348"/>
<source>Resources</source>
<translation>Ressources</translation>
</message>
<message>
- <location filename="QScintilla/Editor.py" line="5332"/>
+ <location filename="QScintilla/Editor.py" line="5350"/>
<source>Add file...</source>
<translation>Ajouter un fichier...</translation>
</message>
<message>
- <location filename="QScintilla/Editor.py" line="5334"/>
+ <location filename="QScintilla/Editor.py" line="5352"/>
<source>Add files...</source>
<translation>Ajouter des fichiers...</translation>
</message>
<message>
- <location filename="QScintilla/Editor.py" line="5336"/>
+ <location filename="QScintilla/Editor.py" line="5354"/>
<source>Add aliased file...</source>
<translation>Ajouter un fichier alias...</translation>
</message>
<message>
- <location filename="QScintilla/Editor.py" line="5338"/>
+ <location filename="QScintilla/Editor.py" line="5356"/>
<source>Add localized resource...</source>
<translation>Ajouter une ressource localisée...</translation>
</message>
<message>
- <location filename="QScintilla/Editor.py" line="5359"/>
+ <location filename="QScintilla/Editor.py" line="5377"/>
<source>Add file resource</source>
<translation>Ajoute un fichier ressource</translation>
</message>
<message>
- <location filename="QScintilla/Editor.py" line="5375"/>
+ <location filename="QScintilla/Editor.py" line="5393"/>
<source>Add file resources</source>
<translation>Ajoute des fichiers ressources</translation>
</message>
<message>
- <location filename="QScintilla/Editor.py" line="5402"/>
+ <location filename="QScintilla/Editor.py" line="5420"/>
<source>Add aliased file resource</source>
<translation>Ajoute un alias de fichier ressource</translation>
</message>
@@ -8076,32 +8076,32 @@
<translation type="obsolete">Alias pour le fichier <b>%1</b>:</translation>
</message>
<message>
- <location filename="QScintilla/Editor.py" line="5463"/>
+ <location filename="QScintilla/Editor.py" line="5481"/>
<source>Package Diagram</source>
<translation>Diagramme de package</translation>
</message>
<message>
- <location filename="QScintilla/Editor.py" line="5463"/>
+ <location filename="QScintilla/Editor.py" line="5481"/>
<source>Include class attributes?</source>
<translation>Inclure les attributs de classes ?</translation>
</message>
<message>
- <location filename="QScintilla/Editor.py" line="5492"/>
+ <location filename="QScintilla/Editor.py" line="5510"/>
<source>Application Diagram</source>
<translation>Diagramme de l'application</translation>
</message>
<message>
- <location filename="QScintilla/Editor.py" line="5492"/>
+ <location filename="QScintilla/Editor.py" line="5510"/>
<source>Include module names?</source>
<translation>Inclure les noms de modules ?</translation>
</message>
<message>
- <location filename="QScintilla/Editor.py" line="5341"/>
+ <location filename="QScintilla/Editor.py" line="5359"/>
<source>Add resource frame</source>
<translation>Ajouter un cadre ressource</translation>
</message>
<message>
- <location filename="QScintilla/Editor.py" line="4969"/>
+ <location filename="QScintilla/Editor.py" line="4987"/>
<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>
@@ -8156,12 +8156,12 @@
<translation>Aucun format d'exportation indiqué. Abandon...</translation>
</message>
<message>
- <location filename="QScintilla/Editor.py" line="5480"/>
+ <location filename="QScintilla/Editor.py" line="5498"/>
<source>Imports Diagram</source>
<translation>Diagramme des modules</translation>
</message>
<message>
- <location filename="QScintilla/Editor.py" line="5480"/>
+ <location filename="QScintilla/Editor.py" line="5498"/>
<source>Include imports from external modules?</source>
<translation>Inclure l'importation de modules externes?</translation>
</message>
@@ -8241,7 +8241,7 @@
<translation>Sélectionne l'analyseur Pygments à appliquer.</translation>
</message>
<message>
- <location filename="QScintilla/Editor.py" line="5730"/>
+ <location filename="QScintilla/Editor.py" line="5748"/>
<source>Check spelling...</source>
<translation>Correction orthographique...</translation>
</message>
@@ -8251,12 +8251,12 @@
<translation>Correction orthographique de la sélection...</translation>
</message>
<message>
- <location filename="QScintilla/Editor.py" line="5732"/>
+ <location filename="QScintilla/Editor.py" line="5750"/>
<source>Add to dictionary</source>
<translation>Ajouter au dictionnaire</translation>
</message>
<message>
- <location filename="QScintilla/Editor.py" line="5734"/>
+ <location filename="QScintilla/Editor.py" line="5752"/>
<source>Ignore All</source>
<translation>Tout ignorer</translation>
</message>
@@ -8296,37 +8296,37 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="QScintilla/Editor.py" line="4900"/>
+ <location filename="QScintilla/Editor.py" line="4918"/>
<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="4907"/>
+ <location filename="QScintilla/Editor.py" line="4925"/>
<source><p>The macro file <b>{0}</b> is corrupt.</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="QScintilla/Editor.py" line="4958"/>
+ <location filename="QScintilla/Editor.py" line="4976"/>
<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="5107"/>
+ <location filename="QScintilla/Editor.py" line="5125"/>
<source><p>The file <b>{0}</b> has been changed while it was opened in eric5. Reread it?</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="QScintilla/Editor.py" line="5195"/>
+ <location filename="QScintilla/Editor.py" line="5213"/>
<source>{0} (ro)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="QScintilla/Editor.py" line="5312"/>
+ <location filename="QScintilla/Editor.py" line="5330"/>
<source><p><b>{0}</b> is not a file.</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="QScintilla/Editor.py" line="5402"/>
+ <location filename="QScintilla/Editor.py" line="5420"/>
<source>Alias for file <b>{0}</b>:</source>
<translation type="unfinished"></translation>
</message>
@@ -8351,12 +8351,12 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="QScintilla/Editor.py" line="4759"/>
+ <location filename="QScintilla/Editor.py" line="4777"/>
<source>py3flakes Warning</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="QScintilla/Editor.py" line="4759"/>
+ <location filename="QScintilla/Editor.py" line="4777"/>
<source>No py3flakes warning message available.</source>
<translation type="unfinished"></translation>
</message>
@@ -8366,25 +8366,45 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="QScintilla/Editor.py" line="4943"/>
+ <location filename="QScintilla/Editor.py" line="4961"/>
<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="4802"/>
+ <location filename="QScintilla/Editor.py" line="4820"/>
<source>Warning: {0}</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="QScintilla/Editor.py" line="4808"/>
+ <location filename="QScintilla/Editor.py" line="4826"/>
<source>Error: {0}</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="QScintilla/Editor.py" line="5112"/>
+ <location filename="QScintilla/Editor.py" line="5130"/>
<source><br><b>Warning:</b> You will lose your changes upon reopening it.</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="QScintilla/Editor.py" line="3706"/>
+ <source>Activating Auto-Completion Provider</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="QScintilla/Editor.py" line="3706"/>
+ <source>Auto-completion provider cannot be connected because there is already another one active. Please check your configuration.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="QScintilla/Editor.py" line="3891"/>
+ <source>Activating Calltip Provider</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="QScintilla/Editor.py" line="3891"/>
+ <source>Calltip provider cannot be connected because there is already another one active. Please check your configuration.</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>EditorAPIsPage</name>
@@ -19818,12 +19838,12 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListAllGuardsDialog.py" line="99"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListAllGuardsDialog.py" line="98"/>
<source>Unguarded</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListAllGuardsDialog.py" line="104"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListAllGuardsDialog.py" line="103"/>
<source>no patches found</source>
<translation type="unfinished"></translation>
</message>
@@ -34938,12 +34958,12 @@
<translation>Effacer et réinitialiser</translation>
</message>
<message>
- <location filename="QScintilla/Shell.py" line="1372"/>
+ <location filename="QScintilla/Shell.py" line="1374"/>
<source>Drop Error</source>
<translation>Erreur de suppression</translation>
</message>
<message>
- <location filename="QScintilla/Shell.py" line="539"/>
+ <location filename="QScintilla/Shell.py" line="541"/>
<source>No.</source>
<translation>Non.</translation>
</message>
@@ -34974,7 +34994,7 @@
<translation type="obsolete">Langage shell "%1" non supporté.</translation>
</message>
<message>
- <location filename="QScintilla/Shell.py" line="536"/>
+ <location filename="QScintilla/Shell.py" line="538"/>
<source>Passive Debug Mode</source>
<translation>Mode débogueur passif</translation>
</message>
@@ -35004,17 +35024,17 @@
<translation>Afficher</translation>
</message>
<message>
- <location filename="QScintilla/Shell.py" line="487"/>
+ <location filename="QScintilla/Shell.py" line="489"/>
<source>Select History</source>
<translation>Historique</translation>
</message>
<message>
- <location filename="QScintilla/Shell.py" line="487"/>
+ <location filename="QScintilla/Shell.py" line="489"/>
<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="537"/>
+ <location filename="QScintilla/Shell.py" line="539"/>
<source>
Not connected</source>
<translation>Non connexté</translation>
@@ -35030,28 +35050,28 @@
<translation type="unfinished">Couper</translation>
</message>
<message>
- <location filename="QScintilla/Shell.py" line="541"/>
+ <location filename="QScintilla/Shell.py" line="543"/>
<source>{0} on {1}, {2}</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="QScintilla/Shell.py" line="602"/>
+ <location filename="QScintilla/Shell.py" line="604"/>
<source>StdOut: {0}</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="QScintilla/Shell.py" line="610"/>
+ <location filename="QScintilla/Shell.py" line="612"/>
<source>StdErr: {0}</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="QScintilla/Shell.py" line="1102"/>
+ <location filename="QScintilla/Shell.py" line="1104"/>
<source>Shell language "{0}" not supported.
</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="QScintilla/Shell.py" line="1372"/>
+ <location filename="QScintilla/Shell.py" line="1374"/>
<source><p><b>{0}</b> is not a file.</p></source>
<translation type="unfinished"></translation>
</message>
