--- a/i18n/eric5_fr.ts Fri Sep 09 12:29:45 2011 +0200
+++ b/i18n/eric5_fr.ts Fri Sep 09 19:15:06 2011 +0200
@@ -4094,7 +4094,7 @@
<context>
<name>DebugUI</name>
<message>
- <location filename="Debugger/DebugUI.py" line="1574"/>
+ <location filename="Debugger/DebugUI.py" line="1586"/>
<source>Run Script</source>
<translation>Lancer le script</translation>
</message>
@@ -4114,7 +4114,7 @@
<translation><b>Lancer le script</b><p>Entrer les arguments de la ligne de commande et lancer le script sans le débogueur. Si le script a des modifications, elles doivent d'abord être enregistrées.</p></translation>
</message>
<message>
- <location filename="Debugger/DebugUI.py" line="1587"/>
+ <location filename="Debugger/DebugUI.py" line="1599"/>
<source>Run Project</source>
<translation>Lancer le projet</translation>
</message>
@@ -4254,7 +4254,7 @@
<translation type="obsolete"><b>Lancement du projet avec Cyclops</b><p>Entrer les arguments de la ligne de commande et lancer le projet avec Cyclops. Si des fichiers ont été modifiés, ils doivent d'abord être sauvés.</p></translation>
</message>
<message>
- <location filename="Debugger/DebugUI.py" line="1684"/>
+ <location filename="Debugger/DebugUI.py" line="1696"/>
<source>Debug Script</source>
<translation>Déboguer le script</translation>
</message>
@@ -4274,7 +4274,7 @@
<translation><b>Deboguer le script</b><p>Entrer les arguments de la ligne de commande et donner la ligne qui correspond à la première instruction Python. Si le fichier a été modifié, il doit d'abord être sauvé.</p></translation>
</message>
<message>
- <location filename="Debugger/DebugUI.py" line="1697"/>
+ <location filename="Debugger/DebugUI.py" line="1709"/>
<source>Debug Project</source>
<translation>Déboguer le projet</translation>
</message>
@@ -4409,7 +4409,7 @@
<translation><b>Arrêt</b><p>Arrête le débogage courant.</p></translation>
</message>
<message>
- <location filename="Debugger/DebugUI.py" line="1946"/>
+ <location filename="Debugger/DebugUI.py" line="1958"/>
<source>Evaluate</source>
<translation>Evaluer</translation>
</message>
@@ -4424,7 +4424,7 @@
<translation>Evalue l'expression dans le contexte en cours</translation>
</message>
<message>
- <location filename="Debugger/DebugUI.py" line="1975"/>
+ <location filename="Debugger/DebugUI.py" line="1987"/>
<source>Execute</source>
<translation>Exécuter</translation>
</message>
@@ -4534,32 +4534,32 @@
<translation>Une erreur imprévue est apparue. Regardez les détails dans la fenêtre shell.</translation>
</message>
<message>
- <location filename="Debugger/DebugUI.py" line="1079"/>
+ <location filename="Debugger/DebugUI.py" line="1091"/>
<source>The program being debugged has terminated unexpectedly.</source>
<translation>Le programme débogué s'est terminé de façon prématurée.</translation>
</message>
<message>
- <location filename="Debugger/DebugUI.py" line="1371"/>
+ <location filename="Debugger/DebugUI.py" line="1383"/>
<source>Coverage of Project</source>
<translation>Coverage du projet</translation>
</message>
<message>
- <location filename="Debugger/DebugUI.py" line="1361"/>
+ <location filename="Debugger/DebugUI.py" line="1373"/>
<source>Coverage of Script</source>
<translation>Coverage du Script</translation>
</message>
<message>
- <location filename="Debugger/DebugUI.py" line="1587"/>
+ <location filename="Debugger/DebugUI.py" line="1599"/>
<source>There is no main script defined for the current project. Aborting</source>
<translation>Il n'y a pas de script principal défini dans le projet en cours. Abandon</translation>
</message>
<message>
- <location filename="Debugger/DebugUI.py" line="1478"/>
+ <location filename="Debugger/DebugUI.py" line="1490"/>
<source>Profile of Project</source>
<translation>Profil du projet</translation>
</message>
<message>
- <location filename="Debugger/DebugUI.py" line="1467"/>
+ <location filename="Debugger/DebugUI.py" line="1479"/>
<source>Profile of Script</source>
<translation>Profil du Script</translation>
</message>
@@ -4579,17 +4579,17 @@
<translation type="obsolete">Erreur Cyclops</translation>
</message>
<message>
- <location filename="Debugger/DebugUI.py" line="1697"/>
+ <location filename="Debugger/DebugUI.py" line="1709"/>
<source>There is no main script defined for the current project. No debugging possible.</source>
<translation>Il n'y a pas de script principal défini dans le projet en cours. Débogage impossible.</translation>
</message>
<message>
- <location filename="Debugger/DebugUI.py" line="1946"/>
+ <location filename="Debugger/DebugUI.py" line="1958"/>
<source>Enter the statement to evaluate</source>
<translation>Entrer une instruction à évaluer</translation>
</message>
<message>
- <location filename="Debugger/DebugUI.py" line="1975"/>
+ <location filename="Debugger/DebugUI.py" line="1987"/>
<source>Enter the statement to execute</source>
<translation>Entrer une instruction à exécuter</translation>
</message>
@@ -4654,7 +4654,7 @@
<translation type="obsolete"><p>Le programme s'est terminé avec le code de sortie %1.</p></translation>
</message>
<message>
- <location filename="Debugger/DebugUI.py" line="1148"/>
+ <location filename="Debugger/DebugUI.py" line="1160"/>
<source>Breakpoint Condition Error</source>
<translation>Erreur de condition pour le point d'arrêt</translation>
</message>
@@ -4732,7 +4732,7 @@
<translation><b>Evaluer</b><p>Evalue une expression dans le contexte courant du programme débogué. Le résultat est affiché dans la fenêtre Shell</p></translation>
</message>
<message>
- <location filename="Debugger/DebugUI.py" line="1179"/>
+ <location filename="Debugger/DebugUI.py" line="1191"/>
<source>Watch Expression Error</source>
<translation>Erreur dans l'expression</translation>
</message>
@@ -4752,7 +4752,7 @@
<translation type="obsolete"><p>L'expression '<b>%1</b>' pour la variable <b>%2</b> existe déjà.</p></translation>
</message>
<message>
- <location filename="Debugger/DebugUI.py" line="1214"/>
+ <location filename="Debugger/DebugUI.py" line="1226"/>
<source>Watch expression already exists</source>
<translation>L'expression existe déjà</translation>
</message>
@@ -4804,32 +4804,32 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Debugger/DebugUI.py" line="1034"/>
+ <location filename="Debugger/DebugUI.py" line="1046"/>
<source><p>The debugged program raised the exception <b>{0}</b><br>"<b>{1}</b>"<br>File: <b>{2}</b>, Line: <b>{3}</b></p><p>Break here?</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Debugger/DebugUI.py" line="1045"/>
+ <location filename="Debugger/DebugUI.py" line="1057"/>
<source><p>The debugged program raised the exception <b>{0}</b><br>"<b>{1}</b>"</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Debugger/DebugUI.py" line="1148"/>
+ <location filename="Debugger/DebugUI.py" line="1160"/>
<source><p>The condition of the breakpoint <b>{0}, {1}</b> contains a syntax error.</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Debugger/DebugUI.py" line="1179"/>
+ <location filename="Debugger/DebugUI.py" line="1191"/>
<source><p>The watch expression <b>{0}</b> contains a syntax error.</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Debugger/DebugUI.py" line="1206"/>
+ <location filename="Debugger/DebugUI.py" line="1218"/>
<source><p>A watch expression '<b>{0}</b>' already exists.</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Debugger/DebugUI.py" line="1210"/>
+ <location filename="Debugger/DebugUI.py" line="1222"/>
<source><p>A watch expression '<b>{0}</b>' for the variable <b>{1}</b> already exists.</p></source>
<translation type="unfinished"></translation>
</message>
@@ -16786,87 +16786,87 @@
<context>
<name>Hg</name>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="243"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="244"/>
<source>The hg process finished with the exit code {0}</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="246"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="247"/>
<source>The hg process did not finish within 30s.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="248"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="249"/>
<source>Could not start the hg executable.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="274"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="275"/>
<source>Create project repository</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="274"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="275"/>
<source>The project repository could not be created.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="302"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="303"/>
<source>Creating Mercurial repository</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="317"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="318"/>
<source>Initial commit to Mercurial repository</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="363"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="364"/>
<source>Cloning project from a Mercurial repository</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="518"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="519"/>
<source>Synchronizing with the Mercurial repository</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="570"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="571"/>
<source>Adding files/directories to the Mercurial repository</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="634"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="635"/>
<source>Removing files/directories from the Mercurial repository</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="698"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="699"/>
<source>Renaming {0}</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="827"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="828"/>
<source>Taging in the Mercurial repository</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="857"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="860"/>
<source>Reverting changes</source>
<translation type="unfinished">Revenir avant les modifications</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="905"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="910"/>
<source>Merging</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1144"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1149"/>
<source>Mercurial command</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1334"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1339"/>
<source>Copying {0}</source>
<translation type="unfinished"></translation>
</message>
@@ -16876,170 +16876,175 @@
<translation type="obsolete">Sélectionner plusieurs entrées à afficher.</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1579"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1584"/>
<source>Pulling from a remote Mercurial repository</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1629"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1637"/>
<source>Pushing to a remote Mercurial repository</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1748"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1756"/>
<source>Resolving files/directories</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1769"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1777"/>
<source>Create Branch</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1769"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1777"/>
<source>Enter branch name</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1780"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1788"/>
<source>Creating branch in the Mercurial repository</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1861"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1869"/>
<source>Verifying the integrity of the Mercurial repository</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1886"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1894"/>
<source>Showing the combined configuration settings</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1909"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1917"/>
<source>Showing aliases for remote repositories</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1932"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1940"/>
<source>Recovering from interrupted transaction</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2170"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2178"/>
<source>Shall the working directory be updated?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1804"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1812"/>
<source>Showing current branch</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2079"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2087"/>
<source>Create changegroup</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2182"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2190"/>
<source>Apply changegroups</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2199"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2207"/>
<source>Bisect subcommand ({0}) invalid.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2233"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2241"/>
<source>Mercurial Bisect ({0})</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2131"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2139"/>
<source>Preview changegroup</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1955"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1963"/>
<source>Identifying project directory</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1986"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1994"/>
<source>Create .hgignore file</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1986"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1994"/>
<source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2265"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2273"/>
<source>Removing files from the Mercurial repository only</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2037"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2045"/>
<source>Mercurial Changegroup Files (*.hg)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2164"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2172"/>
<source>Mercurial Changegroup Files (*.hg);;All Files (*)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2141"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2149"/>
<source>Identifying changegroup file</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2321"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2329"/>
<source>Backing out changeset</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2301"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2309"/>
<source>No revision given. Aborting...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2054"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2062"/>
<source><p>The Mercurial changegroup file <b>{0}</b> already exists. Overwrite it?</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2346"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2354"/>
<source>Rollback last transaction</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2341"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2349"/>
<source>Are you sure you want to rollback the last transaction?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="466"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="467"/>
<source>Committing changes to Mercurial repository</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2497"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2560"/>
<source>Mercurial Command Server</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2384"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2447"/>
<source><p>The Mercurial Command Server could not be restarted.</p><p>Reason: {0}</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2497"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2560"/>
<source><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2421"/>
+ <source>Import Patch</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>HgAnnotateDialog</name>
@@ -18385,6 +18390,104 @@
</message>
</context>
<context>
+ <name>HgImportDialog</name>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="14"/>
+ <source>Import Patch</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="23"/>
+ <source>Commit data</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="29"/>
+ <source>Select to not commit the imported patch</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="32"/>
+ <source>Do not commit</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="42"/>
+ <source>Commit message:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="49"/>
+ <source>Enter the commit message or leave empty to use the default one</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="61"/>
+ <source>Commit Date:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="68"/>
+ <source>Enter optional date for the commit</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="94"/>
+ <source>Commit User:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="101"/>
+ <source>Enter optional user for the commit</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="113"/>
+ <source>Strip Count:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="122"/>
+ <source>Enter number of leading directories to strip off (default 1)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="153"/>
+ <source>Patch File:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="162"/>
+ <source>Enter the name of the patch file</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="169"/>
+ <source>Press to select the patch file via a file selection dialog</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="181"/>
+ <source>Select to enforce the import</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="184"/>
+ <source>Enforce Import</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.py" line="65"/>
+ <source>Select patch file</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.py" line="65"/>
+ <source>Patch Files (*.diff *.patch);;All Files (*)</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>HgLogBrowserDialog</name>
<message>
<location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="59"/>
@@ -19268,17 +19371,17 @@
<translation type="unfinished">Sélectionner tous les répertoires ayant une version</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="609"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="622"/>
<source>Remove from repository only</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="598"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="611"/>
<source>Do you really want to remove these translation files from the repository?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="609"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="622"/>
<source>Do you really want to remove these files from the repository?</source>
<translation type="unfinished"></translation>
</message>
@@ -19931,7 +20034,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="836"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="849"/>
<source>Repository Administration</source>
<translation type="unfinished"></translation>
</message>
@@ -19966,7 +20069,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1178"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1197"/>
<source>Apply changegroups</source>
<translation type="unfinished"></translation>
</message>
@@ -19981,7 +20084,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="866"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="879"/>
<source>Changegroup Management</source>
<translation type="unfinished"></translation>
</message>
@@ -20061,7 +20164,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="874"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="892"/>
<source>Bisect</source>
<translation type="unfinished"></translation>
</message>
@@ -20166,7 +20269,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="859"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="872"/>
<source>Specials</source>
<translation type="unfinished"></translation>
</message>
@@ -20191,12 +20294,12 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1016"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1035"/>
<source>Pull</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1178"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1265"/>
<source>The project should be reread. Do this now?</source>
<translation type="unfinished"></translation>
</message>
@@ -20231,7 +20334,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="882"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="900"/>
<source>Extensions</source>
<translation type="unfinished"></translation>
</message>
@@ -20310,6 +20413,36 @@
<source><b>Skip</b><p>This skips a selectable changeset.</p></source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1252"/>
+ <source>Import Patch</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="826"/>
+ <source>Import Patch...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="829"/>
+ <source>Import a patch from a patch file</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="832"/>
+ <source><b>Import Patch</b><p>This imports a patch from a patch file into the project.</p></source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="887"/>
+ <source>Patch Management</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1265"/>
+ <source>Revert Changes</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>HgPurgeListDialog</name>
@@ -43309,7 +43442,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckerDialog.py" line="273"/>
+ <location filename="Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckerDialog.py" line="274"/>
<source>No issues found.</source>
<translation type="unfinished"></translation>
</message>
@@ -49341,17 +49474,17 @@
<context>
<name>Utilities</name>
<message>
- <location filename="Utilities/__init__.py" line="1037"/>
+ <location filename="Utilities/__init__.py" line="1058"/>
<source><p>You may use %-codes as placeholders in the string. Supported codes are:<table><tr><td>%C</td><td>column of the cursor of the current editor</td></tr><tr><td>%D</td><td>directory of the current editor</td></tr><tr><td>%F</td><td>filename of the current editor</td></tr><tr><td>%H</td><td>home directory of the current user</td></tr><tr><td>%L</td><td>line of the cursor of the current editor</td></tr><tr><td>%P</td><td>path of the current project</td></tr><tr><td>%S</td><td>selected text of the current editor</td></tr><tr><td>%U</td><td>username of the current user</td></tr><tr><td>%%</td><td>the percent sign</td></tr></table></p></source>
<translation><p>Vous pouvez utiliser la syntaxe "%-code" dans la chaine de caractères. Les codes supportés sont :<table><tr><td>%C</td><td>colonne du curseur de l'éditeur courant</td></tr><tr><td>%D</td><td>répertoire de l'éditeur courant</td></tr><tr><td>%F</td><td>nom de fichier de l'éditeur courant</td></tr><tr><td>%H</td><td>répertoire 'home' de l'utilisateur courant</td></tr><tr><td>%L</td><td>ligne du curseur de l'éditeur courant</td></tr><tr><td>%P</td><td>chemin du projet courant</td></tr><tr><td>%S</td><td>texte sélectionné dans l'éditeur courant</td></tr><tr><td>%U</td><td>nom d'utilisateur de l'utilisateur courant</td></tr><tr><td>%%</td><td>le signe pourcent</td></tr></table></p></translation>
</message>
<message>
- <location filename="Utilities/__init__.py" line="1223"/>
+ <location filename="Utilities/__init__.py" line="1244"/>
<source>Python2 interpreter not configured.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Utilities/__init__.py" line="1270"/>
+ <location filename="Utilities/__init__.py" line="1291"/>
<source>Python2 interpreter did not finish within 30s.</source>
<translation type="unfinished"></translation>
</message>
@@ -53573,30 +53706,30 @@
<context>
<name>mercurial</name>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1204"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1209"/>
<source><tr><td><b>Parent #{0}</b></td><td></td></tr>
<tr><td><b>Changeset</b></td><td>{1}</td></tr></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1698"/>
- <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source>
- <translation type="unfinished"></translation>
- </message>
- <message>
<location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1706"/>
+ <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1714"/>
<source><tr><td><b>Branches</b></td><td>{0}</td></tr></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1220"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1225"/>
<source><tr><td><b>Last author</b></td><td>{0}</td></tr>
<tr><td><b>Committed date</b></td><td>{1}</td></tr>
<tr><td><b>Committed time</b></td><td>{2}</td></tr></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1250"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1255"/>
<source><h3>Repository information</h3>
<p><table>
<tr><td><b>Mercurial V.</b></td><td>{0}</td></tr>
@@ -53607,31 +53740,31 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1692"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1700"/>
<source><tr><td><b>Tip</b></td><td></td></tr>
</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1694"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1702"/>
<source><tr><td><b>Changeset</b></td><td>{0}</td></tr></source>
<translation type="unfinished"></translation>
</message>
<message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1718"/>
+ <source><tr><td><b>Parents</b></td><td>{0}</td></tr></source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1721"/>
+ <source><tr><td><b>Last author</b></td><td>{0}</td></tr>
+<tr><td><b>Committed date</b></td><td>{1}</td></tr>
+<tr><td><b>Committed time</b></td><td>{2}</td></tr>
+</table></p></source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1710"/>
- <source><tr><td><b>Parents</b></td><td>{0}</td></tr></source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1713"/>
- <source><tr><td><b>Last author</b></td><td>{0}</td></tr>
-<tr><td><b>Committed date</b></td><td>{1}</td></tr>
-<tr><td><b>Committed time</b></td><td>{2}</td></tr>
-</table></p></source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1702"/>
<source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source>
<translation type="unfinished"></translation>
</message>
