Mercurial Repositories > eric / changeset
changeset
Added support for --log and --dry-run to the hg graft operation and added code to disable the (deprecated) transplant menu for Mercurial 2.3.0.
Wed, 08 Aug 2012 18:21:45 +0200
- author
- Detlev Offenbach <detlev@die-offenbachs.de>
- date
- Wed, 08 Aug 2012 18:21:45 +0200
- changeset 1990
- 7fee3661c4f9
- parent 1987
- c7b98f0180ab
- child 1991
- 54101b0b0075
Added support for --log and --dry-run to the hg graft operation and added code to disable the (deprecated) transplant menu for Mercurial 2.3.0.
--- a/APIs/Python3/eric5.api Sat Aug 04 20:42:45 2012 +0200 +++ b/APIs/Python3/eric5.api Wed Aug 08 18:21:45 2012 +0200 @@ -3944,7 +3944,7 @@ eric5.Plugins.VcsPlugins.vcsMercurial.HgGraftDialog.HgGraftDialog.on_revisionsEdit_textChanged?4() eric5.Plugins.VcsPlugins.vcsMercurial.HgGraftDialog.HgGraftDialog.on_userEdit_textChanged?4(txt) eric5.Plugins.VcsPlugins.vcsMercurial.HgGraftDialog.HgGraftDialog.on_userGroup_toggled?4(checked) -eric5.Plugins.VcsPlugins.vcsMercurial.HgGraftDialog.HgGraftDialog?1(parent=None) +eric5.Plugins.VcsPlugins.vcsMercurial.HgGraftDialog.HgGraftDialog?1(vcs, parent=None) eric5.Plugins.VcsPlugins.vcsMercurial.HgImportDialog.HgImportDialog.getParameters?4() eric5.Plugins.VcsPlugins.vcsMercurial.HgImportDialog.HgImportDialog.on_patchFileButton_clicked?4() eric5.Plugins.VcsPlugins.vcsMercurial.HgImportDialog.HgImportDialog.on_patchFileEdit_textChanged?4(txt)
--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.HgGraftDialog.html Sat Aug 04 20:42:45 2012 +0200 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.HgGraftDialog.html Wed Aug 08 18:21:45 2012 +0200 @@ -86,11 +86,14 @@ </table> <a NAME="HgGraftDialog.__init__" ID="HgGraftDialog.__init__"></a> <h4>HgGraftDialog (Constructor)</h4> -<b>HgGraftDialog</b>(<i>parent=None</i>) +<b>HgGraftDialog</b>(<i>vcs, parent=None</i>) <p> Constructor </p><dl> -<dt><i>parent</i></dt> +<dt><i>vcs</i></dt> +<dd> +reference to the VCS object (Hg) +</dd><dt><i>parent</i></dt> <dd> reference to the parent widget (QWidget) </dd> @@ -109,10 +112,12 @@ <dd> tuple with list of revisions, a tuple giving a flag indicating to set the user, a flag indicating to use the - current user and the user name and another tuple giving a flag + current user and the user name, another tuple giving a flag indicating to set the date, a flag indicating to use the - current date and the date (list of strings, (boolean, boolean, string), - (boolean, boolean, string)) + current date and the date, a flag indicating to append graft info + to the log message and a flag indicating a dry-run (list of strings, + (boolean, boolean, string), (boolean, boolean, string), boolean, + boolean) </dd> </dl><a NAME="HgGraftDialog.on_currentUserCheckBox_toggled" ID="HgGraftDialog.on_currentUserCheckBox_toggled"></a> <h4>HgGraftDialog.on_currentUserCheckBox_toggled</h4>
--- a/Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.py Sat Aug 04 20:42:45 2012 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.py Wed Aug 08 18:21:45 2012 +0200 @@ -17,16 +17,22 @@ """ Class implementing a dialog to enter the data for a graft session. """ - def __init__(self, parent=None): + def __init__(self, vcs, parent=None): """ Constructor + @param vcs reference to the VCS object (Hg) @param parent reference to the parent widget (QWidget) """ super().__init__(parent) self.setupUi(self) self.dateTimeEdit.setDateTime(QDateTime.currentDateTime()) + + if vcs.version < (2, 3): + self.logCheckBox.setEnabled(False) + self.logCheckBox.setChecked(False) + self.logCheckBox.setVisible(False) self.__updateOk() @@ -82,10 +88,12 @@ @return tuple with list of revisions, a tuple giving a flag indicating to set the user, a flag indicating to use the - current user and the user name and another tuple giving a flag + current user and the user name, another tuple giving a flag indicating to set the date, a flag indicating to use the - current date and the date (list of strings, (boolean, boolean, string), - (boolean, boolean, string)) + current date and the date, a flag indicating to append graft info + to the log message and a flag indicating a dry-run (list of strings, + (boolean, boolean, string), (boolean, boolean, string), boolean, + boolean) """ userData = (self.userGroup.isChecked(), self.currentUserCheckBox.isChecked(), @@ -94,4 +102,6 @@ self.currentDateCheckBox.isChecked(), self.dateTimeEdit.dateTime().toString("yyyy-MM-dd hh:mm")) return (self.revisionsEdit.toPlainText().strip().splitlines(), - userData, dateData) + userData, dateData, + self.logCheckBox.isChecked(), + self.dryRunCheckBox.isChecked())
--- a/Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.ui Sat Aug 04 20:42:45 2012 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.ui Wed Aug 08 18:21:45 2012 +0200 @@ -7,7 +7,7 @@ <x>0</x> <y>0</y> <width>450</width> - <height>382</height> + <height>400</height> </rect> </property> <property name="windowTitle"> @@ -143,6 +143,29 @@ </widget> </item> <item> + <widget class="QCheckBox" name="logCheckBox"> + <property name="toolTip"> + <string>Select to append graft info to the log message</string> + </property> + <property name="text"> + <string>Append Graft &Info</string> + </property> + <property name="checked"> + <bool>true</bool> + </property> + </widget> + </item> + <item> + <widget class="QCheckBox" name="dryRunCheckBox"> + <property name="toolTip"> + <string>Select to perform a dry-run of the graft operation</string> + </property> + <property name="text"> + <string>Perform Dry-Run</string> + </property> + </widget> + </item> + <item> <widget class="QDialogButtonBox" name="buttonBox"> <property name="orientation"> <enum>Qt::Horizontal</enum> @@ -162,6 +185,8 @@ <tabstop>dateGroup</tabstop> <tabstop>currentDateCheckBox</tabstop> <tabstop>dateTimeEdit</tabstop> + <tabstop>logCheckBox</tabstop> + <tabstop>dryRunCheckBox</tabstop> <tabstop>buttonBox</tabstop> </tabstops> <resources/>
--- a/Plugins/VcsPlugins/vcsMercurial/hg.py Sat Aug 04 20:42:45 2012 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/hg.py Wed Aug 08 18:21:45 2012 +0200 @@ -2578,10 +2578,10 @@ return False res = False - dlg = HgGraftDialog() + dlg = HgGraftDialog(self) if dlg.exec_() == QDialog.Accepted: revs, (userData, currentUser, userName), \ - (dateData, currentDate, dateStr) = dlg.getData() + (dateData, currentDate, dateStr), log, dryrun = dlg.getData() args = [] args.append("graft") @@ -2598,6 +2598,10 @@ else: args.append("--date") args.append(dateStr) + if log: + args.append("--log") + if dryrun: + args.append("--dry-run") args.extend(revs) dia = HgDialog(self.trUtf8('Copy Changesets'), self) @@ -2851,7 +2855,13 @@ @param extensionName name of the extension to check for (string) @return flag indicating an active extension (boolean) """ - return extensionName.strip() in self.__activeExtensions + extensionName = extensionName.strip() + isActive = extensionName in self.__activeExtensions + if isActive and extensionName == "transplant" and self.version >= (2, 3): + # transplant extension is deprecated as of Mercurial 2.3.0 + isActive = False + + return isActive def getExtensionObject(self, extensionName): """
--- a/changelog Sat Aug 04 20:42:45 2012 +0200 +++ b/changelog Wed Aug 08 18:21:45 2012 +0200 @@ -11,6 +11,11 @@ variables viewer - Configuration Dialog -- added a filter edit to filter the configuration tree +- Version Control System Interfaces + -- Mercurial + --- added support for --log and --dry-run to the hg graft operation as of + Mercurial 2.3.0 + --- added code to disable the (deprecated) transplant menu for Mercurial 2.3.0 - Web Browser -- added context menu entries for HTML5 media elements -- added a personal information manager to assist in completing form fields
--- a/i18n/eric5_cs.ts Sat Aug 04 20:42:45 2012 +0200 +++ b/i18n/eric5_cs.ts Wed Aug 08 18:21:45 2012 +0200 @@ -17673,17 +17673,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> @@ -17703,42 +17703,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> @@ -19374,6 +19374,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>
--- a/i18n/eric5_de.ts Sat Aug 04 20:42:45 2012 +0200 +++ b/i18n/eric5_de.ts Wed Aug 08 18:21:45 2012 +0200 @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> -<!DOCTYPE TS><TS version="2.0" language="de" sourcelanguage=""> +<!DOCTYPE TS> +<TS version="2.0" language="de"> <context> <name>AboutDialog</name> <message> @@ -1928,7 +1929,7 @@ </message> <message> <location filename="Helpviewer/Bookmarks/BookmarksMenu.py" line="142"/> - <source>Open in New &Tab<byte value="x9"/>Ctrl+LMB</source> + <source>Open in New &Tab Ctrl+LMB</source> <translation>In neuem &Register öffnen\tStrg+LMK</translation> </message> </context> @@ -2165,7 +2166,7 @@ </message> <message> <location filename="Helpviewer/Bookmarks/BookmarksToolBar.py" line="90"/> - <source>Open in New &Tab<byte value="x9"/>Ctrl+LMB</source> + <source>Open in New &Tab Ctrl+LMB</source> <translation>In neuem &Register öffnen\tStrg+LMK</translation> </message> </context> @@ -14007,7 +14008,7 @@ </message> <message> <location filename="Helpviewer/HelpBrowserWV.py" line="977"/> - <source>Open Link in New Tab<byte value="x9"/>Ctrl+LMB</source> + <source>Open Link in New Tab Ctrl+LMB</source> <translation>Link in neuem Fenster öffnen\tStrg+LMK</translation> </message> <message> @@ -17184,17 +17185,17 @@ <translation>Pflege Änderungen in das Mercurial Repository ein</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>Mercurial Befehlsserver</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><p>Der Mercurial Befehlsserver konnte nicht wiedergestartet werden.</p><p>Ursache: {0}</p></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><p>Der Mercurial Befehlsserver konnte nicht gestartet werden.</p><p>Ursache: {0}</p></translation> </message> @@ -17214,42 +17215,42 @@ <translation>Phase ändern</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>Änderungssätze kopieren</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>Änderungssätze kopieren (Fortsetzung)</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>Unterrepository hinzufügen</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><p>Die Unterrepositorydatei .hgsub konnte nicht gelesen werden.</p><p>Ursache: {0}</p></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><p>Die Unterrepositorydatei .hgsub enthält bereits einen Eintrag <b>{0}</b>. Abbruch...</p></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><p>Die Unterrepositorydatei .hgsub konnte nicht gespeichert werden.</p><p>Ursache: {0}</p></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>Unterrepositories löschen</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><p>Die Unterrepositorydatei .hgsub existiert nicht. Abbruch...</p></translation> </message> @@ -18866,6 +18867,26 @@ <source>Enter the date and time to be used</source> <translation>Gib das zu verwendenden Datum und Zeit ein</translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.ui" line="148"/> + <source>Select to append graft info to the log message</source> + <translation>Auswählen, um eine Kopierinformation an die Änderungsmeldung anzuhängen</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.ui" line="151"/> + <source>Append Graft &Info</source> + <translation>Kopier&information anhängen</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>Auswählen, um einen Testlauf der Kopieraktion durchzuführen</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.ui" line="164"/> + <source>Perform Dry-Run</source> + <translation>Testlauf durchführen</translation> + </message> </context> <context> <name>HgImportDialog</name>
--- 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>
--- a/i18n/eric5_es.ts Sat Aug 04 20:42:45 2012 +0200 +++ b/i18n/eric5_es.ts Wed Aug 08 18:21:45 2012 +0200 @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!DOCTYPE TS> -<TS version="2.0" language="es"> +<!DOCTYPE TS><TS version="2.0" language="es" sourcelanguage=""> <context> <name>AboutDialog</name> <message> @@ -1939,8 +1938,8 @@ </message> <message> <location filename="Helpviewer/Bookmarks/BookmarksMenu.py" line="142"/> - <source>Open in New &Tab Ctrl+LMB</source> - <translation>Abrir en Nueva &Pestaña Ctrl+LMB (botón izquierdo del ratón)</translation> + <source>Open in New &Tab<byte value="x9"/>Ctrl+LMB</source> + <translation>Abrir en Nueva &Pestaña<byte value="x9"/>Ctrl+LMB (botón izquierdo del ratón)</translation> </message> <message> <location filename="Helpviewer/Bookmarks/BookmarksMenu.py" line="147"/> @@ -2181,8 +2180,8 @@ </message> <message> <location filename="Helpviewer/Bookmarks/BookmarksToolBar.py" line="90"/> - <source>Open in New &Tab Ctrl+LMB</source> - <translation>Abrir en Nueva &Pestaña Ctrl+LMB (botón izquierdo del ratón)</translation> + <source>Open in New &Tab<byte value="x9"/>Ctrl+LMB</source> + <translation>Abrir en Nueva &Pestaña<byte value="x9"/>Ctrl+LMB (botón izquierdo del ratón)</translation> </message> <message> <location filename="Helpviewer/Bookmarks/BookmarksToolBar.py" line="99"/> @@ -13741,7 +13740,7 @@ <name>HelpBrowser</name> <message> <location filename="Helpviewer/HelpBrowserWV.py" line="977"/> - <source>Open Link in New Tab Ctrl+LMB</source> + <source>Open Link in New Tab<byte value="x9"/>Ctrl+LMB</source> <translation>Abrir enlace en Nueva Pestaña Ctrl+LMB (botón izquierdo del ratón)</translation> </message> <message> @@ -17213,17 +17212,17 @@ <translation>Haciendo commit de cambios al repositorio Mercurial</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>Servidor de Comandos de Mercurial</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><p>El Servidor de Comandos de Mercurial no ha podido reiniciarse.</p><p>Razón: {0}</p></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><p>El Servidor de Comandos de Mercurial no ha podido iniciarse.</p><p>Razón: {0}</p></translation> </message> @@ -17243,42 +17242,42 @@ <translation>Cambiar Fase</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>Copiar Changesets</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>Copiar Changesets (Continuar)</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>Añadir Sub-repositorio</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><p>No se ha podido leer el archivo .hgsub de sub-repositorios.</p><p>Razón: {0}</p></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><p>El archivo .hgsub de sub-repositorios ya contiene una entrada.</p><p>Abortando...</p></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><p>No se ha podido escribir al archivo .hgsub de sub-repositorios.</p><p>Razón: {0}</p></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>Eliminar Sub-repositorios</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><p>El archivo de subrepositorios .hgsub no existe. Abortando...</p></translation> </message> @@ -18902,6 +18901,26 @@ <source>Enter the date and time to be used</source> <translation>Introduzca la fecha y hora a usar</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>
--- a/i18n/eric5_fr.ts Sat Aug 04 20:42:45 2012 +0200 +++ b/i18n/eric5_fr.ts Wed Aug 08 18:21:45 2012 +0200 @@ -18713,17 +18713,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> @@ -18743,42 +18743,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> @@ -20396,6 +20396,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>
--- a/i18n/eric5_it.ts Sat Aug 04 20:42:45 2012 +0200 +++ b/i18n/eric5_it.ts Wed Aug 08 18:21:45 2012 +0200 @@ -17439,17 +17439,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> @@ -17469,42 +17469,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> @@ -19140,6 +19140,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>
--- a/i18n/eric5_ru.ts Sat Aug 04 20:42:45 2012 +0200 +++ b/i18n/eric5_ru.ts Wed Aug 08 18:21:45 2012 +0200 @@ -17541,17 +17541,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> @@ -17571,42 +17571,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> @@ -19237,6 +19237,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>
--- a/i18n/eric5_tr.ts Sat Aug 04 20:42:45 2012 +0200 +++ b/i18n/eric5_tr.ts Wed Aug 08 18:21:45 2012 +0200 @@ -17664,17 +17664,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> @@ -17694,42 +17694,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> @@ -19362,6 +19362,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>
--- a/i18n/eric5_zh_CN.GB2312.ts Sat Aug 04 20:42:45 2012 +0200 +++ b/i18n/eric5_zh_CN.GB2312.ts Wed Aug 08 18:21:45 2012 +0200 @@ -18674,17 +18674,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> @@ -18704,42 +18704,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> @@ -20357,6 +20357,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>
