Mon, 25 Mar 2013 18:15:32 +0100
Added a 'Copy Changesets' button to the Mercurial log browser dialog.
--- a/APIs/Python3/eric5.api Mon Mar 25 15:42:11 2013 +0100 +++ b/APIs/Python3/eric5.api Mon Mar 25 18:15:32 2013 +0100 @@ -4384,7 +4384,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(vcs, parent=None) +eric5.Plugins.VcsPlugins.vcsMercurial.HgGraftDialog.HgGraftDialog?1(vcs, revs=None, 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) @@ -4409,6 +4409,7 @@ eric5.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.HgLogBrowserDialog.on_diffRevisionsButton_clicked?4() eric5.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.HgLogBrowserDialog.on_fieldCombo_activated?4(txt) eric5.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.HgLogBrowserDialog.on_fromDate_dateChanged?4(date) +eric5.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.HgLogBrowserDialog.on_graftButton_clicked?4() eric5.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.HgLogBrowserDialog.on_input_returnPressed?4() eric5.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.HgLogBrowserDialog.on_logTree_currentItemChanged?4(current, previous) eric5.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.HgLogBrowserDialog.on_logTree_itemSelectionChanged?4() @@ -4721,7 +4722,7 @@ eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgForget?4(name) eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgGetBranchesList?4(repodir) eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgGetTagsList?4(repodir) -eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgGraft?4(path) +eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgGraft?4(path, revs=None) eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgGraftContinue?4(path) eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgIdentify?4(name) eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgIdentifyBundle?4(name)
--- a/Documentation/Help/source.qhp Mon Mar 25 15:42:11 2013 +0100 +++ b/Documentation/Help/source.qhp Mon Mar 25 18:15:32 2013 +0100 @@ -5724,6 +5724,7 @@ <keyword name="HgLogBrowserDialog.__resortFiles" id="HgLogBrowserDialog.__resortFiles" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.__resortFiles" /> <keyword name="HgLogBrowserDialog.__showError" id="HgLogBrowserDialog.__showError" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.__showError" /> <keyword name="HgLogBrowserDialog.__updateDiffButtons" id="HgLogBrowserDialog.__updateDiffButtons" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.__updateDiffButtons" /> + <keyword name="HgLogBrowserDialog.__updateGraftButton" id="HgLogBrowserDialog.__updateGraftButton" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.__updateGraftButton" /> <keyword name="HgLogBrowserDialog.__updateGui" id="HgLogBrowserDialog.__updateGui" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.__updateGui" /> <keyword name="HgLogBrowserDialog.__updatePhaseButton" id="HgLogBrowserDialog.__updatePhaseButton" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.__updatePhaseButton" /> <keyword name="HgLogBrowserDialog.closeEvent" id="HgLogBrowserDialog.closeEvent" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.closeEvent" /> @@ -5736,6 +5737,7 @@ <keyword name="HgLogBrowserDialog.on_diffRevisionsButton_clicked" id="HgLogBrowserDialog.on_diffRevisionsButton_clicked" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.on_diffRevisionsButton_clicked" /> <keyword name="HgLogBrowserDialog.on_fieldCombo_activated" id="HgLogBrowserDialog.on_fieldCombo_activated" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.on_fieldCombo_activated" /> <keyword name="HgLogBrowserDialog.on_fromDate_dateChanged" id="HgLogBrowserDialog.on_fromDate_dateChanged" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.on_fromDate_dateChanged" /> + <keyword name="HgLogBrowserDialog.on_graftButton_clicked" id="HgLogBrowserDialog.on_graftButton_clicked" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.on_graftButton_clicked" /> <keyword name="HgLogBrowserDialog.on_input_returnPressed" id="HgLogBrowserDialog.on_input_returnPressed" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.on_input_returnPressed" /> <keyword name="HgLogBrowserDialog.on_logTree_currentItemChanged" id="HgLogBrowserDialog.on_logTree_currentItemChanged" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.on_logTree_currentItemChanged" /> <keyword name="HgLogBrowserDialog.on_logTree_itemSelectionChanged" id="HgLogBrowserDialog.on_logTree_itemSelectionChanged" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.on_logTree_itemSelectionChanged" />
--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.HgGraftDialog.html Mon Mar 25 15:42:11 2013 +0100 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.HgGraftDialog.html Mon Mar 25 18:15:32 2013 +0100 @@ -85,13 +85,16 @@ </table> <a NAME="HgGraftDialog.__init__" ID="HgGraftDialog.__init__"></a> <h4>HgGraftDialog (Constructor)</h4> -<b>HgGraftDialog</b>(<i>vcs, parent=None</i>) +<b>HgGraftDialog</b>(<i>vcs, revs=None, parent=None</i>) <p> Constructor </p><dl> <dt><i>vcs</i></dt> <dd> reference to the VCS object (Hg) +</dd><dt><i>revs</i></dt> +<dd> +list of revisions to show in the revisions pane (list of strings) </dd><dt><i>parent</i></dt> <dd> reference to the parent widget (QWidget)
--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html Mon Mar 25 15:42:11 2013 +0100 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html Mon Mar 25 18:15:32 2013 +0100 @@ -129,6 +129,9 @@ <td><a href="#HgLogBrowserDialog.__updateDiffButtons">__updateDiffButtons</a></td> <td>Private slot to update the enabled status of the diff buttons.</td> </tr><tr> +<td><a href="#HgLogBrowserDialog.__updateGraftButton">__updateGraftButton</a></td> +<td>Private slot to update the status of the graft button.</td> +</tr><tr> <td><a href="#HgLogBrowserDialog.__updateGui">__updateGui</a></td> <td>Private slot to update GUI elements except the diff and phase buttons.</td> </tr><tr> @@ -165,6 +168,9 @@ <td><a href="#HgLogBrowserDialog.on_fromDate_dateChanged">on_fromDate_dateChanged</a></td> <td>Private slot called, when the from date changes.</td> </tr><tr> +<td><a href="#HgLogBrowserDialog.on_graftButton_clicked">on_graftButton_clicked</a></td> +<td>Private slot to handle the Copy Changesets button.</td> +</tr><tr> <td><a href="#HgLogBrowserDialog.on_input_returnPressed">on_input_returnPressed</a></td> <td>Private slot to handle the press of the return key in the input field.</td> </tr><tr> @@ -506,6 +512,11 @@ <b>__updateDiffButtons</b>(<i></i>) <p> Private slot to update the enabled status of the diff buttons. +</p><a NAME="HgLogBrowserDialog.__updateGraftButton" ID="HgLogBrowserDialog.__updateGraftButton"></a> +<h4>HgLogBrowserDialog.__updateGraftButton</h4> +<b>__updateGraftButton</b>(<i></i>) +<p> + Private slot to update the status of the graft button. </p><a NAME="HgLogBrowserDialog.__updateGui" ID="HgLogBrowserDialog.__updateGui"></a> <h4>HgLogBrowserDialog.__updateGui</h4> <b>__updateGui</b>(<i>itm</i>) @@ -609,7 +620,12 @@ <dd> new date (QDate) </dd> -</dl><a NAME="HgLogBrowserDialog.on_input_returnPressed" ID="HgLogBrowserDialog.on_input_returnPressed"></a> +</dl><a NAME="HgLogBrowserDialog.on_graftButton_clicked" ID="HgLogBrowserDialog.on_graftButton_clicked"></a> +<h4>HgLogBrowserDialog.on_graftButton_clicked</h4> +<b>on_graftButton_clicked</b>(<i></i>) +<p> + Private slot to handle the Copy Changesets button. +</p><a NAME="HgLogBrowserDialog.on_input_returnPressed" ID="HgLogBrowserDialog.on_input_returnPressed"></a> <h4>HgLogBrowserDialog.on_input_returnPressed</h4> <b>on_input_returnPressed</b>(<i></i>) <p>
--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.hg.html Mon Mar 25 15:42:11 2013 +0100 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.hg.html Mon Mar 25 18:15:32 2013 +0100 @@ -652,13 +652,16 @@ </dd> </dl><a NAME="Hg.hgGraft" ID="Hg.hgGraft"></a> <h4>Hg.hgGraft</h4> -<b>hgGraft</b>(<i>path</i>) +<b>hgGraft</b>(<i>path, revs=None</i>) <p> Public method to copy changesets from another branch. </p><dl> <dt><i>path</i></dt> <dd> directory name of the project (string) +</dd><dt><i>revs</i></dt> +<dd> +list of revisions to show in the revisions pane (list of strings) </dd> </dl><dl> <dt>Returns:</dt>
--- a/Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.py Mon Mar 25 15:42:11 2013 +0100 +++ b/Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.py Mon Mar 25 18:15:32 2013 +0100 @@ -17,11 +17,12 @@ """ Class implementing a dialog to enter the data for a graft session. """ - def __init__(self, vcs, parent=None): + def __init__(self, vcs, revs=None, parent=None): """ Constructor @param vcs reference to the VCS object (Hg) + @param revs list of revisions to show in the revisions pane (list of strings) @param parent reference to the parent widget (QWidget) """ super().__init__(parent) @@ -33,6 +34,9 @@ self.logCheckBox.setEnabled(False) self.logCheckBox.setChecked(False) self.logCheckBox.setVisible(False) + + if revs: + self.revisionsEdit.setPlainText("\n".join(sorted(revs))) self.__updateOk()
--- a/Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py Mon Mar 25 15:42:11 2013 +0100 +++ b/Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py Mon Mar 25 18:15:32 2013 +0100 @@ -131,6 +131,12 @@ self.logTree.setColumnHidden(self.PhaseColumn, True) self.phaseLine.hide() self.phaseButton.hide() + if self.vcs.version < (2, 0): + self.graftButton.setEnabled(False) + self.graftButton.hide() + if self.phaseButton.isHidden() and \ + self.graftButton.isHidden(): + self.phaseLine.hide() def __initData(self): """ @@ -154,6 +160,7 @@ self.__branchColors = {} self.__projectRevision = -1 + self.__projectBranch = "" def closeEvent(self, e): """ @@ -427,7 +434,7 @@ args = [] args.append("identify") - args.append("-n") + args.append("-nb") output = "" if self.__hgClient: @@ -457,9 +464,12 @@ errMsg) if output: - self.__projectRevision = output.strip() - if self.__projectRevision.endswith("+"): - self.__projectRevision = self.__projectRevision[:-1] + outputList = output.strip().split() + if len(outputList) == 2: + self.__projectRevision = outputList[0].strip() + if self.__projectRevision.endswith("+"): + self.__projectRevision = self.__projectRevision[:-1] + self.__projectBranch = outputList[1].strip() def __getClosedBranches(self): """ @@ -1013,6 +1023,21 @@ else: self.phaseButton.setEnabled(False) + def __updateGraftButton(self): + """ + Private slot to update the status of the graft button. + """ + if self.graftButton.isVisible(): + # step 1: count selected entries not belonging to the current branch + otherBranches = 0 + for itm in self.logTree.selectedItems(): + branch = itm.text(self.BranchColumn) + if branch != self.__projectBranch: + otherBranches += 1 + + # step 2: set the status of the graft button + self.graftButton.setEnabled(otherBranches > 0) + def __updateGui(self, itm): """ Private slot to update GUI elements except the diff and phase buttons. @@ -1045,6 +1070,7 @@ self.__updateGui(current) self.__updateDiffButtons() self.__updatePhaseButton() + self.__updateGraftButton() @pyqtSlot() def on_logTree_itemSelectionChanged(self): @@ -1056,6 +1082,7 @@ self.__updateDiffButtons() self.__updatePhaseButton() + self.__updateGraftButton() @pyqtSlot() def on_nextButton_clicked(self): @@ -1306,3 +1333,27 @@ if res: for itm in self.logTree.selectedItems(): itm.setText(self.PhaseColumn, newPhase) + + @pyqtSlot() + def on_graftButton_clicked(self): + """ + Private slot to handle the Copy Changesets button. + """ + revs = [] + + for itm in self.logTree.selectedItems(): + branch = itm.text(self.BranchColumn) + if branch != self.__projectBranch: + revs.append(itm.text(self.RevisionColumn).strip().split(":", 1)[0]) + + if revs: + shouldReopen = self.vcs.hgGraft(self.repodir, revs) + if shouldReopen: + res = E5MessageBox.yesNo(None, + self.trUtf8("Copy Changesets"), + self.trUtf8("""The project should be reread. Do this now?"""), + yesDefault=True) + if res: + e5App().getObject("Project").reopenProject() + else: + self.on_refreshButton_clicked()
--- a/Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui Mon Mar 25 15:42:11 2013 +0100 +++ b/Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui Mon Mar 25 18:15:32 2013 +0100 @@ -343,6 +343,16 @@ </widget> </item> <item> + <widget class="QPushButton" name="graftButton"> + <property name="toolTip"> + <string>Press to copy the selected changesets to the current branch</string> + </property> + <property name="text"> + <string>Copy Changesets</string> + </property> + </widget> + </item> + <item> <widget class="QPushButton" name="phaseButton"> <property name="toolTip"> <string>Change the phase of the selected revisions</string> @@ -491,12 +501,13 @@ <tabstop>diffP1Button</tabstop> <tabstop>diffP2Button</tabstop> <tabstop>diffRevisionsButton</tabstop> + <tabstop>graftButton</tabstop> <tabstop>phaseButton</tabstop> <tabstop>errors</tabstop> <tabstop>input</tabstop> <tabstop>passwordCheckBox</tabstop> + <tabstop>buttonBox</tabstop> <tabstop>sendButton</tabstop> - <tabstop>buttonBox</tabstop> </tabstops> <resources/> <connections/>
--- a/Plugins/VcsPlugins/vcsMercurial/hg.py Mon Mar 25 15:42:11 2013 +0100 +++ b/Plugins/VcsPlugins/vcsMercurial/hg.py Mon Mar 25 18:15:32 2013 +0100 @@ -2625,11 +2625,12 @@ return res - def hgGraft(self, path): + def hgGraft(self, path, revs=None): """ Public method to copy changesets from another branch. @param path directory name of the project (string) + @param revs list of revisions to show in the revisions pane (list of strings) @return flag indicating that the project should be reread (boolean) """ # find the root of the repo @@ -2641,7 +2642,7 @@ from .HgGraftDialog import HgGraftDialog res = False - dlg = HgGraftDialog(self) + dlg = HgGraftDialog(self, revs) if dlg.exec_() == QDialog.Accepted: revs, (userData, currentUser, userName), \ (dateData, currentDate, dateStr), log, dryrun = dlg.getData()
--- a/changelog Mon Mar 25 15:42:11 2013 +0100 +++ b/changelog Mon Mar 25 18:15:32 2013 +0100 @@ -33,6 +33,8 @@ - Version Control System Interfaces -- All --- added a confirmation dialog to the 'revert' actions + -- Mercurial + --- added a 'Copy Changesets' button to the log browser dialog - Web Browser -- reworked the various SSL info widgets to show more info - Third Party packages
--- a/i18n/eric5_cs.ts Mon Mar 25 15:42:11 2013 +0100 +++ b/i18n/eric5_cs.ts Mon Mar 25 18:15:32 2013 +0100 @@ -18548,17 +18548,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2983"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2984"/> <source>Mercurial Command Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2854"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2855"/> <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="2983"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2984"/> <source><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> @@ -18578,42 +18578,42 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2670"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2671"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2697"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2698"/> <source>Copy Changesets (Continue)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2778"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2779"/> <source>Add Sub-repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2808"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2809"/> <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="2761"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2762"/> <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="2825"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2826"/> <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="2825"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2826"/> <source>Remove Sub-repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2797"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2798"/> <source><p>The sub-repositories file .hgsub does not exist. Aborting...</p></source> <translation type="unfinished"></translation> </message> @@ -20426,12 +20426,12 @@ <translation>Vybrat pole pro filtrování</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1175"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1202"/> <source>Revision</source> <translation>Revize</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1172"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1199"/> <source>Author</source> <translation>Autor</translation> </message> @@ -20511,52 +20511,52 @@ <translation>&Porovnat revize</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="383"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="393"/> <source>Errors</source> <translation>Chyby</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="389"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="399"/> <source><b>Mercurial log errors</b><p>This shows possible error messages of the hg log command.</p></source> <translation><b>Mercurial log chyb</b><p>Zobrazí možné chyby z příkazu hg log.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="405"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="415"/> <source>Input</source> <translation>Vstup</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="427"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="437"/> <source>Press to send the input to the hg process</source> <translation>Stisknutím odeslat vstup do hg procesu</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="430"/> - <source>&Send</source> - <translation>Ode&slat</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="433"/> - <source>Alt+S</source> - <translation></translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="440"/> - <source>Enter data to be sent to the hg process</source> - <translation>Zadejte data, která se odešlou do hg procesu</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="447"/> - <source>Select to switch the input field to password mode</source> - <translation>Vybrat pro přepnutí vstupního pole do režimu hesla</translation> + <source>&Send</source> + <translation>Ode&slat</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="443"/> + <source>Alt+S</source> + <translation></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="450"/> + <source>Enter data to be sent to the hg process</source> + <translation>Zadejte data, která se odešlou do hg procesu</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="457"/> + <source>Select to switch the input field to password mode</source> + <translation>Vybrat pro přepnutí vstupního pole do režimu hesla</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="460"/> <source>&Password Mode</source> <translation>Mód vstu&pu hesla</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="453"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="463"/> <source>Alt+P</source> <translation></translation> </message> @@ -20576,27 +20576,27 @@ <translation>Změněno</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="690"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="700"/> <source>Process Generation Error</source> <translation>Chyba v procesu generování</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="690"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="700"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>Proces {0} nelze spustit. Ověřte, že je umístěn v požadované cestě.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="492"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="502"/> <source>The hg process did not finish within 30s.</source> <translation>Hg proces neskončil do 30s.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="495"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="505"/> <source>Could not start the hg executable.</source> <translation>Nelze spustit hg program.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="498"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="508"/> <source>Mercurial Error</source> <translation>Mercurial chyba</translation> </message> @@ -20676,21 +20676,36 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="348"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="358"/> <source>Change the phase of the selected revisions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="351"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="361"/> <source><b>Change Phase</b> <p>This changes the phase of the selected revisions. The selected revisions have to have the same current phase.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="355"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="365"/> <source>Change Phase</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="348"/> + <source>Press to copy the selected changesets to the current branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1352"/> + <source>Copy Changesets</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1352"/> + <source>The project should be reread. Do this now?</source> + <translation type="unfinished">Projekt bude znovu načten. Má se provést?</translation> + </message> </context> <context> <name>HgLogDialog</name>
--- a/i18n/eric5_de.ts Mon Mar 25 15:42:11 2013 +0100 +++ b/i18n/eric5_de.ts Mon Mar 25 18:15:32 2013 +0100 @@ -17936,17 +17936,17 @@ <translation>Pflege Änderungen in das Mercurial Repository ein</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2983"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2984"/> <source>Mercurial Command Server</source> <translation>Mercurial Befehlsserver</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2854"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2855"/> <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="2983"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2984"/> <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> @@ -17966,42 +17966,42 @@ <translation>Phase ändern</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2670"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2671"/> <source>Copy Changesets</source> <translation>Änderungssätze kopieren</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2697"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2698"/> <source>Copy Changesets (Continue)</source> <translation>Änderungssätze kopieren (Fortsetzung)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2778"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2779"/> <source>Add Sub-repository</source> <translation>Unterrepository hinzufügen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2808"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2809"/> <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="2761"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2762"/> <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="2825"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2826"/> <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="2825"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2826"/> <source>Remove Sub-repositories</source> <translation>Unterrepositories löschen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2797"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2798"/> <source><p>The sub-repositories file .hgsub does not exist. Aborting...</p></source> <translation><p>Die Unterrepositorydatei .hgsub existiert nicht. Abbruch...</p></translation> </message> @@ -19795,12 +19795,12 @@ <translation>Wähle das als Filter zu verwendende Feld</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1175"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1202"/> <source>Revision</source> <translation>Revision</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1172"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1199"/> <source>Author</source> <translation>Autor</translation> </message> @@ -19870,52 +19870,52 @@ <translation>Bei Kopieren/Umbenennen anhalten</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="383"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="393"/> <source>Errors</source> <translation>Fehler</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="389"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="399"/> <source><b>Mercurial log errors</b><p>This shows possible error messages of the hg log command.</p></source> <translation><b>Mercurial Log Fehler</b><p>Dies zeigt mögliche Fehlermeldungen des hg log Befehls.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="405"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="415"/> <source>Input</source> <translation>Eingabe</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="427"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="437"/> <source>Press to send the input to the hg process</source> <translation>Drücken um die Eingabe an den hg Prozess zu senden</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="430"/> - <source>&Send</source> - <translation>Sen&den</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="433"/> - <source>Alt+S</source> - <translation>Alt+D</translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="440"/> - <source>Enter data to be sent to the hg process</source> - <translation>Gib die Daten ein, die an den hg Prozess geschickt werden sollen</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="447"/> - <source>Select to switch the input field to password mode</source> - <translation>Anwählen, um den Kennwort Modus für das Eingabefeld auszuwählen</translation> + <source>&Send</source> + <translation>Sen&den</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="443"/> + <source>Alt+S</source> + <translation>Alt+D</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="450"/> + <source>Enter data to be sent to the hg process</source> + <translation>Gib die Daten ein, die an den hg Prozess geschickt werden sollen</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="457"/> + <source>Select to switch the input field to password mode</source> + <translation>Anwählen, um den Kennwort Modus für das Eingabefeld auszuwählen</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="460"/> <source>&Password Mode</source> <translation>&Kennwort Modus</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="453"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="463"/> <source>Alt+P</source> <translation>Alt+P</translation> </message> @@ -19935,27 +19935,27 @@ <translation>Modifiziert</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="690"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="700"/> <source>Process Generation Error</source> <translation>Fehler beim Prozessstart</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="690"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="700"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>Der Prozess {0} konnte nicht gestartet werden. Stellen Sie sicher, dass er sich im Suchpfad befindet.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="492"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="502"/> <source>The hg process did not finish within 30s.</source> <translation>Der hg Prozess endete nicht innerhalb von 30s.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="495"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="505"/> <source>Could not start the hg executable.</source> <translation>Das hg Programm konnte nicht gestartet werden.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="498"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="508"/> <source>Mercurial Error</source> <translation>Mercurial Fehler</translation> </message> @@ -20040,21 +20040,36 @@ <translation>Phase</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="348"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="358"/> <source>Change the phase of the selected revisions</source> <translation>Ändert die Phase der ausgewählten Revisionen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="351"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="361"/> <source><b>Change Phase</b> <p>This changes the phase of the selected revisions. The selected revisions have to have the same current phase.</p></source> <translation><b>Phase ändern</b><p>Dies ändert die Phase der ausgewählten Revisionen. Die ausgewählten Revisionen müssen sich in der gleichen Phase befinden.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="355"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="365"/> <source>Change Phase</source> <translation>Phase ändern</translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="348"/> + <source>Press to copy the selected changesets to the current branch</source> + <translation>Drücken, um die ausgewählten Änderungssätze in den aktuellen Zweig zu kopeieren</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1352"/> + <source>Copy Changesets</source> + <translation>Änderungssätze kopieren</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1352"/> + <source>The project should be reread. Do this now?</source> + <translation>Das Projekt sollte neu gelesen werde. Jetzt durchführen?</translation> + </message> </context> <context> <name>HgLogDialog</name>
--- a/i18n/eric5_en.ts Mon Mar 25 15:42:11 2013 +0100 +++ b/i18n/eric5_en.ts Mon Mar 25 18:15:32 2013 +0100 @@ -17840,17 +17840,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2983"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2984"/> <source>Mercurial Command Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2854"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2855"/> <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="2983"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2984"/> <source><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> @@ -17870,42 +17870,42 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2670"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2671"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2697"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2698"/> <source>Copy Changesets (Continue)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2778"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2779"/> <source>Add Sub-repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2808"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2809"/> <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="2761"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2762"/> <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="2825"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2826"/> <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="2825"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2826"/> <source>Remove Sub-repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2797"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2798"/> <source><p>The sub-repositories file .hgsub does not exist. Aborting...</p></source> <translation type="unfinished"></translation> </message> @@ -19685,12 +19685,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1175"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1202"/> <source>Revision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1172"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1199"/> <source>Author</source> <translation type="unfinished"></translation> </message> @@ -19795,52 +19795,52 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="383"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="393"/> <source>Errors</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="389"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="399"/> <source><b>Mercurial log errors</b><p>This shows possible error messages of the hg log command.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="405"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="415"/> <source>Input</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="427"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="437"/> <source>Press to send the input to the hg process</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="430"/> - <source>&Send</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="433"/> - <source>Alt+S</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="440"/> - <source>Enter data to be sent to the hg process</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="447"/> - <source>Select to switch the input field to password mode</source> + <source>&Send</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="443"/> + <source>Alt+S</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="450"/> + <source>Enter data to be sent to the hg process</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="457"/> + <source>Select to switch the input field to password mode</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="460"/> <source>&Password Mode</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="453"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="463"/> <source>Alt+P</source> <translation type="unfinished"></translation> </message> @@ -19865,27 +19865,27 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="492"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="502"/> <source>The hg process did not finish within 30s.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="495"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="505"/> <source>Could not start the hg executable.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="498"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="508"/> <source>Mercurial Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="690"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="700"/> <source>Process Generation Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="690"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="700"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished"></translation> </message> @@ -19920,21 +19920,36 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="348"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="358"/> <source>Change the phase of the selected revisions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="351"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="361"/> <source><b>Change Phase</b> <p>This changes the phase of the selected revisions. The selected revisions have to have the same current phase.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="355"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="365"/> <source>Change Phase</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="348"/> + <source>Press to copy the selected changesets to the current branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1352"/> + <source>Copy Changesets</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1352"/> + <source>The project should be reread. Do this now?</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgLogDialog</name>
--- a/i18n/eric5_es.ts Mon Mar 25 15:42:11 2013 +0100 +++ b/i18n/eric5_es.ts Mon Mar 25 18:15:32 2013 +0100 @@ -17937,17 +17937,17 @@ <translation>Haciendo commit de cambios al repositorio Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2983"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2984"/> <source>Mercurial Command Server</source> <translation>Servidor de Comandos de Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2854"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2855"/> <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="2983"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2984"/> <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> @@ -17967,42 +17967,42 @@ <translation>Cambiar Fase</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2670"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2671"/> <source>Copy Changesets</source> <translation>Copiar Changesets</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2697"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2698"/> <source>Copy Changesets (Continue)</source> <translation>Copiar Changesets (Continuar)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2778"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2779"/> <source>Add Sub-repository</source> <translation>Añadir Sub-repositorio</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2808"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2809"/> <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="2761"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2762"/> <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="2825"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2826"/> <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="2825"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2826"/> <source>Remove Sub-repositories</source> <translation>Eliminar Sub-repositorios</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2797"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2798"/> <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> @@ -19796,12 +19796,12 @@ <translation>Seleccione el campo de filtrado</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1175"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1202"/> <source>Revision</source> <translation>Revisión</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1172"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1199"/> <source>Author</source> <translation>Autor</translation> </message> @@ -19871,52 +19871,52 @@ <translation>&Comparar Revisiones</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="383"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="393"/> <source>Errors</source> <translation>Errores</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="389"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="399"/> <source><b>Mercurial log errors</b><p>This shows possible error messages of the hg log command.</p></source> <translation><b>Errores de Mercurial log</b><p>Muestra los posibles mensajes de error del comando hg log.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="405"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="415"/> <source>Input</source> <translation>Input</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="427"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="437"/> <source>Press to send the input to the hg process</source> <translation>Pulsar para enviar el input al proceso de hg</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="430"/> - <source>&Send</source> - <translation>&Enviar</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="433"/> - <source>Alt+S</source> - <translation>Alt+S</translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="440"/> - <source>Enter data to be sent to the hg process</source> - <translation>Introduzca los datos a enviar al proceso de hg</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="447"/> - <source>Select to switch the input field to password mode</source> - <translation>Seleccionar para cambiar el campo de input a modo contraseña</translation> + <source>&Send</source> + <translation>&Enviar</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="443"/> + <source>Alt+S</source> + <translation>Alt+S</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="450"/> + <source>Enter data to be sent to the hg process</source> + <translation>Introduzca los datos a enviar al proceso de hg</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="457"/> + <source>Select to switch the input field to password mode</source> + <translation>Seleccionar para cambiar el campo de input a modo contraseña</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="460"/> <source>&Password Mode</source> <translation>&Modo de contraseña</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="453"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="463"/> <source>Alt+P</source> <translation>Alt+P</translation> </message> @@ -19936,12 +19936,12 @@ <translation>Modificado</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="690"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="700"/> <source>Process Generation Error</source> <translation>Error de Generación de Proceso</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="690"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="700"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>El proceso {0} no se ha podido ejecutar. Verifique que está en la ruta de búsqueda (search path).</translation> </message> @@ -19956,17 +19956,17 @@ <translation>Tags</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="492"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="502"/> <source>The hg process did not finish within 30s.</source> <translation>El proceso hg no terminó en un plazo de 30s.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="495"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="505"/> <source>Could not start the hg executable.</source> <translation>No se ha podido iniciar el ejecutable de hg.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="498"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="508"/> <source>Mercurial Error</source> <translation>Error de Mercurial</translation> </message> @@ -20041,22 +20041,37 @@ <translation>Fase</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="348"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="358"/> <source>Change the phase of the selected revisions</source> <translation>Cambiar la fase de las revisiones seleccionadas</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="351"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="361"/> <source><b>Change Phase</b> <p>This changes the phase of the selected revisions. The selected revisions have to have the same current phase.</p></source> <translation><b>Cambiar Fase</b> <p>Cambia la fase de las revisiones seleccionadas. Las revisiones seleccionadas deben tener la misma fase actual.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="355"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="365"/> <source>Change Phase</source> <translation>Cambiar Fase</translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="348"/> + <source>Press to copy the selected changesets to the current branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1352"/> + <source>Copy Changesets</source> + <translation type="unfinished">Copiar Changesets</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1352"/> + <source>The project should be reread. Do this now?</source> + <translation type="unfinished">El proyecto debería ser cargado de nuevo. ¿Desea hacerlo ahora?</translation> + </message> </context> <context> <name>HgLogDialog</name>
--- a/i18n/eric5_fr.ts Mon Mar 25 15:42:11 2013 +0100 +++ b/i18n/eric5_fr.ts Mon Mar 25 18:15:32 2013 +0100 @@ -19570,17 +19570,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2983"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2984"/> <source>Mercurial Command Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2854"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2855"/> <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="2983"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2984"/> <source><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> @@ -19600,42 +19600,42 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2670"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2671"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2697"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2698"/> <source>Copy Changesets (Continue)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2778"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2779"/> <source>Add Sub-repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2808"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2809"/> <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="2761"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2762"/> <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="2825"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2826"/> <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="2825"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2826"/> <source>Remove Sub-repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2797"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2798"/> <source><p>The sub-repositories file .hgsub does not exist. Aborting...</p></source> <translation type="unfinished"></translation> </message> @@ -21430,12 +21430,12 @@ <translation type="unfinished">Sélectionner le champ à filtrer</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1175"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1202"/> <source>Revision</source> <translation type="unfinished">Révision</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1172"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1199"/> <source>Author</source> <translation type="unfinished">Auteur</translation> </message> @@ -21530,52 +21530,52 @@ <translation type="unfinished">&Comparer des versions</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="383"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="393"/> <source>Errors</source> <translation type="unfinished">Erreurs</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="389"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="399"/> <source><b>Mercurial log errors</b><p>This shows possible error messages of the hg log command.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="405"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="415"/> <source>Input</source> <translation type="unfinished">Entrée</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="427"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="437"/> <source>Press to send the input to the hg process</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="430"/> - <source>&Send</source> - <translation type="unfinished">&Envoyer</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="433"/> - <source>Alt+S</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="440"/> - <source>Enter data to be sent to the hg process</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="447"/> - <source>Select to switch the input field to password mode</source> - <translation type="unfinished">Cocher pour basculer le champ d'entrée en mode Mot de Passe</translation> + <source>&Send</source> + <translation type="unfinished">&Envoyer</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="443"/> + <source>Alt+S</source> + <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="450"/> + <source>Enter data to be sent to the hg process</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="457"/> + <source>Select to switch the input field to password mode</source> + <translation type="unfinished">Cocher pour basculer le champ d'entrée en mode Mot de Passe</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="460"/> <source>&Password Mode</source> <translation type="unfinished">Mode Mot de &Passe</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="453"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="463"/> <source>Alt+P</source> <translation type="unfinished">Alt+P</translation> </message> @@ -21595,27 +21595,27 @@ <translation type="unfinished">Modifié</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="690"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="700"/> <source>Process Generation Error</source> <translation type="unfinished">Erreur du processus</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="690"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="700"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished">Impossible de lancer le processus {0}. Assurez-vous qu'il est bien dans le chemin de recherche.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="492"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="502"/> <source>The hg process did not finish within 30s.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="495"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="505"/> <source>Could not start the hg executable.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="498"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="508"/> <source>Mercurial Error</source> <translation type="unfinished"></translation> </message> @@ -21695,21 +21695,36 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="348"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="358"/> <source>Change the phase of the selected revisions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="351"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="361"/> <source><b>Change Phase</b> <p>This changes the phase of the selected revisions. The selected revisions have to have the same current phase.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="355"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="365"/> <source>Change Phase</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="348"/> + <source>Press to copy the selected changesets to the current branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1352"/> + <source>Copy Changesets</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1352"/> + <source>The project should be reread. Do this now?</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgLogDialog</name>
--- a/i18n/eric5_it.ts Mon Mar 25 15:42:11 2013 +0100 +++ b/i18n/eric5_it.ts Mon Mar 25 18:15:32 2013 +0100 @@ -18438,17 +18438,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2983"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2984"/> <source>Mercurial Command Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2854"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2855"/> <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="2983"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2984"/> <source><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> @@ -18468,42 +18468,42 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2670"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2671"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2697"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2698"/> <source>Copy Changesets (Continue)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2778"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2779"/> <source>Add Sub-repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2808"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2809"/> <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="2761"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2762"/> <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="2825"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2826"/> <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="2825"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2826"/> <source>Remove Sub-repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2797"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2798"/> <source><p>The sub-repositories file .hgsub does not exist. Aborting...</p></source> <translation type="unfinished"></translation> </message> @@ -20316,12 +20316,12 @@ <translation>Seleziona il campo su cui filtrare</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1175"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1202"/> <source>Revision</source> <translation>Revisione</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1172"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1199"/> <source>Author</source> <translation>Autore</translation> </message> @@ -20401,52 +20401,52 @@ <translation>&Confronta revisioni</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="383"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="393"/> <source>Errors</source> <translation>Errori</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="389"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="399"/> <source><b>Mercurial log errors</b><p>This shows possible error messages of the hg log command.</p></source> <translation><b>Log errori Mercurial</b><p>Mostra gli eventuali messaggi di errore del comando hg log.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="405"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="415"/> <source>Input</source> <translation>Input</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="427"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="437"/> <source>Press to send the input to the hg process</source> <translation>Premi per spedire l'input al processo hg</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="430"/> - <source>&Send</source> - <translation>&Spedisci</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="433"/> - <source>Alt+S</source> - <translation>Alt+S</translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="440"/> - <source>Enter data to be sent to the hg process</source> - <translation>Inserisci i dati da inviare al processo hg</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="447"/> - <source>Select to switch the input field to password mode</source> - <translation>Seleziona per impostare il campo di input in modalità password</translation> + <source>&Send</source> + <translation>&Spedisci</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="443"/> + <source>Alt+S</source> + <translation>Alt+S</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="450"/> + <source>Enter data to be sent to the hg process</source> + <translation>Inserisci i dati da inviare al processo hg</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="457"/> + <source>Select to switch the input field to password mode</source> + <translation>Seleziona per impostare il campo di input in modalità password</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="460"/> <source>&Password Mode</source> <translation>Modo &Password</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="453"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="463"/> <source>Alt+P</source> <translation>Alt+P</translation> </message> @@ -20466,27 +20466,27 @@ <translation>Modificato</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="690"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="700"/> <source>Process Generation Error</source> <translation>Errore Generazione Processo</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="690"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="700"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>Il processo {0} non può essere avviato. Assicurarsi che sia nel path.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="492"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="502"/> <source>The hg process did not finish within 30s.</source> <translation>Il processo hg non è finito entro i 30s.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="495"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="505"/> <source>Could not start the hg executable.</source> <translation>Non posso avviare l'eseguibile hg.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="498"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="508"/> <source>Mercurial Error</source> <translation>Mercurial Error</translation> </message> @@ -20561,21 +20561,36 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="348"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="358"/> <source>Change the phase of the selected revisions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="351"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="361"/> <source><b>Change Phase</b> <p>This changes the phase of the selected revisions. The selected revisions have to have the same current phase.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="355"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="365"/> <source>Change Phase</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="348"/> + <source>Press to copy the selected changesets to the current branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1352"/> + <source>Copy Changesets</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1352"/> + <source>The project should be reread. Do this now?</source> + <translation type="unfinished">Il progetto deve essere riletto. Farlo ora ?</translation> + </message> </context> <context> <name>HgLogDialog</name>
--- a/i18n/eric5_ru.ts Mon Mar 25 15:42:11 2013 +0100 +++ b/i18n/eric5_ru.ts Mon Mar 25 18:15:32 2013 +0100 @@ -18562,17 +18562,17 @@ <translation>Фиксировать изменения в репозиторий</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2983"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2984"/> <source>Mercurial Command Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2854"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2855"/> <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="2983"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2984"/> <source><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> @@ -18592,42 +18592,42 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2670"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2671"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2697"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2698"/> <source>Copy Changesets (Continue)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2778"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2779"/> <source>Add Sub-repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2808"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2809"/> <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="2761"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2762"/> <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="2825"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2826"/> <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="2825"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2826"/> <source>Remove Sub-repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2797"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2798"/> <source><p>The sub-repositories file .hgsub does not exist. Aborting...</p></source> <translation type="unfinished"></translation> </message> @@ -20435,12 +20435,12 @@ <translation>Задайте поле, по которому фильтровать</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1175"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1202"/> <source>Revision</source> <translation>Версия (ревизия)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1172"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1199"/> <source>Author</source> <translation>Автор</translation> </message> @@ -20510,53 +20510,53 @@ <translation>&Сравнить версии</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="383"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="393"/> <source>Errors</source> <translation>Ошибки</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="389"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="399"/> <source><b>Mercurial log errors</b><p>This shows possible error messages of the hg log command.</p></source> <translation><b>Ошибки</b> <p>Показаны возможные ошибки команды hg log.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="405"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="415"/> <source>Input</source> <translation>Ввод</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="427"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="437"/> <source>Press to send the input to the hg process</source> <translation>Отправить данные процессу hg</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="430"/> - <source>&Send</source> - <translation>&Отправить</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="433"/> - <source>Alt+S</source> - <translation>Alt+О</translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="440"/> - <source>Enter data to be sent to the hg process</source> - <translation>Задайте данные, которые будут посланы процессу hg</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="447"/> - <source>Select to switch the input field to password mode</source> - <translation>Задать режим ввода пароля для поля ввода пароля</translation> + <source>&Send</source> + <translation>&Отправить</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="443"/> + <source>Alt+S</source> + <translation>Alt+О</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="450"/> + <source>Enter data to be sent to the hg process</source> + <translation>Задайте данные, которые будут посланы процессу hg</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="457"/> + <source>Select to switch the input field to password mode</source> + <translation>Задать режим ввода пароля для поля ввода пароля</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="460"/> <source>&Password Mode</source> <translation>&Парольный режим</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="453"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="463"/> <source>Alt+P</source> <translation>Alt+П</translation> </message> @@ -20576,12 +20576,12 @@ <translation>Изменено</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="690"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="700"/> <source>Process Generation Error</source> <translation>Ошибка процесса генерации</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="690"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="700"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>Не могу запустить процесс {0}. Убедитесь, что он находится в пути поиска.</translation> </message> @@ -20596,17 +20596,17 @@ <translation>Метки</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="492"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="502"/> <source>The hg process did not finish within 30s.</source> <translation>Процесс hg не завершился в течение 30 секунд.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="495"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="505"/> <source>Could not start the hg executable.</source> <translation>Невозможно запустить исполняемый файл hg.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="498"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="508"/> <source>Mercurial Error</source> <translation>Ошибка Mercurial</translation> </message> @@ -20686,21 +20686,36 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="348"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="358"/> <source>Change the phase of the selected revisions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="351"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="361"/> <source><b>Change Phase</b> <p>This changes the phase of the selected revisions. The selected revisions have to have the same current phase.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="355"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="365"/> <source>Change Phase</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="348"/> + <source>Press to copy the selected changesets to the current branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1352"/> + <source>Copy Changesets</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1352"/> + <source>The project should be reread. Do this now?</source> + <translation type="unfinished">Необходимо перезагрузить проект. Сделать это?</translation> + </message> </context> <context> <name>HgLogDialog</name>
--- a/i18n/eric5_tr.ts Mon Mar 25 15:42:11 2013 +0100 +++ b/i18n/eric5_tr.ts Mon Mar 25 18:15:32 2013 +0100 @@ -18534,17 +18534,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2983"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2984"/> <source>Mercurial Command Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2854"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2855"/> <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="2983"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2984"/> <source><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> @@ -18564,42 +18564,42 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2670"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2671"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2697"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2698"/> <source>Copy Changesets (Continue)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2778"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2779"/> <source>Add Sub-repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2808"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2809"/> <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="2761"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2762"/> <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="2825"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2826"/> <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="2825"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2826"/> <source>Remove Sub-repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2797"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2798"/> <source><p>The sub-repositories file .hgsub does not exist. Aborting...</p></source> <translation type="unfinished"></translation> </message> @@ -20409,12 +20409,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1175"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1202"/> <source>Revision</source> <translation>Gözden Geçirme</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1172"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1199"/> <source>Author</source> <translation>Yazar</translation> </message> @@ -20519,52 +20519,52 @@ <translation>Gözden Geçirmeleri Karşılaş&tır</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="383"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="393"/> <source>Errors</source> <translation>Hatalar</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="389"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="399"/> <source><b>Mercurial log errors</b><p>This shows possible error messages of the hg log command.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="405"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="415"/> <source>Input</source> <translation>Girdi</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="427"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="437"/> <source>Press to send the input to the hg process</source> <translation>Hg işlem girdilerini göndermek için basınız</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="430"/> - <source>&Send</source> - <translation>&Gönder</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="433"/> - <source>Alt+S</source> - <translation>Alt+S</translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="440"/> - <source>Enter data to be sent to the hg process</source> - <translation>Hg işlemlerine göndermek için verileri giriniz</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="447"/> - <source>Select to switch the input field to password mode</source> - <translation>Giriş alanını parola moduna çevirmek için seçiniz</translation> + <source>&Send</source> + <translation>&Gönder</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="443"/> + <source>Alt+S</source> + <translation>Alt+S</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="450"/> + <source>Enter data to be sent to the hg process</source> + <translation>Hg işlemlerine göndermek için verileri giriniz</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="457"/> + <source>Select to switch the input field to password mode</source> + <translation>Giriş alanını parola moduna çevirmek için seçiniz</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="460"/> <source>&Password Mode</source> <translation>&Parola Modu</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="453"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="463"/> <source>Alt+P</source> <translation>Alt+P</translation> </message> @@ -20584,27 +20584,27 @@ <translation>Değiştirildi</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="492"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="502"/> <source>The hg process did not finish within 30s.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="495"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="505"/> <source>Could not start the hg executable.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="498"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="508"/> <source>Mercurial Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="690"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="700"/> <source>Process Generation Error</source> <translation>İşlem Üretecinde Hata</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="690"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="700"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>Süreç {0} başlatılamadı. Bunun arama yolunda olduğundan emin olun.</translation> </message> @@ -20659,21 +20659,36 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="348"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="358"/> <source>Change the phase of the selected revisions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="351"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="361"/> <source><b>Change Phase</b> <p>This changes the phase of the selected revisions. The selected revisions have to have the same current phase.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="355"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="365"/> <source>Change Phase</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="348"/> + <source>Press to copy the selected changesets to the current branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1352"/> + <source>Copy Changesets</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1352"/> + <source>The project should be reread. Do this now?</source> + <translation type="unfinished">Projenin yeniden okunması gerekiyor. Şimdi yapılsın mı?</translation> + </message> </context> <context> <name>HgLogDialog</name>
--- a/i18n/eric5_zh_CN.GB2312.ts Mon Mar 25 15:42:11 2013 +0100 +++ b/i18n/eric5_zh_CN.GB2312.ts Mon Mar 25 18:15:32 2013 +0100 @@ -19509,17 +19509,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2983"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2984"/> <source>Mercurial Command Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2854"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2855"/> <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="2983"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2984"/> <source><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> @@ -19539,42 +19539,42 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2670"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2671"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2697"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2698"/> <source>Copy Changesets (Continue)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2778"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2779"/> <source>Add Sub-repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2808"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2809"/> <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="2761"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2762"/> <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="2825"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2826"/> <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="2825"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2826"/> <source>Remove Sub-repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2797"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2798"/> <source><p>The sub-repositories file .hgsub does not exist. Aborting...</p></source> <translation type="unfinished"></translation> </message> @@ -21369,12 +21369,12 @@ <translation type="unfinished">选择要过滤的区域</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1175"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1202"/> <source>Revision</source> <translation type="unfinished">修订</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1172"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1199"/> <source>Author</source> <translation type="unfinished">作者</translation> </message> @@ -21469,52 +21469,52 @@ <translation type="unfinished">比较修订(&C)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="383"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="393"/> <source>Errors</source> <translation type="unfinished">错误</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="389"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="399"/> <source><b>Mercurial log errors</b><p>This shows possible error messages of the hg log command.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="405"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="415"/> <source>Input</source> <translation type="unfinished">输入</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="427"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="437"/> <source>Press to send the input to the hg process</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="430"/> - <source>&Send</source> - <translation type="unfinished">发送(&S)</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="433"/> - <source>Alt+S</source> - <translation type="unfinished">Alt+S</translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="440"/> - <source>Enter data to be sent to the hg process</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="447"/> - <source>Select to switch the input field to password mode</source> - <translation type="unfinished">选择将输入区域转换成密码模式</translation> + <source>&Send</source> + <translation type="unfinished">发送(&S)</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="443"/> + <source>Alt+S</source> + <translation type="unfinished">Alt+S</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="450"/> + <source>Enter data to be sent to the hg process</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="457"/> + <source>Select to switch the input field to password mode</source> + <translation type="unfinished">选择将输入区域转换成密码模式</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="460"/> <source>&Password Mode</source> <translation type="unfinished">密码模式(&P)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="453"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="463"/> <source>Alt+P</source> <translation type="unfinished">Alt+P</translation> </message> @@ -21534,27 +21534,27 @@ <translation type="unfinished">已修改</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="690"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="700"/> <source>Process Generation Error</source> <translation type="unfinished">进程生成错误</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="690"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="700"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="492"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="502"/> <source>The hg process did not finish within 30s.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="495"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="505"/> <source>Could not start the hg executable.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="498"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="508"/> <source>Mercurial Error</source> <translation type="unfinished"></translation> </message> @@ -21634,21 +21634,36 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="348"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="358"/> <source>Change the phase of the selected revisions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="351"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="361"/> <source><b>Change Phase</b> <p>This changes the phase of the selected revisions. The selected revisions have to have the same current phase.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="355"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="365"/> <source>Change Phase</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="348"/> + <source>Press to copy the selected changesets to the current branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1352"/> + <source>Copy Changesets</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1352"/> + <source>The project should be reread. Do this now?</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgLogDialog</name>