--- a/i18n/eric5_fr.ts Sat Feb 26 14:28:21 2011 +0100 +++ b/i18n/eric5_fr.ts Sat Feb 26 18:14:12 2011 +0100 @@ -7467,87 +7467,87 @@ <translation>Désactiver le point d'arrêt</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4310"/> + <location filename="QScintilla/Editor.py" line="4316"/> <source>Code Coverage</source> <translation>Code Coverage</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4310"/> + <location filename="QScintilla/Editor.py" line="4316"/> <source>Please select a coverage file</source> <translation>Sélectionner un fichier coverage</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4448"/> + <location filename="QScintilla/Editor.py" line="4454"/> <source>Profile Data</source> <translation>Profiler de données</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4448"/> + <location filename="QScintilla/Editor.py" line="4454"/> <source>Please select a profile file</source> <translation>Sélectionner un fichier profile</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4790"/> + <location filename="QScintilla/Editor.py" line="4809"/> <source>Macro Name</source> <translation>Nom de la macro</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4790"/> + <location filename="QScintilla/Editor.py" line="4809"/> <source>Select a macro name:</source> <translation>Sélectionner un nom de macro:</translation> </message> <message> + <location filename="QScintilla/Editor.py" line="4877"/> + <source>Macro files (*.macro)</source> + <translation>Fichier Macro (*.macro)</translation> + </message> + <message> + <location filename="QScintilla/Editor.py" line="4837"/> + <source>Load macro file</source> + <translation>Charger un fichier macro</translation> + </message> + <message> <location filename="QScintilla/Editor.py" line="4858"/> - <source>Macro files (*.macro)</source> - <translation>Fichier Macro (*.macro)</translation> - </message> - <message> - <location filename="QScintilla/Editor.py" line="4818"/> - <source>Load macro file</source> - <translation>Charger un fichier macro</translation> - </message> - <message> - <location filename="QScintilla/Editor.py" line="4839"/> <source>Error loading macro</source> <translation>Erreur lors du chargement de la macro</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4858"/> + <location filename="QScintilla/Editor.py" line="4877"/> <source>Save macro file</source> <translation>Enregistrer le fichier macro</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4875"/> + <location filename="QScintilla/Editor.py" line="4894"/> <source>Save macro</source> <translation>Enregistrer la macro</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4890"/> + <location filename="QScintilla/Editor.py" line="4909"/> <source>Error saving macro</source> <translation>Erreur lors de l'enregistrement de la macro</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4901"/> + <location filename="QScintilla/Editor.py" line="4920"/> <source>Start Macro Recording</source> <translation>Démarrer l'enregistrement de la macro</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4926"/> + <location filename="QScintilla/Editor.py" line="4945"/> <source>Macro Recording</source> <translation>Enregistrement de macro</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4926"/> + <location filename="QScintilla/Editor.py" line="4945"/> <source>Enter name of the macro:</source> <translation>Entrer le nom de la macro:</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5044"/> + <location filename="QScintilla/Editor.py" line="5063"/> <source><br><b>Warning:</b> You will loose your changes upon reopening it.</source> <translation><br><b>Warning:</b> Toutes les modifications seront écrasées en réouvrant le fichier.</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5048"/> + <location filename="QScintilla/Editor.py" line="5067"/> <source>File changed</source> <translation>Fichier modifié</translation> </message> @@ -7587,7 +7587,7 @@ <translation type="obsolete">Prière de sélectionner un rapport Cyclops à supprimer</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5244"/> + <location filename="QScintilla/Editor.py" line="5263"/> <source>Drop Error</source> <translation>Erreur de suppression</translation> </message> @@ -7597,12 +7597,12 @@ <translation>Afficher le message d'erreur de syntaxe</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4566"/> + <location filename="QScintilla/Editor.py" line="4584"/> <source>Syntax Error</source> <translation>Erreur de syntaxe</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4566"/> + <location filename="QScintilla/Editor.py" line="4584"/> <source>No syntax error message available.</source> <translation>Aucun message d'erreur de syntaxe..</translation> </message> @@ -7632,17 +7632,17 @@ <translation>Ligne non executée précédente</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4356"/> + <location filename="QScintilla/Editor.py" line="4362"/> <source>Show Code Coverage Annotations</source> <translation>Afficher les annotations de Code Coverage</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4352"/> + <location filename="QScintilla/Editor.py" line="4358"/> <source>All lines have been covered.</source> <translation>Toutes les lignes ont été executées.</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4356"/> + <location filename="QScintilla/Editor.py" line="4362"/> <source>There is no coverage file available.</source> <translation>Impossible de trouver le fichier de coverage.</translation> </message> @@ -7742,42 +7742,42 @@ <translation type="obsolete">%1 (ro)</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5262"/> + <location filename="QScintilla/Editor.py" line="5281"/> <source>Resources</source> <translation>Ressources</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5264"/> + <location filename="QScintilla/Editor.py" line="5283"/> <source>Add file...</source> <translation>Ajouter un fichier...</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5266"/> + <location filename="QScintilla/Editor.py" line="5285"/> <source>Add files...</source> <translation>Ajouter des fichiers...</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5268"/> + <location filename="QScintilla/Editor.py" line="5287"/> <source>Add aliased file...</source> <translation>Ajouter un fichier alias...</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5270"/> + <location filename="QScintilla/Editor.py" line="5289"/> <source>Add localized resource...</source> <translation>Ajouter une ressource localisée...</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5291"/> + <location filename="QScintilla/Editor.py" line="5310"/> <source>Add file resource</source> <translation>Ajoute un fichier ressource</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5307"/> + <location filename="QScintilla/Editor.py" line="5326"/> <source>Add file resources</source> <translation>Ajoute des fichiers ressources</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5334"/> + <location filename="QScintilla/Editor.py" line="5353"/> <source>Add aliased file resource</source> <translation>Ajoute un alias de fichier ressource</translation> </message> @@ -7787,32 +7787,32 @@ <translation type="obsolete">Alias pour le fichier <b>%1</b>:</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5395"/> + <location filename="QScintilla/Editor.py" line="5414"/> <source>Package Diagram</source> <translation>Diagramme de package</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5395"/> + <location filename="QScintilla/Editor.py" line="5414"/> <source>Include class attributes?</source> <translation>Inclure les attributs de classes ?</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5424"/> + <location filename="QScintilla/Editor.py" line="5443"/> <source>Application Diagram</source> <translation>Diagramme de l'application</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5424"/> + <location filename="QScintilla/Editor.py" line="5443"/> <source>Include module names?</source> <translation>Inclure les noms de modules ?</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5273"/> + <location filename="QScintilla/Editor.py" line="5292"/> <source>Add resource frame</source> <translation>Ajouter un cadre ressource</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4901"/> + <location filename="QScintilla/Editor.py" line="4920"/> <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> @@ -7867,12 +7867,12 @@ <translation>Aucun format d'exportation indiqué. Abandon...</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5412"/> + <location filename="QScintilla/Editor.py" line="5431"/> <source>Imports Diagram</source> <translation>Diagramme des modules</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5412"/> + <location filename="QScintilla/Editor.py" line="5431"/> <source>Include imports from external modules?</source> <translation>Inclure l'importation de modules externes?</translation> </message> @@ -7952,7 +7952,7 @@ <translation>Sélectionne l'analyseur Pygments à appliquer.</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5656"/> + <location filename="QScintilla/Editor.py" line="5675"/> <source>Check spelling...</source> <translation>Correction orthographique...</translation> </message> @@ -7962,12 +7962,12 @@ <translation>Correction orthographique de la sélection...</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5658"/> + <location filename="QScintilla/Editor.py" line="5677"/> <source>Add to dictionary</source> <translation>Ajouter au dictionnaire</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5660"/> + <location filename="QScintilla/Editor.py" line="5679"/> <source>Ignore All</source> <translation>Tout ignorer</translation> </message> @@ -8007,37 +8007,37 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4832"/> + <location filename="QScintilla/Editor.py" line="4851"/> <source><p>The macro file <b>{0}</b> could not be read.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4839"/> + <location filename="QScintilla/Editor.py" line="4858"/> <source><p>The macro file <b>{0}</b> is corrupt.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4890"/> + <location filename="QScintilla/Editor.py" line="4909"/> <source><p>The macro file <b>{0}</b> could not be written.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5039"/> + <location filename="QScintilla/Editor.py" line="5058"/> <source><p>The file <b>{0}</b> has been changed while it was opened in eric5. Reread it?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5127"/> + <location filename="QScintilla/Editor.py" line="5146"/> <source>{0} (ro)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5244"/> + <location filename="QScintilla/Editor.py" line="5263"/> <source><p><b>{0}</b> is not a file.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5334"/> + <location filename="QScintilla/Editor.py" line="5353"/> <source>Alias for file <b>{0}</b>:</source> <translation type="unfinished"></translation> </message> @@ -8062,12 +8062,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4692"/> + <location filename="QScintilla/Editor.py" line="4710"/> <source>py3flakes Warning</source> <translation type="unfinished"></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4692"/> + <location filename="QScintilla/Editor.py" line="4710"/> <source>No py3flakes warning message available.</source> <translation type="unfinished"></translation> </message> @@ -8077,17 +8077,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4875"/> + <location filename="QScintilla/Editor.py" line="4894"/> <source><p>The macro file <b>{0}</b> already exists. Overwrite it?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4735"/> + <location filename="QScintilla/Editor.py" line="4753"/> <source>Warning: {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4741"/> + <location filename="QScintilla/Editor.py" line="4759"/> <source>Error: {0}</source> <translation type="unfinished"></translation> </message> @@ -18816,7 +18816,7 @@ <context> <name>HgStatusDialog</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="182"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="211"/> <source>Mercurial Status</source> <translation type="unfinished"></translation> </message> @@ -18827,175 +18827,275 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="46"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="85"/> <source>Status</source> <translation type="unfinished">Etat (status)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="51"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="90"/> <source>Path</source> <translation type="unfinished">Chemin</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="65"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="188"/> <source>Errors</source> <translation type="unfinished">Erreurs</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="87"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="210"/> <source>Input</source> <translation type="unfinished">Entrée</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="109"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="232"/> <source>Press to send the input to the hg process</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="112"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="235"/> <source>&Send</source> <translation type="unfinished">&Envoyer</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="115"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="238"/> <source>Alt+S</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="122"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="245"/> <source>Enter data to be sent to the hg process</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="129"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="252"/> <source>Select to switch the input field to password mode</source> <translation type="unfinished">Cocher pour basculer le champ d'entrée en mode Mot de Passe</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="132"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="255"/> <source>&Password Mode</source> <translation type="unfinished">Mode Mot de &Passe</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="135"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="258"/> <source>Alt+P</source> <translation type="unfinished">Alt+P</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="42"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="45"/> <source>Refresh</source> <translation type="unfinished">Rafraichir</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="43"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="46"/> <source>Press to refresh the status display</source> <translation type="unfinished">Cliquer pour rafraichir l'affichage</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="57"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="61"/> <source>Commit changes to repository...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="60"/> - <source>Add to repository</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="64"/> + <source>Add to repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="70"/> <source>Revert changes</source> <translation type="unfinished">Revenir avant les modifications</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="67"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="75"/> <source>Adjust column sizes</source> <translation type="unfinished">Ajuster la largeur des colonnes</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="90"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="98"/> <source>added</source> <translation type="unfinished">ajouté</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="93"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="101"/> <source>modified</source> <translation type="unfinished">modifié</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="94"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="102"/> <source>removed</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="95"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="103"/> <source>not tracked</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="91"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="99"/> <source>normal</source> <translation type="unfinished">normal</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="92"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="100"/> <source>ignored</source> <translation type="unfinished">ignoré</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="96"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="104"/> <source>missing</source> <translation type="unfinished">manquant</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="189"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="218"/> <source>Process Generation Error</source> <translation type="unfinished">Erreur du processus</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="189"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="218"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="371"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="501"/> <source>Commit</source> <translation type="unfinished">Commit</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="432"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="603"/> <source>There are no uncommitted changes available/selected.</source> <translation type="unfinished">Il n'y a pas de modification non commitée disponible/sélectionnée.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="397"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="528"/> <source>Add</source> <translation type="unfinished">Ajouter</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="397"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="528"/> <source>There are no unversioned entries available/selected.</source> <translation type="unfinished">Aucune entrée "non-versionnée" disponible/sélectionnée.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="432"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="586"/> <source>Revert</source> <translation type="unfinished">Recouvrir</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="62"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="68"/> <source>Remove from repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="417"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="549"/> <source>Remove</source> <translation type="unfinished">Supprimer</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="417"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="586"/> <source>There are no missing entries available/selected.</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="39"/> + <source>&Filter on Status:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="49"/> + <source>Select the status of entries to be shown</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="100"/> + <source>Commit the selected changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="103"/> + <source>&Commit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="117"/> + <source>Add the selected entries to the repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="120"/> + <source>&Add</source> + <translation type="unfinished">&Ajouter</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="127"/> + <source>Show differences of the selected entries to the repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="130"/> + <source>&Differences</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="137"/> + <source>Revert the selected entries to the last revision in the repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="140"/> + <source>Re&vert</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="147"/> + <source>Forget about the selected missing entries</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="150"/> + <source>For&get</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="157"/> + <source>Restore the selected missing entries from the repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="160"/> + <source>&Restore</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="66"/> + <source>Show differences</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="72"/> + <source>Restore missing</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="413"/> + <source>all</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="603"/> + <source>Difference</source> + <translation type="obsolete">Différence</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="603"/> + <source>Differences</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="501"/> + <source>There are no entries selected to be committed.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgStatusMonitorThread</name> @@ -37945,304 +38045,304 @@ <context> <name>SvnStatusDialog</name> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="145"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="157"/> <source>normal</source> <translation>normal</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="133"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="145"/> <source>added</source> <translation>ajouté</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="134"/> - <source>deleted</source> - <translation>effacé</translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="146"/> + <source>deleted</source> + <translation>effacé</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="158"/> <source>modified</source> <translation>modifié</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="147"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="159"/> <source>conflict</source> <translation>conflit</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="140"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="152"/> <source>unversioned</source> <translation>sans version</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="141"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="153"/> <source>missing</source> <translation>manquant</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="142"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="154"/> <source>type error</source> <translation>erreur de type</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="143"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="155"/> <source>no</source> <translation>non</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="144"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="156"/> <source>yes</source> <translation>oui</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="138"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="150"/> <source>external</source> <translation>exterieur</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="139"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="151"/> <source>ignored</source> <translation>ignoré</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="233"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="270"/> <source>Subversion Status</source> <translation>Status Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="74"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="78"/> <source>Commit changes to repository...</source> <translation>Commit des changements dans le référentiel...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="444"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="576"/> <source>Commit</source> <translation>Commit</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="492"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="662"/> <source>There are no uncommitted changes available/selected.</source> <translation>Il n'y a pas de modification non commitée disponible/sélectionnée.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="513"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="681"/> <source>Lock</source> <translation>Verrouillage</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="529"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="697"/> <source>Unlock</source> <translation>Déverrouillage</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="94"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="102"/> <source>Break lock</source> <translation>Casser le verrouillage d'un autre utilisateur</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="97"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="105"/> <source>Steal lock</source> <translation>Reverrouiller à son nom</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="137"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="149"/> <source>locked</source> <translation>verrouillé</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="138"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="150"/> <source>other lock</source> <translation>autre verrou</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="139"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="151"/> <source>stolen lock</source> <translation>verrou volé</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="140"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="152"/> <source>broken lock</source> <translation>verrou cassé</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="136"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="148"/> <source>not locked</source> <translation>non verrouilé</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="136"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="148"/> <source>replaced</source> <translation>remplacé</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="513"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="681"/> <source>There are no unlocked files available/selected.</source> <translation>Il n'y a aucun fichier déverrouilé disponible/sélectionné.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="563"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="731"/> <source>There are no locked files available/selected.</source> <translation>Il n'y a aucun fichier verrouilé disponible/sélectionné.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="546"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="714"/> <source>Break Lock</source> <translation>Casser le verrouillage d'un autre utilisateur</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="563"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="731"/> <source>Steal Lock</source> <translation>Voler le verrou</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="16"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="17"/> <source><b>Subversion Status</b> <p>This dialog shows the status of the selected file or project.</p></source> <translation><b>Etat Subversion</b> <p>Cette fenêtre affiche l'état du fichier ou du projet sélectionné.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="53"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="93"/> <source>Status</source> <translation>Etat (status)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="58"/> - <source>Prop. Status</source> - <translation>Etat des Prop.</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="63"/> - <source>Locked</source> - <translation>Verrouillé</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="68"/> - <source>History</source> - <translation>Historique</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="73"/> - <source>Switched</source> - <translation>Basculé</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="78"/> - <source>Lock Info</source> - <translation>Info verrouillage</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="83"/> - <source>Up to date</source> - <translation>A jour</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="88"/> - <source>Revision</source> - <translation>Révision</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="93"/> - <source>Last Change</source> - <translation>Dernière modification</translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="98"/> - <source>Author</source> - <translation>Auteur</translation> + <source>Prop. Status</source> + <translation>Etat des Prop.</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="103"/> + <source>Locked</source> + <translation>Verrouillé</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="108"/> + <source>History</source> + <translation>Historique</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="113"/> + <source>Switched</source> + <translation>Basculé</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="118"/> + <source>Lock Info</source> + <translation>Info verrouillage</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="123"/> + <source>Up to date</source> + <translation>A jour</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="128"/> + <source>Revision</source> + <translation>Révision</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="133"/> + <source>Last Change</source> + <translation>Dernière modification</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="138"/> + <source>Author</source> + <translation>Auteur</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="143"/> <source>Path</source> <translation>Chemin</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="117"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="231"/> <source>Errors</source> <translation>Erreurs</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.ui" line="136"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.ui" line="250"/> <source>Input</source> <translation>Entrée</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.ui" line="158"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.ui" line="272"/> <source>Press to send the input to the subversion process</source> <translation>Cliquer pour envoyer l'entrée saisie au processus Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.ui" line="161"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.ui" line="275"/> <source>&Send</source> <translation>&Envoyer</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.ui" line="164"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.ui" line="278"/> <source>Alt+S</source> <translation>Alt+E</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.ui" line="171"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.ui" line="285"/> <source>Enter data to be sent to the subversion process</source> <translation>Entrer les données à envoyer au processus Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.ui" line="178"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.ui" line="292"/> <source>Select to switch the input field to password mode</source> <translation>Cocher pour basculer le champ d'entrée en mode Mot de Passe</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.ui" line="181"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.ui" line="295"/> <source>&Password Mode</source> <translation>Mode Mot de &Passe</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.ui" line="184"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.ui" line="298"/> <source>Alt+P</source> <translation>Alt+P</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="57"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="60"/> <source>Press to refresh the status display</source> <translation>Cliquer pour rafraichir l'affichage</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="101"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="109"/> <source>Adjust column sizes</source> <translation>Ajuster la largeur des colonnes</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="334"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="366"/> <source>Process Generation Error</source> <translation>Erreur du processus</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="55"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="58"/> <source>Refresh</source> <translation>Rafraichir</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="77"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="81"/> <source>Add to repository</source> <translation>Ajouter au référentiel</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="79"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="85"/> <source>Revert changes</source> <translation>Revenir avant les modifications</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="471"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="603"/> <source>Add</source> <translation>Ajouter</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="471"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="603"/> <source>There are no unversioned entries available/selected.</source> <translation>Aucune entrée "non-versionnée" disponible/sélectionnée.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="492"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="645"/> <source>Revert</source> <translation>Recouvrir</translation> </message> @@ -38252,33 +38352,128 @@ <translation type="obsolete">Impossible de lancer le processus %1. Assurez-vous qu'il est bien dans le chemin de recherche.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="48"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="88"/> <source>Changelist</source> <translation>Liste des modifications</translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="91"/> + <source>Add to Changelist</source> + <translation>Ajouter à la liste des modifications</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="765"/> + <source>Remove from Changelist</source> + <translation>Supprimer de la liste des modifications</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="747"/> + <source>There are no files available/selected not belonging to a changelist.</source> + <translation>Il n'y a pas de fichiers disponibles ou sélectionnés n'appartenant pas à une liste.</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="765"/> + <source>There are no files available/selected belonging to a changelist.</source> + <translation>Il n'y a pas de fichiers disponibles ou sélectionnés appartenant à une liste.</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="366"/> + <source>The process {0} could not be started. Ensure, that it is in the search path.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="39"/> + <source>&Filter on Status:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="49"/> + <source>Select the status of entries to be shown</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="153"/> + <source>Commit the selected changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="156"/> + <source>&Commit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="170"/> + <source>Add the selected entries to the repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="173"/> + <source>&Add</source> + <translation type="unfinished">&Ajouter</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="180"/> + <source>Show differences of the selected entries to the repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="183"/> + <source>&Differences</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="190"/> + <source>Revert the selected entries to the last revision in the repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="193"/> + <source>Re&vert</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="200"/> + <source>Restore the selected missing entries from the repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="203"/> + <source>&Restore</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="83"/> - <source>Add to Changelist</source> - <translation>Ajouter à la liste des modifications</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="597"/> - <source>Remove from Changelist</source> - <translation>Supprimer de la liste des modifications</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="579"/> - <source>There are no files available/selected not belonging to a changelist.</source> - <translation>Il n'y a pas de fichiers disponibles ou sélectionnés n'appartenant pas à une liste.</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="597"/> - <source>There are no files available/selected belonging to a changelist.</source> - <translation>Il n'y a pas de fichiers disponibles ou sélectionnés appartenant à une liste.</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="334"/> - <source>The process {0} could not be started. Ensure, that it is in the search path.</source> + <source>Show differences</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="87"/> + <source>Restore missing</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="495"/> + <source>all</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="662"/> + <source>Difference</source> + <translation type="obsolete">Différence</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="662"/> + <source>Differences</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="576"/> + <source>There are no entries selected to be committed.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="645"/> + <source>There are no missing entries available/selected.</source> <translation type="unfinished"></translation> </message> </context> @@ -39285,7 +39480,7 @@ <translation type="obsolete">Cliquer pour afficher tous les fichiers contenant des erreurs de syntaxe</translation> </message> <message> - <location filename="Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckerDialog.py" line="44"/> + <location filename="Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckerDialog.py" line="45"/> <source>Show</source> <translation>Afficher</translation> </message> @@ -39300,12 +39495,12 @@ <translation type="unfinished">Message</translation> </message> <message> - <location filename="Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckerDialog.py" line="46"/> + <location filename="Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckerDialog.py" line="47"/> <source>Press to show all files containing an issue</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckerDialog.py" line="269"/> + <location filename="Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckerDialog.py" line="272"/> <source>No issues found.</source> <translation type="unfinished"></translation> </message> @@ -39335,7 +39530,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckerDialog.py" line="188"/> + <location filename="Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckerDialog.py" line="191"/> <source>Error: {0}</source> <translation type="unfinished"></translation> </message> @@ -45083,12 +45278,12 @@ <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> <message> - <location filename="Utilities/__init__.py" line="1132"/> + <location filename="Utilities/__init__.py" line="1138"/> <source>Python2 interpreter not configured.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Utilities/__init__.py" line="1177"/> + <location filename="Utilities/__init__.py" line="1184"/> <source>Python2 interpreter did not finish within 30s.</source> <translation type="unfinished"></translation> </message>