--- a/i18n/eric5_fr.ts Sat Jun 02 17:41:24 2012 +0200 +++ b/i18n/eric5_fr.ts Sun Jun 03 12:51:15 2012 +0200 @@ -42110,47 +42110,47 @@ <context> <name>Subversion</name> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="314"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="315"/> <source>Importing project into Subversion repository</source> <translation>Importer le projet dans le référentiel Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="364"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="365"/> <source>Subversion Checkout</source> <translation>'Checkout' Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="426"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="427"/> <source>The tag must be a normal tag (tags) or a branch tag (branches). Please select from the list.</source> <translation>L'étiquette doit être une étiquette normale (tags) ou une étiquette de branche (branches). Prière de faire un choix dans la liste.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="385"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="386"/> <source>Checking project out of Subversion repository</source> <translation>'Checkout' du projet depuis le référentiel Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="426"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="427"/> <source>Subversion Export</source> <translation>'Export' Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="446"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="447"/> <source>Exporting project from Subversion repository</source> <translation>Exporter un projet du référentiel Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1126"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1127"/> <source>Subversion Error</source> <translation>Erreur Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="987"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="988"/> <source>The URL of the project repository could not be retrieved from the working copy. The tag operation will be aborted</source> <translation>Impossible d'atteindre l'URL du référentiel à partir de la copie locale. Abandon de l'opération d'étiquetage</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1011"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1012"/> <source>The URL of the project repository has an invalid format. The tag operation will be aborted</source> <translation>Le format de l'URL du référentiel n'est pas valide. Abandon de l'opération d'étiquetage</translation> </message> @@ -42160,12 +42160,12 @@ <translation type="obsolete">Etiquetage de %1 dans le référentiel Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1102"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1103"/> <source>The URL of the project repository could not be retrieved from the working copy. The switch operation will be aborted</source> <translation>Impossible d'atteindre l'URL du référentiel du projet depuis la copie locale. Abandon de l'opération</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1126"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1127"/> <source>The URL of the project repository has an invalid format. The switch operation will be aborted</source> <translation>Le format de l'URL du référentiel n'est pas valide. Abandon de l'opération</translation> </message> @@ -42185,7 +42185,7 @@ <translation type="obsolete">Nettoyage de %1</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1563"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1564"/> <source>Subversion command</source> <translation>Commande Subversion</translation> </message> @@ -42200,97 +42200,97 @@ <translation type="obsolete">Déplacement de %1</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1776"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1777"/> <source>Subversion Set Property</source> <translation>Propriété Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1809"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1810"/> <source>You have to supply a property name. Aborting.</source> <translation>Vous devez donner un nom à la propriété. Abandon.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1827"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1828"/> <source>Subversion Delete Property</source> <translation>Suppression d'une propriété Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1647"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1648"/> <source>Enter property name</source> <translation>Entrer le nom de la propriété</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="530"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="531"/> <source>Commiting changes to Subversion repository</source> <translation>'Commiter' les modifications dans le référentiel Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="586"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="587"/> <source>Synchronizing with the Subversion repository</source> <translation>Synchronisation avec le référentiel Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="687"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="688"/> <source>Adding files/directories to the Subversion repository</source> <translation>Ajouter des fichiers/répertoires au référentiel Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="786"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="787"/> <source>Adding directory trees to the Subversion repository</source> <translation>Ajouter des arborescences de répertoires dans le référentiel Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="821"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="822"/> <source>Removing files/directories from the Subversion repository</source> <translation>Supprimer des fichiers/répertoires du réferentiel Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1075"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1076"/> <source>Reverting changes</source> <translation>Revenir avant les modifications</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1670"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1671"/> <source>Resolving conficts</source> <translation>Résoudre les confits</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="222"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="223"/> <source>Create project in repository</source> <translation>Créer un projet dans le référentiel</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="222"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="223"/> <source>The project could not be created in the repository. Maybe the given repository doesn't exist or the repository server is down.</source> <translation>Impossible de créer le projet dans le référentiel. Peut-être que le référentiel indiqué n'existe pas ou que le serveur ne répond pas.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="244"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="245"/> <source>New project</source> <translation>Nouveau projet</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="244"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="245"/> <source>The project could not be checked out of the repository.<br />Restoring the original contents.</source> <translation>Le projet n'a pu être mis à jour à partir du référentiel.<br />Restauration du contenu initial.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="923"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="924"/> <source>Subversion Log</source> <translation>Log Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="923"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="924"/> <source>Select number of entries to show.</source> <translation>Sélectionner plusieurs entrées à afficher.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1993"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1994"/> <source>Locking in the Subversion repository</source> <translation>Verrouillage dans le référentiel Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2031"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2032"/> <source>Unlocking in the Subversion repository</source> <translation>Déverrouillage dans le référentiel Subversion</translation> </message> @@ -42307,27 +42307,27 @@ </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1792"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1793"/> <source>Property set.</source> <translation>Propriété définie.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1842"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1843"/> <source>Property deleted.</source> <translation>Propriété supprimée.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1973"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1974"/> <source>Subversion Lock</source> <translation>Verrou Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1973"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1974"/> <source>Enter lock comment</source> <translation>Entrer un commentaire pour le verrou</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2076"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2077"/> <source>Relocating</source> <translation>Déplacement</translation> </message> @@ -42493,37 +42493,37 @@ <translation type="obsolete">Le processus SVN s'est terminé avec le code de sortie %1</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="195"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="196"/> <source>The svn process did not finish within 30s.</source> <translation>Le processus SVN ne s'est pas terminé dans les 30 dernières secondes.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="197"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="198"/> <source>Could not start the svn executable.</source> <translation>Impossible de lancer l'executable SVN.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2102"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2103"/> <source>Repository Browser</source> <translation>Navigateur de référentiel</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2102"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2103"/> <source>Enter the repository URL.</source> <translation>Entrer l'URL du référentiel.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2126"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2127"/> <source>Remove from changelist</source> <translation>Supprimer de la liste des modifications</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2162"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2164"/> <source>Add to changelist</source> <translation>Ajouter à la liste des modifications:</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2152"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2153"/> <source>Enter name of the changelist:</source> <translation>Entrer le nom de la liste des modifications:</translation> </message> @@ -42543,53 +42543,53 @@ <translation></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="192"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="193"/> <source>The svn process finished with the exit code {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="883"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="884"/> <source>Moving {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1046"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1047"/> <source>Tagging {0} in the Subversion repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1148"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1149"/> <source>Switching to {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1250"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1251"/> <source>Merging {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1527"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1528"/> <source>Cleaning up {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1709"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1710"/> <source>Copying {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="330"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="331"/> <source>Imported revision {0}. </source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="555"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="556"/> <source>Committed revision {0}.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1155"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1156"/> <source>Revision {0}. </source> <translation type="unfinished"></translation> @@ -42800,6 +42800,96 @@ </message> </context> <context> + <name>SvnChangeListsDialog</name> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.ui" line="14"/> + <source>Subversion Change Lists</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.ui" line="23"/> + <source>Change Lists:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.ui" line="36"/> + <source><b>Change Lists</b> +<p>Select a change list here to see the associated files in the list below.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.ui" line="63"/> + <source><b>Files</b> +<p>This shows a list of files associated with the change list selected above.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.ui" line="80"/> + <source>Errors</source> + <translation type="unfinished">Erreurs</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.ui" line="99"/> + <source>Input</source> + <translation type="unfinished">Entrée</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.ui" line="121"/> + <source>Press to send the input to the subversion process</source> + <translation type="unfinished">Cliquer pour envoyer l'entrée saisie au processus Subversion</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.ui" line="124"/> + <source>&Send</source> + <translation type="unfinished">&Envoyer</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.ui" line="127"/> + <source>Alt+S</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.ui" line="134"/> + <source>Enter data to be sent to the subversion process</source> + <translation type="unfinished">Entrer les données à envoyer au processus Subversion</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.ui" line="141"/> + <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/vcsSubversion/SvnChangeListsDialog.ui" line="144"/> + <source>&Password Mode</source> + <translation type="unfinished">Mode Mot de &Passe</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.ui" line="147"/> + <source>Alt+P</source> + <translation type="unfinished">Alt+P</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.py" line="75"/> + <source>Files (relative to {0}):</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.py" line="138"/> + <source>No changelists found</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.py" line="109"/> + <source>Process Generation Error</source> + <translation type="unfinished">Erreur du processus</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.py" line="109"/> + <source>The process {0} could not be started. Ensure, that it is in the search path.</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>SvnCommandDialog</name> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommandDialog.py" line="70"/> @@ -42889,56 +42979,61 @@ <context> <name>SvnCommitDialog</name> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="25"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="26"/> <source>Enter the log message.</source> <translation>Entrer un message log.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="28"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="29"/> <source><b>Log Message</b> <p>Enter the log message for the commit action.</p></source> <translation><b> Message Log</b> <p>Entrer un message log pour la mise à jour 'commit'.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="13"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="14"/> <source>Subversion</source> <translation>Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="42"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="43"/> <source>Recent commit messages</source> <translation>Messages de commit récents</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="49"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="50"/> <source>Select a recent commit message to use</source> <translation>Sélectionner un message de commit</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="19"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="20"/> <source>Commit Message</source> <translation>Message de commit</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="59"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="60"/> <source>Changelists</source> <translation>Listes des modifications</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="72"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="73"/> <source>Select to keep the changelists</source> <translation>Sélectionner pour conserver les listes de modifications</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="75"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="76"/> <source>Keep changelists</source> <translation>Conserver les listes de modifications</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="65"/> <source>Enter the list of changelists separated by ';'</source> - <translation>Entrer la liste des listes de modifs séparées par ';'</translation> + <translation type="obsolete">Entrer la liste des listes de modifs séparées par ';'</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="66"/> + <source>Select the change lists to limit the commit</source> + <translation type="unfinished"></translation> </message> </context> <context> @@ -44619,122 +44714,122 @@ <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/vcsPySvn/ProjectHelper.py" line="206"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="221"/> <source>Tag in repository</source> <translation>Etiqueter au niveau du référentiel (tag)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="206"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="221"/> <source>&Tag in repository...</source> <translation>&Etiqueter dans le référentiel...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="210"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="225"/> <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/vcsPySvn/ProjectHelper.py" line="213"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="228"/> <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/vcsPySvn/ProjectHelper.py" line="220"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="235"/> <source>Export from repository</source> <translation>Exporter du référentiel</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="220"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="235"/> <source>&Export from repository...</source> <translation>&Exporter du référentiel...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="224"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="239"/> <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/vcsPySvn/ProjectHelper.py" line="227"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="242"/> <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/vcsPySvn/ProjectHelper.py" line="234"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="249"/> <source>Command options</source> <translation>Options de commande</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="234"/> - <source>Command &options...</source> - <translation>&Options de commande...</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="237"/> - <source>Show the VCS command options</source> - <translation>Affiche les options de commandes VCS</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="238"/> - <source><b>Command options...</b><p>This shows a dialog to edit the VCS command options.</p></source> - <translation><b>Options de commandes...</b><p>Affiche une boite de dialogue pour éditer les options de commandes VCS</p></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="245"/> - <source>Revert changes</source> - <translation>Revenir avant les modifications</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="245"/> - <source>Re&vert changes</source> - <translation>&Recharger le projet</translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="249"/> - <source>Revert all changes made to the local project</source> - <translation>Recharger le projet et écraser toutes les modifications locales</translation> + <source>Command &options...</source> + <translation>&Options de commande...</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="252"/> + <source>Show the VCS command options</source> + <translation>Affiche les options de commandes VCS</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="253"/> + <source><b>Command options...</b><p>This shows a dialog to edit the VCS command options.</p></source> + <translation><b>Options de commandes...</b><p>Affiche une boite de dialogue pour éditer les options de commandes VCS</p></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="260"/> + <source>Revert changes</source> + <translation>Revenir avant les modifications</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="260"/> + <source>Re&vert changes</source> + <translation>&Recharger le projet</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="264"/> + <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/vcsPySvn/ProjectHelper.py" line="267"/> <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/vcsPySvn/ProjectHelper.py" line="259"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="274"/> <source>Merge</source> <translation>Fusionner</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="259"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="274"/> <source>Mer&ge changes...</source> <translation>&Fusionner les modifications...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="263"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="278"/> <source>Merge changes of a tag/revision into the local project</source> <translation>Fusionner les modifications d'une révision avec le projet local</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="266"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="281"/> <source><b>Merge</b><p>This merges changes of a tag/revision into the local project.</p></source> <translation><b>Fusionner</b><p>Fusionner les modifications d'une révision avec le projet local</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="273"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="288"/> <source>Switch</source> <translation>Basculer de version</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="273"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="288"/> <source>S&witch...</source> <translation>&Basculer de version...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="277"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="292"/> <source>Switch the local copy to another tag/branch</source> <translation>Bascule de la copie locale vers une autre branche/étiquette</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="280"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="295"/> <source><b>Switch</b><p>This switches the local copy to another tag/branch.</p></source> <translation><b>Basculer de version</b><p>Bascule de la copie locale vers une autre branche/étiquette.</p></translation> </message> @@ -44759,162 +44854,162 @@ <translation type="obsolete"><b>Résolution des conflits</b><p>Résout tous les conflits VCS du projet local.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="300"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="315"/> <source>Cleanup</source> <translation>Nettoyer</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="300"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="315"/> <source>Cleanu&p</source> <translation>&Nettoyer</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="303"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="318"/> <source>Cleanup the local project</source> <translation>Nettoyer le projet local</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="306"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="321"/> <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/vcsPySvn/ProjectHelper.py" line="313"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="328"/> <source>Execute command</source> <translation>Exécuter une commande</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="313"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="328"/> <source>E&xecute command...</source> <translation>E&xécuter une commande...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="316"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="331"/> <source>Execute an arbitrary VCS command</source> <translation>Exécuter une commande VCS arbitraire</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="319"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="334"/> <source><b>Execute command</b><p>This opens a dialog to enter an arbitrary VCS command.</p></source> <translation><b>Exécuter une commande</b><p>Ouvre une boite de dialogue pour exécuter une commande VCS arbitraire.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="326"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="341"/> <source>List tags</source> <translation>Lister les étiquettes</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="326"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="341"/> <source>List tags...</source> <translation>Lister les étiquettes...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="329"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="344"/> <source>List tags of the project</source> <translation>Liste les étiquettes du projet</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="332"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="347"/> <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/vcsPySvn/ProjectHelper.py" line="339"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="354"/> <source>List branches</source> <translation>Lister les branches</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="339"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="354"/> <source>List branches...</source> <translation>Lister les branches...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="342"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="357"/> <source>List branches of the project</source> <translation>Liste les branches du projet</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="345"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="360"/> <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/vcsPySvn/ProjectHelper.py" line="352"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="367"/> <source>List repository contents</source> <translation>Listing du référentiel</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="352"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="367"/> <source>List repository contents...</source> <translation>Listing du référentiel...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="355"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="370"/> <source>Lists the contents of the repository</source> <translation>Liste le contenu du référentiel</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="358"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="373"/> <source><b>List repository contents</b><p>This lists the contents of the repository.</p></source> <translation><b>Listing du référentiel</b><p>Cette liste affiche le contenu du référentiel.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="365"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="380"/> <source>Set Property</source> <translation>Définir une propriété</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="365"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="380"/> <source>Set Property...</source> <translation>Définir une propriété...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="368"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="383"/> <source>Set a property for the project files</source> <translation>Définit une propriété pour les fichiers projets</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="371"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="386"/> <source><b>Set Property</b><p>This sets a property for the project files.</p></source> <translation><b>Propriétés</b><p>Définition des propritétés du projet</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="378"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="393"/> <source>List Properties</source> <translation>Lister les propriétés</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="378"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="393"/> <source>List Properties...</source> <translation>Lister les propriétés...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="381"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="396"/> <source>List properties of the project files</source> <translation>Liste des propriétés des fichiers projets</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="384"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="399"/> <source><b>List Properties</b><p>This lists the properties of the project files.</p></source> <translation><b>Liste des proprtiétés</b><p>Liste des propriétés des fichiers projets.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="391"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="406"/> <source>Delete Property</source> <translation>Supprimer une propriété</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="391"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="406"/> <source>Delete Property...</source> <translation>Supprimer une propriété...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="394"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="409"/> <source>Delete a property for the project files</source> <translation>Suppression d'une propriété pour les fichiers projets</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="397"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="412"/> <source><b>Delete Property</b><p>This deletes a property for the project files.</p></source> <translation><b>Supprimer une propriété</b><p>Supprime une propriété des fichiers projets.</p></translation> </message> @@ -44934,37 +45029,37 @@ <translation type="obsolete"><b>Afficher un log limité</b><p>Affiche le log du projet limité aux entrées sélectionnées</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="191"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="206"/> <source>Show repository info</source> <translation>Affiche les infos du référentiel</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="195"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="210"/> <source>Show some repository related information for the local project</source> <translation>Affiche les informations du référentiel en rapport avec le projet local</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="404"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="419"/> <source>Relocate</source> <translation>Déplacer</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="404"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="419"/> <source>Relocate...</source> <translation>Déplacer...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="408"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="423"/> <source>Relocate the working copy to a new repository URL</source> <translation>Recopie une copie de travail vers une nouvelle URL de référentiel</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="411"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="426"/> <source><b>Relocate</b><p>This relocates the working copy to a new repository URL.</p></source> <translation><b>Relocaliser</b><p>Redéfinit une URL de référentiel pour la copie courante.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="198"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="213"/> <source><b>Show repository info</b><p>This shows some repository related information for the local project.</p></source> <translation><b>Afficher les infos du référentiel</b><p>Affiche les informations du référentiel en rapport avec le projet local.</p></translation> </message> @@ -44999,65 +45094,80 @@ <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/vcsPySvn/ProjectHelper.py" line="418"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="433"/> <source>Repository Browser</source> <translation>Navigateur de référentiel</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="418"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="433"/> <source>Repository Browser...</source> <translation>Navigateur de référentiel...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="422"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="437"/> <source>Show the Repository Browser dialog</source> <translation>Affiche la fenêtre de navigation du référentiel</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="425"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="440"/> <source><b>Repository Browser</b><p>This shows the Repository Browser dialog.</p></source> <translation><b>Navigateur de référentiel</b><p>Affiche la fenêtre de navigation du référentiel.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="432"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="447"/> <source>Configure</source> <translation>Configuration</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="432"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="447"/> <source>Configure...</source> <translation>Configuration...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="435"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="450"/> <source>Show the configuration dialog with the Subversion page selected</source> <translation>Afficher la page de configuration avec la page Subversion sélectionnée</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="438"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="453"/> <source><b>Configure</b><p>Show the configuration dialog with the Subversion page selected.</p></source> <translation><b>Configuration</b><p>Affiche la page de configuration avec la page Subversion sélectionnée.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="287"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="302"/> <source>Conflicts resolved</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="287"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="302"/> <source>Con&flicts resolved</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="290"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="305"/> <source>Mark all conflicts of the local project as resolved</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="293"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="308"/> <source><b>Conflicts resolved</b><p>This marks all conflicts of the local project as resolved.</p></source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="191"/> + <source>Show change lists</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="195"/> + <source>Show the change lists and associated files of the local project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="198"/> + <source><b>Show change lists</b><p>This shows the change lists and associated files of the local project.</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>SvnPropDelDialog</name> @@ -45566,22 +45676,22 @@ <translation>Commit des changements dans le référentiel...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="583"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="584"/> <source>Commit</source> <translation>Commit</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="681"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="682"/> <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="700"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="701"/> <source>Lock</source> <translation>Verrouillage</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="716"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="717"/> <source>Unlock</source> <translation>Déverrouillage</translation> </message> @@ -45626,22 +45736,22 @@ <translation>remplacé</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="700"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="701"/> <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="750"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="751"/> <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="733"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="734"/> <source>Break Lock</source> <translation>Casser le verrouillage d'un autre utilisateur</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="750"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="751"/> <source>Steal Lock</source> <translation>Voler le verrou</translation> </message> @@ -45783,17 +45893,17 @@ <translation>Revenir avant les modifications</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="622"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="623"/> <source>Add</source> <translation>Ajouter</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="622"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="623"/> <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="664"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="665"/> <source>Revert</source> <translation>Recouvrir</translation> </message> @@ -45813,17 +45923,17 @@ <translation>Ajouter à la liste des modifications</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="784"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="785"/> <source>Remove from Changelist</source> <translation>Supprimer de la liste des modifications</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="766"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="767"/> <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="784"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="785"/> <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> @@ -45903,7 +46013,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="502"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="503"/> <source>all</source> <translation type="unfinished"></translation> </message> @@ -45913,17 +46023,17 @@ <translation type="obsolete">Différence</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="681"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="682"/> <source>Differences</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="583"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="584"/> <source>There are no entries selected to be committed.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="664"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="665"/> <source>There are no missing entries available/selected.</source> <translation type="unfinished"></translation> </message> @@ -58856,7 +58966,7 @@ en cours</b></td><td>%3</td></tr><tr><td><b>Version "commitée"</b></td><td>%4</td></tr><tr><td><b>Date du commit</b></td><td>%5</td></tr><tr><td><b>Heure du commit</b></td><td>%6</td></tr><tr><td><b>Dernier auteur</b></td><td>%7</td></tr></table></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1604"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1605"/> <source>unknown</source> <translation>inconnu</translation> </message> @@ -58866,12 +58976,12 @@ <translation type="obsolete"><h3>Informations sur le référentiel</h3><table><tr><td><b>PySvn V.</b></td><td>%1</td></tr><tr><td><b>Subversion V.</b></td><td>%2</td></tr><tr><td><b>API Subversion V.</b></td><td>%3</td></tr><tr><td><b>URL</b></td><td>%4</td></tr><tr><td><b>Révision actuelle</b></td><td>%5</td></tr><tr><td><b>Révision validée</b></td><td>%6</td></tr><tr><td><b>Date de validation</b></td><td>%7</td></tr><tr><td><b>Heure de validation</b></td><td>%8</td></tr><tr><td><b>Dernier auteur</b></td><td>%9</td></tr></table></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1473"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1474"/> <source><h3>Repository information</h3><table><tr><td><b>Subversion V.</b></td><td>{0}</td></tr><tr><td><b>URL</b></td><td>{1}</td></tr><tr><td><b>Current revision</b></td><td>{2}</td></tr><tr><td><b>Committed revision</b></td><td>{3}</td></tr><tr><td><b>Committed date</b></td><td>{4}</td></tr><tr><td><b>Comitted time</b></td><td>{5}</td></tr><tr><td><b>Last author</b></td><td>{6}</td></tr></table></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1605"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1606"/> <source><h3>Repository information</h3><table><tr><td><b>PySvn V.</b></td><td>{0}</td></tr><tr><td><b>Subversion V.</b></td><td>{1}</td></tr><tr><td><b>Subversion API V.</b></td><td>{2}</td></tr><tr><td><b>URL</b></td><td>{3}</td></tr><tr><td><b>Current revision</b></td><td>{4}</td></tr><tr><td><b>Committed revision</b></td><td>{5}</td></tr><tr><td><b>Committed date</b></td><td>{6}</td></tr><tr><td><b>Comitted time</b></td><td>{7}</td></tr><tr><td><b>Last author</b></td><td>{8}</td></tr></table></source> <translation type="unfinished"></translation> </message>