--- a/eric6/i18n/eric6_fr.ts Tue Feb 16 17:12:48 2021 +0100
+++ b/eric6/i18n/eric6_fr.ts Tue Feb 16 18:25:47 2021 +0100
@@ -11378,562 +11378,562 @@
<context>
<name>Editor</name>
<message>
- <location filename="../QScintilla/Editor.py" line="785"/>
+ <location filename="../QScintilla/Editor.py" line="787"/>
<source>Undo</source>
<translation>Défaire</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="788"/>
+ <location filename="../QScintilla/Editor.py" line="790"/>
<source>Redo</source>
<translation>Refaire</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="791"/>
+ <location filename="../QScintilla/Editor.py" line="793"/>
<source>Revert to last saved state</source>
<translation>Ecraser avec le dernier état enregistré</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="795"/>
+ <location filename="../QScintilla/Editor.py" line="797"/>
<source>Cut</source>
<translation>Couper</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="798"/>
+ <location filename="../QScintilla/Editor.py" line="800"/>
<source>Copy</source>
<translation>Copier</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="801"/>
+ <location filename="../QScintilla/Editor.py" line="803"/>
<source>Paste</source>
<translation>Coller</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="809"/>
+ <location filename="../QScintilla/Editor.py" line="811"/>
<source>Indent</source>
<translation>Indenter</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="812"/>
+ <location filename="../QScintilla/Editor.py" line="814"/>
<source>Unindent</source>
<translation>Désindenter</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="815"/>
+ <location filename="../QScintilla/Editor.py" line="817"/>
<source>Comment</source>
<translation>Commenter</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="818"/>
+ <location filename="../QScintilla/Editor.py" line="820"/>
<source>Uncomment</source>
<translation>Décommenter</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="821"/>
+ <location filename="../QScintilla/Editor.py" line="823"/>
<source>Stream Comment</source>
<translation>Commentaire type "Stream"</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="824"/>
+ <location filename="../QScintilla/Editor.py" line="826"/>
<source>Box Comment</source>
<translation>Commentaire type "Bloc"</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="832"/>
- <source>Select to brace</source>
- <translation>Sélection parenthèses</translation>
- </message>
- <message>
<location filename="../QScintilla/Editor.py" line="834"/>
+ <source>Select to brace</source>
+ <translation>Sélection parenthèses</translation>
+ </message>
+ <message>
+ <location filename="../QScintilla/Editor.py" line="836"/>
<source>Select all</source>
<translation>Tout sélectionner</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="835"/>
+ <location filename="../QScintilla/Editor.py" line="837"/>
<source>Deselect all</source>
<translation>Tout déselectionner</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="853"/>
+ <location filename="../QScintilla/Editor.py" line="855"/>
<source>Shorten empty lines</source>
<translation>Raccourcir les lignes vides</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1050"/>
+ <location filename="../QScintilla/Editor.py" line="1052"/>
<source>Languages</source>
<translation>Langages</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="860"/>
+ <location filename="../QScintilla/Editor.py" line="862"/>
<source>Use Monospaced Font</source>
<translation>Utiliser une police monospacée</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="980"/>
+ <location filename="../QScintilla/Editor.py" line="982"/>
<source>Check</source>
<translation>Vérification</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1000"/>
- <source>Show</source>
- <translation>Afficher</translation>
- </message>
- <message>
- <location filename="../QScintilla/Editor.py" line="908"/>
- <source>Close</source>
- <translation>Fermer</translation>
- </message>
- <message>
- <location filename="../QScintilla/Editor.py" line="914"/>
- <source>Save</source>
- <translation>Enregistrer</translation>
- </message>
- <message>
- <location filename="../QScintilla/Editor.py" line="917"/>
- <source>Save As...</source>
- <translation>Enregistrer sous...</translation>
- </message>
- <message>
- <location filename="../QScintilla/Editor.py" line="933"/>
- <source>Print</source>
- <translation>Imprimer</translation>
- </message>
- <message>
<location filename="../QScintilla/Editor.py" line="1002"/>
+ <source>Show</source>
+ <translation>Afficher</translation>
+ </message>
+ <message>
+ <location filename="../QScintilla/Editor.py" line="910"/>
+ <source>Close</source>
+ <translation>Fermer</translation>
+ </message>
+ <message>
+ <location filename="../QScintilla/Editor.py" line="916"/>
+ <source>Save</source>
+ <translation>Enregistrer</translation>
+ </message>
+ <message>
+ <location filename="../QScintilla/Editor.py" line="919"/>
+ <source>Save As...</source>
+ <translation>Enregistrer sous...</translation>
+ </message>
+ <message>
+ <location filename="../QScintilla/Editor.py" line="935"/>
+ <source>Print</source>
+ <translation>Imprimer</translation>
+ </message>
+ <message>
+ <location filename="../QScintilla/Editor.py" line="1004"/>
<source>Code metrics...</source>
<translation>Statistiques du code...</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1003"/>
+ <location filename="../QScintilla/Editor.py" line="1005"/>
<source>Code coverage...</source>
<translation>Code coverage...</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1011"/>
+ <location filename="../QScintilla/Editor.py" line="1013"/>
<source>Profile data...</source>
<translation>Profiler les données...</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1230"/>
- <source>Toggle bookmark</source>
- <translation>Placer/supprimer un signet</translation>
- </message>
- <message>
<location filename="../QScintilla/Editor.py" line="1232"/>
- <source>Next bookmark</source>
- <translation>Signet suivant</translation>
+ <source>Toggle bookmark</source>
+ <translation>Placer/supprimer un signet</translation>
</message>
<message>
<location filename="../QScintilla/Editor.py" line="1234"/>
- <source>Previous bookmark</source>
- <translation>Signet précédent</translation>
+ <source>Next bookmark</source>
+ <translation>Signet suivant</translation>
</message>
<message>
<location filename="../QScintilla/Editor.py" line="1236"/>
+ <source>Previous bookmark</source>
+ <translation>Signet précédent</translation>
+ </message>
+ <message>
+ <location filename="../QScintilla/Editor.py" line="1238"/>
<source>Clear all bookmarks</source>
<translation>Effacer tous les signets</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1245"/>
+ <location filename="../QScintilla/Editor.py" line="1247"/>
<source>Toggle breakpoint</source>
<translation>Placer/supprimer un point d'arrêt</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1250"/>
+ <location filename="../QScintilla/Editor.py" line="1252"/>
<source>Edit breakpoint...</source>
<translation>Éditer le point d'arrêt...</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="5634"/>
+ <location filename="../QScintilla/Editor.py" line="5636"/>
<source>Enable breakpoint</source>
<translation>Activer le point d'arrêt</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1255"/>
- <source>Next breakpoint</source>
- <translation>Point d'arrêt suivant</translation>
- </message>
- <message>
<location filename="../QScintilla/Editor.py" line="1257"/>
+ <source>Next breakpoint</source>
+ <translation>Point d'arrêt suivant</translation>
+ </message>
+ <message>
+ <location filename="../QScintilla/Editor.py" line="1259"/>
<source>Previous breakpoint</source>
<translation>Point d'arrêt précédent</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1262"/>
+ <location filename="../QScintilla/Editor.py" line="1264"/>
<source>Clear all breakpoints</source>
<translation>Effacer tous les points d'arrêts</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1979"/>
+ <location filename="../QScintilla/Editor.py" line="1981"/>
<source>Modification of Read Only file</source>
<translation>Modification de la lecture seule</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1979"/>
+ <location filename="../QScintilla/Editor.py" line="1981"/>
<source>You are attempting to change a read only file. Please save to a different file first.</source>
<translation>Le fichier est en lecture seule. Sauvez d'abord votre fichier sous un autre nom.</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="2689"/>
+ <location filename="../QScintilla/Editor.py" line="2691"/>
<source>Printing...</source>
<translation>Impression....</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="2706"/>
- <source>Printing completed</source>
- <translation>Impression terminée</translation>
- </message>
- <message>
<location filename="../QScintilla/Editor.py" line="2708"/>
+ <source>Printing completed</source>
+ <translation>Impression terminée</translation>
+ </message>
+ <message>
+ <location filename="../QScintilla/Editor.py" line="2710"/>
<source>Error while printing</source>
<translation>Erreur durant l'impression</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="2711"/>
+ <location filename="../QScintilla/Editor.py" line="2713"/>
<source>Printing aborted</source>
<translation>Impression abandonnée</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="3124"/>
+ <location filename="../QScintilla/Editor.py" line="3126"/>
<source>Open File</source>
<translation>Ouvrir Fichier</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="3311"/>
+ <location filename="../QScintilla/Editor.py" line="3313"/>
<source>Save File</source>
<translation>Enregistrer Fichier</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="3066"/>
+ <location filename="../QScintilla/Editor.py" line="3068"/>
<source>File Modified</source>
<translation>Fichier Modifié</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="4789"/>
+ <location filename="../QScintilla/Editor.py" line="4791"/>
<source>Autocompletion</source>
<translation>Autocompletion</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="4789"/>
+ <location filename="../QScintilla/Editor.py" line="4791"/>
<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="5637"/>
+ <location filename="../QScintilla/Editor.py" line="5639"/>
<source>Disable breakpoint</source>
<translation>Désactiver le point d'arrêt</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="6012"/>
+ <location filename="../QScintilla/Editor.py" line="6014"/>
<source>Code Coverage</source>
<translation>Code Coverage</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="6012"/>
+ <location filename="../QScintilla/Editor.py" line="6014"/>
<source>Please select a coverage file</source>
<translation>Sélectionner un fichier coverage</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="6192"/>
+ <location filename="../QScintilla/Editor.py" line="6194"/>
<source>Profile Data</source>
<translation>Profiler de données</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="6192"/>
+ <location filename="../QScintilla/Editor.py" line="6194"/>
<source>Please select a profile file</source>
<translation>Sélectionner un fichier profile</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="6743"/>
+ <location filename="../QScintilla/Editor.py" line="6745"/>
<source>Macro Name</source>
<translation>Nom de la macro</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="6743"/>
+ <location filename="../QScintilla/Editor.py" line="6745"/>
<source>Select a macro name:</source>
<translation>Sélectionner un nom de macro:</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="6813"/>
+ <location filename="../QScintilla/Editor.py" line="6815"/>
<source>Macro files (*.macro)</source>
<translation>Fichier Macro (*.macro)</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="6771"/>
+ <location filename="../QScintilla/Editor.py" line="6773"/>
<source>Load macro file</source>
<translation>Charger un fichier macro</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="6793"/>
+ <location filename="../QScintilla/Editor.py" line="6795"/>
<source>Error loading macro</source>
<translation>Erreur lors du chargement de la macro</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="6813"/>
+ <location filename="../QScintilla/Editor.py" line="6815"/>
<source>Save macro file</source>
<translation>Enregistrer le fichier macro</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="6830"/>
+ <location filename="../QScintilla/Editor.py" line="6832"/>
<source>Save macro</source>
<translation>Enregistrer la macro</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="6845"/>
+ <location filename="../QScintilla/Editor.py" line="6847"/>
<source>Error saving macro</source>
<translation>Erreur lors de l'enregistrement de la macro</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="6858"/>
+ <location filename="../QScintilla/Editor.py" line="6860"/>
<source>Start Macro Recording</source>
<translation>Démarrer l'enregistrement de la macro</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="6884"/>
+ <location filename="../QScintilla/Editor.py" line="6886"/>
<source>Macro Recording</source>
<translation>Enregistrement de macro</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="6884"/>
+ <location filename="../QScintilla/Editor.py" line="6886"/>
<source>Enter name of the macro:</source>
<translation>Entrer le nom de la macro:</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="7054"/>
+ <location filename="../QScintilla/Editor.py" line="7056"/>
<source>File changed</source>
<translation>Fichier modifié</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="865"/>
+ <location filename="../QScintilla/Editor.py" line="867"/>
<source>Autosave enabled</source>
<translation>Sauvegarde automatique activée</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1310"/>
+ <location filename="../QScintilla/Editor.py" line="1312"/>
<source>Goto syntax error</source>
<translation>Aller à l'erreur de syntaxe suivante</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1319"/>
+ <location filename="../QScintilla/Editor.py" line="1321"/>
<source>Clear syntax error</source>
<translation>Supprimer les flags d'erreurs de syntaxe</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="7386"/>
+ <location filename="../QScintilla/Editor.py" line="7388"/>
<source>Drop Error</source>
<translation>Erreur de suppression</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1314"/>
+ <location filename="../QScintilla/Editor.py" line="1316"/>
<source>Show syntax error message</source>
<translation>Afficher le message d'erreur de syntaxe</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="6354"/>
+ <location filename="../QScintilla/Editor.py" line="6356"/>
<source>Syntax Error</source>
<translation>Erreur de syntaxe</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="6354"/>
+ <location filename="../QScintilla/Editor.py" line="6356"/>
<source>No syntax error message available.</source>
<translation>Aucun message d'erreur de syntaxe..</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1247"/>
+ <location filename="../QScintilla/Editor.py" line="1249"/>
<source>Toggle temporary breakpoint</source>
<translation>Placer/Supprimer un point d'arret temporaire</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1005"/>
+ <location filename="../QScintilla/Editor.py" line="1007"/>
<source>Show code coverage annotations</source>
<translation>Afficher les annotations de code coverage</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1008"/>
+ <location filename="../QScintilla/Editor.py" line="1010"/>
<source>Hide code coverage annotations</source>
<translation>Masquer les annotations de code coverage</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1341"/>
+ <location filename="../QScintilla/Editor.py" line="1343"/>
<source>Next uncovered line</source>
<translation>Ligne non executée suivante</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1345"/>
+ <location filename="../QScintilla/Editor.py" line="1347"/>
<source>Previous uncovered line</source>
<translation>Ligne non executée précédente</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="6075"/>
+ <location filename="../QScintilla/Editor.py" line="6077"/>
<source>Show Code Coverage Annotations</source>
<translation>Afficher les annotations de Code Coverage</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="6068"/>
+ <location filename="../QScintilla/Editor.py" line="6070"/>
<source>All lines have been covered.</source>
<translation>Toutes les lignes ont été executées.</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="6075"/>
+ <location filename="../QScintilla/Editor.py" line="6077"/>
<source>There is no coverage file available.</source>
<translation>Impossible de trouver le fichier de coverage.</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1024"/>
- <source>Diagrams</source>
- <translation>Diagrammes</translation>
- </message>
- <message>
<location filename="../QScintilla/Editor.py" line="1026"/>
- <source>Class Diagram...</source>
- <translation>Diagramme des classes...</translation>
+ <source>Diagrams</source>
+ <translation>Diagrammes</translation>
</message>
<message>
<location filename="../QScintilla/Editor.py" line="1028"/>
- <source>Package Diagram...</source>
- <translation>Diagramme des packages...</translation>
+ <source>Class Diagram...</source>
+ <translation>Diagramme des classes...</translation>
</message>
<message>
<location filename="../QScintilla/Editor.py" line="1030"/>
- <source>Imports Diagram...</source>
- <translation>Diagramme des modules...</translation>
+ <source>Package Diagram...</source>
+ <translation>Diagramme des packages...</translation>
</message>
<message>
<location filename="../QScintilla/Editor.py" line="1032"/>
+ <source>Imports Diagram...</source>
+ <translation>Diagramme des modules...</translation>
+ </message>
+ <message>
+ <location filename="../QScintilla/Editor.py" line="1034"/>
<source>Application Diagram...</source>
<translation>Diagramme de l'application...</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1183"/>
+ <location filename="../QScintilla/Editor.py" line="1185"/>
<source>No Language</source>
<translation>Pas de langage</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="7407"/>
- <source>Resources</source>
- <translation>Ressources</translation>
- </message>
- <message>
<location filename="../QScintilla/Editor.py" line="7409"/>
- <source>Add file...</source>
- <translation>Ajouter un fichier...</translation>
+ <source>Resources</source>
+ <translation>Ressources</translation>
</message>
<message>
<location filename="../QScintilla/Editor.py" line="7411"/>
- <source>Add files...</source>
- <translation>Ajouter des fichiers...</translation>
+ <source>Add file...</source>
+ <translation>Ajouter un fichier...</translation>
</message>
<message>
<location filename="../QScintilla/Editor.py" line="7413"/>
+ <source>Add files...</source>
+ <translation>Ajouter des fichiers...</translation>
+ </message>
+ <message>
+ <location filename="../QScintilla/Editor.py" line="7415"/>
<source>Add aliased file...</source>
<translation>Ajouter un fichier alias...</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="7416"/>
+ <location filename="../QScintilla/Editor.py" line="7418"/>
<source>Add localized resource...</source>
<translation>Ajouter une ressource localisée...</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="7439"/>
+ <location filename="../QScintilla/Editor.py" line="7441"/>
<source>Add file resource</source>
<translation>Ajoute un fichier ressource</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="7455"/>
+ <location filename="../QScintilla/Editor.py" line="7457"/>
<source>Add file resources</source>
<translation>Ajoute des fichiers ressources</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="7482"/>
+ <location filename="../QScintilla/Editor.py" line="7484"/>
<source>Add aliased file resource</source>
<translation>Ajoute un alias de fichier ressource</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="7548"/>
+ <location filename="../QScintilla/Editor.py" line="7550"/>
<source>Package Diagram</source>
<translation>Diagramme de package</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="7548"/>
+ <location filename="../QScintilla/Editor.py" line="7550"/>
<source>Include class attributes?</source>
<translation>Inclure les attributs de classes ?</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="7584"/>
+ <location filename="../QScintilla/Editor.py" line="7586"/>
<source>Application Diagram</source>
<translation>Diagramme de l'application</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="7584"/>
+ <location filename="../QScintilla/Editor.py" line="7586"/>
<source>Include module names?</source>
<translation>Inclure les noms de modules ?</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="7420"/>
+ <location filename="../QScintilla/Editor.py" line="7422"/>
<source>Add resource frame</source>
<translation>Ajouter un cadre ressource</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="6858"/>
+ <location filename="../QScintilla/Editor.py" line="6860"/>
<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>
<message>
- <location filename="../QScintilla/Editor.py" line="962"/>
- <source>Complete from Document</source>
- <translation>à partir du document</translation>
- </message>
- <message>
<location filename="../QScintilla/Editor.py" line="964"/>
- <source>Complete from APIs</source>
- <translation>à partir des fichiers API</translation>
+ <source>Complete from Document</source>
+ <translation>à partir du document</translation>
</message>
<message>
<location filename="../QScintilla/Editor.py" line="966"/>
+ <source>Complete from APIs</source>
+ <translation>à partir des fichiers API</translation>
+ </message>
+ <message>
+ <location filename="../QScintilla/Editor.py" line="968"/>
<source>Complete from Document and APIs</source>
<translation>à partir du document et des fichiers API</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1350"/>
+ <location filename="../QScintilla/Editor.py" line="1352"/>
<source>Next task</source>
<translation>Tâche suivante</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1354"/>
+ <location filename="../QScintilla/Editor.py" line="1356"/>
<source>Previous task</source>
<translation>Tâche précédente</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1208"/>
+ <location filename="../QScintilla/Editor.py" line="1210"/>
<source>Export as</source>
<translation>Exporter en tant que</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1404"/>
+ <location filename="../QScintilla/Editor.py" line="1406"/>
<source>Export source</source>
<translation>Exportation de source</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1404"/>
+ <location filename="../QScintilla/Editor.py" line="1406"/>
<source>No export format given. Aborting...</source>
<translation>Aucun format d'exportation indiqué. Abandon...</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="7570"/>
+ <location filename="../QScintilla/Editor.py" line="7572"/>
<source>Imports Diagram</source>
<translation>Diagramme des modules</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="7570"/>
+ <location filename="../QScintilla/Editor.py" line="7572"/>
<source>Include imports from external modules?</source>
<translation>Inclure l'importation de modules externes?</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="884"/>
+ <location filename="../QScintilla/Editor.py" line="886"/>
<source>Calltip</source>
<translation>Calltip</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="930"/>
+ <location filename="../QScintilla/Editor.py" line="932"/>
<source>Print Preview</source>
<translation>Aperçu avant impression</translation>
</message>
@@ -11943,77 +11943,77 @@
<translation><b>Fenêtre d'édition</b><p>Cette fenêtre est utilisée pour afficher et éditer les codes sources. Vous pouvez en ouvrir autant que vous le souhaitez. Le nom du fichier ouvert est inscrit dans la barre principale.</p><p>Vous pouvez définir des points d'arrêt en cliquant sur la marge de gauche, entre les numéros de lignes et les marques de pliage de code. Les points d'arrêt peuvent être édités via le menu contextuel (en cliquant droit sur le point).</p><p>De manière similaire, vous pouvez définir des signets avec Shift+Click dans la marge.</p><p>Pour ces deux types de points, le menu contextuel (click droit) permet de défaire l'action.</p><p>Le Ctrl+Click sur une marque d'erreur de sytaxe permet de visualiser les informations sur l'erreur.</p></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="869"/>
+ <location filename="../QScintilla/Editor.py" line="871"/>
<source>Typing aids enabled</source>
<translation>Aide à la frappe activée</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1140"/>
+ <location filename="../QScintilla/Editor.py" line="1142"/>
<source>End-of-Line Type</source>
<translation>Type de fin de ligne</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1144"/>
+ <location filename="../QScintilla/Editor.py" line="1146"/>
<source>Unix</source>
<translation>Unix</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1151"/>
+ <location filename="../QScintilla/Editor.py" line="1153"/>
<source>Windows</source>
<translation>Windows</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1158"/>
+ <location filename="../QScintilla/Editor.py" line="1160"/>
<source>Macintosh</source>
<translation>Macintosh</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1099"/>
+ <location filename="../QScintilla/Editor.py" line="1101"/>
<source>Encodings</source>
<translation>Encodings</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1079"/>
+ <location filename="../QScintilla/Editor.py" line="1081"/>
<source>Guessed</source>
<translation>Suggestion</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1419"/>
+ <location filename="../QScintilla/Editor.py" line="1421"/>
<source>Alternatives</source>
<translation>Alternatives</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1435"/>
+ <location filename="../QScintilla/Editor.py" line="1437"/>
<source>Pygments Lexer</source>
<translation>Analyseur Pygments</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1435"/>
+ <location filename="../QScintilla/Editor.py" line="1437"/>
<source>Select the Pygments lexer to apply.</source>
<translation>Sélectionne l'analyseur Pygments à appliquer.</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="7913"/>
+ <location filename="../QScintilla/Editor.py" line="7915"/>
<source>Check spelling...</source>
<translation>Correction orthographique...</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="843"/>
+ <location filename="../QScintilla/Editor.py" line="845"/>
<source>Check spelling of selection...</source>
<translation>Correction orthographique de la sélection...</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="7916"/>
- <source>Add to dictionary</source>
- <translation>Ajouter au dictionnaire</translation>
- </message>
- <message>
<location filename="../QScintilla/Editor.py" line="7918"/>
+ <source>Add to dictionary</source>
+ <translation>Ajouter au dictionnaire</translation>
+ </message>
+ <message>
+ <location filename="../QScintilla/Editor.py" line="7920"/>
<source>Ignore All</source>
<translation>Tout ignorer</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="847"/>
+ <location filename="../QScintilla/Editor.py" line="849"/>
<source>Remove from dictionary</source>
<translation>Supprimer du dictionnaire</translation>
</message>
@@ -12023,167 +12023,167 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1396"/>
+ <location filename="../QScintilla/Editor.py" line="1398"/>
<source><p>No exporter available for the export format <b>{0}</b>. Aborting...</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1415"/>
+ <location filename="../QScintilla/Editor.py" line="1417"/>
<source>Alternatives ({0})</source>
<translation type="unfinished">Alternatives ({0})</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="3066"/>
+ <location filename="../QScintilla/Editor.py" line="3068"/>
<source><p>The file <b>{0}</b> has unsaved changes.</p></source>
<translation><p>Le fichier <b>{0}</b> a des modifications non enregistrées.</p></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="3124"/>
+ <location filename="../QScintilla/Editor.py" line="3126"/>
<source><p>The file <b>{0}</b> could not be opened.</p><p>Reason: {1}</p></source>
<translation><p>Le fichier <b>{0}</b> ne peut être ouvert.</p><p>Raison : {1}</p></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="3248"/>
+ <location filename="../QScintilla/Editor.py" line="3250"/>
<source><p>The file <b>{0}</b> could not be saved.<br/>Reason: {1}</p></source>
<translation><p>Le fichier <b>{0}</b> ne peut être enregistré.<br/>Raison : {1}</p></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="6784"/>
+ <location filename="../QScintilla/Editor.py" line="6786"/>
<source><p>The macro file <b>{0}</b> could not be read.</p></source>
<translation><p>Le fichier macro <b>{0}</b> ne peut être lu.</p></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="6793"/>
+ <location filename="../QScintilla/Editor.py" line="6795"/>
<source><p>The macro file <b>{0}</b> is corrupt.</p></source>
<translation><p>Le fichier macro <b>{0}</b> est corrompu.</p></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="6845"/>
+ <location filename="../QScintilla/Editor.py" line="6847"/>
<source><p>The macro file <b>{0}</b> could not be written.</p></source>
<translation><p>Le fichier macro <b>{0}</b> ne peut être écrit.</p></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="7245"/>
+ <location filename="../QScintilla/Editor.py" line="7247"/>
<source>{0} (ro)</source>
<translation type="unfinished">{0} (ro)</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="7386"/>
+ <location filename="../QScintilla/Editor.py" line="7388"/>
<source><p><b>{0}</b> is not a file.</p></source>
<translation><p><b>{0}</b> n'est pas un fichier.</p></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="7482"/>
+ <location filename="../QScintilla/Editor.py" line="7484"/>
<source>Alias for file <b>{0}</b>:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1324"/>
+ <location filename="../QScintilla/Editor.py" line="1326"/>
<source>Next warning</source>
<translation>Alerte suivante</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1328"/>
+ <location filename="../QScintilla/Editor.py" line="1330"/>
<source>Previous warning</source>
<translation>Alerte précédente</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1332"/>
+ <location filename="../QScintilla/Editor.py" line="1334"/>
<source>Show warning message</source>
<translation>Afficher les messages d'alerte</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1336"/>
+ <location filename="../QScintilla/Editor.py" line="1338"/>
<source>Clear warnings</source>
<translation>Effacer les alertes</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="3311"/>
+ <location filename="../QScintilla/Editor.py" line="3313"/>
<source><p>The file <b>{0}</b> already exists. Overwrite it?</p></source>
<translation><p>Le fichier <b>{0}</b>existe déjà. Écraser ?</p></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="6830"/>
+ <location filename="../QScintilla/Editor.py" line="6832"/>
<source><p>The macro file <b>{0}</b> already exists. Overwrite it?</p></source>
<translation><p>Le fichier macro <b>{0}</b>existe déjà. Écraser ?</p></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="6631"/>
+ <location filename="../QScintilla/Editor.py" line="6633"/>
<source>Warning: {0}</source>
<translation>Alerte : {0}</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="6638"/>
+ <location filename="../QScintilla/Editor.py" line="6640"/>
<source>Error: {0}</source>
<translation>Erreur : {0}</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="7050"/>
+ <location filename="../QScintilla/Editor.py" line="7052"/>
<source><br><b>Warning:</b> You will lose your changes upon reopening it.</source>
<translation><br><b>Alerte :</b> Vous allez perdre vos modifications à la réouverture.</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="926"/>
+ <location filename="../QScintilla/Editor.py" line="928"/>
<source>Open 'rejection' file</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1036"/>
+ <location filename="../QScintilla/Editor.py" line="1038"/>
<source>Load Diagram...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1359"/>
+ <location filename="../QScintilla/Editor.py" line="1361"/>
<source>Next change</source>
<translation>Modification suivante</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1363"/>
+ <location filename="../QScintilla/Editor.py" line="1365"/>
<source>Previous change</source>
<translation>Modification précédente</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="8334"/>
+ <location filename="../QScintilla/Editor.py" line="8336"/>
<source>Sort Lines</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="8334"/>
+ <location filename="../QScintilla/Editor.py" line="8336"/>
<source>The selection contains illegal data for a numerical sort.</source>
<translation>La sélection contient des données illégales pour un tri numérique.</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="6566"/>
+ <location filename="../QScintilla/Editor.py" line="6568"/>
<source>Warning</source>
<translation>Warning</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="6566"/>
+ <location filename="../QScintilla/Editor.py" line="6568"/>
<source>No warning messages available.</source>
<translation>Pas de message d'alerte disponible.</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="6628"/>
+ <location filename="../QScintilla/Editor.py" line="6630"/>
<source>Style: {0}</source>
<translation>Style : {0}</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="900"/>
+ <location filename="../QScintilla/Editor.py" line="902"/>
<source>New Document View</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="903"/>
+ <location filename="../QScintilla/Editor.py" line="905"/>
<source>New Document View (with new split)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="990"/>
+ <location filename="../QScintilla/Editor.py" line="992"/>
<source>Tools</source>
<translation>Outils</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1121"/>
+ <location filename="../QScintilla/Editor.py" line="1123"/>
<source>Re-Open With Encoding</source>
<translation>Réouvrir avec encodage</translation>
</message>
@@ -12193,122 +12193,122 @@
<translation type="obsolete"><p>Le fichier <b>{0}</b> a été modifié depuis l'ouverture dans eric6. Le relire ?</p></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="876"/>
+ <location filename="../QScintilla/Editor.py" line="878"/>
<source>Automatic Completion enabled</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="956"/>
+ <location filename="../QScintilla/Editor.py" line="958"/>
<source>Complete</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="4921"/>
+ <location filename="../QScintilla/Editor.py" line="4923"/>
<source>Auto-Completion Provider</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="4921"/>
+ <location filename="../QScintilla/Editor.py" line="4923"/>
<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="5200"/>
+ <location filename="../QScintilla/Editor.py" line="5202"/>
<source>Call-Tips Provider</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="5200"/>
+ <location filename="../QScintilla/Editor.py" line="5202"/>
<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="8423"/>
+ <location filename="../QScintilla/Editor.py" line="8425"/>
<source>Register Mouse Click Handler</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="8423"/>
+ <location filename="../QScintilla/Editor.py" line="8425"/>
<source>A mouse click handler for "{0}" was already registered by "{1}". Aborting request by "{2}"...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="920"/>
+ <location filename="../QScintilla/Editor.py" line="922"/>
<source>Save Copy...</source>
<translation>Enregistrer une copie...</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="959"/>
+ <location filename="../QScintilla/Editor.py" line="961"/>
<source>Clear Completions Cache</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="886"/>
+ <location filename="../QScintilla/Editor.py" line="888"/>
<source>Code Info</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1367"/>
+ <location filename="../QScintilla/Editor.py" line="1369"/>
<source>Clear changes</source>
<translation>Effacer les modifications</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="805"/>
+ <location filename="../QScintilla/Editor.py" line="807"/>
<source>Execute Selection In Console</source>
<translation>Exécuter la sélection en console</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="8544"/>
+ <location filename="../QScintilla/Editor.py" line="8546"/>
<source>EditorConfig Properties</source>
<translation>Propriétés d'EditorConfig</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="8544"/>
+ <location filename="../QScintilla/Editor.py" line="8546"/>
<source><p>The EditorConfig properties for file <b>{0}</b> could not be loaded.</p></source>
<translation><p>Les propriétés d'EditorConfig du fichier <b>{0}</b> n'ont pas pu être chargées.</p></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1271"/>
+ <location filename="../QScintilla/Editor.py" line="1273"/>
<source>Toggle all folds</source>
<translation>Contracte/Déploie tout le code</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1276"/>
+ <location filename="../QScintilla/Editor.py" line="1278"/>
<source>Toggle all folds (including children)</source>
<translation>Contracte/Déploie tout le code (sous-niveaux inclus)</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1281"/>
+ <location filename="../QScintilla/Editor.py" line="1283"/>
<source>Toggle current fold</source>
<translation>Contracte/Déploie le paragraphe courant</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1287"/>
+ <location filename="../QScintilla/Editor.py" line="1289"/>
<source>Expand (including children)</source>
<translation>Déploie (sous-niveaux inclus)</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1292"/>
+ <location filename="../QScintilla/Editor.py" line="1294"/>
<source>Collapse (including children)</source>
<translation>Contracte (sous-niveaux inclus)</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1298"/>
+ <location filename="../QScintilla/Editor.py" line="1300"/>
<source>Clear all folds</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1179"/>
+ <location filename="../QScintilla/Editor.py" line="1181"/>
<source>Spell Check Languages</source>
<translation>Correction orthographique</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="7044"/>
+ <location filename="../QScintilla/Editor.py" line="7046"/>
<source><p>The file <b>{0}</b> has been changed while it was opened in eric. Reread it?</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="8738"/>
+ <location filename="../QScintilla/Editor.py" line="8740"/>
<source>Generate Docstring</source>
<translation type="unfinished"></translation>
</message>
@@ -30630,17 +30630,17 @@
<translation>Récupérant le signet d'un dépôt Mercurial distant</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3245"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3247"/>
<source>Push Bookmark</source>
<translation>Envoyer signet</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3245"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3247"/>
<source>Select the bookmark to be push:</source>
<translation>Sélectionner le signet à envoyer:</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3257"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3262"/>
<source>Pushing bookmark to a remote Mercurial repository</source>
<translation>À envoyer le signet à un dépôt Mercurial distant</translation>
</message>
@@ -31420,35 +31420,45 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="277"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="288"/>
<source>Switch</source>
<translation>Basculer de version</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="277"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="288"/>
<source>The project should be reread. Do this now?</source>
<translation>Le projet devrai être relu. Le faire maintenant ?</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="296"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="307"/>
<source>Delete Bookmark</source>
<translation>Supprimer le signet</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="296"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="307"/>
<source><p>Shall the bookmark <b>{0}</b> really be deleted?</p></source>
<translation><p>Faut-il vraiment supprimer le signet <b>{0}</b> ?</p></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="312"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="323"/>
<source>Rename Bookmark</source>
<translation>Renommer le signet</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="312"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="323"/>
<source><p>Enter the new name for bookmark <b>{0}</b>:</p></source>
<translation><p>Entrer le nouveau nom pour le signet <b>{0}</b>:</p></translation>
</message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="267"/>
+ <source>Push Current</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="272"/>
+ <source>Push All</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>HgBranchInputDialog</name>
@@ -34059,1453 +34069,1468 @@
<context>
<name>HgProjectHelper</name>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="122"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="117"/>
<source>New from repository</source>
<translation>Nouveau à partir du référentiel</translation>
</message>
<message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="117"/>
+ <source>&New from repository...</source>
+ <translation>&Nouveau depuis un référentiel...</translation>
+ </message>
+ <message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="122"/>
- <source>&New from repository...</source>
- <translation>&Nouveau depuis un référentiel...</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="127"/>
<source>Create (clone) a new project from a Mercurial repository</source>
<translation>Créer (clone) un nouveau projet à partir d'un dépot Mercurial</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="130"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="125"/>
<source><b>New from repository</b><p>This creates (clones) a new local project from a Mercurial repository.</p></source>
<translation><b>Nouvea à partir d'un dépot</b><p>Cela créé (clone) un nouveau projet local à partir d'un dépot Mercurial.</p></translation>
</message>
<message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="133"/>
+ <source>Show incoming log</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="138"/>
- <source>Show incoming log</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="143"/>
<source>Show the log of incoming changes</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="146"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="141"/>
<source><b>Show incoming log</b><p>This shows the log of changes coming into the repository.</p></source>
<translation type="unfinished"></translation>
</message>
<message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="149"/>
+ <source>Pull changes</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="154"/>
- <source>Pull changes</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="159"/>
<source>Pull changes from a remote repository</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="162"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="157"/>
<source><b>Pull changes</b><p>This pulls changes from a remote repository into the local repository.</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="170"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="165"/>
<source>Update from repository</source>
<translation>Mise à jour à partir du dépot</translation>
</message>
<message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="165"/>
+ <source>&Update from repository</source>
+ <translation>Mettre à jo&ur à partir du dépot</translation>
+ </message>
+ <message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="170"/>
- <source>&Update from repository</source>
- <translation>Mettre à jo&ur à partir du dépot</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="175"/>
<source>Update the local project from the Mercurial repository</source>
<translation>Mettre à jour le projet local à partir du dépot Mercurial</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="178"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="173"/>
<source><b>Update from repository</b><p>This updates the local project from the Mercurial repository.</p></source>
<translation><b>Mettre à jour à partir d'un dépot</b><p>Cela mets à jour le projet local à partir d'un dépot Mercurial.</p></translation>
</message>
<message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="181"/>
+ <source>Commit changes to repository</source>
+ <translation>"Commiter" les modifications au référentiel</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="181"/>
+ <source>&Commit changes to repository...</source>
+ <translation>&Appliquer les changements dans le référentiel...</translation>
+ </message>
+ <message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="186"/>
- <source>Commit changes to repository</source>
- <translation>"Commiter" les modifications au référentiel</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="186"/>
- <source>&Commit changes to repository...</source>
- <translation>&Appliquer les changements dans le référentiel...</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="191"/>
<source>Commit changes to the local project to the Mercurial repository</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="194"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="189"/>
<source><b>Commit changes to repository</b><p>This commits changes to the local project to the Mercurial repository.</p></source>
<translation type="unfinished"></translation>
</message>
<message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="197"/>
+ <source>Show outgoing log</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="202"/>
- <source>Show outgoing log</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="207"/>
<source>Show the log of outgoing changes</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="210"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="205"/>
<source><b>Show outgoing log</b><p>This shows the log of changes outgoing out of the repository.</p></source>
<translation type="unfinished"></translation>
</message>
<message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="213"/>
+ <source>Push changes</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="218"/>
- <source>Push changes</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="223"/>
<source>Push changes to a remote repository</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="226"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="221"/>
<source><b>Push changes</b><p>This pushes changes from the local repository to a remote repository.</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="250"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="245"/>
<source>Export from repository</source>
<translation>Exporter du référentiel</translation>
</message>
<message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="245"/>
+ <source>&Export from repository...</source>
+ <translation>&Exporter du référentiel...</translation>
+ </message>
+ <message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="250"/>
- <source>&Export from repository...</source>
- <translation>&Exporter du référentiel...</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="255"/>
<source>Export a project from the repository</source>
<translation>Exporte un projet d'un référentiel VCS</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="258"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="253"/>
<source><b>Export from repository</b><p>This exports a project from the repository.</p></source>
<translation><b>Exporter du référentiel</b><p>Exporte un projet d'un référentiel VCS.</p></translation>
</message>
<message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="260"/>
+ <source>Show log browser</source>
+ <translation>Afficher le navigateur de logs</translation>
+ </message>
+ <message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="265"/>
- <source>Show log browser</source>
- <translation>Afficher le navigateur de logs</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="270"/>
<source>Show a dialog to browse the log of the local project</source>
<translation>Affiche une fenêtre permettant de parcourir les logs du projet local</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="273"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="268"/>
<source><b>Show log browser</b><p>This shows a dialog to browse the log of the local project. A limited number of entries is shown first. More can be retrieved later on.</p></source>
<translation><b>Navigateur de logs</b><p>Affiche une fenêtre permettant de parcourir les messages logs du projet local. La fenêtre n'affiche qu'un nombre limité d'entrées, mais un bouton permet d'afficher les logs plus anciens.</p></translation>
</message>
<message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="277"/>
+ <source>Show &difference</source>
+ <translation>Afficher les &différences</translation>
+ </message>
+ <message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="282"/>
- <source>Show &difference</source>
- <translation>Afficher les &différences</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="287"/>
<source>Show the difference of the local project to the repository</source>
<translation>Affiche les différences entre le projet local et le référentiel</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="303"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="298"/>
<source>Show the difference of revisions of the project to the repository</source>
<translation>Affiche les différences entre le référentiel et les différentes révisions du projet</translation>
</message>
<message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="309"/>
+ <source>Show status</source>
+ <translation>Afficher l'état (status)</translation>
+ </message>
+ <message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="314"/>
- <source>Show status</source>
- <translation>Afficher l'état (status)</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="319"/>
<source>Show the status of the local project</source>
<translation>Affiche l'état du projet local par rapport au référentiel VCS</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="322"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="317"/>
<source><b>Show status</b><p>This shows the status of the local project.</p></source>
<translation><b>Afficher l'état VCS</b><p>Affiche l'état du projet local par rapport au référentiel VCS.</p></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="345"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="340"/>
<source>Show heads</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="349"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="344"/>
<source>Show the heads of the repository</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="352"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="347"/>
<source><b>Show heads</b><p>This shows the heads of the repository.</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="359"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="354"/>
<source>Show parents</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="363"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="358"/>
<source>Show the parents of the repository</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="366"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="361"/>
<source><b>Show parents</b><p>This shows the parents of the repository.</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="373"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="368"/>
<source>Show tip</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="377"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="372"/>
<source>Show the tip of the repository</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="380"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="375"/>
<source><b>Show tip</b><p>This shows the tip of the repository.</p></source>
<translation type="unfinished"></translation>
</message>
<message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="382"/>
+ <source>Revert changes</source>
+ <translation>Revenir avant les modifications</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="382"/>
+ <source>Re&vert changes</source>
+ <translation>&Recharger le projet</translation>
+ </message>
+ <message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="387"/>
- <source>Revert changes</source>
- <translation>Revenir avant les modifications</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="387"/>
- <source>Re&vert changes</source>
- <translation>&Recharger le projet</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="392"/>
<source>Revert all changes made to the local project</source>
<translation>Recharger le projet et écraser toutes les modifications locales</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="395"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="390"/>
<source><b>Revert changes</b><p>This reverts all changes made to the local project.</p></source>
<translation><b>Recharger le projet</b><p>Recharge le projet et écrase toutes les modifications effectuées localement.</p></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1728"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1740"/>
<source>Merge</source>
<translation>Fusionner</translation>
</message>
<message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="397"/>
+ <source>Mer&ge changes...</source>
+ <translation>&Fusionner les modifications...</translation>
+ </message>
+ <message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="402"/>
- <source>Mer&ge changes...</source>
- <translation>&Fusionner les modifications...</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="407"/>
<source>Merge changes of a revision into the local project</source>
<translation>Fusionne les modifications d'une révision dans le projet local</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="410"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="405"/>
<source><b>Merge</b><p>This merges changes of a revision into the local project.</p></source>
<translation><b>Fusion</b><p>Cela fusionne les modifications d'une révision dans le projet local.</p></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="508"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="503"/>
<source>Tag in repository</source>
<translation>Etiqueter au niveau du référentiel (tag)</translation>
</message>
<message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="503"/>
+ <source>&Tag in repository...</source>
+ <translation>&Etiqueter dans le référentiel...</translation>
+ </message>
+ <message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="508"/>
- <source>&Tag in repository...</source>
- <translation>&Etiqueter dans le référentiel...</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="513"/>
<source>Tag the local project in the repository</source>
<translation>Etiquette le projet local dans le référentiel</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="516"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="511"/>
<source><b>Tag in repository</b><p>This tags the local project in the repository.</p></source>
<translation><b>Etiqueter dans le référentiel</b><p>Etiquette le projet local dans le référentiel (opération "tag").</p></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="523"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="518"/>
<source>List tags</source>
<translation>Lister les étiquettes</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="523"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="518"/>
<source>List tags...</source>
<translation>Lister les étiquettes...</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="527"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="522"/>
<source>List tags of the project</source>
<translation>Liste les étiquettes du projet</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="530"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="525"/>
<source><b>List tags</b><p>This lists the tags of the project.</p></source>
<translation><b>Liste des étiquettes</b><p>Liste les étiquettes du projet.</p></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="537"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="532"/>
<source>List branches</source>
<translation>Lister les branches</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="537"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="532"/>
<source>List branches...</source>
<translation>Lister les branches...</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="541"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="536"/>
<source>List branches of the project</source>
<translation>Liste les branches du projet</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="544"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="539"/>
<source><b>List branches</b><p>This lists the branches of the project.</p></source>
<translation><b>Liste des branches</b><p>Effectue la liste de toutes les branches de développement du projet.</p></translation>
</message>
<message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="546"/>
+ <source>Create branch</source>
+ <translation>Créer une branche</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="546"/>
+ <source>Create &branch...</source>
+ <translation>Créer une &branche...</translation>
+ </message>
+ <message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="551"/>
- <source>Create branch</source>
- <translation>Créer une branche</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="551"/>
- <source>Create &branch...</source>
- <translation>Créer une &branche...</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="556"/>
<source>Create a new branch for the local project in the repository</source>
<translation>Créer une nouvelle branche pour le projet local dans le dépot</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="559"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="554"/>
<source><b>Create branch</b><p>This creates a new branch for the local project in the repository.</p></source>
<translation type="unfinished"></translation>
</message>
<message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="579"/>
+ <source>Close branch</source>
+ <translation>Fermer la branche</translation>
+ </message>
+ <message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="584"/>
- <source>Close branch</source>
- <translation>Fermer la branche</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="589"/>
<source>Close the current branch of the local project</source>
<translation>Feme la branche courante du projet local</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="592"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="587"/>
<source><b>Close branch</b><p>This closes the current branch of the local project.</p></source>
<translation><b>Fermer la branche</b><p>Ceci feme la branche courante du projet local.</p></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="613"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="608"/>
<source>Switch</source>
<translation>Basculer de version</translation>
</message>
<message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="608"/>
+ <source>S&witch...</source>
+ <translation>&Basculer de version...</translation>
+ </message>
+ <message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="613"/>
- <source>S&witch...</source>
- <translation>&Basculer de version...</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="618"/>
<source>Switch the working directory to another revision</source>
<translation type="unfinished">Basculer le répertoire de travail sur une autre version</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="621"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="616"/>
<source><b>Switch</b><p>This switches the working directory to another revision.</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="629"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="624"/>
<source>Cleanup</source>
<translation>Nettoyer</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="629"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="624"/>
<source>Cleanu&p</source>
<translation>&Nettoyer</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="633"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="628"/>
<source>Cleanup the local project</source>
<translation>Nettoyer le projet local</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="636"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="631"/>
<source><b>Cleanup</b><p>This performs a cleanup of the local project.</p></source>
<translation><b>Nettoyer</b><p>Permet de nettoyer le projet local.</p></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="643"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="638"/>
<source>Execute command</source>
<translation>Exécuter une commande</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="643"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="638"/>
<source>E&xecute command...</source>
<translation>E&xécuter une commande...</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="647"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="642"/>
<source>Execute an arbitrary Mercurial command</source>
<translation>Executer une commande Mercurial arbitraire</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="650"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="645"/>
<source><b>Execute command</b><p>This opens a dialog to enter an arbitrary Mercurial command.</p></source>
<translation><b>Exécuter une commande</b><p>Ceci ouvre une fenêtre pour saisir une commande arbitraire Mercurial.</p></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="658"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="653"/>
<source>Configure</source>
<translation>Configuration</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="658"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="653"/>
<source>Configure...</source>
<translation>Configuration...</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="662"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="657"/>
<source>Show the configuration dialog with the Mercurial page selected</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="665"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="660"/>
<source><b>Configure</b><p>Show the configuration dialog with the Mercurial page selected.</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="718"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="713"/>
<source>Show paths</source>
<translation>Montrer les chemins</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="718"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="713"/>
<source>Show paths...</source>
<translation>Montrer les chemins...</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="722"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="717"/>
<source>Show the aliases for remote repositories</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="725"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="720"/>
<source><b>Show paths</b><p>This shows the aliases for remote repositories.</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="732"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="727"/>
<source>Verify repository</source>
<translation>Vérifier le dépot</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="732"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="727"/>
<source>Verify repository...</source>
<translation>Vérifier le dépot...</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="736"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="731"/>
<source>Verify the integrity of the repository</source>
<translation>Vérifier l'intégrité du dépot</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="739"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="734"/>
<source><b>Verify repository</b><p>This verifies the integrity of the repository.</p></source>
<translation><b>Vérifier le dépot</b><p>Ceci vérifie l'intégrité du dépot.</p></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="746"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="741"/>
<source>Recover</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="746"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="741"/>
<source>Recover...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="750"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="745"/>
<source>Recover from an interrupted transaction</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="753"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="748"/>
<source><b>Recover</b><p>This recovers from an interrupted transaction.</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="774"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="769"/>
<source>Create .hgignore</source>
<translation>Créer le .hgignore</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="778"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="773"/>
<source>Create a .hgignore file with default values</source>
<translation>Créer un fichier .hgignore avec les valeurs par défaut</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="781"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="776"/>
<source><b>Create .hgignore</b><p>This creates a .hgignore file with default values.</p></source>
<translation><b>Créer le .hgignore</b><p>Créer un fichier .hgignore avec les valeurs par défaut.</p></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="788"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="783"/>
<source>Create changegroup</source>
<translation type="unfinished"></translation>
</message>
<message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="783"/>
+ <source>Create changegroup...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="788"/>
- <source>Create changegroup...</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="793"/>
<source>Create changegroup file collecting changesets</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1860"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1872"/>
<source>Apply changegroups</source>
<translation type="unfinished"></translation>
</message>
<message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="815"/>
+ <source>Apply changegroups...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="820"/>
- <source>Apply changegroups...</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="825"/>
<source>Apply one or several changegroup files</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1357"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1369"/>
<source>Changegroup Management</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="796"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="791"/>
<source><b>Create changegroup</b><p>This creates a changegroup file collecting selected changesets (hg bundle).</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="828"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="823"/>
<source><b>Apply changegroups</b><p>This applies one or several changegroup files generated by the 'Create changegroup' action (hg unbundle).</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="599"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="594"/>
<source>Show current branch</source>
<translation>Montrer la branche courante</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="603"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="598"/>
<source>Show the current branch of the project</source>
<translation>Montrer la branche courante du projet</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="606"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="601"/>
<source><b>Show current branch</b><p>This shows the current branch of the project.</p></source>
<translation><b>Montrer la branche courante</b><p>Ceci montre la branche courante du projet.</p></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="836"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="831"/>
<source>Mark as "good"</source>
<translation>Marquer comme "bon"</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="840"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="835"/>
<source>Mark a selectable changeset as good</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="843"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="838"/>
<source><b>Mark as good</b><p>This marks a selectable changeset as good.</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="850"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="845"/>
<source>Mark as "bad"</source>
<translation>Marquer comme "mauvais"</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="854"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="849"/>
<source>Mark a selectable changeset as bad</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="857"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="852"/>
<source><b>Mark as bad</b><p>This marks a selectable changeset as bad.</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="864"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="859"/>
<source>Skip</source>
<translation>Passer</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="878"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="873"/>
<source>Reset</source>
<translation>Réinitialiser</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="882"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="877"/>
<source>Reset the bisect search data</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="885"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="880"/>
<source><b>Reset</b><p>This resets the bisect search data.</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1370"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1382"/>
<source>Bisect</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="836"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="831"/>
<source>Mark as "good"...</source>
<translation>Marquer comme "bon"...</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="850"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="845"/>
<source>Mark as "bad"...</source>
<translation>Marquer comme "mauvais"...</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="804"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="799"/>
<source>Preview changegroup</source>
<translation type="unfinished"></translation>
</message>
<message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="799"/>
+ <source>Preview changegroup...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="755"/>
+ <source>Identify</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="755"/>
+ <source>Identify...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="759"/>
+ <source>Identify the project directory</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="762"/>
+ <source><b>Identify</b><p>This identifies the project directory.</p></source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="804"/>
- <source>Preview changegroup...</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="760"/>
- <source>Identify</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="760"/>
- <source>Identify...</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="764"/>
- <source>Identify the project directory</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="767"/>
- <source><b>Identify</b><p>This identifies the project directory.</p></source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="809"/>
<source>Preview a changegroup file containing a collection of changesets</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="812"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="807"/>
<source><b>Preview changegroup</b><p>This previews a changegroup file containing a collection of changesets.</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="892"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="887"/>
<source>Back out changeset</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="896"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="891"/>
<source>Back out changes of an earlier changeset</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="899"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="894"/>
<source><b>Back out changeset</b><p>This backs out changes of an earlier changeset.</p></source>
<translation type="unfinished"></translation>
</message>
<message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="229"/>
+ <source>Push changes (force)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="234"/>
- <source>Push changes (force)</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="239"/>
<source>Push changes to a remote repository with force option</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="242"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="237"/>
<source><b>Push changes (force)</b><p>This pushes changes from the local repository to a remote repository using the 'force' option.</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1348"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1360"/>
<source>Specials</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="933"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="928"/>
<source>Serve project repository</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="933"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="928"/>
<source>Serve project repository...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="937"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="932"/>
<source>Serve the project repository</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="940"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="935"/>
<source><b>Serve project repository</b><p>This serves the project repository.</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1671"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1683"/>
<source>Pull</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2000"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2012"/>
<source>The project should be reread. Do this now?</source>
<translation type="unfinished"></translation>
</message>
<message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="562"/>
+ <source>Push new branch</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="567"/>
- <source>Push new branch</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="572"/>
<source>Push the current branch of the local project as a new named branch</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="576"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="571"/>
<source><b>Push new branch</b><p>This pushes the current branch of the local project as a new named branch.</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="906"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="901"/>
<source>Rollback last transaction</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="910"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="905"/>
<source>Rollback the last transaction</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1415"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1427"/>
<source>Extensions</source>
<translation type="unfinished">Extensions</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="673"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="668"/>
<source>Edit user configuration</source>
<translation>Éditer la configuration utilisateur</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="673"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="668"/>
<source>Edit user configuration...</source>
<translation>Éditer la configuration utilisateur...</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="677"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="672"/>
<source>Show an editor to edit the user configuration file</source>
<translation>Affiche un éditeur pour modifier le fichier de configuration utilisateur</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="680"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="675"/>
<source><b>Edit user configuration</b><p>Show an editor to edit the user configuration file.</p></source>
<translation><b>Éditer la configuration utilisateur</b><p>Affiche un éditeur pour modifier le fichier de configuration utilisateur.</p></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="687"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="682"/>
<source>Edit repository configuration</source>
<translation>Éditer la configuration du dépot</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="687"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="682"/>
<source>Edit repository configuration...</source>
<translation>Éditer la configuration du dépot...</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="691"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="686"/>
<source>Show an editor to edit the repository configuration file</source>
<translation>Affiche un éditeur pour modifier le fichier de configuration du dépot</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="694"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="689"/>
<source><b>Edit repository configuration</b><p>Show an editor to edit the repository configuration file.</p></source>
<translation><b>Éditer la configuration du dépot</b><p>Affiche un éditeur pour modifier le fichier de configuration du dépot.</p></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="702"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="697"/>
<source>Show combined configuration settings</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="702"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="697"/>
<source>Show combined configuration settings...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="706"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="701"/>
<source>Show the combined configuration settings from all configuration files</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="710"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="705"/>
<source><b>Show combined configuration settings</b><p>This shows the combined configuration settings from all configuration files.</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="864"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="859"/>
<source>Skip...</source>
<translation>Passer...</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="868"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="863"/>
<source>Skip a selectable changeset</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="871"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="866"/>
<source><b>Skip</b><p>This skips a selectable changeset.</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1916"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1928"/>
<source>Import Patch</source>
<translation>Importer un patch</translation>
</message>
<message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="942"/>
+ <source>Import Patch...</source>
+ <translation>Importer un patch...</translation>
+ </message>
+ <message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="947"/>
- <source>Import Patch...</source>
- <translation>Importer un patch...</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="952"/>
<source>Import a patch from a patch file</source>
<translation>Importer un patch à partir d'un fichier patch</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="955"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="950"/>
<source><b>Import Patch</b><p>This imports a patch from a patch file into the project.</p></source>
<translation><b>Importer un patch</b><p>Ceci importe un patch à partir d'un fichier patch dans le projet.</p></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1364"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1376"/>
<source>Patch Management</source>
<translation>Gestion de patch</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1936"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1948"/>
<source>Revert Changes</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="963"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="958"/>
<source>Export Patches</source>
<translation>Exporter les patchs</translation>
</message>
<message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="958"/>
+ <source>Export Patches...</source>
+ <translation>Exporter les patchs...</translation>
+ </message>
+ <message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="963"/>
- <source>Export Patches...</source>
- <translation>Exporter les patchs...</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="968"/>
<source>Export revisions to patch files</source>
<translation>Exporter les révisions vers les fichiers patchs</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="971"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="966"/>
<source><b>Export Patches</b><p>This exports revisions of the project to patch files.</p></source>
<translation><b>Exporter les patchs</b><p>Ceci exporte les révisions vers les fichiers patchs.</p></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="978"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="973"/>
<source>Change Phase</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="978"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="973"/>
<source>Change Phase...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="982"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="977"/>
<source>Change the phase of revisions</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="985"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="980"/>
<source><b>Change Phase</b><p>This changes the phase of revisions.</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1956"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1968"/>
<source>Copy Changesets</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="997"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="992"/>
<source>Copies changesets from another branch</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1000"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="995"/>
<source><b>Copy Changesets</b><p>This copies changesets from another branch on top of the current working directory with the user, date and description of the original changeset.</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1009"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1004"/>
<source>Continue Copying Session</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1013"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1008"/>
<source>Continue the last copying session after conflicts were resolved</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1016"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1011"/>
<source><b>Continue Copying Session</b><p>This continues the last copying session after conflicts were resolved.</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1971"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1983"/>
<source>Copy Changesets (Continue)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="478"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="473"/>
<source>Conflicts resolved</source>
<translation>Conflits résolus</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="478"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="473"/>
<source>Con&flicts resolved</source>
<translation>Con&flits résolus</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="482"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="477"/>
<source>Mark all conflicts of the local project as resolved</source>
<translation>Marquer tous les conflits du projet local comme résolus</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="485"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="480"/>
<source><b>Conflicts resolved</b><p>This marks all conflicts of the local project as resolved.</p></source>
<translation><b>Conflits résolus</b><p>Ceci marque tous les conflits du projet local comme résolus.</p></translation>
</message>
<message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1048"/>
+ <source>Add</source>
+ <translation>Ajouter</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1048"/>
+ <source>Add...</source>
+ <translation>Ajouter...</translation>
+ </message>
+ <message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1053"/>
- <source>Add</source>
- <translation>Ajouter</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1053"/>
- <source>Add...</source>
- <translation>Ajouter...</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1058"/>
<source>Add a sub-repository</source>
<translation>Ajouter un sous-répertoire</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1061"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1056"/>
<source><b>Add...</b><p>Add a sub-repository to the project.</p></source>
<translation><b>Ajouter...</b><p>Ajouter un sous-répertoire au projet.</p></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1068"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1063"/>
<source>Remove</source>
<translation>Supprimer</translation>
</message>
<message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1063"/>
+ <source>Remove...</source>
+ <translation>Supprimer...</translation>
+ </message>
+ <message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1068"/>
- <source>Remove...</source>
- <translation>Supprimer...</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1073"/>
<source>Remove sub-repositories</source>
<translation>Supprimer les sous-répertoires</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1076"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1071"/>
<source><b>Remove...</b><p>Remove sub-repositories from the project.</p></source>
<translation><b>Supprimer...</b><p>Supprimer les sous-répertoires du projet.</p></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1435"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1447"/>
<source>Sub-Repository</source>
<translation>Sous-répertoire</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="314"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="309"/>
<source>Show &status...</source>
<translation>Montrer les &statuts...</translation>
</message>
<message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="324"/>
+ <source>Show Summary</source>
+ <translation>Montrer le bilan</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="324"/>
+ <source>Show summary...</source>
+ <translation>Montrer le bilan...</translation>
+ </message>
+ <message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="329"/>
- <source>Show Summary</source>
- <translation>Montrer le bilan</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="329"/>
- <source>Show summary...</source>
- <translation>Montrer le bilan...</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="334"/>
<source>Show summary information of the working directory status</source>
<translation type="unfinished">Afficher le bilan du statut du répertoire de travail</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="337"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="332"/>
<source><b>Show summary</b><p>This shows some summary information of the working directory status.</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1084"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1079"/>
<source>Create unversioned archive</source>
<translation type="unfinished"></translation>
</message>
<message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1079"/>
+ <source>Create unversioned archive...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1084"/>
- <source>Create unversioned archive...</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1089"/>
<source>Create an unversioned archive from the repository</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1092"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1087"/>
<source><b>Create unversioned archive...</b><p>This creates an unversioned archive from the repository.</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="913"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="908"/>
<source><b>Rollback last transaction</b><p>This performs a rollback of the last transaction. Transactions are used to encapsulate the effects of all commands that create new changesets or propagate existing changesets into a repository. For example, the following commands are transactional, and their effects can be rolled back:<ul><li>commit</li><li>import</li><li>pull</li><li>push (with this repository as the destination)</li><li>unbundle</li></ul></p><p><strong>This command is dangerous. Please use with care. </strong></p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1323"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1335"/>
<source>Administration</source>
<translation>Administration</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="282"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="277"/>
<source>Show differences</source>
<translation>Montrer les différences</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="298"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="293"/>
<source>Show differences (extended)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="290"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="285"/>
<source><b>Show differences</b><p>This shows differences of the local project to the repository.</p></source>
<translation type="unfinished"><b>Montrer les différences</b><p>Cela affiche les différences entre le projet local et le dépot.</p></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="306"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="301"/>
<source><b>Show differences (extended)</b><p>This shows differences of selectable revisions of the project.</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1100"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1095"/>
<source>List bookmarks</source>
<translation>Lister les signets</translation>
</message>
<message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1095"/>
+ <source>List bookmarks...</source>
+ <translation>Lister les signets ...</translation>
+ </message>
+ <message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1100"/>
- <source>List bookmarks...</source>
- <translation>Lister les signets ...</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1105"/>
<source>List bookmarks of the project</source>
<translation>Lister les signets du projet</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1108"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1103"/>
<source><b>List bookmarks</b><p>This lists the bookmarks of the project.</p></source>
<translation><b>Lister les signets</b><p>Ceci liste tous les signets du projet.</p></translation>
</message>
<message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1110"/>
+ <source>Define bookmark</source>
+ <translation>Définir signet</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1110"/>
+ <source>Define bookmark...</source>
+ <translation>Définir signet ...</translation>
+ </message>
+ <message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1115"/>
- <source>Define bookmark</source>
- <translation>Définir signet</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1115"/>
- <source>Define bookmark...</source>
- <translation>Définir signet ...</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1120"/>
<source>Define a bookmark for the project</source>
<translation>Définir un signet pour le projet</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1123"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1118"/>
<source><b>Define bookmark</b><p>This defines a bookmark for the project.</p></source>
<translation><b>Définir un signet</b><p>Ceci défini un signet pour le projet.</p></translation>
</message>
<message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1125"/>
+ <source>Delete bookmark</source>
+ <translation>Supprimer signet</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1125"/>
+ <source>Delete bookmark...</source>
+ <translation>Supprimer signet ...</translation>
+ </message>
+ <message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1130"/>
- <source>Delete bookmark</source>
- <translation>Supprimer signet</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1130"/>
- <source>Delete bookmark...</source>
- <translation>Supprimer signet ...</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1135"/>
<source>Delete a bookmark of the project</source>
<translation>Supprimer un signet du projet</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1138"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1133"/>
<source><b>Delete bookmark</b><p>This deletes a bookmark of the project.</p></source>
<translation><b>Supprimer signet</b><p>Ceci supprime un signet du projet.</p></translation>
</message>
<message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1140"/>
+ <source>Rename bookmark</source>
+ <translation>Renommer signet</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1140"/>
+ <source>Rename bookmark...</source>
+ <translation>Renommer signet ...</translation>
+ </message>
+ <message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1145"/>
- <source>Rename bookmark</source>
- <translation>Renommer signet</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1145"/>
- <source>Rename bookmark...</source>
- <translation>Renommer signet ...</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1150"/>
<source>Rename a bookmark of the project</source>
<translation>Renommer un signet du projet</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1153"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1148"/>
<source><b>Rename bookmark</b><p>This renames a bookmark of the project.</p></source>
<translation><b>Renommer signet</b><p>Ceci renome un signet du projet.</p></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1160"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1155"/>
<source>Move bookmark</source>
<translation>Déplacer signet</translation>
</message>
<message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1155"/>
+ <source>Move bookmark...</source>
+ <translation>Déplacer signet ...</translation>
+ </message>
+ <message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1160"/>
- <source>Move bookmark...</source>
- <translation>Déplacer signet ...</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1165"/>
<source>Move a bookmark of the project</source>
<translation>Déplacer un signet du projet</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1168"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1163"/>
<source><b>Move bookmark</b><p>This moves a bookmark of the project to another changeset.</p></source>
<translation><b>Déplacer signet</b><p>Ceci déplace un signet du projet dans un autre ensemble.</p></translation>
</message>
<message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1171"/>
+ <source>Show incoming bookmarks</source>
+ <translation>Montrer nouveaux signets</translation>
+ </message>
+ <message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1176"/>
- <source>Show incoming bookmarks</source>
- <translation>Montrer nouveaux signets</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1181"/>
<source>Show a list of incoming bookmarks</source>
<translation>Montrer la liste des nouveaux signets</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1184"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1179"/>
<source><b>Show incoming bookmarks</b><p>This shows a list of new bookmarks available at the remote repository.</p></source>
<translation><b>Montrer les nouveaux signets</b><p>Cedi montre la liste des nouveaux signets disponibles dans le dépôt distant. </p></translation>
</message>
<message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1188"/>
+ <source>Pull bookmark</source>
+ <translation>Télécharger signet</translation>
+ </message>
+ <message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1193"/>
- <source>Pull bookmark</source>
- <translation>Télécharger signet</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1198"/>
<source>Pull a bookmark from a remote repository</source>
<translation>Télecharger un signet d'un répertoire distant</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1201"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1196"/>
<source><b>Pull bookmark</b><p>This pulls a bookmark from a remote repository into the local repository.</p></source>
<translation><b>Télécharger signet</b><p>Ceci télécharge un signe d'un répertoire distant dans le répertoire local. </p></translation>
</message>
<message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1220"/>
+ <source>Show outgoing bookmarks</source>
+ <translation>Montrer signets sortants</translation>
+ </message>
+ <message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1225"/>
- <source>Show outgoing bookmarks</source>
- <translation>Montrer signets sortants</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1230"/>
<source>Show a list of outgoing bookmarks</source>
<translation>Montrer la list des signets sortants</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1233"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1228"/>
<source><b>Show outgoing bookmarks</b><p>This shows a list of new bookmarks available at the local repository.</p></source>
<translation><b>Montrer les signets sortants</b><p>Ceci montre la liste des signets disponibles dans le répertoire local.</p></translation>
</message>
<message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1237"/>
+ <source>Push bookmark</source>
+ <translation>Envoyer signet</translation>
+ </message>
+ <message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1242"/>
- <source>Push bookmark</source>
- <translation>Envoyer signet</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1247"/>
<source>Push a bookmark to a remote repository</source>
<translation>Envoyer un signet dans un répertoire distant</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1250"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1245"/>
<source><b>Push bookmark</b><p>This pushes a bookmark from the local repository to a remote repository.</p></source>
<translation><b>Envoyer signet</b><p>Ceci envoie un signet depuis un répertoire local dans un répertoire distant. </p></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1394"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1406"/>
<source>Bookmarks</source>
<translation>Signets</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1378"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1390"/>
<source>Tags</source>
<translation>Étiquettes</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1385"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1397"/>
<source>Branches</source>
<translation>Branches</translation>
</message>
<message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="442"/>
+ <source>Re-Merge</source>
+ <translation>Re-fusionner</translation>
+ </message>
+ <message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="447"/>
- <source>Re-Merge</source>
- <translation>Re-fusionner</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="452"/>
<source>Re-Merge all conflicting, unresolved files of the project</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="463"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="458"/>
<source>Show conflicts</source>
<translation>Montrer les conflits</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="463"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="458"/>
<source>Show conflicts...</source>
<translation>Montrer les conflits...</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="467"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="462"/>
<source>Show a dialog listing all files with conflicts</source>
<translation>Affiche une fenêtre listant tous les fichiers en conflit</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="470"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="465"/>
<source><b>Show conflicts</b><p>This shows a dialog listing all files which had or still have conflicts.</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="493"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="488"/>
<source>Conflicts unresolved</source>
<translation>Conflits non résolus</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="497"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="492"/>
<source>Mark all conflicts of the local project as unresolved</source>
<translation>Marquer tous les conflits du projet local comme non résolus</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="500"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="495"/>
<source><b>Conflicts unresolved</b><p>This marks all conflicts of the local project as unresolved.</p></source>
<translation><b>Conflits non résolus</b><p>Ceci marque tous les conflits du projet local comme non résolus.</p></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="455"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="450"/>
<source><b>Re-Merge</b><p>This re-merges all conflicting, unresolved files of the project discarding any previous merge attempt.</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1523"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1535"/>
<source>Mercurial</source>
<translation>Mercurial</translation>
</message>
<message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1204"/>
+ <source>Pull current bookmark</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1209"/>
- <source>Pull current bookmark</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1214"/>
<source>Pull the current bookmark from a remote repository</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1217"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1212"/>
<source><b>Pull current bookmark</b><p>This pulls the current bookmark from a remote repository into the local repository.</p></source>
<translation type="unfinished"></translation>
</message>
<message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1253"/>
+ <source>Push current bookmark</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1258"/>
- <source>Push current bookmark</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1263"/>
<source>Push the current bookmark to a remote repository</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1266"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1261"/>
<source><b>Push current bookmark</b><p>This pushes the current bookmark from the local repository to a remote repository.</p></source>
<translation type="unfinished"></translation>
</message>
<message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1286"/>
+ <source>Delete all backups</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1291"/>
+ <source>Delete all backup bundles stored in the backup area</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1294"/>
+ <source><b>Delete all backups</b><p>This deletes all backup bundles stored in the backup area of the repository.</p></source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1019"/>
+ <source>Stop Copying Session</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1023"/>
+ <source>Stop the interrupted copying session</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1033"/>
+ <source>Abort Copying Session</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1037"/>
+ <source>Abort the interrupted copying session and rollback</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1040"/>
+ <source><b>Abort Copying Session</b><p>This aborts the interrupted copying session and rollbacks to the state before the copy.</p></source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1452"/>
+ <source>Merge Changesets</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1997"/>
+ <source>Copy Changesets (Stop)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2012"/>
+ <source>Copy Changesets (Abort)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1026"/>
+ <source><b>Stop Copying Session</b><p>This stops the interrupted copying session.</p></source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="413"/>
+ <source>Commit Merge</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="420"/>
+ <source><b>Commit a merge</b><p>This commits a merge working directory</p></source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="427"/>
+ <source>Abort Merge</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="431"/>
+ <source>Abort an uncommitted merge and lose all changes</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="434"/>
+ <source><b>Abort uncommitted merge</b><p>This aborts an uncommitted merge causing all changes to be lost.</p></source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="417"/>
+ <source>Commit all the merged changes.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1270"/>
+ <source>Push all bookmarks</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1275"/>
- <source>Delete all backups</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1280"/>
- <source>Delete all backup bundles stored in the backup area</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1283"/>
- <source><b>Delete all backups</b><p>This deletes all backup bundles stored in the backup area of the repository.</p></source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1024"/>
- <source>Stop Copying Session</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1028"/>
- <source>Stop the interrupted copying session</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1038"/>
- <source>Abort Copying Session</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1042"/>
- <source>Abort the interrupted copying session and rollback</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1045"/>
- <source><b>Abort Copying Session</b><p>This aborts the interrupted copying session and rollbacks to the state before the copy.</p></source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1440"/>
- <source>Merge Changesets</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1985"/>
- <source>Copy Changesets (Stop)</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2000"/>
- <source>Copy Changesets (Abort)</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1031"/>
- <source><b>Stop Copying Session</b><p>This stops the interrupted copying session.</p></source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="418"/>
- <source>Commit Merge</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="425"/>
- <source><b>Commit a merge</b><p>This commits a merge working directory</p></source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="432"/>
- <source>Abort Merge</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="436"/>
- <source>Abort an uncommitted merge and lose all changes</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="439"/>
- <source><b>Abort uncommitted merge</b><p>This aborts an uncommitted merge causing all changes to be lost.</p></source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="422"/>
- <source>Commit all the merged changes.</source>
+ <source>Push all bookmarks to a remote repository</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1278"/>
+ <source><b>Push all bookmarks</b><p>This pushes all bookmark from the local repository to a remote repository.</p></source>
<translation type="unfinished"></translation>
</message>
</context>
@@ -38343,22 +38368,22 @@
<context>
<name>HighlightingStylesFile</name>
<message>
- <location filename="../Preferences/HighlightingStylesFile.py" line="80"/>
+ <location filename="../Preferences/HighlightingStylesFile.py" line="88"/>
<source>Export Highlighting Styles</source>
<translation type="unfinished">Exportation des styles</translation>
</message>
<message>
- <location filename="../Preferences/HighlightingStylesFile.py" line="80"/>
+ <location filename="../Preferences/HighlightingStylesFile.py" line="88"/>
<source><p>The highlighting styles file <b>{0}</b> could not be written.</p><p>Reason: {1}</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Preferences/HighlightingStylesFile.py" line="107"/>
+ <location filename="../Preferences/HighlightingStylesFile.py" line="115"/>
<source>Import Highlighting Styles</source>
<translation type="unfinished">Importation des styles</translation>
</message>
<message>
- <location filename="../Preferences/HighlightingStylesFile.py" line="107"/>
+ <location filename="../Preferences/HighlightingStylesFile.py" line="115"/>
<source><p>The highlighting styles file <b>{0}</b> could not be read.</p><p>Reason: {1}</p></source>
<translation type="unfinished"></translation>
</message>
@@ -47078,7 +47103,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="531"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="535"/>
<source>Press to connect the selected device</source>
<translation>Cliquer pour se connecter au matériel sélectionné</translation>
</message>
@@ -47088,7 +47113,7 @@
<translation type="unfinished"></translation>
</message>
<message numerus="yes">
- <location filename="../MicroPython/MicroPythonWidget.py" line="307"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="310"/>
<source>%n supported device(s) detected.</source>
<translation>
<numerusform>%n matériel supporté détecté.</numerusform>
@@ -47096,37 +47121,37 @@
</translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="329"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="332"/>
<source>No supported devices detected.</source>
<translation>Pas de matériel supporté détecté.</translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="501"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="505"/>
<source>Clear</source>
<translation>Effacer</translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="503"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="507"/>
<source>Copy</source>
<translation>Copier</translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="504"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="508"/>
<source>Paste</source>
<translation>Coller</translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="526"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="530"/>
<source>Press to disconnect the current device</source>
<translation>Cliquer pour déconnecter le matériel courant</translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="547"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="551"/>
<source>No device attached</source>
<translation>Pas de matériel relié</translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="547"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="551"/>
<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.
@@ -47135,212 +47160,212 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="574"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="578"/>
<source>Start REPL</source>
<translation>Démarrer REPL</translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="574"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="578"/>
<source><p>The REPL cannot be started.</p><p>Reason: {0}</p></source>
<translation><p>REPL ne peut être démarré.</p><p>Raison : {0}</p></translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="976"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="1005"/>
<source>Serial Device Connect</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="976"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="1005"/>
<source><p>Cannot connect to device at serial port <b>{0}</b>.</p></source>
<translation><p>Ne peut connecter un matériel sur le port série<b>{0}</b>.</p></translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="1021"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="1050"/>
<source>Run Script</source>
<translation>Lancer le script</translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="1004"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="1033"/>
<source>There is no editor open. Abort...</source>
<translation>Il n'y a pas d'éditeur ouvert. Annulation...</translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="1012"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="1041"/>
<source>The current editor does not contain a script. Abort...</source>
<translation>L'éditeur courant ne contient pas de script. Annulation...</translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="1021"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="1050"/>
<source><p>Cannot run script.</p><p>Reason: {0}</p></source>
<translation><p>Ne peut lancer le script.</p><p>Raison : {0}</p></translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="1045"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="1074"/>
<source>Open Python File</source>
<translation>Ouvrir un fichier Python</translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="1045"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="1074"/>
<source>Python3 Files (*.py);;All Files (*)</source>
<translation>Fichiers Python3 (*.py);;Tous les fichiers (*)</translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="1090"/>
- <source>Start Chart</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="1090"/>
- <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="1119"/>
- <source>Unsaved Chart Data</source>
+ <source>Start Chart</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../MicroPython/MicroPythonWidget.py" line="1119"/>
+ <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="1148"/>
+ <source>Unsaved Chart Data</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="1148"/>
<source>The chart contains unsaved data.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="1170"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="1199"/>
<source>Start File Manager</source>
<translation>Démarrer le gestionnaire de fichier</translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="1170"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="1199"/>
<source><p>The File Manager cannot be started.</p><p>Reason: {0}</p></source>
<translation><p>Le gestionnaire de fichier ne peut démarrer.</p><p>Raison : {0}</p></translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="1241"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="1270"/>
<source>Show Version</source>
<translation>Montrer la version</translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="1244"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="1273"/>
<source>Show Implementation</source>
<translation>Montrer l'implémentation</translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="1370"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="1399"/>
<source>Synchronize Time</source>
<translation>Synchroniser le temps</translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="1252"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="1281"/>
<source>Show Device Time</source>
<translation>Montrer l'horloge matériel</translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="1255"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="1284"/>
<source>Show Local Time</source>
<translation>Montrer l'horloge locale</translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="1588"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="1617"/>
<source>Compile Python File</source>
<translation>Compilier le fichier Python</translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="1608"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="1637"/>
<source>Compile Current Editor</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="1307"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="1336"/>
<source><h3>Device Version Information</h3></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="1316"/>
- <source>No version information available.</source>
- <translation>Pas d'information de version disponible.</translation>
- </message>
- <message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="1318"/>
- <source>Device Version Information</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="1341"/>
- <source>unknown</source>
- <translation>inconnu</translation>
- </message>
- <message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="1345"/>
- <source>Device Implementation Information</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
<location filename="../MicroPython/MicroPythonWidget.py" line="1345"/>
- <source><h3>Device Implementation Information</h3><p>This device contains <b>{0} {1}</b>.</p></source>
+ <source>No version information available.</source>
+ <translation>Pas d'information de version disponible.</translation>
+ </message>
+ <message>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="1347"/>
+ <source>Device Version Information</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../MicroPython/MicroPythonWidget.py" line="1370"/>
+ <source>unknown</source>
+ <translation>inconnu</translation>
+ </message>
+ <message>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="1374"/>
+ <source>Device Implementation Information</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="1374"/>
+ <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="1399"/>
<source><p>The time of the connected device was synchronized with the local time.</p></source>
<translation><p>L'horloge du matériel connecté a été synchronisée à l'horloge locale.</p></translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="1392"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="1421"/>
<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><h3>Date et heure matériel</h3><table><tr><td><b>Date</b></td><td>{0}</td></tr><tr><td><b>Heure</b></td><td>{1}</td></tr></table></translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="1400"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="1429"/>
<source><h3>Device Date and Time</h3><p>{0}</p></source>
<translation><h3>Date et heure matériel</h3><p>{0}</p></translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="1415"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="1444"/>
<source>Device Date and Time</source>
<translation>Date et heure matériel</translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="1428"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="1457"/>
<source>Local Date and Time</source>
<translation>Date et heure locales</translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="1428"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="1457"/>
<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><h3>Date et heure locales</h3><table><tr><td><b>Date</b></td><td>{0}</td></tr><tr><td><b>Heure</b></td><td>{1}</td></tr></table></translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="1496"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="1525"/>
<source>Error handling device</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="1496"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="1525"/>
<source><p>There was an error communicating with the connected device.</p><p>Method: {0}</p><p>Message: {1}</p></source>
<translation><p>Il y a eu une erreur de communication avec le matériel connecté.</p><p>Méthode : {0}</p><p>Message : {1}</p></translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="1536"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="1565"/>
<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="1558"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="1587"/>
<source>Python Files (*.py);;All Files (*)</source>
<translation>Fichiers Python (*.py);;Tous les fichiers (*)</translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="1568"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="1597"/>
<source>The Python file <b>{0}</b> does not exist. Aborting...</source>
<translation>Le fichier Python <b>{0}</b> n'existe pas. Annulation...</translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="1578"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="1607"/>
<source>'mpy-cross' Output</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="1601"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="1630"/>
<source>The current editor does not contain a Python file. Aborting...</source>
<translation>L'éditeur courant ne contient pas un fichier Python. Annulation...</translation>
</message>
@@ -47355,52 +47380,52 @@
<translation>Cliquer pour ouvrir un gestionnaire de fichier sur le matériel sélectionné</translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="1103"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="1132"/>
<source>µPy Chart</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="1186"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="1215"/>
<source>µPy Files</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="1284"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="1313"/>
<source>Show Documentation</source>
<translation>Montrer la documentation</translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="1297"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="1326"/>
<source>Configure</source>
<translation>Configuration</translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="1258"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="1287"/>
<source>Show Time</source>
<translation>Montrer l'horloge</translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="1277"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="1306"/>
<source>Download Firmware</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="1471"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="1500"/>
<source>Date and Time</source>
<translation>Date et heure</translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="1454"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="1483"/>
<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><table><tr><th></th><th>Date et heure locales</th><th>Date et heure matériel</th></tr><tr><td><b>Date</b></td><td align='center'>{0}</td><td align='center'>{2}</td></tr><tr><td><b>Heure</b></td><td align='center'>{1}</td><td align='center'>{3}</td></tr></table></translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="1471"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="1500"/>
<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><table><tr><th>Date et heure locales</th><th>Date et heure matériel</th></tr><tr><td align='center'>{0} {1}</td><td align='center'>{2}</td></tr></table></translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="382"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="386"/>
<source>Unknown MicroPython Device</source>
<translation>Matériel MicroPython inconnu</translation>
</message>
@@ -47410,54 +47435,54 @@
<translation type="obsolete">{0} ({1:04x}/{2:04x})</translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="1294"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="1323"/>
<source>Ignored Serial Devices</source>
<translation>Matériels séries ignorés</translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="1226"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="1255"/>
<source>Downloads</source>
<translation type="unfinished">Téléchargements</translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="312"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="315"/>
<source>{0} - {1} ({2})</source>
<comment>board name, description, port name</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="354"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="358"/>
<source><p>Detected these unknown serial devices</p><ul><li>{0}</li></ul><p>Please report them together with the board name and a short description to <a href="mailto:{1}"> the eric bug reporting address</a> if it is a MicroPython board.</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="354"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="358"/>
<source>{0} (0x{1:04x}/0x{2:04x})</source>
<comment>description, VId, PId</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="382"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="386"/>
<source>Would you like to add them to the list of manually configured devices?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="1292"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="1321"/>
<source>Manage Unknown Devices</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="1693"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="1722"/>
<source>Add Unknown Devices</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="1693"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="1722"/>
<source>Select the devices to be added:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="1289"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="1318"/>
<source>Flash UF2 Device</source>
<translation type="unfinished"></translation>
</message>
@@ -55274,22 +55299,22 @@
<context>
<name>ProjectFile</name>
<message>
- <location filename="../Project/ProjectFile.py" line="72"/>
+ <location filename="../Project/ProjectFile.py" line="97"/>
<source>Save Project File</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Project/ProjectFile.py" line="72"/>
+ <location filename="../Project/ProjectFile.py" line="97"/>
<source><p>The project file <b>{0}</b> could not be written.</p><p>Reason: {1}</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Project/ProjectFile.py" line="98"/>
+ <location filename="../Project/ProjectFile.py" line="123"/>
<source>Read Project File</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Project/ProjectFile.py" line="98"/>
+ <location filename="../Project/ProjectFile.py" line="123"/>
<source><p>The project file <b>{0}</b> could not be read.</p><p>Reason: {1}</p></source>
<translation type="unfinished"></translation>
</message>
@@ -77215,97 +77240,97 @@
<translation type="unfinished">Rafraichir</translation>
</message>
<message>
- <location filename="../MicroPython/UF2FlashDialog.py" line="288"/>
+ <location filename="../MicroPython/UF2FlashDialog.py" line="357"/>
<source><h3>CircuitPython Board</h3><p>In order to prepare the board for flashing follow these steps:</p><ol><li>Switch your device to 'bootloader' mode by double-pressing the reset button.</li><li>Wait until the device has entered 'bootloader' mode.</li><li>(If this does not happen, then try shorter or longer pauses between presses.)</li><li>Ensure the boot volume is available (this may require mounting it).</li><li>Select the firmware file to be flashed and click the flash button.</li></ol></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../MicroPython/UF2FlashDialog.py" line="311"/>
+ <location filename="../MicroPython/UF2FlashDialog.py" line="380"/>
<source><h3>Pi Pico (RP2040) Board</h3><p>In order to prepare the board for flashing follow these steps:</p><ol><li>Plug in your board while holding the BOOTSEL button.</li><li>Wait until the device has entered 'bootloader' mode.</li><li>Ensure the boot volume is available (this may require mounting it).</li><li>Select the firmware file to be flashed and click the flash button.</li></ol></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../MicroPython/UF2FlashDialog.py" line="386"/>
+ <location filename="../MicroPython/UF2FlashDialog.py" line="455"/>
<source>MicroPython/CircuitPython Files (*.uf2);;All Files (*)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../MicroPython/UF2FlashDialog.py" line="454"/>
+ <location filename="../MicroPython/UF2FlashDialog.py" line="523"/>
<source>Manual Select</source>
<translation type="unfinished">Sélection Manuelle</translation>
</message>
<message>
- <location filename="../MicroPython/UF2FlashDialog.py" line="555"/>
- <source>Reset Instructions:</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../MicroPython/UF2FlashDialog.py" line="499"/>
- <source><h4>No known devices detected.</h4><p>Follow the appropriate instructions below to set <b>one</b> board into 'bootloader' mode. Press <b>Refresh</b> when ready.</p></source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../MicroPython/UF2FlashDialog.py" line="522"/>
- <source><h4>Flash {0} Firmware</h4><p>Follow the instructions below to set <b>one</b> board into 'bootloader' mode. Press <b>Refresh</b> when ready.</p><hr/>{1}</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../MicroPython/UF2FlashDialog.py" line="532"/>
- <source><h4>Potentially UF2 capable devices found</h4><p>Found these potentially UF2 capable devices:</p><ul><li>{0}</li></ul><p>Follow the instructions below to set <b>one</b> board into 'bootloader' mode. Press <b>Refresh</b> when ready.</p></source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../MicroPython/UF2FlashDialog.py" line="557"/>
- <source><h4>No known devices detected.</h4><p>Follow the instructions below to set <b>one</b> board into 'bootloader' mode. Press <b>Refresh</b> when ready.</p></source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../MicroPython/UF2FlashDialog.py" line="569"/>
- <source>Flash Instructions:</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../MicroPython/UF2FlashDialog.py" line="594"/>
- <source>Boot Volume not found:</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../MicroPython/UF2FlashDialog.py" line="596"/>
- <source><h4>No Boot Volume detected.</h4><p>Please ensure that the boot volume of the device to be flashed is available. </source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../MicroPython/UF2FlashDialog.py" line="602"/>
- <source>This volume should be named <b>{0}</b>. Press <b>Refresh</b> when ready.</p></source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../MicroPython/UF2FlashDialog.py" line="607"/>
- <source>This volume should have one of these names.</p><ul><li>{0}</li></ul><p>Press <b>Refresh</b> when ready.</p></source>
- <translation type="unfinished"></translation>
- </message>
- <message>
<location filename="../MicroPython/UF2FlashDialog.py" line="624"/>
- <source>Multiple Boot Volumes found:</source>
+ <source>Reset Instructions:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../MicroPython/UF2FlashDialog.py" line="568"/>
+ <source><h4>No known devices detected.</h4><p>Follow the appropriate instructions below to set <b>one</b> board into 'bootloader' mode. Press <b>Refresh</b> when ready.</p></source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../MicroPython/UF2FlashDialog.py" line="591"/>
+ <source><h4>Flash {0} Firmware</h4><p>Follow the instructions below to set <b>one</b> board into 'bootloader' mode. Press <b>Refresh</b> when ready.</p><hr/>{1}</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../MicroPython/UF2FlashDialog.py" line="601"/>
+ <source><h4>Potentially UF2 capable devices found</h4><p>Found these potentially UF2 capable devices:</p><ul><li>{0}</li></ul><p>Follow the instructions below to set <b>one</b> board into 'bootloader' mode. Press <b>Refresh</b> when ready.</p></source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../MicroPython/UF2FlashDialog.py" line="626"/>
+ <source><h4>No known devices detected.</h4><p>Follow the instructions below to set <b>one</b> board into 'bootloader' mode. Press <b>Refresh</b> when ready.</p></source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../MicroPython/UF2FlashDialog.py" line="638"/>
+ <source>Flash Instructions:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../MicroPython/UF2FlashDialog.py" line="663"/>
+ <source>Boot Volume not found:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../MicroPython/UF2FlashDialog.py" line="665"/>
+ <source><h4>No Boot Volume detected.</h4><p>Please ensure that the boot volume of the device to be flashed is available. </source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../MicroPython/UF2FlashDialog.py" line="671"/>
+ <source>This volume should be named <b>{0}</b>. Press <b>Refresh</b> when ready.</p></source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../MicroPython/UF2FlashDialog.py" line="676"/>
+ <source>This volume should have one of these names.</p><ul><li>{0}</li></ul><p>Press <b>Refresh</b> when ready.</p></source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../MicroPython/UF2FlashDialog.py" line="693"/>
+ <source>Multiple Boot Volumes found:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../MicroPython/UF2FlashDialog.py" line="695"/>
<source><h4>Multiple Boot Volumes were found</h4><p>These volume paths were found.</p><ul><li>{0}</li></ul><p>Please ensure that only one device of a type is ready for flashing. Press <b>Refresh</b> when ready.</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../MicroPython/UF2FlashDialog.py" line="645"/>
+ <location filename="../MicroPython/UF2FlashDialog.py" line="714"/>
<source>Flashing {0}</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../MicroPython/UF2FlashDialog.py" line="571"/>
+ <location filename="../MicroPython/UF2FlashDialog.py" line="640"/>
<source><h4>Flash method 'manual' selected.</h4><p>Follow the instructions below to flash a device by entering the data manually.</p><ol><li>Change the device to 'bootloader' mode.</li><li>Wait until the device has entered 'bootloader' mode.</li><li>Ensure the boot volume is available (this may require mounting it) and select its path.</li><li>Select the firmware file to be flashed and click the flash button.</li></ol></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../MicroPython/UF2FlashDialog.py" line="647"/>
+ <location filename="../MicroPython/UF2FlashDialog.py" line="716"/>
<source><p>Flashing the {0} firmware to the device. Please wait until the device resets automatically.</p></source>
<translation type="unfinished"></translation>
</message>
@@ -78414,37 +78439,37 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../MicroPython/UnknownDevicesDialog.py" line="168"/>
+ <location filename="../MicroPython/UnknownDevicesDialog.py" line="171"/>
<source>Delete Unknown Devices</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../MicroPython/UnknownDevicesDialog.py" line="150"/>
+ <location filename="../MicroPython/UnknownDevicesDialog.py" line="153"/>
<source>The selected entries contain some with modified data. Shall they really be deleted?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../MicroPython/UnknownDevicesDialog.py" line="168"/>
+ <location filename="../MicroPython/UnknownDevicesDialog.py" line="171"/>
<source>The list contains some devices with modified data. Shall they really be deleted?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../MicroPython/UnknownDevicesDialog.py" line="184"/>
+ <location filename="../MicroPython/UnknownDevicesDialog.py" line="187"/>
<source>Restore Unknown Devices</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../MicroPython/UnknownDevicesDialog.py" line="184"/>
+ <location filename="../MicroPython/UnknownDevicesDialog.py" line="187"/>
<source>Restoring the list of unknown devices will overwrite all changes made. Do you really want to restore the list?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../MicroPython/UnknownDevicesDialog.py" line="247"/>
+ <location filename="../MicroPython/UnknownDevicesDialog.py" line="250"/>
<source>Unsaved Data</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../MicroPython/UnknownDevicesDialog.py" line="247"/>
+ <location filename="../MicroPython/UnknownDevicesDialog.py" line="250"/>
<source>The list of devices contains some with modified data.</source>
<translation type="unfinished"></translation>
</message>
@@ -81168,7 +81193,7 @@
<context>
<name>Utilities</name>
<message>
- <location filename="../Utilities/__init__.py" line="1450"/>
+ <location filename="../Utilities/__init__.py" line="1453"/>
<source><p>You may use %-codes as placeholders in the string. Supported codes are:<table><tr><td>%C</td><td>column of the cursor of the current editor</td></tr><tr><td>%D</td><td>directory of the current editor</td></tr><tr><td>%F</td><td>filename of the current editor</td></tr><tr><td>%H</td><td>home directory of the current user</td></tr><tr><td>%L</td><td>line of the cursor of the current editor</td></tr><tr><td>%P</td><td>path of the current project</td></tr><tr><td>%S</td><td>selected text of the current editor</td></tr><tr><td>%U</td><td>username of the current user</td></tr><tr><td>%%</td><td>the percent sign</td></tr></table></p></source>
<translation><p>Vous pouvez utiliser la syntaxe "%-code" dans la chaine de caractères. Les codes supportés sont :<table><tr><td>%C</td><td>colonne du curseur de l'éditeur courant</td></tr><tr><td>%D</td><td>répertoire de l'éditeur courant</td></tr><tr><td>%F</td><td>nom de fichier de l'éditeur courant</td></tr><tr><td>%H</td><td>répertoire 'home' de l'utilisateur courant</td></tr><tr><td>%L</td><td>ligne du curseur de l'éditeur courant</td></tr><tr><td>%P</td><td>chemin du projet courant</td></tr><tr><td>%S</td><td>texte sélectionné dans l'éditeur courant</td></tr><tr><td>%U</td><td>nom d'utilisateur de l'utilisateur courant</td></tr><tr><td>%%</td><td>le signe pourcent</td></tr></table></p></translation>
</message>
