--- a/i18n/eric5_en.ts Sat Aug 04 20:42:45 2012 +0200 +++ b/i18n/eric5_en.ts Wed Aug 08 18:21:45 2012 +0200 @@ -17093,17 +17093,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2906"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2916"/> <source>Mercurial Command Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2785"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2789"/> <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="2906"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2916"/> <source><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> @@ -17123,42 +17123,42 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2603"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2607"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2630"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2634"/> <source>Copy Changesets (Continue)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2710"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2714"/> <source>Add Sub-repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2740"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2744"/> <source><p>The sub-repositories file .hgsub could not be read.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2693"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2697"/> <source><p>The sub-repositories file .hgsub already contains an entry <b>{0}</b>. Aborting...</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2756"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2760"/> <source><p>The sub-repositories file .hgsub could not be written to.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2756"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2760"/> <source>Remove Sub-repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2729"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2733"/> <source><p>The sub-repositories file .hgsub does not exist. Aborting...</p></source> <translation type="unfinished"></translation> </message> @@ -18751,6 +18751,26 @@ <source>Enter the date and time to be used</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.ui" line="148"/> + <source>Select to append graft info to the log message</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.ui" line="151"/> + <source>Append Graft &Info</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.ui" line="161"/> + <source>Select to perform a dry-run of the graft operation</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.ui" line="164"/> + <source>Perform Dry-Run</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgImportDialog</name>