Sat, 28 Jan 2017 14:22:00 +0100
Added up and down buttons to move the current entry to the Mercurial and Subversion log browsers.
--- a/APIs/Python3/eric6.api Sat Jan 28 12:39:43 2017 +0100 +++ b/APIs/Python3/eric6.api Sat Jan 28 14:22:00 2017 +0100 @@ -4884,6 +4884,7 @@ eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.HgLogBrowserDialog.on_diffP1Button_clicked?4() eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.HgLogBrowserDialog.on_diffP2Button_clicked?4() eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.HgLogBrowserDialog.on_diffRevisionsButton_clicked?4() +eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.HgLogBrowserDialog.on_downButton_clicked?4() eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.HgLogBrowserDialog.on_fieldCombo_activated?4(txt) eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.HgLogBrowserDialog.on_findNextButton_clicked?4() eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.HgLogBrowserDialog.on_findPrevButton_clicked?4() @@ -4900,6 +4901,7 @@ eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.HgLogBrowserDialog.on_sendButton_clicked?4() eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.HgLogBrowserDialog.on_stopCheckBox_clicked?4(checked) eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.HgLogBrowserDialog.on_toDate_dateChanged?4(date) +eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.HgLogBrowserDialog.on_upButton_clicked?4() eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.HgLogBrowserDialog.show?4() eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.HgLogBrowserDialog.start?4(fn, bundle=None, isFile=False, noEntries=0) eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.HgLogBrowserDialog?1(vcs, mode="log", parent=None) @@ -5498,6 +5500,7 @@ eric6.Plugins.VcsPlugins.vcsPySvn.SvnLogBrowserDialog.SvnLogBrowserDialog.on_buttonBox_clicked?4(button) eric6.Plugins.VcsPlugins.vcsPySvn.SvnLogBrowserDialog.SvnLogBrowserDialog.on_diffPreviousButton_clicked?4() eric6.Plugins.VcsPlugins.vcsPySvn.SvnLogBrowserDialog.SvnLogBrowserDialog.on_diffRevisionsButton_clicked?4() +eric6.Plugins.VcsPlugins.vcsPySvn.SvnLogBrowserDialog.SvnLogBrowserDialog.on_downButton_clicked?4() eric6.Plugins.VcsPlugins.vcsPySvn.SvnLogBrowserDialog.SvnLogBrowserDialog.on_fieldCombo_activated?4(txt) eric6.Plugins.VcsPlugins.vcsPySvn.SvnLogBrowserDialog.SvnLogBrowserDialog.on_fromDate_dateChanged?4(date) eric6.Plugins.VcsPlugins.vcsPySvn.SvnLogBrowserDialog.SvnLogBrowserDialog.on_logTree_currentItemChanged?4(current, previous) @@ -5506,6 +5509,7 @@ eric6.Plugins.VcsPlugins.vcsPySvn.SvnLogBrowserDialog.SvnLogBrowserDialog.on_rxEdit_textChanged?4(txt) eric6.Plugins.VcsPlugins.vcsPySvn.SvnLogBrowserDialog.SvnLogBrowserDialog.on_stopCheckBox_clicked?4(checked) eric6.Plugins.VcsPlugins.vcsPySvn.SvnLogBrowserDialog.SvnLogBrowserDialog.on_toDate_dateChanged?4(date) +eric6.Plugins.VcsPlugins.vcsPySvn.SvnLogBrowserDialog.SvnLogBrowserDialog.on_upButton_clicked?4() eric6.Plugins.VcsPlugins.vcsPySvn.SvnLogBrowserDialog.SvnLogBrowserDialog.show?4() eric6.Plugins.VcsPlugins.vcsPySvn.SvnLogBrowserDialog.SvnLogBrowserDialog.start?4(fn, isFile=False) eric6.Plugins.VcsPlugins.vcsPySvn.SvnLogBrowserDialog.SvnLogBrowserDialog?1(vcs, parent=None) @@ -5729,6 +5733,7 @@ eric6.Plugins.VcsPlugins.vcsSubversion.SvnLogBrowserDialog.SvnLogBrowserDialog.on_buttonBox_clicked?4(button) eric6.Plugins.VcsPlugins.vcsSubversion.SvnLogBrowserDialog.SvnLogBrowserDialog.on_diffPreviousButton_clicked?4() eric6.Plugins.VcsPlugins.vcsSubversion.SvnLogBrowserDialog.SvnLogBrowserDialog.on_diffRevisionsButton_clicked?4() +eric6.Plugins.VcsPlugins.vcsSubversion.SvnLogBrowserDialog.SvnLogBrowserDialog.on_downButton_clicked?4() eric6.Plugins.VcsPlugins.vcsSubversion.SvnLogBrowserDialog.SvnLogBrowserDialog.on_fieldCombo_activated?4(txt) eric6.Plugins.VcsPlugins.vcsSubversion.SvnLogBrowserDialog.SvnLogBrowserDialog.on_fromDate_dateChanged?4(date) eric6.Plugins.VcsPlugins.vcsSubversion.SvnLogBrowserDialog.SvnLogBrowserDialog.on_input_returnPressed?4() @@ -5740,6 +5745,7 @@ eric6.Plugins.VcsPlugins.vcsSubversion.SvnLogBrowserDialog.SvnLogBrowserDialog.on_sendButton_clicked?4() eric6.Plugins.VcsPlugins.vcsSubversion.SvnLogBrowserDialog.SvnLogBrowserDialog.on_stopCheckBox_clicked?4(checked) eric6.Plugins.VcsPlugins.vcsSubversion.SvnLogBrowserDialog.SvnLogBrowserDialog.on_toDate_dateChanged?4(date) +eric6.Plugins.VcsPlugins.vcsSubversion.SvnLogBrowserDialog.SvnLogBrowserDialog.on_upButton_clicked?4() eric6.Plugins.VcsPlugins.vcsSubversion.SvnLogBrowserDialog.SvnLogBrowserDialog.show?4() eric6.Plugins.VcsPlugins.vcsSubversion.SvnLogBrowserDialog.SvnLogBrowserDialog.start?4(fn, isFile=False) eric6.Plugins.VcsPlugins.vcsSubversion.SvnLogBrowserDialog.SvnLogBrowserDialog?1(vcs, parent=None)
--- a/Documentation/Help/source.qhp Sat Jan 28 12:39:43 2017 +0100 +++ b/Documentation/Help/source.qhp Sat Jan 28 14:22:00 2017 +0100 @@ -7608,6 +7608,7 @@ <keyword name="HgLogBrowserDialog.on_diffP1Button_clicked" id="HgLogBrowserDialog.on_diffP1Button_clicked" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.on_diffP1Button_clicked" /> <keyword name="HgLogBrowserDialog.on_diffP2Button_clicked" id="HgLogBrowserDialog.on_diffP2Button_clicked" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.on_diffP2Button_clicked" /> <keyword name="HgLogBrowserDialog.on_diffRevisionsButton_clicked" id="HgLogBrowserDialog.on_diffRevisionsButton_clicked" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.on_diffRevisionsButton_clicked" /> + <keyword name="HgLogBrowserDialog.on_downButton_clicked" id="HgLogBrowserDialog.on_downButton_clicked" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.on_downButton_clicked" /> <keyword name="HgLogBrowserDialog.on_fieldCombo_activated" id="HgLogBrowserDialog.on_fieldCombo_activated" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.on_fieldCombo_activated" /> <keyword name="HgLogBrowserDialog.on_findNextButton_clicked" id="HgLogBrowserDialog.on_findNextButton_clicked" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.on_findNextButton_clicked" /> <keyword name="HgLogBrowserDialog.on_findPrevButton_clicked" id="HgLogBrowserDialog.on_findPrevButton_clicked" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.on_findPrevButton_clicked" /> @@ -7624,6 +7625,7 @@ <keyword name="HgLogBrowserDialog.on_sendButton_clicked" id="HgLogBrowserDialog.on_sendButton_clicked" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.on_sendButton_clicked" /> <keyword name="HgLogBrowserDialog.on_stopCheckBox_clicked" id="HgLogBrowserDialog.on_stopCheckBox_clicked" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.on_stopCheckBox_clicked" /> <keyword name="HgLogBrowserDialog.on_toDate_dateChanged" id="HgLogBrowserDialog.on_toDate_dateChanged" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.on_toDate_dateChanged" /> + <keyword name="HgLogBrowserDialog.on_upButton_clicked" id="HgLogBrowserDialog.on_upButton_clicked" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.on_upButton_clicked" /> <keyword name="HgLogBrowserDialog.show" id="HgLogBrowserDialog.show" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.show" /> <keyword name="HgLogBrowserDialog.start" id="HgLogBrowserDialog.start" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.start" /> <keyword name="HgLogDialog" id="HgLogDialog" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogDialog.html#HgLogDialog" /> @@ -13307,6 +13309,8 @@ <keyword name="SvnLogBrowserDialog.on_diffPreviousButton_clicked" id="SvnLogBrowserDialog.on_diffPreviousButton_clicked" ref="eric6.Plugins.VcsPlugins.vcsSubversion.SvnLogBrowserDialog.html#SvnLogBrowserDialog.on_diffPreviousButton_clicked" /> <keyword name="SvnLogBrowserDialog.on_diffRevisionsButton_clicked" id="SvnLogBrowserDialog.on_diffRevisionsButton_clicked" ref="eric6.Plugins.VcsPlugins.vcsPySvn.SvnLogBrowserDialog.html#SvnLogBrowserDialog.on_diffRevisionsButton_clicked" /> <keyword name="SvnLogBrowserDialog.on_diffRevisionsButton_clicked" id="SvnLogBrowserDialog.on_diffRevisionsButton_clicked" ref="eric6.Plugins.VcsPlugins.vcsSubversion.SvnLogBrowserDialog.html#SvnLogBrowserDialog.on_diffRevisionsButton_clicked" /> + <keyword name="SvnLogBrowserDialog.on_downButton_clicked" id="SvnLogBrowserDialog.on_downButton_clicked" ref="eric6.Plugins.VcsPlugins.vcsPySvn.SvnLogBrowserDialog.html#SvnLogBrowserDialog.on_downButton_clicked" /> + <keyword name="SvnLogBrowserDialog.on_downButton_clicked" id="SvnLogBrowserDialog.on_downButton_clicked" ref="eric6.Plugins.VcsPlugins.vcsSubversion.SvnLogBrowserDialog.html#SvnLogBrowserDialog.on_downButton_clicked" /> <keyword name="SvnLogBrowserDialog.on_fieldCombo_activated" id="SvnLogBrowserDialog.on_fieldCombo_activated" ref="eric6.Plugins.VcsPlugins.vcsPySvn.SvnLogBrowserDialog.html#SvnLogBrowserDialog.on_fieldCombo_activated" /> <keyword name="SvnLogBrowserDialog.on_fieldCombo_activated" id="SvnLogBrowserDialog.on_fieldCombo_activated" ref="eric6.Plugins.VcsPlugins.vcsSubversion.SvnLogBrowserDialog.html#SvnLogBrowserDialog.on_fieldCombo_activated" /> <keyword name="SvnLogBrowserDialog.on_fromDate_dateChanged" id="SvnLogBrowserDialog.on_fromDate_dateChanged" ref="eric6.Plugins.VcsPlugins.vcsPySvn.SvnLogBrowserDialog.html#SvnLogBrowserDialog.on_fromDate_dateChanged" /> @@ -13326,6 +13330,8 @@ <keyword name="SvnLogBrowserDialog.on_stopCheckBox_clicked" id="SvnLogBrowserDialog.on_stopCheckBox_clicked" ref="eric6.Plugins.VcsPlugins.vcsSubversion.SvnLogBrowserDialog.html#SvnLogBrowserDialog.on_stopCheckBox_clicked" /> <keyword name="SvnLogBrowserDialog.on_toDate_dateChanged" id="SvnLogBrowserDialog.on_toDate_dateChanged" ref="eric6.Plugins.VcsPlugins.vcsPySvn.SvnLogBrowserDialog.html#SvnLogBrowserDialog.on_toDate_dateChanged" /> <keyword name="SvnLogBrowserDialog.on_toDate_dateChanged" id="SvnLogBrowserDialog.on_toDate_dateChanged" ref="eric6.Plugins.VcsPlugins.vcsSubversion.SvnLogBrowserDialog.html#SvnLogBrowserDialog.on_toDate_dateChanged" /> + <keyword name="SvnLogBrowserDialog.on_upButton_clicked" id="SvnLogBrowserDialog.on_upButton_clicked" ref="eric6.Plugins.VcsPlugins.vcsPySvn.SvnLogBrowserDialog.html#SvnLogBrowserDialog.on_upButton_clicked" /> + <keyword name="SvnLogBrowserDialog.on_upButton_clicked" id="SvnLogBrowserDialog.on_upButton_clicked" ref="eric6.Plugins.VcsPlugins.vcsSubversion.SvnLogBrowserDialog.html#SvnLogBrowserDialog.on_upButton_clicked" /> <keyword name="SvnLogBrowserDialog.show" id="SvnLogBrowserDialog.show" ref="eric6.Plugins.VcsPlugins.vcsPySvn.SvnLogBrowserDialog.html#SvnLogBrowserDialog.show" /> <keyword name="SvnLogBrowserDialog.show" id="SvnLogBrowserDialog.show" ref="eric6.Plugins.VcsPlugins.vcsSubversion.SvnLogBrowserDialog.html#SvnLogBrowserDialog.show" /> <keyword name="SvnLogBrowserDialog.start" id="SvnLogBrowserDialog.start" ref="eric6.Plugins.VcsPlugins.vcsPySvn.SvnLogBrowserDialog.html#SvnLogBrowserDialog.start" />
--- a/Documentation/Source/eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html Sat Jan 28 12:39:43 2017 +0100 +++ b/Documentation/Source/eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html Sat Jan 28 14:22:00 2017 +0100 @@ -216,6 +216,9 @@ <td><a href="#HgLogBrowserDialog.on_diffRevisionsButton_clicked">on_diffRevisionsButton_clicked</a></td> <td>Private slot to handle the Compare Revisions button.</td> </tr><tr> +<td><a href="#HgLogBrowserDialog.on_downButton_clicked">on_downButton_clicked</a></td> +<td>Private slot to move the current item down one entry.</td> +</tr><tr> <td><a href="#HgLogBrowserDialog.on_fieldCombo_activated">on_fieldCombo_activated</a></td> <td>Private slot called, when a new filter field is selected.</td> </tr><tr> @@ -264,6 +267,9 @@ <td><a href="#HgLogBrowserDialog.on_toDate_dateChanged">on_toDate_dateChanged</a></td> <td>Private slot called, when the from date changes.</td> </tr><tr> +<td><a href="#HgLogBrowserDialog.on_upButton_clicked">on_upButton_clicked</a></td> +<td>Private slot to move the current item up one entry.</td> +</tr><tr> <td><a href="#HgLogBrowserDialog.show">show</a></td> <td>Public slot to show the dialog.</td> </tr><tr> @@ -792,6 +798,11 @@ <b>on_diffRevisionsButton_clicked</b>(<i></i>) <p> Private slot to handle the Compare Revisions button. +</p><a NAME="HgLogBrowserDialog.on_downButton_clicked" ID="HgLogBrowserDialog.on_downButton_clicked"></a> +<h4>HgLogBrowserDialog.on_downButton_clicked</h4> +<b>on_downButton_clicked</b>(<i></i>) +<p> + Private slot to move the current item down one entry. </p><a NAME="HgLogBrowserDialog.on_fieldCombo_activated" ID="HgLogBrowserDialog.on_fieldCombo_activated"></a> <h4>HgLogBrowserDialog.on_fieldCombo_activated</h4> <b>on_fieldCombo_activated</b>(<i>txt</i>) @@ -915,7 +926,12 @@ <dd> new date (QDate) </dd> -</dl><a NAME="HgLogBrowserDialog.show" ID="HgLogBrowserDialog.show"></a> +</dl><a NAME="HgLogBrowserDialog.on_upButton_clicked" ID="HgLogBrowserDialog.on_upButton_clicked"></a> +<h4>HgLogBrowserDialog.on_upButton_clicked</h4> +<b>on_upButton_clicked</b>(<i></i>) +<p> + Private slot to move the current item up one entry. +</p><a NAME="HgLogBrowserDialog.show" ID="HgLogBrowserDialog.show"></a> <h4>HgLogBrowserDialog.show</h4> <b>show</b>(<i></i>) <p>
--- a/Documentation/Source/eric6.Plugins.VcsPlugins.vcsPySvn.SvnLogBrowserDialog.html Sat Jan 28 12:39:43 2017 +0100 +++ b/Documentation/Source/eric6.Plugins.VcsPlugins.vcsPySvn.SvnLogBrowserDialog.html Sat Jan 28 14:22:00 2017 +0100 @@ -114,6 +114,9 @@ <td><a href="#SvnLogBrowserDialog.on_diffRevisionsButton_clicked">on_diffRevisionsButton_clicked</a></td> <td>Private slot to handle the Compare Revisions button.</td> </tr><tr> +<td><a href="#SvnLogBrowserDialog.on_downButton_clicked">on_downButton_clicked</a></td> +<td>Private slot to move the current item down one entry.</td> +</tr><tr> <td><a href="#SvnLogBrowserDialog.on_fieldCombo_activated">on_fieldCombo_activated</a></td> <td>Private slot called, when a new filter field is selected.</td> </tr><tr> @@ -138,6 +141,9 @@ <td><a href="#SvnLogBrowserDialog.on_toDate_dateChanged">on_toDate_dateChanged</a></td> <td>Private slot called, when the from date changes.</td> </tr><tr> +<td><a href="#SvnLogBrowserDialog.on_upButton_clicked">on_upButton_clicked</a></td> +<td>Private slot to move the current item up one entry.</td> +</tr><tr> <td><a href="#SvnLogBrowserDialog.show">show</a></td> <td>Public slot to show the dialog.</td> </tr><tr> @@ -325,6 +331,11 @@ <b>on_diffRevisionsButton_clicked</b>(<i></i>) <p> Private slot to handle the Compare Revisions button. +</p><a NAME="SvnLogBrowserDialog.on_downButton_clicked" ID="SvnLogBrowserDialog.on_downButton_clicked"></a> +<h4>SvnLogBrowserDialog.on_downButton_clicked</h4> +<b>on_downButton_clicked</b>(<i></i>) +<p> + Private slot to move the current item down one entry. </p><a NAME="SvnLogBrowserDialog.on_fieldCombo_activated" ID="SvnLogBrowserDialog.on_fieldCombo_activated"></a> <h4>SvnLogBrowserDialog.on_fieldCombo_activated</h4> <b>on_fieldCombo_activated</b>(<i>txt</i>) @@ -398,7 +409,12 @@ <dd> new date (QDate) </dd> -</dl><a NAME="SvnLogBrowserDialog.show" ID="SvnLogBrowserDialog.show"></a> +</dl><a NAME="SvnLogBrowserDialog.on_upButton_clicked" ID="SvnLogBrowserDialog.on_upButton_clicked"></a> +<h4>SvnLogBrowserDialog.on_upButton_clicked</h4> +<b>on_upButton_clicked</b>(<i></i>) +<p> + Private slot to move the current item up one entry. +</p><a NAME="SvnLogBrowserDialog.show" ID="SvnLogBrowserDialog.show"></a> <h4>SvnLogBrowserDialog.show</h4> <b>show</b>(<i></i>) <p>
--- a/Documentation/Source/eric6.Plugins.VcsPlugins.vcsSubversion.SvnLogBrowserDialog.html Sat Jan 28 12:39:43 2017 +0100 +++ b/Documentation/Source/eric6.Plugins.VcsPlugins.vcsSubversion.SvnLogBrowserDialog.html Sat Jan 28 14:22:00 2017 +0100 @@ -123,6 +123,9 @@ <td><a href="#SvnLogBrowserDialog.on_diffRevisionsButton_clicked">on_diffRevisionsButton_clicked</a></td> <td>Private slot to handle the Compare Revisions button.</td> </tr><tr> +<td><a href="#SvnLogBrowserDialog.on_downButton_clicked">on_downButton_clicked</a></td> +<td>Private slot to move the current item down one entry.</td> +</tr><tr> <td><a href="#SvnLogBrowserDialog.on_fieldCombo_activated">on_fieldCombo_activated</a></td> <td>Private slot called, when a new filter field is selected.</td> </tr><tr> @@ -156,6 +159,9 @@ <td><a href="#SvnLogBrowserDialog.on_toDate_dateChanged">on_toDate_dateChanged</a></td> <td>Private slot called, when the from date changes.</td> </tr><tr> +<td><a href="#SvnLogBrowserDialog.on_upButton_clicked">on_upButton_clicked</a></td> +<td>Private slot to move the current item up one entry.</td> +</tr><tr> <td><a href="#SvnLogBrowserDialog.show">show</a></td> <td>Public slot to show the dialog.</td> </tr><tr> @@ -369,6 +375,11 @@ <b>on_diffRevisionsButton_clicked</b>(<i></i>) <p> Private slot to handle the Compare Revisions button. +</p><a NAME="SvnLogBrowserDialog.on_downButton_clicked" ID="SvnLogBrowserDialog.on_downButton_clicked"></a> +<h4>SvnLogBrowserDialog.on_downButton_clicked</h4> +<b>on_downButton_clicked</b>(<i></i>) +<p> + Private slot to move the current item down one entry. </p><a NAME="SvnLogBrowserDialog.on_fieldCombo_activated" ID="SvnLogBrowserDialog.on_fieldCombo_activated"></a> <h4>SvnLogBrowserDialog.on_fieldCombo_activated</h4> <b>on_fieldCombo_activated</b>(<i>txt</i>) @@ -462,7 +473,12 @@ <dd> new date (QDate) </dd> -</dl><a NAME="SvnLogBrowserDialog.show" ID="SvnLogBrowserDialog.show"></a> +</dl><a NAME="SvnLogBrowserDialog.on_upButton_clicked" ID="SvnLogBrowserDialog.on_upButton_clicked"></a> +<h4>SvnLogBrowserDialog.on_upButton_clicked</h4> +<b>on_upButton_clicked</b>(<i></i>) +<p> + Private slot to move the current item up one entry. +</p><a NAME="SvnLogBrowserDialog.show" ID="SvnLogBrowserDialog.show"></a> <h4>SvnLogBrowserDialog.show</h4> <b>show</b>(<i></i>) <p>
--- a/Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py Sat Jan 28 12:39:43 2017 +0100 +++ b/Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py Sat Jan 28 14:22:00 2017 +0100 @@ -82,6 +82,9 @@ self.filesTree.headerItem().setText(self.filesTree.columnCount(), "") self.filesTree.header().setSortIndicator(0, Qt.AscendingOrder) + self.upButton.setIcon(UI.PixmapCache.getIcon("1uparrow.png")) + self.downButton.setIcon(UI.PixmapCache.getIcon("1downarrow.png")) + self.refreshButton = self.buttonBox.addButton( self.tr("&Refresh"), QDialogButtonBox.ActionRole) self.refreshButton.setToolTip( @@ -1394,6 +1397,14 @@ for col in range(self.logTree.columnCount()): current and current.setFont(col, self.__logTreeBoldFont) previous and previous.setFont(col, self.__logTreeNormalFont) + + # set the state of the up and down buttons + self.upButton.setEnabled( + current is not None and + self.logTree.indexOfTopLevelItem(current) > 0) + self.downButton.setEnabled( + current is not None and + int(current.text(self.RevisionColumn).split(":")[0]) > 0) @pyqtSlot() def on_logTree_itemSelectionChanged(self): @@ -1407,6 +1418,28 @@ self.__updateToolMenuActions() @pyqtSlot() + def on_upButton_clicked(self): + """ + Private slot to move the current item up one entry. + """ + itm = self.logTree.itemAbove(self.logTree.currentItem()) + if itm: + self.logTree.setCurrentItem(itm) + + @pyqtSlot() + def on_downButton_clicked(self): + """ + Private slot to move the current item down one entry. + """ + itm = self.logTree.itemBelow(self.logTree.currentItem()) + if itm: + self.logTree.setCurrentItem(itm) + else: + # load the next bunch and try again + self.on_nextButton_clicked() + self.on_downButton_clicked() + + @pyqtSlot() def on_nextButton_clicked(self): """ Private slot to handle the Next button.
--- a/Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui Sat Jan 28 12:39:43 2017 +0100 +++ b/Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui Sat Jan 28 14:22:00 2017 +0100 @@ -320,6 +320,16 @@ </property> </widget> </item> + <item row="0" column="2"> + <widget class="QCheckBox" name="stopCheckBox"> + <property name="toolTip"> + <string>Select to stop listing log messages at a copy or move</string> + </property> + <property name="text"> + <string>Stop on Copy/Move</string> + </property> + </widget> + </item> <item row="0" column="3" rowspan="2"> <widget class="Line" name="line"> <property name="frameShadow"> @@ -333,17 +343,27 @@ </property> </widget> </item> - <item row="0" column="2"> - <widget class="QCheckBox" name="stopCheckBox"> + <item row="0" column="4"> + <widget class="QToolButton" name="upButton"> <property name="toolTip"> - <string>Select to stop listing log messages at a copy or move</string> + <string>Press to move up in the log list</string> </property> - <property name="text"> - <string>Stop on Copy/Move</string> + <property name="autoRepeat"> + <bool>true</bool> </property> </widget> </item> - <item row="0" column="4"> + <item row="0" column="5"> + <widget class="QToolButton" name="downButton"> + <property name="toolTip"> + <string>Press to move down in the log list</string> + </property> + <property name="autoRepeat"> + <bool>true</bool> + </property> + </widget> + </item> + <item row="0" column="6"> <widget class="QPushButton" name="diffP1Button"> <property name="toolTip"> <string>Press to generate a diff to the first parent revision</string> @@ -353,7 +373,7 @@ </property> </widget> </item> - <item row="0" column="5"> + <item row="0" column="7"> <widget class="QPushButton" name="diffP2Button"> <property name="toolTip"> <string>Press to generate a diff to the second parent revision</string> @@ -363,7 +383,7 @@ </property> </widget> </item> - <item row="0" column="6"> + <item row="0" column="8"> <widget class="QPushButton" name="diffRevisionsButton"> <property name="toolTip"> <string>Press to compare two revisions</string> @@ -373,7 +393,7 @@ </property> </widget> </item> - <item row="0" column="7" rowspan="2"> + <item row="0" column="9" rowspan="2"> <widget class="Line" name="phaseLine"> <property name="frameShadow"> <enum>QFrame::Raised</enum> @@ -386,7 +406,17 @@ </property> </widget> </item> - <item row="0" column="9"> + <item row="0" column="10"> + <widget class="QToolButton" name="actionsButton"> + <property name="toolTip"> + <string>Select action from menu</string> + </property> + <property name="popupMode"> + <enum>QToolButton::InstantPopup</enum> + </property> + </widget> + </item> + <item row="0" column="11"> <spacer> <property name="orientation"> <enum>Qt::Horizontal</enum> @@ -394,12 +424,12 @@ <property name="sizeHint" stdset="0"> <size> <width>38</width> - <height>29</height> + <height>18</height> </size> </property> </spacer> </item> - <item row="1" column="4" colspan="3"> + <item row="1" column="4" colspan="5"> <widget class="QCheckBox" name="sbsCheckBox"> <property name="toolTip"> <string>Select to show differences side-by-side</string> @@ -409,16 +439,6 @@ </property> </widget> </item> - <item row="0" column="8"> - <widget class="QToolButton" name="actionsButton"> - <property name="toolTip"> - <string>Select action from menu</string> - </property> - <property name="popupMode"> - <enum>QToolButton::InstantPopup</enum> - </property> - </widget> - </item> </layout> </item> <item> @@ -542,6 +562,8 @@ <tabstop>nextButton</tabstop> <tabstop>limitSpinBox</tabstop> <tabstop>stopCheckBox</tabstop> + <tabstop>upButton</tabstop> + <tabstop>downButton</tabstop> <tabstop>diffP1Button</tabstop> <tabstop>diffP2Button</tabstop> <tabstop>diffRevisionsButton</tabstop>
--- a/Plugins/VcsPlugins/vcsPySvn/SvnLogBrowserDialog.py Sat Jan 28 12:39:43 2017 +0100 +++ b/Plugins/VcsPlugins/vcsPySvn/SvnLogBrowserDialog.py Sat Jan 28 14:22:00 2017 +0100 @@ -26,6 +26,8 @@ from .Ui_SvnLogBrowserDialog import Ui_SvnLogBrowserDialog +import UI.PixmapCache + class SvnLogBrowserDialog(QWidget, SvnDialogMixin, Ui_SvnLogBrowserDialog): """ @@ -47,6 +49,9 @@ self.buttonBox.button(QDialogButtonBox.Close).setEnabled(False) self.buttonBox.button(QDialogButtonBox.Cancel).setDefault(True) + self.upButton.setIcon(UI.PixmapCache.getIcon("1uparrow.png")) + self.downButton.setIcon(UI.PixmapCache.getIcon("1downarrow.png")) + self.filesTree.headerItem().setText(self.filesTree.columnCount(), "") self.filesTree.header().setSortIndicator(0, Qt.AscendingOrder) @@ -68,6 +73,11 @@ 'R': self.tr('Replaced'), } + self.__logTreeNormalFont = self.logTree.font() + self.__logTreeNormalFont.setBold(False) + self.__logTreeBoldFont = self.logTree.font() + self.__logTreeBoldFont.setBold(True) + self.client = self.vcs.getClient() self.client.callback_cancel = \ self._clientCancelCallback @@ -427,6 +437,19 @@ self.diffPreviousButton.setEnabled( current != self.logTree.topLevelItem( self.logTree.topLevelItemCount() - 1)) + + # Highlight the current entry using a bold font + for col in range(self.logTree.columnCount()): + current and current.setFont(col, self.__logTreeBoldFont) + previous and previous.setFont(col, self.__logTreeNormalFont) + + # set the state of the up and down buttons + self.upButton.setEnabled( + current is not None and + self.logTree.indexOfTopLevelItem(current) > 0) + self.downButton.setEnabled( + current is not None and + int(current.text(0)) > 1) @pyqtSlot() def on_logTree_itemSelectionChanged(self): @@ -586,3 +609,25 @@ int(self.stopCheckBox.isChecked())) self.nextButton.setEnabled(True) self.limitSpinBox.setEnabled(True) + + @pyqtSlot() + def on_upButton_clicked(self): + """ + Private slot to move the current item up one entry. + """ + itm = self.logTree.itemAbove(self.logTree.currentItem()) + if itm: + self.logTree.setCurrentItem(itm) + + @pyqtSlot() + def on_downButton_clicked(self): + """ + Private slot to move the current item down one entry. + """ + itm = self.logTree.itemBelow(self.logTree.currentItem()) + if itm: + self.logTree.setCurrentItem(itm) + else: + # load the next bunch and try again + self.on_nextButton_clicked() + self.on_downButton_clicked()
--- a/Plugins/VcsPlugins/vcsPySvn/SvnLogBrowserDialog.ui Sat Jan 28 12:39:43 2017 +0100 +++ b/Plugins/VcsPlugins/vcsPySvn/SvnLogBrowserDialog.ui Sat Jan 28 14:22:00 2017 +0100 @@ -228,14 +228,34 @@ </property> </widget> </item> - <item row="0" column="3" rowspan="2"> + <item row="0" column="3" rowspan="2" colspan="2"> <widget class="Line" name="line"> <property name="orientation"> <enum>Qt::Vertical</enum> </property> </widget> </item> - <item row="0" column="4"> + <item row="0" column="5"> + <widget class="QToolButton" name="upButton"> + <property name="toolTip"> + <string>Press to move up in the log list</string> + </property> + <property name="autoRepeat"> + <bool>true</bool> + </property> + </widget> + </item> + <item row="0" column="6"> + <widget class="QToolButton" name="downButton"> + <property name="toolTip"> + <string>Press to move down in the log list</string> + </property> + <property name="autoRepeat"> + <bool>true</bool> + </property> + </widget> + </item> + <item row="0" column="7"> <widget class="QPushButton" name="diffPreviousButton"> <property name="toolTip"> <string>Press to generate a diff to the previous revision</string> @@ -245,7 +265,7 @@ </property> </widget> </item> - <item row="0" column="5"> + <item row="0" column="8"> <widget class="QPushButton" name="diffRevisionsButton"> <property name="toolTip"> <string>Press to compare two revisions</string> @@ -255,7 +275,7 @@ </property> </widget> </item> - <item row="0" column="6"> + <item row="0" column="9"> <spacer> <property name="orientation"> <enum>Qt::Horizontal</enum> @@ -268,7 +288,7 @@ </property> </spacer> </item> - <item row="1" column="4" colspan="3"> + <item row="1" column="4" colspan="6"> <widget class="QCheckBox" name="sbsCheckBox"> <property name="toolTip"> <string>Select to show differences side-by-side</string> @@ -310,10 +330,11 @@ <tabstop>nextButton</tabstop> <tabstop>limitSpinBox</tabstop> <tabstop>stopCheckBox</tabstop> + <tabstop>upButton</tabstop> + <tabstop>downButton</tabstop> <tabstop>diffPreviousButton</tabstop> <tabstop>diffRevisionsButton</tabstop> <tabstop>sbsCheckBox</tabstop> - <tabstop>buttonBox</tabstop> </tabstops> <resources/> <connections/>
--- a/Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py Sat Jan 28 12:39:43 2017 +0100 +++ b/Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py Sat Jan 28 14:22:00 2017 +0100 @@ -26,6 +26,7 @@ from .Ui_SvnLogBrowserDialog import Ui_SvnLogBrowserDialog import Preferences +import UI.PixmapCache class SvnLogBrowserDialog(QWidget, Ui_SvnLogBrowserDialog): @@ -47,6 +48,9 @@ self.buttonBox.button(QDialogButtonBox.Close).setEnabled(False) self.buttonBox.button(QDialogButtonBox.Cancel).setDefault(True) + self.upButton.setIcon(UI.PixmapCache.getIcon("1uparrow.png")) + self.downButton.setIcon(UI.PixmapCache.getIcon("1downarrow.png")) + self.filesTree.headerItem().setText(self.filesTree.columnCount(), "") self.filesTree.header().setSortIndicator(0, Qt.AscendingOrder) @@ -92,6 +96,11 @@ 'R': self.tr('Replaced'), } self.intercept = False + + self.__logTreeNormalFont = self.logTree.font() + self.__logTreeNormalFont.setBold(False) + self.__logTreeBoldFont = self.logTree.font() + self.__logTreeBoldFont.setBold(True) def __initData(self): """ @@ -366,7 +375,7 @@ elif self.rx_rev2.exactMatch(s): log["revision"] = self.rx_rev2.cap(1) log["author"] = self.rx_rev2.cap(2) - log["date"] = self.rx_rev2.cap(3) + log["date"] = " ".join(self.rx_rev2.cap(3).split()[:2]) # number of lines is ignored elif self.rx_flags1.exactMatch(s): changedPaths.append({ @@ -519,6 +528,19 @@ self.diffPreviousButton.setEnabled( current != self.logTree.topLevelItem( self.logTree.topLevelItemCount() - 1)) + + # Highlight the current entry using a bold font + for col in range(self.logTree.columnCount()): + current and current.setFont(col, self.__logTreeBoldFont) + previous and previous.setFont(col, self.__logTreeNormalFont) + + # set the state of the up and down buttons + self.upButton.setEnabled( + current is not None and + self.logTree.indexOfTopLevelItem(current) > 0) + self.downButton.setEnabled( + current is not None and + int(current.text(0)) > 1) @pyqtSlot() def on_logTree_itemSelectionChanged(self): @@ -656,6 +678,28 @@ self.nextButton.setEnabled(True) self.limitSpinBox.setEnabled(True) + @pyqtSlot() + def on_upButton_clicked(self): + """ + Private slot to move the current item up one entry. + """ + itm = self.logTree.itemAbove(self.logTree.currentItem()) + if itm: + self.logTree.setCurrentItem(itm) + + @pyqtSlot() + def on_downButton_clicked(self): + """ + Private slot to move the current item down one entry. + """ + itm = self.logTree.itemBelow(self.logTree.currentItem()) + if itm: + self.logTree.setCurrentItem(itm) + else: + # load the next bunch and try again + self.on_nextButton_clicked() + self.on_downButton_clicked() + def on_passwordCheckBox_toggled(self, isOn): """ Private slot to handle the password checkbox toggled.
--- a/Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui Sat Jan 28 12:39:43 2017 +0100 +++ b/Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui Sat Jan 28 14:22:00 2017 +0100 @@ -236,6 +236,26 @@ </widget> </item> <item row="0" column="4"> + <widget class="QToolButton" name="upButton"> + <property name="toolTip"> + <string>Press to move up in the log list</string> + </property> + <property name="autoRepeat"> + <bool>true</bool> + </property> + </widget> + </item> + <item row="0" column="5"> + <widget class="QToolButton" name="downButton"> + <property name="toolTip"> + <string>Press to move down in the log list</string> + </property> + <property name="autoRepeat"> + <bool>true</bool> + </property> + </widget> + </item> + <item row="0" column="6"> <widget class="QPushButton" name="diffPreviousButton"> <property name="toolTip"> <string>Press to generate a diff to the previous revision</string> @@ -245,7 +265,7 @@ </property> </widget> </item> - <item row="0" column="5"> + <item row="0" column="7"> <widget class="QPushButton" name="diffRevisionsButton"> <property name="toolTip"> <string>Press to compare two revisions</string> @@ -255,7 +275,7 @@ </property> </widget> </item> - <item row="0" column="6"> + <item row="0" column="8"> <spacer> <property name="orientation"> <enum>Qt::Horizontal</enum> @@ -268,7 +288,7 @@ </property> </spacer> </item> - <item row="1" column="4" colspan="3"> + <item row="1" column="4" colspan="5"> <widget class="QCheckBox" name="sbsCheckBox"> <property name="toolTip"> <string>Select to show differences side-by-side</string> @@ -396,6 +416,8 @@ <tabstop>nextButton</tabstop> <tabstop>limitSpinBox</tabstop> <tabstop>stopCheckBox</tabstop> + <tabstop>upButton</tabstop> + <tabstop>downButton</tabstop> <tabstop>diffPreviousButton</tabstop> <tabstop>diffRevisionsButton</tabstop> <tabstop>sbsCheckBox</tabstop> @@ -403,7 +425,6 @@ <tabstop>input</tabstop> <tabstop>passwordCheckBox</tabstop> <tabstop>sendButton</tabstop> - <tabstop>buttonBox</tabstop> </tabstops> <resources/> <connections/>
--- a/changelog Sat Jan 28 12:39:43 2017 +0100 +++ b/changelog Sat Jan 28 14:22:00 2017 +0100 @@ -14,6 +14,9 @@ the built in Email dialog - Mercurial Interface -- added clickable links to the log browser details pane + -- added up and down buttons to move the current entry to the log browser +- Subversion interface + -- added up and down buttons to move the current entry to the log browser - Web Browser -- added functionality to manage the plug-in provided documentation sets
--- a/i18n/eric6_cs.ts Sat Jan 28 12:39:43 2017 +0100 +++ b/i18n/eric6_cs.ts Sat Jan 28 14:22:00 2017 +0100 @@ -9288,7 +9288,7 @@ <context> <name>Editor</name> <message> - <location filename="../QScintilla/Editor.py" line="2881"/> + <location filename="../QScintilla/Editor.py" line="2883"/> <source>Open File</source> <translation>Otevřít soubor</translation> </message> @@ -9548,7 +9548,7 @@ <translation>Editovat breakpoint...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5159"/> + <location filename="../QScintilla/Editor.py" line="5161"/> <source>Enable breakpoint</source> <translation>Aktivovat breakpoint</translation> </message> @@ -9598,237 +9598,237 @@ <translation>LMB přepínač breakpointů</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1755"/> + <location filename="../QScintilla/Editor.py" line="1757"/> <source>Modification of Read Only file</source> <translation>Modifikace souboru otevřeného jen pro čtení</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1755"/> + <location filename="../QScintilla/Editor.py" line="1757"/> <source>You are attempting to change a read only file. Please save to a different file first.</source> <translation>Pokoušíte se změnit soubor, který je otevřen jen pro čtení. Prosím, uložte jej nejdříve do jiného souboru.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="2446"/> + <location filename="../QScintilla/Editor.py" line="2448"/> <source>Printing...</source> <translation>Tisk...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="2463"/> - <source>Printing completed</source> - <translation>Tisk je hotov</translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="2465"/> + <source>Printing completed</source> + <translation>Tisk je hotov</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="2467"/> <source>Error while printing</source> <translation>Chyba během tisku</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="2468"/> + <location filename="../QScintilla/Editor.py" line="2470"/> <source>Printing aborted</source> <translation>Tisk byl zrušen</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="3044"/> + <location filename="../QScintilla/Editor.py" line="3046"/> <source>Save File</source> <translation>Uložit soubor</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="2826"/> + <location filename="../QScintilla/Editor.py" line="2828"/> <source>File Modified</source> <translation>Soubor je modifikován</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4432"/> + <location filename="../QScintilla/Editor.py" line="4434"/> <source>Autocompletion</source> <translation>Autodoplňování</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4432"/> + <location filename="../QScintilla/Editor.py" line="4434"/> <source>Autocompletion is not available because there is no autocompletion source set.</source> <translation>Autodoplňování není dostupné protože zdrojová část autodoplňování nebyla nalezena.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5162"/> + <location filename="../QScintilla/Editor.py" line="5164"/> <source>Disable breakpoint</source> <translation>Deaktivovat breakpoint</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5536"/> + <location filename="../QScintilla/Editor.py" line="5538"/> <source>Code Coverage</source> <translation>Pokrytí kódu</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5536"/> + <location filename="../QScintilla/Editor.py" line="5538"/> <source>Please select a coverage file</source> <translation>Prosím, vyberte soubor s pokrytím kódu</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5599"/> + <location filename="../QScintilla/Editor.py" line="5601"/> <source>Show Code Coverage Annotations</source> <translation>Zobrazit poznámky pokrytí kódu</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5592"/> + <location filename="../QScintilla/Editor.py" line="5594"/> <source>All lines have been covered.</source> <translation>Všechny řádky byly pokryty.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5599"/> + <location filename="../QScintilla/Editor.py" line="5601"/> <source>There is no coverage file available.</source> <translation>Soubor s pokrytím není dostupný.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5714"/> + <location filename="../QScintilla/Editor.py" line="5716"/> <source>Profile Data</source> <translation>Profilovat data</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5714"/> + <location filename="../QScintilla/Editor.py" line="5716"/> <source>Please select a profile file</source> <translation>Prosím, vyberte soubor s profilem</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5874"/> + <location filename="../QScintilla/Editor.py" line="5876"/> <source>Syntax Error</source> <translation>Chyba syntaxe</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5874"/> + <location filename="../QScintilla/Editor.py" line="5876"/> <source>No syntax error message available.</source> <translation>Hlášení syntaktické chyby není dostupné.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6189"/> + <location filename="../QScintilla/Editor.py" line="6191"/> <source>Macro Name</source> <translation>Název makra</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6189"/> + <location filename="../QScintilla/Editor.py" line="6191"/> <source>Select a macro name:</source> <translation>Vyberte název makra:</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6217"/> + <location filename="../QScintilla/Editor.py" line="6219"/> <source>Load macro file</source> <translation>Načíst soubor makra</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6260"/> + <location filename="../QScintilla/Editor.py" line="6262"/> <source>Macro files (*.macro)</source> <translation>Macro soubory (*.macro)</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6240"/> + <location filename="../QScintilla/Editor.py" line="6242"/> <source>Error loading macro</source> <translation>Chyba při načítání makra</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6260"/> + <location filename="../QScintilla/Editor.py" line="6262"/> <source>Save macro file</source> <translation>Uložit soubor s makrem</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6277"/> + <location filename="../QScintilla/Editor.py" line="6279"/> <source>Save macro</source> <translation>Uložit makro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6293"/> + <location filename="../QScintilla/Editor.py" line="6295"/> <source>Error saving macro</source> <translation>Chyba při ukládání makra</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6306"/> + <location filename="../QScintilla/Editor.py" line="6308"/> <source>Start Macro Recording</source> <translation>Spustit záznam makra</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6306"/> + <location filename="../QScintilla/Editor.py" line="6308"/> <source>Macro recording is already active. Start new?</source> <translation>Nahrávání makra již probíhá. Spustit nové?</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6332"/> + <location filename="../QScintilla/Editor.py" line="6334"/> <source>Macro Recording</source> <translation>Záznam makra</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6332"/> + <location filename="../QScintilla/Editor.py" line="6334"/> <source>Enter name of the macro:</source> <translation>Vložte název makra:</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6470"/> + <location filename="../QScintilla/Editor.py" line="6472"/> <source>File changed</source> <translation>Soubor změněn</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6774"/> + <location filename="../QScintilla/Editor.py" line="6776"/> <source>Drop Error</source> <translation>Zahodit chybu</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6795"/> - <source>Resources</source> - <translation>Zdroje</translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="6797"/> - <source>Add file...</source> - <translation>Přidat soubor...</translation> + <source>Resources</source> + <translation>Zdroje</translation> </message> <message> <location filename="../QScintilla/Editor.py" line="6799"/> - <source>Add files...</source> - <translation>Přidat soubory...</translation> + <source>Add file...</source> + <translation>Přidat soubor...</translation> </message> <message> <location filename="../QScintilla/Editor.py" line="6801"/> + <source>Add files...</source> + <translation>Přidat soubory...</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="6803"/> <source>Add aliased file...</source> <translation>Přidat zástupce souboru...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6804"/> + <location filename="../QScintilla/Editor.py" line="6806"/> <source>Add localized resource...</source> <translation>Přidat lokalizované resource...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6808"/> + <location filename="../QScintilla/Editor.py" line="6810"/> <source>Add resource frame</source> <translation>Přidat resource frame</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6827"/> + <location filename="../QScintilla/Editor.py" line="6829"/> <source>Add file resource</source> <translation>Přidat soubor resource</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6843"/> + <location filename="../QScintilla/Editor.py" line="6845"/> <source>Add file resources</source> <translation>Přidat soubory resource</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6871"/> + <location filename="../QScintilla/Editor.py" line="6873"/> <source>Add aliased file resource</source> <translation>Přidat zástupce souboru resource</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6935"/> + <location filename="../QScintilla/Editor.py" line="6937"/> <source>Package Diagram</source> <translation>Diagram balíčku</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6935"/> + <location filename="../QScintilla/Editor.py" line="6937"/> <source>Include class attributes?</source> <translation>Včetně atributů třídy?</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6969"/> + <location filename="../QScintilla/Editor.py" line="6971"/> <source>Application Diagram</source> <translation>Diagram aplikace</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6969"/> + <location filename="../QScintilla/Editor.py" line="6971"/> <source>Include module names?</source> <translation>Včetně jmen modulů?</translation> </message> @@ -9848,12 +9848,12 @@ <translation>Nebyl zadán forám exportu. Zrušeno....</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6955"/> + <location filename="../QScintilla/Editor.py" line="6957"/> <source>Imports Diagram</source> <translation>Importovat diagram</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6955"/> + <location filename="../QScintilla/Editor.py" line="6957"/> <source>Include imports from external modules?</source> <translation>Zahrnout importy z externích modulů?</translation> </message> @@ -9928,7 +9928,7 @@ <translation>Použít Pygments lexer.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7247"/> + <location filename="../QScintilla/Editor.py" line="7249"/> <source>Check spelling...</source> <translation>Zatrhnout kontrolu...</translation> </message> @@ -9938,12 +9938,12 @@ <translation>Zatrhnout výběr kontroly...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7250"/> + <location filename="../QScintilla/Editor.py" line="7252"/> <source>Add to dictionary</source> <translation>Přidat do slovníku</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7252"/> + <location filename="../QScintilla/Editor.py" line="7254"/> <source>Ignore All</source> <translation>Ignorovat vše</translation> </message> @@ -9968,47 +9968,47 @@ <translation>Alternativy ({0})</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="2826"/> + <location filename="../QScintilla/Editor.py" line="2828"/> <source><p>The file <b>{0}</b> has unsaved changes.</p></source> <translation><p>Soubor <b>{0}</b> obsahuje neuložené změny.</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="2881"/> + <location filename="../QScintilla/Editor.py" line="2883"/> <source><p>The file <b>{0}</b> could not be opened.</p><p>Reason: {1}</p></source> <translation><p>Soubor <b>{0}</b> nemůže být přejmenován.<br />Důvod: {1}</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="2985"/> + <location filename="../QScintilla/Editor.py" line="2987"/> <source><p>The file <b>{0}</b> could not be saved.<br/>Reason: {1}</p></source> <translation><p>Soubor <b>{0}</b> nemůže být přejmenován.<br />Důvod: {1}</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6231"/> + <location filename="../QScintilla/Editor.py" line="6233"/> <source><p>The macro file <b>{0}</b> could not be read.</p></source> <translation><p>Soubor s makrem <b>{0}</b> nelze načíst.</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6240"/> + <location filename="../QScintilla/Editor.py" line="6242"/> <source><p>The macro file <b>{0}</b> is corrupt.</p></source> <translation><p>Soubor s makrem <b>{0}</b> je poškozen.</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6293"/> + <location filename="../QScintilla/Editor.py" line="6295"/> <source><p>The macro file <b>{0}</b> could not be written.</p></source> <translation><p>So souboru s makrem <b>{0}</b> nelze zapisovat.</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6634"/> + <location filename="../QScintilla/Editor.py" line="6636"/> <source>{0} (ro)</source> <translation>{0} (ro)</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6774"/> + <location filename="../QScintilla/Editor.py" line="6776"/> <source><p><b>{0}</b> is not a file.</p></source> <translation><p><b>{0}</b> není soubor.</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6871"/> + <location filename="../QScintilla/Editor.py" line="6873"/> <source>Alias for file <b>{0}</b>:</source> <translation>Zástupce pro soubor <b>{0}</b>:</translation> </message> @@ -10033,47 +10033,47 @@ <translation>Vyčistit varování</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="3044"/> + <location filename="../QScintilla/Editor.py" line="3046"/> <source><p>The file <b>{0}</b> already exists. Overwrite it?</p></source> <translation type="unfinished"><p>Soubor <b>{0}</b> již existuje.</p><p>Má se přepsat?</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6277"/> + <location filename="../QScintilla/Editor.py" line="6279"/> <source><p>The macro file <b>{0}</b> already exists. Overwrite it?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6128"/> + <location filename="../QScintilla/Editor.py" line="6130"/> <source>Warning: {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6135"/> + <location filename="../QScintilla/Editor.py" line="6137"/> <source>Error: {0}</source> <translation type="unfinished">Chyby: {0}</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6466"/> + <location filename="../QScintilla/Editor.py" line="6468"/> <source><br><b>Warning:</b> You will lose your changes upon reopening it.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4537"/> + <location filename="../QScintilla/Editor.py" line="4539"/> <source>Activating Auto-Completion Provider</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4537"/> + <location filename="../QScintilla/Editor.py" line="4539"/> <source>Auto-completion provider cannot be connected because there is already another one active. Please check your configuration.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4857"/> + <location filename="../QScintilla/Editor.py" line="4859"/> <source>Activating Calltip Provider</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4857"/> + <location filename="../QScintilla/Editor.py" line="4859"/> <source>Calltip provider cannot be connected because there is already another one active. Please check your configuration.</source> <translation type="unfinished"></translation> </message> @@ -10098,27 +10098,27 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7664"/> + <location filename="../QScintilla/Editor.py" line="7666"/> <source>Sort Lines</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7664"/> + <location filename="../QScintilla/Editor.py" line="7666"/> <source>The selection contains illegal data for a numerical sort.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6064"/> + <location filename="../QScintilla/Editor.py" line="6066"/> <source>Warning</source> <translation type="unfinished">Varování</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6064"/> + <location filename="../QScintilla/Editor.py" line="6066"/> <source>No warning messages available.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6125"/> + <location filename="../QScintilla/Editor.py" line="6127"/> <source>Style: {0}</source> <translation type="unfinished"></translation> </message> @@ -10143,7 +10143,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6460"/> + <location filename="../QScintilla/Editor.py" line="6462"/> <source><p>The file <b>{0}</b> has been changed while it was opened in eric6. Reread it?</p></source> <translation type="unfinished"><p>Soubor <b>{0}</b> byl změněn po té co již byl načten do eric5. Znovu načíst?</p> {0}?} {6.?}</translation> </message> @@ -10158,32 +10158,32 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4586"/> + <location filename="../QScintilla/Editor.py" line="4588"/> <source>Auto-Completion Provider</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4586"/> + <location filename="../QScintilla/Editor.py" line="4588"/> <source>The completion list provider '{0}' was already registered. Ignoring duplicate request.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4900"/> + <location filename="../QScintilla/Editor.py" line="4902"/> <source>Call-Tips Provider</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4900"/> + <location filename="../QScintilla/Editor.py" line="4902"/> <source>The call-tips provider '{0}' was already registered. Ignoring duplicate request.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7751"/> + <location filename="../QScintilla/Editor.py" line="7753"/> <source>Register Mouse Click Handler</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7751"/> + <location filename="../QScintilla/Editor.py" line="7753"/> <source>A mouse click handler for "{0}" was already registered by "{1}". Aborting request by "{2}"...</source> <translation type="unfinished"></translation> </message> @@ -24897,17 +24897,17 @@ <translation>Vybrat pole pro filtrování</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="98"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="101"/> <source>Revision</source> <translation>Revize</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="99"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="102"/> <source>Author</source> <translation>Autor</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="100"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="103"/> <source>Message</source> <translation>Zpráva</translation> </message> @@ -24962,112 +24962,112 @@ <translation>Zadejte max. počet, ke stažení</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="339"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="326"/> <source>Select to stop listing log messages at a copy or move</source> <translation>Vybrat pro zastavení výpisu zpráv pro kopírování neobo přesun</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="342"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="329"/> <source>Stop on Copy/Move</source> <translation>Zatavit kopírování/přesun</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="369"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="389"/> <source>Press to compare two revisions</source> <translation>Stisknout pro porovnání dvou revizí</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="372"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="392"/> <source>&Compare Revisions</source> <translation>&Porovnat revize</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="433"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="453"/> <source>Errors</source> <translation>Chyby</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="439"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="459"/> <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="455"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="475"/> <source>Input</source> <translation>Vstup</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="477"/> - <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="480"/> - <source>&Send</source> - <translation>Ode&slat</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="483"/> - <source>Alt+S</source> - <translation></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="490"/> - <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="497"/> - <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>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="500"/> - <source>&Password Mode</source> - <translation>Mód vstu&pu hesla</translation> + <source>&Send</source> + <translation>Ode&slat</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="503"/> + <source>Alt+S</source> + <translation></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="510"/> + <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="517"/> + <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="520"/> + <source>&Password Mode</source> + <translation>Mód vstu&pu hesla</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="523"/> <source>Alt+P</source> <translation></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="161"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="164"/> <source>Added</source> <translation>Přidáno</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="162"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="165"/> <source>Deleted</source> <translation>Smazáno</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="163"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="166"/> <source>Modified</source> <translation>Změněno</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="905"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="913"/> <source>Process Generation Error</source> <translation>Chyba v procesu generování</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="905"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="913"/> <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="672"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="680"/> <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="675"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="683"/> <source>Could not start the hg executable.</source> <translation>Nelze spustit hg program.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="678"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="686"/> <source>Mercurial Error</source> <translation>Mercurial chyba</translation> </message> @@ -25077,22 +25077,22 @@ <translation>Graf</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="349"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="369"/> <source>Press to generate a diff to the first parent revision</source> <translation>Stisknout pro generování diffu s první rodičovskou revizí</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="352"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="372"/> <source>Diff to Parent &1</source> <translation>Diff s rodičem &1</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="359"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="379"/> <source>Press to generate a diff to the second parent revision</source> <translation>Stisknout pro generování diffu s druhou rodičovskou revizí</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="362"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="382"/> <source>Diff to Parent &2</source> <translation>Diff s rodičem &2</translation> </message> @@ -25107,7 +25107,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="141"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="144"/> <source>All</source> <translation type="unfinished">Vše</translation> </message> @@ -25122,17 +25122,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="178"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="181"/> <source>Bookmarks</source> <translation type="unfinished">Záložky</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="87"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="90"/> <source>Press to refresh the list of changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="85"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="88"/> <source>&Refresh</source> <translation type="unfinished"></translation> </message> @@ -25142,83 +25142,83 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="198"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="206"/> <source>Change the phase of the selected revisions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="200"/> - <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.py" line="196"/> - <source>Change Phase</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1752"/> - <source>Copy Changesets</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1944"/> - <source>The project should be reread. Do this now?</source> - <translation type="unfinished">Projekt bude znovu načten. Má se provést?</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="405"/> - <source>Select to show differences side-by-side</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="408"/> - <source>Show differences side-by-side</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="415"/> - <source>Select action from menu</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="193"/> - <source>Copy the selected changesets to the current branch</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="205"/> - <source>Tag</source> - <translation type="unfinished">Tag</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="208"/> - <source>Tag the selected revision</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1804"/> - <source>Switch</source> - <translation type="unfinished">Přepnout</translation> + <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.py" line="204"/> + <source>Change Phase</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1795"/> + <source>Copy Changesets</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1987"/> + <source>The project should be reread. Do this now?</source> + <translation type="unfinished">Projekt bude znovu načten. Má se provést?</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="435"/> + <source>Select to show differences side-by-side</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="438"/> + <source>Show differences side-by-side</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="412"/> + <source>Select action from menu</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="201"/> + <source>Copy the selected changesets to the current branch</source> + <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="213"/> + <source>Tag</source> + <translation type="unfinished">Tag</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="216"/> + <source>Tag the selected revision</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1847"/> + <source>Switch</source> + <translation type="unfinished">Přepnout</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="221"/> <source>Switch the working directory to the selected revision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="236"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="244"/> <source>Pull Large Files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="238"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="246"/> <source>Pull large files for selected revisions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="996"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1004"/> <source>{0} (large file)</source> <translation type="unfinished"></translation> </message> @@ -25243,155 +25243,165 @@ <translation type="unfinished">Stisknout pro vyhledání následujícího výskytu</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="95"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="98"/> <source>Find</source> <translation type="unfinished">Hledat</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="96"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="99"/> <source>Filter</source> <translation type="unfinished">Filtr</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="123"/> - <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> - <translation type="unfinished"><tr><td><b>Tagy</b></td><td>{0}</td></tr></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="126"/> + <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> + <translation type="unfinished"><tr><td><b>Tagy</b></td><td>{0}</td></tr></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="129"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2045"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2088"/> <source>Find Commit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2045"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2088"/> <source>'{0}' was not found.</source> <translation type="unfinished">'{0}' nebyl nalezen.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="101"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="104"/> <source>File</source> <translation type="unfinished">Soubor</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="167"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="170"/> <source>Draft</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="168"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="171"/> <source>Public</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="169"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="172"/> <source>Secret</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1902"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1945"/> <source>Pull Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="234"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="242"/> <source>Pull changes from a remote repository</source> <translation type="unfinished">Stáhnout změny (pull) ze vzdáleného repozitáře</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="247"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="255"/> <source>Push Selected Changes</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="258"/> + <source>Push changes of the selected changeset and its ancestors to a remote repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="261"/> + <source>Push All Changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="264"/> + <source>Push all changes to a remote repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1926"/> + <source>Fetch Changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1987"/> + <source>Strip Changesets</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="250"/> - <source>Push changes of the selected changeset and its ancestors to a remote repository</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="253"/> - <source>Push All Changes</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="256"/> - <source>Push all changes to a remote repository</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1883"/> - <source>Fetch Changes</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1944"/> - <source>Strip Changesets</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="242"/> <source>Fetch changes from a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="264"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="272"/> <source>Strip changesets from a repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="218"/> - <source>Define Bookmark...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="221"/> - <source>Bookmark the selected revision</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="223"/> - <source>Move Bookmark...</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="226"/> + <source>Define Bookmark...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="229"/> + <source>Bookmark the selected revision</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="231"/> + <source>Move Bookmark...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="234"/> <source>Move bookmark to the selected revision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1825"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1868"/> <source>Define Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1825"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1868"/> <source>Enter bookmark name for changeset "{0}":</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1847"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1890"/> <source>Move Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1847"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1890"/> <source>Select the bookmark to be moved to changeset "{0}":</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1790"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1833"/> <source>Select bookmark to switch to (leave empty to use revision):</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="112"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="115"/> <source><table><tr><td><b>Revision</b></td><td>{0}</td></tr><tr><td><b>Date</b></td><td>{1}</td></tr><tr><td><b>Author</b></td><td>{2}</td></tr><tr><td><b>Branch</b></td><td>{3}</td></tr><tr><td><b>Parents</b></td><td>{4}</td></tr><tr><td><b>Children</b></td><td>{5}</td></tr>{6}</table></source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="349"/> + <source>Press to move up in the log list</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="359"/> + <source>Press to move down in the log list</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgLogDialog</name> @@ -54496,12 +54506,12 @@ <translation></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="621"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="643"/> <source>Revision</source> <translation>Revize</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="618"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="640"/> <source>Author</source> <translation>Autor</translation> </message> @@ -54511,7 +54521,7 @@ <translation>Datum</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="141"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="150"/> <source>Message</source> <translation>Zpráva</translation> </message> @@ -54551,97 +54561,97 @@ <translation>Zadejte max. počet, ke stažení</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="241"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="261"/> <source>Press to generate a diff to the previous revision</source> <translation>Stisknout pro generování diffu s předchozí revizí</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="244"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="264"/> <source>&Diff to Previous</source> <translation>&Diff s předchozím</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="251"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="271"/> <source>Press to compare two revisions</source> <translation>Stisknout pro porovnání dvou revizí</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="254"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="274"/> <source>&Compare Revisions</source> <translation>&Porovnat revize</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="89"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="93"/> <source>Added</source> <translation>Přidáno</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="90"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="94"/> <source>Deleted</source> <translation>Smazáno</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="91"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="95"/> <source>Modified</source> <translation>Změněno</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnLogBrowserDialog.py" line="504"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnLogBrowserDialog.py" line="527"/> <source>Subversion Error</source> <translation>Subversion chyba</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="292"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="312"/> <source>Errors</source> <translation>Chyby</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="298"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="318"/> <source><b>Subversion log errors</b><p>This shows possible error messages of the svn log command.</p></source> <translation><b>Subversion log chyb</b><p>Zobrazí možné chyby z příkazu svn log.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="314"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="334"/> <source>Input</source> <translation>Vstup</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="336"/> - <source>Press to send the input to the subversion process</source> - <translation>Stisknout pro odeslání vstupu do procesu subversion</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="339"/> - <source>&Send</source> - <translation>Ode&slat</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="342"/> - <source>Alt+S</source> - <translation></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="349"/> - <source>Enter data to be sent to the subversion process</source> - <translation>Zadejte data, která mají být do procesu subversion odeslána</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="356"/> - <source>Select to switch the input field to password mode</source> - <translation>Vybrat pro přepnutí vstupního pole do módu hesla</translation> + <source>Press to send the input to the subversion process</source> + <translation>Stisknout pro odeslání vstupu do procesu subversion</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="359"/> - <source>&Password Mode</source> - <translation>Mód ve&psání hesla</translation> + <source>&Send</source> + <translation>Ode&slat</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="362"/> + <source>Alt+S</source> + <translation></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="369"/> + <source>Enter data to be sent to the subversion process</source> + <translation>Zadejte data, která mají být do procesu subversion odeslána</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="376"/> + <source>Select to switch the input field to password mode</source> + <translation>Vybrat pro přepnutí vstupního pole do módu hesla</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="379"/> + <source>&Password Mode</source> + <translation>Mód ve&psání hesla</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="382"/> <source>Alt+P</source> <translation></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="289"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="298"/> <source>Process Generation Error</source> <translation>Chyba v procesu generování</translation> </message> @@ -54686,25 +54696,35 @@ <translation>Zatavit kopírování/přesun</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="289"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="298"/> <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/vcsSubversion/SvnLogBrowserDialog.py" line="92"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="96"/> <source>Replaced</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="274"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="294"/> <source>Select to show differences side-by-side</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="277"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="297"/> <source>Show differences side-by-side</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="241"/> + <source>Press to move up in the log list</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="251"/> + <source>Press to move down in the log list</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>SvnLogDialog</name>
--- a/i18n/eric6_de.ts Sat Jan 28 12:39:43 2017 +0100 +++ b/i18n/eric6_de.ts Sat Jan 28 14:22:00 2017 +0100 @@ -390,7 +390,7 @@ <context> <name>AddBookmarkDialog</name> <message> - <location filename="../WebBrowser/Bookmarks/AddBookmarkDialog.ui" line="26"/> + <location filename="../WebBrowser/Bookmarks/AddBookmarkDialog.py" line="198"/> <source>Add Bookmark</source> <translation>Lesezeichen hinzufügen</translation> </message> @@ -1727,7 +1727,7 @@ <translation>&Adresse editieren</translation> </message> <message> - <location filename="../WebBrowser/Bookmarks/BookmarksDialog.ui" line="75"/> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="169"/> <source>&Delete</source> <translation>&Löschen</translation> </message> @@ -2424,12 +2424,12 @@ <translation>Drücken, um die Aufrufverfolgung in eine Textdatei zu speichern</translation> </message> <message> - <location filename="../Debugger/CallTraceViewer.ui" line="109"/> + <location filename="../Debugger/CallTraceViewer.py" line="54"/> <source>From</source> <translation>Von</translation> </message> <message> - <location filename="../Debugger/CallTraceViewer.ui" line="114"/> + <location filename="../Debugger/CallTraceViewer.py" line="54"/> <source>To</source> <translation>Nach</translation> </message> @@ -2595,7 +2595,7 @@ <translation>Drücken, um eine verteilte Änderungssitzung abzubrechen</translation> </message> <message> - <location filename="../Cooperation/ChatWidget.ui" line="230"/> + <location filename="../Cooperation/ChatWidget.py" line="513"/> <source>Clear</source> <translation>Löschen</translation> </message> @@ -2892,7 +2892,7 @@ <context> <name>ClickToFlashWhitelistDialog</name> <message> - <location filename="../Helpviewer/WebPlugins/ClickToFlash/ClickToFlashWhitelistDialog.ui" line="14"/> + <location filename="../Helpviewer/WebPlugins/ClickToFlash/ClickToFlashWhitelistDialog.py" line="54"/> <source>ClickToFlash Whitelist</source> <translation>ClickToFlash Whitelist</translation> </message> @@ -4818,7 +4818,7 @@ <translation>Domain:</translation> </message> <message> - <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="223"/> + <location filename="../WebBrowser/CookieJar/CookiesDialog.py" line="177"/> <source><no cookie selected></source> <translation><kein Cookie ausgewählt></translation> </message> @@ -7390,7 +7390,7 @@ <context> <name>DownloadManager</name> <message> - <location filename="../WebBrowser/Download/DownloadManager.ui" line="14"/> + <location filename="../WebBrowser/Download/DownloadManager.py" line="363"/> <source>Downloads</source> <translation>Downloads</translation> </message> @@ -7850,92 +7850,92 @@ <translation>Standard Knöpfe</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="257"/> + <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="41"/> <source>Abort</source> <translation>Abbrechen (Abort)</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="264"/> + <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="42"/> <source>Apply</source> <translation>Anwenden</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="271"/> + <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="43"/> <source>Cancel</source> <translation>Abbrechen (Cancel)</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="278"/> + <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="44"/> <source>Close</source> <translation>Schließen</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="285"/> + <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="45"/> <source>Discard</source> <translation>Verwerfen</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="292"/> + <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="46"/> <source>Help</source> <translation>Hilfe</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="299"/> + <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="47"/> <source>Ignore</source> <translation>Ignorieren</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="306"/> + <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="48"/> <source>No</source> <translation>Nein</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="313"/> + <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="49"/> <source>No to all</source> <translation>Nein zu allen</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="320"/> + <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="50"/> <source>Ok</source> <translation>Ok</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="327"/> + <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="51"/> <source>Open</source> <translation>Öffnen</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="334"/> + <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="52"/> <source>Reset</source> <translation>Zurücksetzen</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="341"/> + <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="53"/> <source>Restore defaults</source> <translation>Auf Standardwerte zurücksetzen</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="348"/> + <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="54"/> <source>Retry</source> <translation>Wiederholen</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="355"/> + <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="55"/> <source>Save</source> <translation>Speichern</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="362"/> + <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="56"/> <source>Save all</source> <translation>Alles speichern</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="369"/> + <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="57"/> <source>Yes</source> <translation>Ja</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="376"/> + <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="58"/> <source>Yes to all</source> <translation>Ja zu allen</translation> </message> @@ -8994,12 +8994,12 @@ <context> <name>Editor</name> <message> - <location filename="../QScintilla/Editor.py" line="2881"/> + <location filename="../QScintilla/Editor.py" line="2883"/> <source>Open File</source> <translation>Datei öffnen</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="3044"/> + <location filename="../QScintilla/Editor.py" line="3046"/> <source>Save File</source> <translation>Datei sichern</translation> </message> @@ -9084,27 +9084,27 @@ <translation>Drucken</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="2446"/> + <location filename="../QScintilla/Editor.py" line="2448"/> <source>Printing...</source> <translation>Drucke...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="2463"/> - <source>Printing completed</source> - <translation>Drucken beendet</translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="2465"/> + <source>Printing completed</source> + <translation>Drucken beendet</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="2467"/> <source>Error while printing</source> <translation>Fehler beim Drucken</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="2468"/> + <location filename="../QScintilla/Editor.py" line="2470"/> <source>Printing aborted</source> <translation>Drucken abgebrochen</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6470"/> + <location filename="../QScintilla/Editor.py" line="6472"/> <source>File changed</source> <translation>Datei geändert</translation> </message> @@ -9114,7 +9114,7 @@ <translation>Prüfen</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="2826"/> + <location filename="../QScintilla/Editor.py" line="2828"/> <source>File Modified</source> <translation>Datei geändert</translation> </message> @@ -9149,12 +9149,12 @@ <translation>Box Kommentar</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1755"/> + <location filename="../QScintilla/Editor.py" line="1757"/> <source>Modification of Read Only file</source> <translation>Änderungsversuch für eine schreibgeschützte Datei</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1755"/> + <location filename="../QScintilla/Editor.py" line="1757"/> <source>You are attempting to change a read only file. Please save to a different file first.</source> <translation>Sie versuchen, eine schreibgeschützte Datei zu ändern. Bitte speichern Sie sie zuerst in eine andere Datei.</translation> </message> @@ -9169,57 +9169,57 @@ <translation>Zurück zum letzten gesichert Zustand</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6189"/> + <location filename="../QScintilla/Editor.py" line="6191"/> <source>Macro Name</source> <translation>Makro Name</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6189"/> + <location filename="../QScintilla/Editor.py" line="6191"/> <source>Select a macro name:</source> <translation>Wähle einen Makro Namen:</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6260"/> + <location filename="../QScintilla/Editor.py" line="6262"/> <source>Macro files (*.macro)</source> <translation>Makrodateien (*.macro)</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6217"/> + <location filename="../QScintilla/Editor.py" line="6219"/> <source>Load macro file</source> <translation>Lade Makrodatei</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6240"/> + <location filename="../QScintilla/Editor.py" line="6242"/> <source>Error loading macro</source> <translation>Fehler beim Makro Laden</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6260"/> + <location filename="../QScintilla/Editor.py" line="6262"/> <source>Save macro file</source> <translation>Makrodatei schreiben</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6277"/> + <location filename="../QScintilla/Editor.py" line="6279"/> <source>Save macro</source> <translation>Makro speichern</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6293"/> + <location filename="../QScintilla/Editor.py" line="6295"/> <source>Error saving macro</source> <translation>Fehler beim Makro speichern</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6306"/> + <location filename="../QScintilla/Editor.py" line="6308"/> <source>Start Macro Recording</source> <translation>Makroaufzeichnung starten</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6332"/> + <location filename="../QScintilla/Editor.py" line="6334"/> <source>Macro Recording</source> <translation>Makroaufzeichnung</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6332"/> + <location filename="../QScintilla/Editor.py" line="6334"/> <source>Enter name of the macro:</source> <translation>Gib einen Namen für das Makro ein:</translation> </message> @@ -9279,42 +9279,42 @@ <translation>Haltepunkt bearbeiten...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5159"/> + <location filename="../QScintilla/Editor.py" line="5161"/> <source>Enable breakpoint</source> <translation>Haltepunkt aktivieren</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5162"/> + <location filename="../QScintilla/Editor.py" line="5164"/> <source>Disable breakpoint</source> <translation>Haltepunkt deaktivieren</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5536"/> + <location filename="../QScintilla/Editor.py" line="5538"/> <source>Code Coverage</source> <translation>Quelltext Abdeckung</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5536"/> + <location filename="../QScintilla/Editor.py" line="5538"/> <source>Please select a coverage file</source> <translation>Bitte wählen Sie eine Datei mit Abdeckungsdaten</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5714"/> + <location filename="../QScintilla/Editor.py" line="5716"/> <source>Profile Data</source> <translation>Profildaten</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5714"/> + <location filename="../QScintilla/Editor.py" line="5716"/> <source>Please select a profile file</source> <translation>Bitte wählen Sie eine Datei mit Profildaten</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4432"/> + <location filename="../QScintilla/Editor.py" line="4434"/> <source>Autocompletion</source> <translation>Automatische Vervollständigung</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4432"/> + <location filename="../QScintilla/Editor.py" line="4434"/> <source>Autocompletion is not available because there is no autocompletion source set.</source> <translation>Die automatische Vervollständigung ist nicht verfügbar, da keine Quelle gesetzt ist.</translation> </message> @@ -9344,7 +9344,7 @@ <translation>Autom. Speicherung aktiv</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6774"/> + <location filename="../QScintilla/Editor.py" line="6776"/> <source>Drop Error</source> <translation>Drop Fehler</translation> </message> @@ -9354,12 +9354,12 @@ <translation>Zeige Syntaxfehlermeldung</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5874"/> + <location filename="../QScintilla/Editor.py" line="5876"/> <source>Syntax Error</source> <translation>Syntaxfehler</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5874"/> + <location filename="../QScintilla/Editor.py" line="5876"/> <source>No syntax error message available.</source> <translation>Keine Syntaxfehlermeldung verfügbar.</translation> </message> @@ -9389,42 +9389,42 @@ <translation>Vorige nichtabgedeckte Zeile</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5599"/> + <location filename="../QScintilla/Editor.py" line="5601"/> <source>Show Code Coverage Annotations</source> <translation>Zeilen ohne Abdeckung Markieren</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5592"/> + <location filename="../QScintilla/Editor.py" line="5594"/> <source>All lines have been covered.</source> <translation>Alle Zeilen sind abgedeckt.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5599"/> + <location filename="../QScintilla/Editor.py" line="5601"/> <source>There is no coverage file available.</source> <translation>Es gibt keine Datei mit Abdeckungsinformationen.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="2826"/> + <location filename="../QScintilla/Editor.py" line="2828"/> <source><p>The file <b>{0}</b> has unsaved changes.</p></source> <translation><p>Die Datei <b>{0}</b> enthält ungesicherte Änderungen.</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6231"/> + <location filename="../QScintilla/Editor.py" line="6233"/> <source><p>The macro file <b>{0}</b> could not be read.</p></source> <translation><p>Die Makrodatei <b>{0}</b> kann nicht gelesen werden.</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6240"/> + <location filename="../QScintilla/Editor.py" line="6242"/> <source><p>The macro file <b>{0}</b> is corrupt.</p></source> <translation><p>Die Makrodatei <b>{0}</b> ist zerstört.</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6293"/> + <location filename="../QScintilla/Editor.py" line="6295"/> <source><p>The macro file <b>{0}</b> could not be written.</p></source> <translation><p>Die Makrodatei <b>{0}</b> kann nicht geschrieben werden.</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6774"/> + <location filename="../QScintilla/Editor.py" line="6776"/> <source><p><b>{0}</b> is not a file.</p></source> <translation><p><b>{0}</b> ist keine Datei.</p></translation> </message> @@ -9464,82 +9464,82 @@ <translation>Keine Sprache</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6634"/> + <location filename="../QScintilla/Editor.py" line="6636"/> <source>{0} (ro)</source> <translation>{0} (ro)</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6795"/> - <source>Resources</source> - <translation>Ressourcen</translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="6797"/> - <source>Add file...</source> - <translation>Datei hinzufügen...</translation> + <source>Resources</source> + <translation>Ressourcen</translation> </message> <message> <location filename="../QScintilla/Editor.py" line="6799"/> - <source>Add files...</source> - <translation>Dateien hinzufügen...</translation> + <source>Add file...</source> + <translation>Datei hinzufügen...</translation> </message> <message> <location filename="../QScintilla/Editor.py" line="6801"/> + <source>Add files...</source> + <translation>Dateien hinzufügen...</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="6803"/> <source>Add aliased file...</source> <translation>Aliased-Datei hinzufügen...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6804"/> + <location filename="../QScintilla/Editor.py" line="6806"/> <source>Add localized resource...</source> <translation>Lokalisierte Ressource hinzufügen...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6827"/> + <location filename="../QScintilla/Editor.py" line="6829"/> <source>Add file resource</source> <translation>Dateiressource hinzufügen</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6843"/> + <location filename="../QScintilla/Editor.py" line="6845"/> <source>Add file resources</source> <translation>Dateiressourcen hinzufügen</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6871"/> + <location filename="../QScintilla/Editor.py" line="6873"/> <source>Add aliased file resource</source> <translation>Aliased-Dateiressourcen hinzufügen</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6871"/> + <location filename="../QScintilla/Editor.py" line="6873"/> <source>Alias for file <b>{0}</b>:</source> <translation>Alias für Datei <b>{0}</b>:</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6935"/> + <location filename="../QScintilla/Editor.py" line="6937"/> <source>Package Diagram</source> <translation>Package-Diagramm</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6935"/> + <location filename="../QScintilla/Editor.py" line="6937"/> <source>Include class attributes?</source> <translation>Klassenattribute anzeigen?</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6969"/> + <location filename="../QScintilla/Editor.py" line="6971"/> <source>Application Diagram</source> <translation>Applikations-Diagramm</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6969"/> + <location filename="../QScintilla/Editor.py" line="6971"/> <source>Include module names?</source> <translation>Modulnamen anzeigen?</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6808"/> + <location filename="../QScintilla/Editor.py" line="6810"/> <source>Add resource frame</source> <translation>Ressourcenrahmen hinzufügen</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6306"/> + <location filename="../QScintilla/Editor.py" line="6308"/> <source>Macro recording is already active. Start new?</source> <translation>Eine Makroaufzeichnung ist bereits aktiv. Neu starten?</translation> </message> @@ -9589,12 +9589,12 @@ <translation>Kein Exportformat angegeben. Abbruch...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6955"/> + <location filename="../QScintilla/Editor.py" line="6957"/> <source>Imports Diagram</source> <translation>Imports Diagramm</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6955"/> + <location filename="../QScintilla/Editor.py" line="6957"/> <source>Include imports from external modules?</source> <translation>Imports externer Module anzeigen?</translation> </message> @@ -9669,7 +9669,7 @@ <translation>Wähle den anzuwendenden Pygments Lexer.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7247"/> + <location filename="../QScintilla/Editor.py" line="7249"/> <source>Check spelling...</source> <translation>Rechtschreibprüfung...</translation> </message> @@ -9679,12 +9679,12 @@ <translation>Rechtschreibprüfung für Auswahl...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7250"/> + <location filename="../QScintilla/Editor.py" line="7252"/> <source>Add to dictionary</source> <translation>Zum Wörterbuch hinzufügen</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7252"/> + <location filename="../QScintilla/Editor.py" line="7254"/> <source>Ignore All</source> <translation>Alle ignorieren</translation> </message> @@ -9694,12 +9694,12 @@ <translation>Aus dem Wörterbuch entfernen</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="2881"/> + <location filename="../QScintilla/Editor.py" line="2883"/> <source><p>The file <b>{0}</b> could not be opened.</p><p>Reason: {1}</p></source> <translation><p>Die Datei <b>{0}</b> konnte nicht geöffnet werden.<br />Ursache: {1}</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="2985"/> + <location filename="../QScintilla/Editor.py" line="2987"/> <source><p>The file <b>{0}</b> could not be saved.<br/>Reason: {1}</p></source> <translation><p>Die Datei <b>{0}</b> konnte nicht gesichert werden.<br/>Grund: {1}</p></translation> </message> @@ -9724,47 +9724,47 @@ <translation>Warnungen löschen</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="3044"/> + <location filename="../QScintilla/Editor.py" line="3046"/> <source><p>The file <b>{0}</b> already exists. Overwrite it?</p></source> <translation><p>Die Datei <b>{0}</b> existiert bereits. Überschreiben?</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6277"/> + <location filename="../QScintilla/Editor.py" line="6279"/> <source><p>The macro file <b>{0}</b> already exists. Overwrite it?</p></source> <translation><p>Die Makrodatei <b>{0}</b> existiert bereits. Überschreiben?</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6128"/> + <location filename="../QScintilla/Editor.py" line="6130"/> <source>Warning: {0}</source> <translation>Warnung: {0}</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6135"/> + <location filename="../QScintilla/Editor.py" line="6137"/> <source>Error: {0}</source> <translation>Fehler: {0}</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6466"/> + <location filename="../QScintilla/Editor.py" line="6468"/> <source><br><b>Warning:</b> You will lose your changes upon reopening it.</source> <translation><br><b>Warnung:</b> Vorgenommenen Änderungen gehen beim neu einlesen verloren.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4537"/> + <location filename="../QScintilla/Editor.py" line="4539"/> <source>Activating Auto-Completion Provider</source> <translation>Aktivierung eines Providers für automatische Vervollständigungen</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4537"/> + <location filename="../QScintilla/Editor.py" line="4539"/> <source>Auto-completion provider cannot be connected because there is already another one active. Please check your configuration.</source> <translation>Ein Provider für automatische Vervollständigungen kann nicht angebunden werden, da bereits ein anderer aktiv ist. Bitte überprüfen Sie Ihre Konfiguration.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4857"/> + <location filename="../QScintilla/Editor.py" line="4859"/> <source>Activating Calltip Provider</source> <translation>Aktivierung eines Providers für Calltips</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4857"/> + <location filename="../QScintilla/Editor.py" line="4859"/> <source>Calltip provider cannot be connected because there is already another one active. Please check your configuration.</source> <translation>Ein Provider für Calltips kann nicht angebunden werden, da bereits ein anderer aktiv ist. Bitte überprüfen Sie Ihre Konfiguration.</translation> </message> @@ -9789,27 +9789,27 @@ <translation>Vorherige Änderung</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7664"/> + <location filename="../QScintilla/Editor.py" line="7666"/> <source>Sort Lines</source> <translation>Zeilen sortieren</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7664"/> + <location filename="../QScintilla/Editor.py" line="7666"/> <source>The selection contains illegal data for a numerical sort.</source> <translation>Die Auswahl enthält für eine numerische Sortierung ungültige Daten.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6064"/> + <location filename="../QScintilla/Editor.py" line="6066"/> <source>Warning</source> <translation>Warnung</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6064"/> + <location filename="../QScintilla/Editor.py" line="6066"/> <source>No warning messages available.</source> <translation>Keine Warnmeldungen verfügbar.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6125"/> + <location filename="../QScintilla/Editor.py" line="6127"/> <source>Style: {0}</source> <translation>Stil: {0}</translation> </message> @@ -9834,7 +9834,7 @@ <translation>Öffnen mit Kodierung</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6460"/> + <location filename="../QScintilla/Editor.py" line="6462"/> <source><p>The file <b>{0}</b> has been changed while it was opened in eric6. Reread it?</p></source> <translation><p>Die Datei <b>{0}</b> wurde geändert, während sie in eric6 geöffnet war. Neu einlesen?</p></translation> </message> @@ -9849,32 +9849,32 @@ <translation>Vervollständigen</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4586"/> + <location filename="../QScintilla/Editor.py" line="4588"/> <source>Auto-Completion Provider</source> <translation>Provider für automatische Vervollständigungen</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4586"/> + <location filename="../QScintilla/Editor.py" line="4588"/> <source>The completion list provider '{0}' was already registered. Ignoring duplicate request.</source> <translation>Der Provider für automatische Vervollständigungen namens '{0}' ist bereits registriert. Die Wiederholung wird ignoriert.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4900"/> + <location filename="../QScintilla/Editor.py" line="4902"/> <source>Call-Tips Provider</source> <translation>Calltipps-Provider</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4900"/> + <location filename="../QScintilla/Editor.py" line="4902"/> <source>The call-tips provider '{0}' was already registered. Ignoring duplicate request.</source> <translation>Der Calltipps-Provider namens '{0}' ist bereits registriert. Die Wiederholung wird ignoriert.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7751"/> + <location filename="../QScintilla/Editor.py" line="7753"/> <source>Register Mouse Click Handler</source> <translation>Maus Klick Handler registrieren</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7751"/> + <location filename="../QScintilla/Editor.py" line="7753"/> <source>A mouse click handler for "{0}" was already registered by "{1}". Aborting request by "{2}"...</source> <translation>Ein Maus Klick Handler für "{0}" wurde bereits durch "{1}" registriert. Die Anfrage durch "{2}" wird abgebrochen...</translation> </message> @@ -9952,7 +9952,7 @@ <translation>Drücken, um eine API-Datei aus der Liste installierter API-Dateien zu wählen</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.ui" line="146"/> + <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="249"/> <source>Add from installed APIs</source> <translation>Von installierten APIs hinzufügen</translation> </message> @@ -9962,7 +9962,7 @@ <translation>Drücke, um die gewählte APIs Zusammenstellung zu übersetzen</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.ui" line="173"/> + <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="301"/> <source>Compile APIs</source> <translation>APIs übersetzen</translation> </message> @@ -9987,7 +9987,7 @@ <translation>Drücken, um eine API-Datei aus der Liste von API-Dateien, die von Plugins installierter wurden, zu wählen</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.ui" line="156"/> + <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="268"/> <source>Add from Plugin APIs</source> <translation>Von Plugin APIs hinzufügen</translation> </message> @@ -11084,7 +11084,7 @@ <translation>Wähle den Modus „Füllen bis zum Zeilenende“.</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="113"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="357"/> <source>Fill to end of line</source> <translation>Füllen bis zum Zeilenende</translation> </message> @@ -11129,7 +11129,7 @@ <translation>Wähle die Schriftart aus.</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="103"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="69"/> <source>Font</source> <translation>Schriftart</translation> </message> @@ -12575,7 +12575,7 @@ <translation>Modus:</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1080"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.py" line="58"/> <source>Disabled</source> <translation>Ausgeschaltet</translation> </message> @@ -13369,7 +13369,7 @@ <context> <name>EmailDialog</name> <message> - <location filename="../UI/EmailDialog.ui" line="13"/> + <location filename="../UI/EmailDialog.py" line="346"/> <source>Send bug report</source> <translation>Sende Fehlerbericht</translation> </message> @@ -14797,12 +14797,12 @@ <translation>Benachrichtigungen</translation> </message> <message> - <location filename="../Helpviewer/FeaturePermissions/FeaturePermissionsDialog.ui" line="122"/> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="110"/> <source>Host</source> <translation>Rechner</translation> </message> <message> - <location filename="../Helpviewer/FeaturePermissions/FeaturePermissionsDialog.ui" line="127"/> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="111"/> <source>Permission</source> <translation>Berechtigung</translation> </message> @@ -14817,7 +14817,7 @@ <translation>Alle entfernen</translation> </message> <message> - <location filename="../Helpviewer/FeaturePermissions/FeaturePermissionsDialog.ui" line="97"/> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="51"/> <source>Geolocation</source> <translation>Geolokalisierung</translation> </message> @@ -15941,7 +15941,7 @@ <translation>Name:</translation> </message> <message> - <location filename="../WebBrowser/FlashCookieManager/FlashCookieManagerDialog.ui" line="158"/> + <location filename="../WebBrowser/FlashCookieManager/FlashCookieManagerDialog.py" line="193"/> <source><no flash cookie selected></source> <translation><kein Flash Cookie ausgewählt></translation> </message> @@ -15951,7 +15951,7 @@ <translation>Größe:</translation> </message> <message> - <location filename="../WebBrowser/FlashCookieManager/FlashCookieManagerDialog.ui" line="137"/> + <location filename="../WebBrowser/FlashCookieManager/FlashCookieManagerDialog.py" line="122"/> <source>Origin:</source> <translation>Ursprung:</translation> </message> @@ -15986,7 +15986,7 @@ <translation>Drücken, um ausgewählte Flash Cookies zu entfernen</translation> </message> <message> - <location filename="../WebBrowser/FlashCookieManager/FlashCookieManagerDialog.ui" line="225"/> + <location filename="../WebBrowser/FlashCookieManager/FlashCookieManagerDialog.py" line="213"/> <source>Remove Cookie</source> <translation>Cookie entfernen</translation> </message> @@ -16414,7 +16414,7 @@ <context> <name>GreaseMonkeyAddScriptDialog</name> <message> - <location filename="../WebBrowser/GreaseMonkey/GreaseMonkeyAddScriptDialog.ui" line="14"/> + <location filename="../WebBrowser/GreaseMonkey/GreaseMonkeyAddScriptDialog.py" line="105"/> <source>GreaseMonkey Script Installation</source> <translation>GreaseMonkey-Skriptinstallation</translation> </message> @@ -22010,7 +22010,7 @@ <context> <name>HgAddSubrepositoryDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAddSubrepositoryDialog.ui" line="14"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAddSubrepositoryDialog.py" line="98"/> <source>Add Sub-repository</source> <translation>Unterrepository hinzufügen</translation> </message> @@ -23193,7 +23193,7 @@ <translation>Drücken, um die ausgewählten Einträge als 'aufgelöst' zu markieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="73"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="246"/> <source>Resolved</source> <translation>Aufgelöst</translation> </message> @@ -23203,7 +23203,7 @@ <translation>Drücken, um die ausgewählten Einträge als 'nicht aufgelöst' zu markieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="83"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="244"/> <source>Unresolved</source> <translation>Nicht Aufgelöst</translation> </message> @@ -23796,7 +23796,7 @@ <translation>Wähle die als Filter zu verwendende Kategorie</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.ui" line="55"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="317"/> <source>Revision</source> <translation>Revision</translation> </message> @@ -24168,7 +24168,7 @@ <translation><p>Die Datei <b>{0}</b> konnte nicht geladen werden.<br/>Grund: {1}</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditPlanEditor.ui" line="14"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditPlanEditor.py" line="249"/> <source>Edit Plan</source> <translation>Plan bearbeiten</translation> </message> @@ -24309,7 +24309,7 @@ <context> <name>HgLogBrowserDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="14"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="73"/> <source>Mercurial Log</source> <translation>Mercurial-Log</translation> </message> @@ -24339,17 +24339,17 @@ <translation>Wähle das als Filter zu verwendende Feld</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="181"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="101"/> <source>Revision</source> <translation>Revision</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="191"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="102"/> <source>Author</source> <translation>Autor</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="201"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="103"/> <source>Message</source> <translation>Nachricht</translation> </message> @@ -24399,102 +24399,102 @@ <translation>Gib die Anzahl an zu holenden Einträgen ein</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="339"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="326"/> <source>Select to stop listing log messages at a copy or move</source> <translation>Auswählen, um die Anzeige von Log Meldungen bei einer Kopier- oder Verschiebeaktion zu stoppen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="342"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="329"/> <source>Stop on Copy/Move</source> <translation>Bei Kopieren/Umbenennen anhalten</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="433"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="453"/> <source>Errors</source> <translation>Fehler</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="439"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="459"/> <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="455"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="475"/> <source>Input</source> <translation>Eingabe</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="477"/> - <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="480"/> - <source>&Send</source> - <translation>Sen&den</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="483"/> - <source>Alt+S</source> - <translation>Alt+D</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="490"/> - <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="497"/> - <source>Select to switch the input field to password mode</source> - <translation>Anwählen, um den Kennwortmodus für das Eingabefeld auszuwählen</translation> + <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="500"/> - <source>&Password Mode</source> - <translation>&Kennwortmodus</translation> + <source>&Send</source> + <translation>Sen&den</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="503"/> + <source>Alt+S</source> + <translation>Alt+D</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="510"/> + <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="517"/> + <source>Select to switch the input field to password mode</source> + <translation>Anwählen, um den Kennwortmodus für das Eingabefeld auszuwählen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="520"/> + <source>&Password Mode</source> + <translation>&Kennwortmodus</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="523"/> <source>Alt+P</source> <translation>Alt+P</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="161"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="164"/> <source>Added</source> <translation>Hinzugefügt</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="162"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="165"/> <source>Deleted</source> <translation>Gelöscht</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="163"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="166"/> <source>Modified</source> <translation>Modifiziert</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="905"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="913"/> <source>Process Generation Error</source> <translation>Fehler beim Prozessstart</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="905"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="913"/> <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="672"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="680"/> <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="675"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="683"/> <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="678"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="686"/> <source>Mercurial Error</source> <translation>Mercurial-Fehler</translation> </message> @@ -24504,32 +24504,32 @@ <translation>Grafik</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="349"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="369"/> <source>Press to generate a diff to the first parent revision</source> <translation>Drücken, um ein Diff zum ersten Vorgänger zu erzeugen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="352"/> - <source>Diff to Parent &1</source> - <translation>Diff zu Vorgänger &1</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="359"/> - <source>Press to generate a diff to the second parent revision</source> - <translation>Drücken, um ein Diff zum zweiten Vorgänger zu erzeugen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="362"/> - <source>Diff to Parent &2</source> - <translation>Diff zu Vorgänger &2</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="369"/> - <source>Press to compare two revisions</source> - <translation>Drücken, um zwei Revisionen zu vergleichen</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="372"/> + <source>Diff to Parent &1</source> + <translation>Diff zu Vorgänger &1</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="379"/> + <source>Press to generate a diff to the second parent revision</source> + <translation>Drücken, um ein Diff zum zweiten Vorgänger zu erzeugen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="382"/> + <source>Diff to Parent &2</source> + <translation>Diff zu Vorgänger &2</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="389"/> + <source>Press to compare two revisions</source> + <translation>Drücken, um zwei Revisionen zu vergleichen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="392"/> <source>&Compare Revisions</source> <translation>&Vergleiche Revisionen</translation> </message> @@ -24544,7 +24544,7 @@ <translation>Wähle den als Filter zu verwendenden Zweig</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="141"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="144"/> <source>All</source> <translation>Alle</translation> </message> @@ -24559,17 +24559,17 @@ <translation>Mercurial-Log (Ausgang)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="178"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="181"/> <source>Bookmarks</source> <translation>Lesezeichen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="87"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="90"/> <source>Press to refresh the list of changesets</source> <translation>Drücken, um die Liste der Änderungssätze zu erneuern</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="85"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="88"/> <source>&Refresh</source> <translation>&Erneuern</translation> </message> @@ -24579,83 +24579,83 @@ <translation>Phase</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="198"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="206"/> <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.py" line="200"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="208"/> <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.py" line="196"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="204"/> <source>Change Phase</source> <translation>Phase ändern</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1752"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1795"/> <source>Copy Changesets</source> <translation>Änderungssätze kopieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1944"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1987"/> <source>The project should be reread. Do this now?</source> <translation>Das Projekt sollte neu gelesen werde. Jetzt durchführen?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="405"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="435"/> <source>Select to show differences side-by-side</source> <translation>Auswählen, um Unterschiede nebeinander anzuzeigen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="408"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="438"/> <source>Show differences side-by-side</source> <translation>Unterschiede nebeneinander anzeigen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="415"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="412"/> <source>Select action from menu</source> <translation>Wähle eine Aktion aus dem Menü</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="193"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="201"/> <source>Copy the selected changesets to the current branch</source> <translation>Ausgewählte Änderungssätze in den aktuellen Zweig kopieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="205"/> - <source>Tag</source> - <translation>Marke setzen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="208"/> - <source>Tag the selected revision</source> - <translation>Ausgewählte Revision mit einer Marke versehen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1804"/> - <source>Switch</source> - <translation>Umschalten</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="213"/> + <source>Tag</source> + <translation>Marke setzen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="216"/> + <source>Tag the selected revision</source> + <translation>Ausgewählte Revision mit einer Marke versehen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1847"/> + <source>Switch</source> + <translation>Umschalten</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="221"/> <source>Switch the working directory to the selected revision</source> <translation>Schaltet das Arbeitsverzeichnis auf die ausgewählte Revision um</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="236"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="244"/> <source>Pull Large Files</source> <translation>Binärriesen herunterladen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="238"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="246"/> <source>Pull large files for selected revisions</source> <translation>Binärriesen der ausgewählten Revisionen herunterladen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="996"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1004"/> <source>{0} (large file)</source> <translation>{0} (Binärriese)</translation> </message> @@ -24680,155 +24680,165 @@ <translation>Drücken, um das nächste Vorkommen zu suchen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="95"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="98"/> <source>Find</source> <translation>Suchen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="96"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="99"/> <source>Filter</source> <translation>Filter</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="123"/> - <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> - <translation><tr><td><b>Marken</b></td><td>{0}</td></tr></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="126"/> + <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> + <translation><tr><td><b>Marken</b></td><td>{0}</td></tr></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="129"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Lesezeichen</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2045"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2088"/> <source>Find Commit</source> <translation>Revision finden</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2045"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2088"/> <source>'{0}' was not found.</source> <translation>„{0}“ wurde nicht gefunden.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="101"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="104"/> <source>File</source> <translation>Datei</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="167"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="170"/> <source>Draft</source> <translation>Entwurf</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="168"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="171"/> <source>Public</source> <translation>Öffentlich</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="169"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="172"/> <source>Secret</source> <translation>Geheim</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1902"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1945"/> <source>Pull Changes</source> <translation>Änderungen herunterladen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="234"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="242"/> <source>Pull changes from a remote repository</source> <translation>Änderungen von einem entfernten Repository herunterladen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="247"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="255"/> <source>Push Selected Changes</source> <translation>Ausgewählte Änderungen hochladen</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="258"/> + <source>Push changes of the selected changeset and its ancestors to a remote repository</source> + <translation>Änderungen des ausgewählten Änderungssatzes und aller Vorgänger in ein entferntes Repository hochladen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="261"/> + <source>Push All Changes</source> + <translation>Alle Änderungen hochladen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="264"/> + <source>Push all changes to a remote repository</source> + <translation>Alle Änderungen an ein entferntes Repository hochladen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1926"/> + <source>Fetch Changes</source> + <translation>Änderungen abholen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1987"/> + <source>Strip Changesets</source> + <translation>Änderungssätze löschen</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="250"/> - <source>Push changes of the selected changeset and its ancestors to a remote repository</source> - <translation>Änderungen des ausgewählten Änderungssatzes und aller Vorgänger in ein entferntes Repository hochladen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="253"/> - <source>Push All Changes</source> - <translation>Alle Änderungen hochladen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="256"/> - <source>Push all changes to a remote repository</source> - <translation>Alle Änderungen an ein entferntes Repository hochladen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1883"/> - <source>Fetch Changes</source> - <translation>Änderungen abholen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1944"/> - <source>Strip Changesets</source> - <translation>Änderungssätze löschen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="242"/> <source>Fetch changes from a remote repository</source> <translation>Änderungen von einem entfernten Repository herunterladen und einarbeiten</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="264"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="272"/> <source>Strip changesets from a repository</source> <translation>Änderungssätze aus einem Repository löschen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="218"/> - <source>Define Bookmark...</source> - <translation>Lesezeichen hinzufügen …</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="221"/> - <source>Bookmark the selected revision</source> - <translation>Lesezeichen für die ausgewählte Revision erzeugen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="223"/> - <source>Move Bookmark...</source> - <translation>Lesezeichen verschieben …</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="226"/> + <source>Define Bookmark...</source> + <translation>Lesezeichen hinzufügen …</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="229"/> + <source>Bookmark the selected revision</source> + <translation>Lesezeichen für die ausgewählte Revision erzeugen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="231"/> + <source>Move Bookmark...</source> + <translation>Lesezeichen verschieben …</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="234"/> <source>Move bookmark to the selected revision</source> <translation>Verschiebe ein Lesezeichen zur ausgewählten Revision</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1825"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1868"/> <source>Define Bookmark</source> <translation>Lesezeichen hinzufügen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1825"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1868"/> <source>Enter bookmark name for changeset "{0}":</source> <translation>Gib einen Lesezeichennamen für den Änderungssatz "{0}" ein: </translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1847"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1890"/> <source>Move Bookmark</source> <translation>Lesezeichen verschieben</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1847"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1890"/> <source>Select the bookmark to be moved to changeset "{0}":</source> <translation>Wähle ein Lesezeichen aus, das zum Änderungssatz "{0}" verschoben werden soll: </translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1790"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1833"/> <source>Select bookmark to switch to (leave empty to use revision):</source> <translation>Wähle das Lesezeichen aus, auf das umgeschaltet werden soll (leer lassen, um Revision zu verwenden):</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="112"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="115"/> <source><table><tr><td><b>Revision</b></td><td>{0}</td></tr><tr><td><b>Date</b></td><td>{1}</td></tr><tr><td><b>Author</b></td><td>{2}</td></tr><tr><td><b>Branch</b></td><td>{3}</td></tr><tr><td><b>Parents</b></td><td>{4}</td></tr><tr><td><b>Children</b></td><td>{5}</td></tr>{6}</table></source> <translation><table><tr><td><b>Revision</b></td><td>{0}</td></tr><tr><td><b>Datum</b></td><td>{1}</td></tr><tr><td><b>Autor</b></td><td>{2}</td></tr><tr><td><b>Zweig</b></td><td>{3}</td></tr><tr><td><b>Eltern</b></td><td>{4}</td></tr><tr><td><b>Kinder</b></td><td>{5}</td></tr>{6}</table></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="349"/> + <source>Press to move up in the log list</source> + <translation>Drücken, um in der Historie nach oben zu gehen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="359"/> + <source>Press to move down in the log list</source> + <translation>Drücken, um in der Historie nach unten zu gehen</translation> + </message> </context> <context> <name>HgLogDialog</name> @@ -28283,7 +28293,7 @@ <context> <name>HgStatusDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="14"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="313"/> <source>Mercurial Status</source> <translation>Mercurial-Status</translation> </message> @@ -28425,7 +28435,7 @@ <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/HgStatusDialog.ui" line="87"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="708"/> <source>Commit</source> <translation>Einpflegen</translation> </message> @@ -28545,7 +28555,7 @@ <translation>alle</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="203"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="854"/> <source>Differences</source> <translation>Unterschiede</translation> </message> @@ -29815,7 +29825,7 @@ <translation>Drücken, um die ausgwählten Einträge zu löschen</translation> </message> <message> - <location filename="../WebBrowser/History/HistoryDialog.ui" line="75"/> + <location filename="../WebBrowser/History/HistoryDialog.py" line="114"/> <source>&Remove</source> <translation>&Entfernen</translation> </message> @@ -35921,92 +35931,92 @@ <translation>Standard Knöpfe</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="219"/> + <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="40"/> <source>Apply</source> <translation>Anwenden</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="226"/> + <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="39"/> <source>Abort</source> <translation>Abbrechen (Abort)</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="233"/> + <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="41"/> <source>Cancel</source> <translation>Abbrechen (Cancel)</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="240"/> + <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="45"/> <source>Ignore</source> <translation>Ignorieren</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="247"/> + <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="54"/> <source>Save all</source> <translation>Alles speichern</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="254"/> + <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="53"/> <source>Save</source> <translation>Speichern</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="261"/> + <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="43"/> <source>Discard</source> <translation>Verwerfen</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="268"/> + <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="56"/> <source>Yes to all</source> <translation>Ja zu allen</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="275"/> + <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="49"/> <source>Open</source> <translation>Öffnen</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="282"/> + <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="50"/> <source>Reset</source> <translation>Zurücksetzen</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="289"/> + <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="48"/> <source>Ok</source> <translation>Ok</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="296"/> + <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="46"/> <source>No</source> <translation>Nein</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="303"/> + <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="44"/> <source>Help</source> <translation>Hilfe</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="310"/> + <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="47"/> <source>No to all</source> <translation>Nein zu allen</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="317"/> + <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="52"/> <source>Retry</source> <translation>Wiederholen</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="324"/> + <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="51"/> <source>Restore defaults</source> <translation>Auf Standardwerte zurücksetzen</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="331"/> + <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="55"/> <source>Yes</source> <translation>Ja</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="338"/> + <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="42"/> <source>Close</source> <translation>Schließen</translation> </message> @@ -37746,7 +37756,7 @@ <context> <name>NoCacheHostsDialog</name> <message> - <location filename="../Helpviewer/Network/NoCacheHostsDialog.ui" line="14"/> + <location filename="../Helpviewer/Network/NoCacheHostsDialog.py" line="52"/> <source>Not Cached Hosts</source> <translation>Nicht Gecachte Hosts</translation> </message> @@ -37854,7 +37864,7 @@ <translation>Einschalten, um die Position visuell auszuwählen, ausschalten, um sie einzulesen</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/NotificationsPage.ui" line="146"/> + <location filename="../Preferences/ConfigurationPages/NotificationsPage.py" line="81"/> <source>Visual Selection</source> <translation>Visuelle Auswahl</translation> </message> @@ -38527,7 +38537,7 @@ <context> <name>PasswordsDialog</name> <message> - <location filename="../WebBrowser/Passwords/PasswordsDialog.ui" line="14"/> + <location filename="../WebBrowser/Passwords/PasswordsDialog.py" line="91"/> <source>Saved Passwords</source> <translation>Gespeicherte Passwörter</translation> </message> @@ -43326,7 +43336,7 @@ <translation>Ausgeführt</translation> </message> <message> - <location filename="../DataViews/PyCoverageDialog.ui" line="172"/> + <location filename="../DataViews/PyCoverageDialog.py" line="349"/> <source>Coverage</source> <translation>Abdeckung</translation> </message> @@ -43376,7 +43386,7 @@ </translation> </message> <message> - <location filename="../DataViews/PyCoverageDialog.ui" line="192"/> + <location filename="../DataViews/PyCoverageDialog.py" line="345"/> <source>%v/%m Files</source> <translation>%v/%m Dateien</translation> </message> @@ -43399,7 +43409,7 @@ <translation>Lösche alle Informationen</translation> </message> <message> - <location filename="../DataViews/PyProfileDialog.ui" line="20"/> + <location filename="../DataViews/PyProfileDialog.py" line="233"/> <source>Profile Results</source> <translation>Profilergebnisse</translation> </message> @@ -48150,7 +48160,7 @@ <translation>Drücken, um die ausgewählten Filter zu löschen</translation> </message> <message> - <location filename="../WebBrowser/QtHelp/QtHelpFiltersDialog.ui" line="89"/> + <location filename="../WebBrowser/QtHelp/QtHelpFiltersDialog.py" line="150"/> <source>Remove Filters</source> <translation>Filter löschen</translation> </message> @@ -48160,7 +48170,7 @@ <translation>Drücken, um die ausgewählten Attribute zu löschen</translation> </message> <message> - <location filename="../WebBrowser/QtHelp/QtHelpFiltersDialog.ui" line="99"/> + <location filename="../WebBrowser/QtHelp/QtHelpFiltersDialog.py" line="178"/> <source>Remove Attributes</source> <translation>Attribute löschen</translation> </message> @@ -49679,7 +49689,7 @@ <context> <name>SendRefererWhitelistDialog</name> <message> - <location filename="../WebBrowser/Network/SendRefererWhitelistDialog.ui" line="14"/> + <location filename="../WebBrowser/Network/SendRefererWhitelistDialog.py" line="52"/> <source>Send Referer Whitelist</source> <translation>Referer Whitelist</translation> </message> @@ -50891,7 +50901,7 @@ <translation>&Vorschau kopieren</translation> </message> <message> - <location filename="../Snapshot/SnapWidget.ui" line="20"/> + <location filename="../Snapshot/SnapWidget.py" line="531"/> <source>eric6 Snapshot</source> <translation>eric6-Bildschirmfoto</translation> </message> @@ -53506,7 +53516,7 @@ <context> <name>SvnDiffDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.ui" line="14"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py" line="171"/> <source>Subversion Diff</source> <translation>Subversion-Diff</translation> </message> @@ -53784,12 +53794,12 @@ <translation>Subversion-Log</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="112"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="643"/> <source>Revision</source> <translation>Revision</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="117"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="640"/> <source>Author</source> <translation>Autor</translation> </message> @@ -53799,7 +53809,7 @@ <translation>Datum</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="127"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="150"/> <source>Message</source> <translation>Nachricht</translation> </message> @@ -53839,102 +53849,102 @@ <translation>Gib die Anzahl an zu holenden Einträgen ein</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="241"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="261"/> <source>Press to generate a diff to the previous revision</source> <translation>Drücken, um ein Diff zur vorherigen Revision zu erzeugen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="244"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="264"/> <source>&Diff to Previous</source> <translation>&Diff zu vorherigen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="251"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="271"/> <source>Press to compare two revisions</source> <translation>Drücken, um zwei Revisionen zu vergleichen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="254"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="274"/> <source>&Compare Revisions</source> <translation>&Vergleiche Revisionen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="89"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="93"/> <source>Added</source> <translation>Hinzugefügt</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="90"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="94"/> <source>Deleted</source> <translation>Gelöscht</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="91"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="95"/> <source>Modified</source> <translation>Modifiziert</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnLogBrowserDialog.py" line="504"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnLogBrowserDialog.py" line="527"/> <source>Subversion Error</source> <translation>Subversion-Fehler</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="292"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="312"/> <source>Errors</source> <translation>Fehler</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="298"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="318"/> <source><b>Subversion log errors</b><p>This shows possible error messages of the svn log command.</p></source> <translation><b>Subversion-Log-Fehler</b><p>Dies zeigt mögliche Fehlermeldungen des svn log-Befehls.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="314"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="334"/> <source>Input</source> <translation>Eingabe</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="336"/> - <source>Press to send the input to the subversion process</source> - <translation>Drücken um die Eingabe an den Subversion-Prozess zu senden</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="339"/> - <source>&Send</source> - <translation>Sen&den</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="342"/> - <source>Alt+S</source> - <translation>Alt+S</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="349"/> - <source>Enter data to be sent to the subversion process</source> - <translation>Gib die Daten ein, die an den Subversion-Prozess geschickt werden sollen</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="356"/> - <source>Select to switch the input field to password mode</source> - <translation>Anwählen, um den Kennwortmodus für das Eingabefeld auszuwählen</translation> + <source>Press to send the input to the subversion process</source> + <translation>Drücken um die Eingabe an den Subversion-Prozess zu senden</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="359"/> - <source>&Password Mode</source> - <translation>&Kennwortmodus</translation> + <source>&Send</source> + <translation>Sen&den</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="362"/> + <source>Alt+S</source> + <translation>Alt+S</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="369"/> + <source>Enter data to be sent to the subversion process</source> + <translation>Gib die Daten ein, die an den Subversion-Prozess geschickt werden sollen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="376"/> + <source>Select to switch the input field to password mode</source> + <translation>Anwählen, um den Kennwortmodus für das Eingabefeld auszuwählen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="379"/> + <source>&Password Mode</source> + <translation>&Kennwortmodus</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="382"/> <source>Alt+P</source> <translation>Alt+P</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="289"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="298"/> <source>Process Generation Error</source> <translation>Fehler beim Prozessstart</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="289"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="298"/> <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> @@ -53979,20 +53989,30 @@ <translation>Bei Kopieren/Umbenennen anhalten</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="92"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="96"/> <source>Replaced</source> <translation>Ersetzt</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="274"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="294"/> <source>Select to show differences side-by-side</source> <translation>Auswählen, um Unterschiede nebeinander anzuzeigen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="277"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="297"/> <source>Show differences side-by-side</source> <translation>Unterschiede nebeneinander anzeigen</translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="241"/> + <source>Press to move up in the log list</source> + <translation>Drücken, um in der Historie nach oben zu gehen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="251"/> + <source>Press to move down in the log list</source> + <translation>Drücken, um in der Historie nach unten zu gehen</translation> + </message> </context> <context> <name>SvnLogDialog</name> @@ -54277,7 +54297,7 @@ <translation>&Protokoll:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnNewProjectOptionsDialog.ui" line="45"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnNewProjectOptionsDialog.py" line="128"/> <source>&URL:</source> <translation>&URL:</translation> </message> @@ -54378,7 +54398,7 @@ <translation>Wähle das Protokoll zum Zugriff auf das Repository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnOptionsDialog.ui" line="45"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnOptionsDialog.py" line="95"/> <source>&URL:</source> <translation>&URL:</translation> </message> @@ -55648,7 +55668,7 @@ <translation>ignoriert</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.ui" line="14"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="394"/> <source>Subversion Status</source> <translation>Subversion-Status</translation> </message> @@ -55658,7 +55678,7 @@ <translation>Änderungen einpflegen...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.ui" line="80"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="711"/> <source>Commit</source> <translation>Einpflegen</translation> </message> @@ -61092,7 +61112,7 @@ <context> <name>UnittestDialog</name> <message> - <location filename="../PyUnit/UnittestDialog.ui" line="14"/> + <location filename="../PyUnit/UnittestDialog.py" line="403"/> <source>Unittest</source> <translation>Modultest</translation> </message>
--- a/i18n/eric6_empty.ts Sat Jan 28 12:39:43 2017 +0100 +++ b/i18n/eric6_empty.ts Sat Jan 28 14:22:00 2017 +0100 @@ -8895,7 +8895,7 @@ <context> <name>Editor</name> <message> - <location filename="../QScintilla/Editor.py" line="2881"/> + <location filename="../QScintilla/Editor.py" line="2883"/> <source>Open File</source> <translation type="unfinished"></translation> </message> @@ -8985,7 +8985,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7247"/> + <location filename="../QScintilla/Editor.py" line="7249"/> <source>Check spelling...</source> <translation type="unfinished"></translation> </message> @@ -9255,7 +9255,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5159"/> + <location filename="../QScintilla/Editor.py" line="5161"/> <source>Enable breakpoint</source> <translation type="unfinished"></translation> </message> @@ -9380,407 +9380,407 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1755"/> + <location filename="../QScintilla/Editor.py" line="1757"/> <source>Modification of Read Only file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1755"/> + <location filename="../QScintilla/Editor.py" line="1757"/> <source>You are attempting to change a read only file. Please save to a different file first.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="2446"/> + <location filename="../QScintilla/Editor.py" line="2448"/> <source>Printing...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="2463"/> - <source>Printing completed</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="2465"/> + <source>Printing completed</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="2467"/> <source>Error while printing</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="2468"/> + <location filename="../QScintilla/Editor.py" line="2470"/> <source>Printing aborted</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="2826"/> + <location filename="../QScintilla/Editor.py" line="2828"/> <source>File Modified</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="2826"/> + <location filename="../QScintilla/Editor.py" line="2828"/> <source><p>The file <b>{0}</b> has unsaved changes.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="2881"/> + <location filename="../QScintilla/Editor.py" line="2883"/> <source><p>The file <b>{0}</b> could not be opened.</p><p>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="3044"/> + <location filename="../QScintilla/Editor.py" line="3046"/> <source>Save File</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="2985"/> + <location filename="../QScintilla/Editor.py" line="2987"/> <source><p>The file <b>{0}</b> could not be saved.<br/>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="3044"/> + <location filename="../QScintilla/Editor.py" line="3046"/> <source><p>The file <b>{0}</b> already exists. Overwrite it?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4432"/> + <location filename="../QScintilla/Editor.py" line="4434"/> <source>Autocompletion</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4432"/> + <location filename="../QScintilla/Editor.py" line="4434"/> <source>Autocompletion is not available because there is no autocompletion source set.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4537"/> + <location filename="../QScintilla/Editor.py" line="4539"/> <source>Activating Auto-Completion Provider</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4537"/> + <location filename="../QScintilla/Editor.py" line="4539"/> <source>Auto-completion provider cannot be connected because there is already another one active. Please check your configuration.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4586"/> + <location filename="../QScintilla/Editor.py" line="4588"/> <source>Auto-Completion Provider</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4586"/> + <location filename="../QScintilla/Editor.py" line="4588"/> <source>The completion list provider '{0}' was already registered. Ignoring duplicate request.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4857"/> + <location filename="../QScintilla/Editor.py" line="4859"/> <source>Activating Calltip Provider</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4857"/> + <location filename="../QScintilla/Editor.py" line="4859"/> <source>Calltip provider cannot be connected because there is already another one active. Please check your configuration.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4900"/> + <location filename="../QScintilla/Editor.py" line="4902"/> <source>Call-Tips Provider</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4900"/> + <location filename="../QScintilla/Editor.py" line="4902"/> <source>The call-tips provider '{0}' was already registered. Ignoring duplicate request.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5162"/> + <location filename="../QScintilla/Editor.py" line="5164"/> <source>Disable breakpoint</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5536"/> + <location filename="../QScintilla/Editor.py" line="5538"/> <source>Code Coverage</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5536"/> + <location filename="../QScintilla/Editor.py" line="5538"/> <source>Please select a coverage file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5599"/> + <location filename="../QScintilla/Editor.py" line="5601"/> <source>Show Code Coverage Annotations</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5592"/> + <location filename="../QScintilla/Editor.py" line="5594"/> <source>All lines have been covered.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5599"/> + <location filename="../QScintilla/Editor.py" line="5601"/> <source>There is no coverage file available.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5714"/> + <location filename="../QScintilla/Editor.py" line="5716"/> <source>Profile Data</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5714"/> + <location filename="../QScintilla/Editor.py" line="5716"/> <source>Please select a profile file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5874"/> + <location filename="../QScintilla/Editor.py" line="5876"/> <source>Syntax Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5874"/> + <location filename="../QScintilla/Editor.py" line="5876"/> <source>No syntax error message available.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6064"/> + <location filename="../QScintilla/Editor.py" line="6066"/> <source>Warning</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6064"/> + <location filename="../QScintilla/Editor.py" line="6066"/> <source>No warning messages available.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6125"/> + <location filename="../QScintilla/Editor.py" line="6127"/> <source>Style: {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6128"/> + <location filename="../QScintilla/Editor.py" line="6130"/> <source>Warning: {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6135"/> + <location filename="../QScintilla/Editor.py" line="6137"/> <source>Error: {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6189"/> + <location filename="../QScintilla/Editor.py" line="6191"/> <source>Macro Name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6189"/> + <location filename="../QScintilla/Editor.py" line="6191"/> <source>Select a macro name:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6217"/> + <location filename="../QScintilla/Editor.py" line="6219"/> <source>Load macro file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6260"/> + <location filename="../QScintilla/Editor.py" line="6262"/> <source>Macro files (*.macro)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6240"/> + <location filename="../QScintilla/Editor.py" line="6242"/> <source>Error loading macro</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6231"/> + <location filename="../QScintilla/Editor.py" line="6233"/> <source><p>The macro file <b>{0}</b> could not be read.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6240"/> + <location filename="../QScintilla/Editor.py" line="6242"/> <source><p>The macro file <b>{0}</b> is corrupt.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6260"/> + <location filename="../QScintilla/Editor.py" line="6262"/> <source>Save macro file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6277"/> + <location filename="../QScintilla/Editor.py" line="6279"/> <source>Save macro</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6277"/> + <location filename="../QScintilla/Editor.py" line="6279"/> <source><p>The macro file <b>{0}</b> already exists. Overwrite it?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6293"/> + <location filename="../QScintilla/Editor.py" line="6295"/> <source>Error saving macro</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6293"/> + <location filename="../QScintilla/Editor.py" line="6295"/> <source><p>The macro file <b>{0}</b> could not be written.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6306"/> + <location filename="../QScintilla/Editor.py" line="6308"/> <source>Start Macro Recording</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6306"/> + <location filename="../QScintilla/Editor.py" line="6308"/> <source>Macro recording is already active. Start new?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6332"/> + <location filename="../QScintilla/Editor.py" line="6334"/> <source>Macro Recording</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6332"/> + <location filename="../QScintilla/Editor.py" line="6334"/> <source>Enter name of the macro:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6460"/> + <location filename="../QScintilla/Editor.py" line="6462"/> <source><p>The file <b>{0}</b> has been changed while it was opened in eric6. Reread it?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6466"/> + <location filename="../QScintilla/Editor.py" line="6468"/> <source><br><b>Warning:</b> You will lose your changes upon reopening it.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6470"/> + <location filename="../QScintilla/Editor.py" line="6472"/> <source>File changed</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6634"/> + <location filename="../QScintilla/Editor.py" line="6636"/> <source>{0} (ro)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6774"/> + <location filename="../QScintilla/Editor.py" line="6776"/> <source>Drop Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6774"/> + <location filename="../QScintilla/Editor.py" line="6776"/> <source><p><b>{0}</b> is not a file.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6795"/> - <source>Resources</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="6797"/> - <source>Add file...</source> + <source>Resources</source> <translation type="unfinished"></translation> </message> <message> <location filename="../QScintilla/Editor.py" line="6799"/> - <source>Add files...</source> + <source>Add file...</source> <translation type="unfinished"></translation> </message> <message> <location filename="../QScintilla/Editor.py" line="6801"/> + <source>Add files...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="6803"/> <source>Add aliased file...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6804"/> + <location filename="../QScintilla/Editor.py" line="6806"/> <source>Add localized resource...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6808"/> + <location filename="../QScintilla/Editor.py" line="6810"/> <source>Add resource frame</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6827"/> + <location filename="../QScintilla/Editor.py" line="6829"/> <source>Add file resource</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6843"/> + <location filename="../QScintilla/Editor.py" line="6845"/> <source>Add file resources</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6871"/> + <location filename="../QScintilla/Editor.py" line="6873"/> <source>Add aliased file resource</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6871"/> + <location filename="../QScintilla/Editor.py" line="6873"/> <source>Alias for file <b>{0}</b>:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6935"/> + <location filename="../QScintilla/Editor.py" line="6937"/> <source>Package Diagram</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6935"/> + <location filename="../QScintilla/Editor.py" line="6937"/> <source>Include class attributes?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6955"/> + <location filename="../QScintilla/Editor.py" line="6957"/> <source>Imports Diagram</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6955"/> + <location filename="../QScintilla/Editor.py" line="6957"/> <source>Include imports from external modules?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6969"/> + <location filename="../QScintilla/Editor.py" line="6971"/> <source>Application Diagram</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6969"/> + <location filename="../QScintilla/Editor.py" line="6971"/> <source>Include module names?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7250"/> - <source>Add to dictionary</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="7252"/> + <source>Add to dictionary</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="7254"/> <source>Ignore All</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7664"/> + <location filename="../QScintilla/Editor.py" line="7666"/> <source>Sort Lines</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7664"/> + <location filename="../QScintilla/Editor.py" line="7666"/> <source>The selection contains illegal data for a numerical sort.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7751"/> + <location filename="../QScintilla/Editor.py" line="7753"/> <source>Register Mouse Click Handler</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7751"/> + <location filename="../QScintilla/Editor.py" line="7753"/> <source>A mouse click handler for "{0}" was already registered by "{1}". Aborting request by "{2}"...</source> <translation type="unfinished"></translation> </message> @@ -24225,7 +24225,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="98"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="101"/> <source>Revision</source> <translation type="unfinished"></translation> </message> @@ -24235,7 +24235,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="99"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="102"/> <source>Author</source> <translation type="unfinished"></translation> </message> @@ -24245,7 +24245,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="100"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="103"/> <source>Message</source> <translation type="unfinished"></translation> </message> @@ -24285,107 +24285,107 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="339"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="326"/> <source>Select to stop listing log messages at a copy or move</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="342"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="329"/> <source>Stop on Copy/Move</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="349"/> - <source>Press to generate a diff to the first parent revision</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="352"/> - <source>Diff to Parent &1</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="359"/> - <source>Press to generate a diff to the second parent revision</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="362"/> - <source>Diff to Parent &2</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="369"/> - <source>Press to compare two revisions</source> + <source>Press to generate a diff to the first parent revision</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="372"/> + <source>Diff to Parent &1</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="379"/> + <source>Press to generate a diff to the second parent revision</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="382"/> + <source>Diff to Parent &2</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="389"/> + <source>Press to compare two revisions</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="392"/> <source>&Compare Revisions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="405"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="435"/> <source>Select to show differences side-by-side</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="408"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="438"/> <source>Show differences side-by-side</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="415"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="412"/> <source>Select action from menu</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="433"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="453"/> <source>Errors</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="439"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="459"/> <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="455"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="475"/> <source>Input</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="477"/> - <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="480"/> - <source>&Send</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="483"/> - <source>Alt+S</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="490"/> - <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="497"/> - <source>Select to switch the input field to password mode</source> + <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="500"/> - <source>&Password Mode</source> + <source>&Send</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="503"/> + <source>Alt+S</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="510"/> + <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="517"/> + <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="520"/> + <source>&Password Mode</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="523"/> <source>Alt+P</source> <translation type="unfinished"></translation> </message> @@ -24400,281 +24400,291 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="85"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="88"/> <source>&Refresh</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="87"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="90"/> <source>Press to refresh the list of changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="95"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="98"/> <source>Find</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="96"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="99"/> <source>Filter</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="101"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="104"/> <source>File</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="123"/> - <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="126"/> + <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="129"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="141"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="144"/> <source>All</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="161"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="164"/> <source>Added</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="162"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="165"/> <source>Deleted</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="163"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="166"/> <source>Modified</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="167"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="170"/> <source>Draft</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="168"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="171"/> <source>Public</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="169"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="172"/> <source>Secret</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="178"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="181"/> <source>Bookmarks</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1752"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1795"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="193"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="201"/> <source>Copy the selected changesets to the current branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="196"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="204"/> <source>Change Phase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="198"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="206"/> <source>Change the phase of the selected revisions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="200"/> - <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.py" line="205"/> - <source>Tag</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="208"/> - <source>Tag the selected revision</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1804"/> - <source>Switch</source> + <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.py" line="213"/> + <source>Tag</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="216"/> + <source>Tag the selected revision</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1847"/> + <source>Switch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="221"/> <source>Switch the working directory to the selected revision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1902"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1945"/> <source>Pull Changes</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="242"/> + <source>Pull changes from a remote repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="244"/> + <source>Pull Large Files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="246"/> + <source>Pull large files for selected revisions</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="255"/> + <source>Push Selected Changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="258"/> + <source>Push changes of the selected changeset and its ancestors to a remote repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="261"/> + <source>Push All Changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="264"/> + <source>Push all changes to a remote repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="680"/> + <source>The hg process did not finish within 30s.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="683"/> + <source>Could not start the hg executable.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="686"/> + <source>Mercurial Error</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="913"/> + <source>Process Generation Error</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="913"/> + <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="1004"/> + <source>{0} (large file)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1987"/> + <source>The project should be reread. Do this now?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2088"/> + <source>Find Commit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2088"/> + <source>'{0}' was not found.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1926"/> + <source>Fetch Changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1987"/> + <source>Strip Changesets</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="250"/> + <source>Fetch changes from a remote repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="272"/> + <source>Strip changesets from a repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="226"/> + <source>Define Bookmark...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="229"/> + <source>Bookmark the selected revision</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="231"/> + <source>Move Bookmark...</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="234"/> - <source>Pull changes from a remote repository</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="236"/> - <source>Pull Large Files</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="238"/> - <source>Pull large files for selected revisions</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="247"/> - <source>Push Selected Changes</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="250"/> - <source>Push changes of the selected changeset and its ancestors to a remote repository</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="253"/> - <source>Push All Changes</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="256"/> - <source>Push all changes to a remote repository</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="672"/> - <source>The hg process did not finish within 30s.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="675"/> - <source>Could not start the hg executable.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="678"/> - <source>Mercurial Error</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="905"/> - <source>Process Generation Error</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="905"/> - <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="996"/> - <source>{0} (large file)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1944"/> - <source>The project should be reread. Do this now?</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2045"/> - <source>Find Commit</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2045"/> - <source>'{0}' was not found.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1883"/> - <source>Fetch Changes</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1944"/> - <source>Strip Changesets</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="242"/> - <source>Fetch changes from a remote repository</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="264"/> - <source>Strip changesets from a repository</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="218"/> - <source>Define Bookmark...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="221"/> - <source>Bookmark the selected revision</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="223"/> - <source>Move Bookmark...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="226"/> <source>Move bookmark to the selected revision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1825"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1868"/> <source>Define Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1825"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1868"/> <source>Enter bookmark name for changeset "{0}":</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1847"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1890"/> <source>Move Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1847"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1890"/> <source>Select the bookmark to be moved to changeset "{0}":</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1790"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1833"/> <source>Select bookmark to switch to (leave empty to use revision):</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="112"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="115"/> <source><table><tr><td><b>Revision</b></td><td>{0}</td></tr><tr><td><b>Date</b></td><td>{1}</td></tr><tr><td><b>Author</b></td><td>{2}</td></tr><tr><td><b>Branch</b></td><td>{3}</td></tr><tr><td><b>Parents</b></td><td>{4}</td></tr><tr><td><b>Children</b></td><td>{5}</td></tr>{6}</table></source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="349"/> + <source>Press to move up in the log list</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="359"/> + <source>Press to move down in the log list</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgLogDialog</name> @@ -53309,17 +53319,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="621"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="643"/> <source>Revision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="618"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="640"/> <source>Author</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="141"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="150"/> <source>Message</source> <translation type="unfinished"></translation> </message> @@ -53379,120 +53389,130 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="241"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="261"/> <source>Press to generate a diff to the previous revision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="244"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="264"/> <source>&Diff to Previous</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="251"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="271"/> <source>Press to compare two revisions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="254"/> - <source>&Compare Revisions</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="274"/> + <source>&Compare Revisions</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="294"/> <source>Select to show differences side-by-side</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="277"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="297"/> <source>Show differences side-by-side</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="292"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="312"/> <source>Errors</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="298"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="318"/> <source><b>Subversion log errors</b><p>This shows possible error messages of the svn log command.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="314"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="334"/> <source>Input</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="336"/> - <source>Press to send the input to the subversion process</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="339"/> - <source>&Send</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="342"/> - <source>Alt+S</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="349"/> - <source>Enter data to be sent to the subversion process</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="356"/> - <source>Select to switch the input field to password mode</source> + <source>Press to send the input to the subversion process</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="359"/> - <source>&Password Mode</source> + <source>&Send</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="362"/> + <source>Alt+S</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="369"/> + <source>Enter data to be sent to the subversion process</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="376"/> + <source>Select to switch the input field to password mode</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="379"/> + <source>&Password Mode</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="382"/> <source>Alt+P</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="89"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="93"/> <source>Added</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="90"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="94"/> <source>Deleted</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="91"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="95"/> <source>Modified</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="92"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="96"/> <source>Replaced</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnLogBrowserDialog.py" line="504"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnLogBrowserDialog.py" line="527"/> <source>Subversion Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="289"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="298"/> <source>Process Generation Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="289"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="298"/> <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/vcsSubversion/SvnLogBrowserDialog.ui" line="241"/> + <source>Press to move up in the log list</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="251"/> + <source>Press to move down in the log list</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>SvnLogDialog</name>
--- a/i18n/eric6_en.ts Sat Jan 28 12:39:43 2017 +0100 +++ b/i18n/eric6_en.ts Sat Jan 28 14:22:00 2017 +0100 @@ -8909,7 +8909,7 @@ <context> <name>Editor</name> <message> - <location filename="../QScintilla/Editor.py" line="2881"/> + <location filename="../QScintilla/Editor.py" line="2883"/> <source>Open File</source> <translation type="unfinished"></translation> </message> @@ -8999,7 +8999,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7247"/> + <location filename="../QScintilla/Editor.py" line="7249"/> <source>Check spelling...</source> <translation type="unfinished"></translation> </message> @@ -9224,7 +9224,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5159"/> + <location filename="../QScintilla/Editor.py" line="5161"/> <source>Enable breakpoint</source> <translation type="unfinished"></translation> </message> @@ -9339,347 +9339,347 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1755"/> + <location filename="../QScintilla/Editor.py" line="1757"/> <source>Modification of Read Only file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1755"/> + <location filename="../QScintilla/Editor.py" line="1757"/> <source>You are attempting to change a read only file. Please save to a different file first.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="2446"/> + <location filename="../QScintilla/Editor.py" line="2448"/> <source>Printing...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="2463"/> - <source>Printing completed</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="2465"/> + <source>Printing completed</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="2467"/> <source>Error while printing</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="2468"/> + <location filename="../QScintilla/Editor.py" line="2470"/> <source>Printing aborted</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="2826"/> + <location filename="../QScintilla/Editor.py" line="2828"/> <source>File Modified</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="2826"/> + <location filename="../QScintilla/Editor.py" line="2828"/> <source><p>The file <b>{0}</b> has unsaved changes.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="2881"/> + <location filename="../QScintilla/Editor.py" line="2883"/> <source><p>The file <b>{0}</b> could not be opened.</p><p>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="3044"/> + <location filename="../QScintilla/Editor.py" line="3046"/> <source>Save File</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="2985"/> + <location filename="../QScintilla/Editor.py" line="2987"/> <source><p>The file <b>{0}</b> could not be saved.<br/>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="3044"/> + <location filename="../QScintilla/Editor.py" line="3046"/> <source><p>The file <b>{0}</b> already exists. Overwrite it?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4432"/> + <location filename="../QScintilla/Editor.py" line="4434"/> <source>Autocompletion</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4432"/> + <location filename="../QScintilla/Editor.py" line="4434"/> <source>Autocompletion is not available because there is no autocompletion source set.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5162"/> + <location filename="../QScintilla/Editor.py" line="5164"/> <source>Disable breakpoint</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5536"/> + <location filename="../QScintilla/Editor.py" line="5538"/> <source>Code Coverage</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5536"/> + <location filename="../QScintilla/Editor.py" line="5538"/> <source>Please select a coverage file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5599"/> + <location filename="../QScintilla/Editor.py" line="5601"/> <source>Show Code Coverage Annotations</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5592"/> + <location filename="../QScintilla/Editor.py" line="5594"/> <source>All lines have been covered.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5599"/> + <location filename="../QScintilla/Editor.py" line="5601"/> <source>There is no coverage file available.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5714"/> + <location filename="../QScintilla/Editor.py" line="5716"/> <source>Profile Data</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5714"/> + <location filename="../QScintilla/Editor.py" line="5716"/> <source>Please select a profile file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5874"/> + <location filename="../QScintilla/Editor.py" line="5876"/> <source>Syntax Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5874"/> + <location filename="../QScintilla/Editor.py" line="5876"/> <source>No syntax error message available.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6189"/> + <location filename="../QScintilla/Editor.py" line="6191"/> <source>Macro Name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6189"/> + <location filename="../QScintilla/Editor.py" line="6191"/> <source>Select a macro name:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6217"/> + <location filename="../QScintilla/Editor.py" line="6219"/> <source>Load macro file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6260"/> + <location filename="../QScintilla/Editor.py" line="6262"/> <source>Macro files (*.macro)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6240"/> + <location filename="../QScintilla/Editor.py" line="6242"/> <source>Error loading macro</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6231"/> + <location filename="../QScintilla/Editor.py" line="6233"/> <source><p>The macro file <b>{0}</b> could not be read.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6240"/> + <location filename="../QScintilla/Editor.py" line="6242"/> <source><p>The macro file <b>{0}</b> is corrupt.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6260"/> + <location filename="../QScintilla/Editor.py" line="6262"/> <source>Save macro file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6277"/> + <location filename="../QScintilla/Editor.py" line="6279"/> <source>Save macro</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6277"/> + <location filename="../QScintilla/Editor.py" line="6279"/> <source><p>The macro file <b>{0}</b> already exists. Overwrite it?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6293"/> + <location filename="../QScintilla/Editor.py" line="6295"/> <source>Error saving macro</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6293"/> + <location filename="../QScintilla/Editor.py" line="6295"/> <source><p>The macro file <b>{0}</b> could not be written.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6306"/> + <location filename="../QScintilla/Editor.py" line="6308"/> <source>Start Macro Recording</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6306"/> + <location filename="../QScintilla/Editor.py" line="6308"/> <source>Macro recording is already active. Start new?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6332"/> + <location filename="../QScintilla/Editor.py" line="6334"/> <source>Macro Recording</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6332"/> + <location filename="../QScintilla/Editor.py" line="6334"/> <source>Enter name of the macro:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6470"/> + <location filename="../QScintilla/Editor.py" line="6472"/> <source>File changed</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6634"/> + <location filename="../QScintilla/Editor.py" line="6636"/> <source>{0} (ro)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6774"/> + <location filename="../QScintilla/Editor.py" line="6776"/> <source>Drop Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6774"/> + <location filename="../QScintilla/Editor.py" line="6776"/> <source><p><b>{0}</b> is not a file.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6795"/> - <source>Resources</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="6797"/> - <source>Add file...</source> + <source>Resources</source> <translation type="unfinished"></translation> </message> <message> <location filename="../QScintilla/Editor.py" line="6799"/> - <source>Add files...</source> + <source>Add file...</source> <translation type="unfinished"></translation> </message> <message> <location filename="../QScintilla/Editor.py" line="6801"/> + <source>Add files...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="6803"/> <source>Add aliased file...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6804"/> + <location filename="../QScintilla/Editor.py" line="6806"/> <source>Add localized resource...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6808"/> + <location filename="../QScintilla/Editor.py" line="6810"/> <source>Add resource frame</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6827"/> + <location filename="../QScintilla/Editor.py" line="6829"/> <source>Add file resource</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6843"/> + <location filename="../QScintilla/Editor.py" line="6845"/> <source>Add file resources</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6871"/> + <location filename="../QScintilla/Editor.py" line="6873"/> <source>Add aliased file resource</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6871"/> + <location filename="../QScintilla/Editor.py" line="6873"/> <source>Alias for file <b>{0}</b>:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6935"/> + <location filename="../QScintilla/Editor.py" line="6937"/> <source>Package Diagram</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6935"/> + <location filename="../QScintilla/Editor.py" line="6937"/> <source>Include class attributes?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6955"/> + <location filename="../QScintilla/Editor.py" line="6957"/> <source>Imports Diagram</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6955"/> + <location filename="../QScintilla/Editor.py" line="6957"/> <source>Include imports from external modules?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6969"/> + <location filename="../QScintilla/Editor.py" line="6971"/> <source>Application Diagram</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6969"/> + <location filename="../QScintilla/Editor.py" line="6971"/> <source>Include module names?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7250"/> - <source>Add to dictionary</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="7252"/> + <source>Add to dictionary</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="7254"/> <source>Ignore All</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6128"/> + <location filename="../QScintilla/Editor.py" line="6130"/> <source>Warning: {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6135"/> + <location filename="../QScintilla/Editor.py" line="6137"/> <source>Error: {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6466"/> + <location filename="../QScintilla/Editor.py" line="6468"/> <source><br><b>Warning:</b> You will lose your changes upon reopening it.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4537"/> + <location filename="../QScintilla/Editor.py" line="4539"/> <source>Activating Auto-Completion Provider</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4537"/> + <location filename="../QScintilla/Editor.py" line="4539"/> <source>Auto-completion provider cannot be connected because there is already another one active. Please check your configuration.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4857"/> + <location filename="../QScintilla/Editor.py" line="4859"/> <source>Activating Calltip Provider</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4857"/> + <location filename="../QScintilla/Editor.py" line="4859"/> <source>Calltip provider cannot be connected because there is already another one active. Please check your configuration.</source> <translation type="unfinished"></translation> </message> @@ -9704,27 +9704,27 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7664"/> + <location filename="../QScintilla/Editor.py" line="7666"/> <source>Sort Lines</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7664"/> + <location filename="../QScintilla/Editor.py" line="7666"/> <source>The selection contains illegal data for a numerical sort.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6064"/> + <location filename="../QScintilla/Editor.py" line="6066"/> <source>Warning</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6064"/> + <location filename="../QScintilla/Editor.py" line="6066"/> <source>No warning messages available.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6125"/> + <location filename="../QScintilla/Editor.py" line="6127"/> <source>Style: {0}</source> <translation type="unfinished"></translation> </message> @@ -9749,7 +9749,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6460"/> + <location filename="../QScintilla/Editor.py" line="6462"/> <source><p>The file <b>{0}</b> has been changed while it was opened in eric6. Reread it?</p></source> <translation type="unfinished"></translation> </message> @@ -9764,32 +9764,32 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4586"/> + <location filename="../QScintilla/Editor.py" line="4588"/> <source>Auto-Completion Provider</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4586"/> + <location filename="../QScintilla/Editor.py" line="4588"/> <source>The completion list provider '{0}' was already registered. Ignoring duplicate request.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4900"/> + <location filename="../QScintilla/Editor.py" line="4902"/> <source>Call-Tips Provider</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4900"/> + <location filename="../QScintilla/Editor.py" line="4902"/> <source>The call-tips provider '{0}' was already registered. Ignoring duplicate request.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7751"/> + <location filename="../QScintilla/Editor.py" line="7753"/> <source>Register Mouse Click Handler</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7751"/> + <location filename="../QScintilla/Editor.py" line="7753"/> <source>A mouse click handler for "{0}" was already registered by "{1}". Aborting request by "{2}"...</source> <translation type="unfinished"></translation> </message> @@ -24216,17 +24216,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="98"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="101"/> <source>Revision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="99"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="102"/> <source>Author</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="100"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="103"/> <source>Message</source> <translation type="unfinished"></translation> </message> @@ -24281,137 +24281,137 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="339"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="326"/> <source>Select to stop listing log messages at a copy or move</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="342"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="329"/> <source>Stop on Copy/Move</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="349"/> - <source>Press to generate a diff to the first parent revision</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="352"/> - <source>Diff to Parent &1</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="359"/> - <source>Press to generate a diff to the second parent revision</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="362"/> - <source>Diff to Parent &2</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="369"/> - <source>Press to compare two revisions</source> + <source>Press to generate a diff to the first parent revision</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="372"/> + <source>Diff to Parent &1</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="379"/> + <source>Press to generate a diff to the second parent revision</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="382"/> + <source>Diff to Parent &2</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="389"/> + <source>Press to compare two revisions</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="392"/> <source>&Compare Revisions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="433"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="453"/> <source>Errors</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="439"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="459"/> <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="455"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="475"/> <source>Input</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="477"/> - <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="480"/> - <source>&Send</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="483"/> - <source>Alt+S</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="490"/> - <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="497"/> - <source>Select to switch the input field to password mode</source> + <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="500"/> - <source>&Password Mode</source> + <source>&Send</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="503"/> + <source>Alt+S</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="510"/> + <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="517"/> + <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="520"/> + <source>&Password Mode</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="523"/> <source>Alt+P</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="161"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="164"/> <source>Added</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="162"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="165"/> <source>Deleted</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="163"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="166"/> <source>Modified</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="141"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="144"/> <source>All</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="672"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="680"/> <source>The hg process did not finish within 30s.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="675"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="683"/> <source>Could not start the hg executable.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="678"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="686"/> <source>Mercurial Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="905"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="913"/> <source>Process Generation Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="905"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="913"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished"></translation> </message> @@ -24426,17 +24426,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="178"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="181"/> <source>Bookmarks</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="87"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="90"/> <source>Press to refresh the list of changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="85"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="88"/> <source>&Refresh</source> <translation type="unfinished"></translation> </message> @@ -24446,83 +24446,83 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="198"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="206"/> <source>Change the phase of the selected revisions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="200"/> - <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.py" line="196"/> - <source>Change Phase</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1752"/> - <source>Copy Changesets</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1944"/> - <source>The project should be reread. Do this now?</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="405"/> - <source>Select to show differences side-by-side</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="408"/> - <source>Show differences side-by-side</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="415"/> - <source>Select action from menu</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="193"/> - <source>Copy the selected changesets to the current branch</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="205"/> - <source>Tag</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="208"/> - <source>Tag the selected revision</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1804"/> - <source>Switch</source> + <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.py" line="204"/> + <source>Change Phase</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1795"/> + <source>Copy Changesets</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1987"/> + <source>The project should be reread. Do this now?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="435"/> + <source>Select to show differences side-by-side</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="438"/> + <source>Show differences side-by-side</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="412"/> + <source>Select action from menu</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="201"/> + <source>Copy the selected changesets to the current branch</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="213"/> + <source>Tag</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="216"/> + <source>Tag the selected revision</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1847"/> + <source>Switch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="221"/> <source>Switch the working directory to the selected revision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="236"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="244"/> <source>Pull Large Files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="238"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="246"/> <source>Pull large files for selected revisions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="996"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1004"/> <source>{0} (large file)</source> <translation type="unfinished"></translation> </message> @@ -24547,155 +24547,165 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="95"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="98"/> <source>Find</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="96"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="99"/> <source>Filter</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="123"/> - <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="126"/> + <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="129"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2045"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2088"/> <source>Find Commit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2045"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2088"/> <source>'{0}' was not found.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="101"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="104"/> <source>File</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="167"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="170"/> <source>Draft</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="168"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="171"/> <source>Public</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="169"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="172"/> <source>Secret</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1902"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1945"/> <source>Pull Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="234"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="242"/> <source>Pull changes from a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="247"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="255"/> <source>Push Selected Changes</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="258"/> + <source>Push changes of the selected changeset and its ancestors to a remote repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="261"/> + <source>Push All Changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="264"/> + <source>Push all changes to a remote repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1926"/> + <source>Fetch Changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1987"/> + <source>Strip Changesets</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="250"/> - <source>Push changes of the selected changeset and its ancestors to a remote repository</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="253"/> - <source>Push All Changes</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="256"/> - <source>Push all changes to a remote repository</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1883"/> - <source>Fetch Changes</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1944"/> - <source>Strip Changesets</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="242"/> <source>Fetch changes from a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="264"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="272"/> <source>Strip changesets from a repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="218"/> - <source>Define Bookmark...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="221"/> - <source>Bookmark the selected revision</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="223"/> - <source>Move Bookmark...</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="226"/> + <source>Define Bookmark...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="229"/> + <source>Bookmark the selected revision</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="231"/> + <source>Move Bookmark...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="234"/> <source>Move bookmark to the selected revision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1825"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1868"/> <source>Define Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1825"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1868"/> <source>Enter bookmark name for changeset "{0}":</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1847"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1890"/> <source>Move Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1847"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1890"/> <source>Select the bookmark to be moved to changeset "{0}":</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1790"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1833"/> <source>Select bookmark to switch to (leave empty to use revision):</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="112"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="115"/> <source><table><tr><td><b>Revision</b></td><td>{0}</td></tr><tr><td><b>Date</b></td><td>{1}</td></tr><tr><td><b>Author</b></td><td>{2}</td></tr><tr><td><b>Branch</b></td><td>{3}</td></tr><tr><td><b>Parents</b></td><td>{4}</td></tr><tr><td><b>Children</b></td><td>{5}</td></tr>{6}</table></source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="349"/> + <source>Press to move up in the log list</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="359"/> + <source>Press to move down in the log list</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgLogDialog</name> @@ -53350,17 +53360,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="621"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="643"/> <source>Revision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="618"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="640"/> <source>Author</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="141"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="150"/> <source>Message</source> <translation type="unfinished"></translation> </message> @@ -53420,120 +53430,130 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="241"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="261"/> <source>Press to generate a diff to the previous revision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="244"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="264"/> <source>&Diff to Previous</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="251"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="271"/> <source>Press to compare two revisions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="254"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="274"/> <source>&Compare Revisions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="292"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="312"/> <source>Errors</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="298"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="318"/> <source><b>Subversion log errors</b><p>This shows possible error messages of the svn log command.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="314"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="334"/> <source>Input</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="336"/> - <source>Press to send the input to the subversion process</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="339"/> - <source>&Send</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="342"/> - <source>Alt+S</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="349"/> - <source>Enter data to be sent to the subversion process</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="356"/> - <source>Select to switch the input field to password mode</source> + <source>Press to send the input to the subversion process</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="359"/> - <source>&Password Mode</source> + <source>&Send</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="362"/> + <source>Alt+S</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="369"/> + <source>Enter data to be sent to the subversion process</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="376"/> + <source>Select to switch the input field to password mode</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="379"/> + <source>&Password Mode</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="382"/> <source>Alt+P</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="89"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="93"/> <source>Added</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="90"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="94"/> <source>Deleted</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="91"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="95"/> <source>Modified</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnLogBrowserDialog.py" line="504"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnLogBrowserDialog.py" line="527"/> <source>Subversion Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="289"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="298"/> <source>Process Generation Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="289"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="298"/> <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/vcsSubversion/SvnLogBrowserDialog.py" line="92"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="96"/> <source>Replaced</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="274"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="294"/> <source>Select to show differences side-by-side</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="277"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="297"/> <source>Show differences side-by-side</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="241"/> + <source>Press to move up in the log list</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="251"/> + <source>Press to move down in the log list</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>SvnLogDialog</name>
--- a/i18n/eric6_es.ts Sat Jan 28 12:39:43 2017 +0100 +++ b/i18n/eric6_es.ts Sat Jan 28 14:22:00 2017 +0100 @@ -8990,7 +8990,7 @@ <context> <name>Editor</name> <message> - <location filename="../QScintilla/Editor.py" line="2881"/> + <location filename="../QScintilla/Editor.py" line="2883"/> <source>Open File</source> <translation>Abrir archivo</translation> </message> @@ -9245,7 +9245,7 @@ <translation>Editar punto de interrupción...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5159"/> + <location filename="../QScintilla/Editor.py" line="5161"/> <source>Enable breakpoint</source> <translation>Activar punto de interrupción</translation> </message> @@ -9305,247 +9305,247 @@ <translation>No se ha proporcionado un formato de exportación. Abortando...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1755"/> + <location filename="../QScintilla/Editor.py" line="1757"/> <source>Modification of Read Only file</source> <translation>Modificación de un archivo de solo lectura</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1755"/> + <location filename="../QScintilla/Editor.py" line="1757"/> <source>You are attempting to change a read only file. Please save to a different file first.</source> <translation>Usted está intentando modificar un archivo solo lectura. Por favor guarde en otro archivo primero.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="2446"/> + <location filename="../QScintilla/Editor.py" line="2448"/> <source>Printing...</source> <translation>Imprimiendo...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="2463"/> - <source>Printing completed</source> - <translation>Impresión completa</translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="2465"/> + <source>Printing completed</source> + <translation>Impresión completa</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="2467"/> <source>Error while printing</source> <translation>Error al imprimir</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="2468"/> + <location filename="../QScintilla/Editor.py" line="2470"/> <source>Printing aborted</source> <translation>Impresión cancelada</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="2826"/> + <location filename="../QScintilla/Editor.py" line="2828"/> <source>File Modified</source> <translation>Archivo modificado</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="3044"/> + <location filename="../QScintilla/Editor.py" line="3046"/> <source>Save File</source> <translation>Guardar archivo</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4432"/> + <location filename="../QScintilla/Editor.py" line="4434"/> <source>Autocompletion</source> <translation>Autocompletar</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4432"/> + <location filename="../QScintilla/Editor.py" line="4434"/> <source>Autocompletion is not available because there is no autocompletion source set.</source> <translation>Autocompletar no está disponible porque no hay origen de datos para autocompletar.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5162"/> + <location filename="../QScintilla/Editor.py" line="5164"/> <source>Disable breakpoint</source> <translation>Deshabilitar punto de interrupción</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5536"/> + <location filename="../QScintilla/Editor.py" line="5538"/> <source>Code Coverage</source> <translation>Cobertura de codigo</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5536"/> + <location filename="../QScintilla/Editor.py" line="5538"/> <source>Please select a coverage file</source> <translation>Por favor seleccione un archivo de cobertura</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5599"/> + <location filename="../QScintilla/Editor.py" line="5601"/> <source>Show Code Coverage Annotations</source> <translation>Mostrar Anotaciones de Cobertura de Código</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5592"/> + <location filename="../QScintilla/Editor.py" line="5594"/> <source>All lines have been covered.</source> <translation>Todas las líneas han sido cubiertas.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5599"/> + <location filename="../QScintilla/Editor.py" line="5601"/> <source>There is no coverage file available.</source> <translation>No hay archivo de cobertura disponible.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5714"/> + <location filename="../QScintilla/Editor.py" line="5716"/> <source>Profile Data</source> <translation>Datos de profiling</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5714"/> + <location filename="../QScintilla/Editor.py" line="5716"/> <source>Please select a profile file</source> <translation>Por favor seleccione un archivo de profiling</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5874"/> + <location filename="../QScintilla/Editor.py" line="5876"/> <source>Syntax Error</source> <translation>Error de sintaxis</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5874"/> + <location filename="../QScintilla/Editor.py" line="5876"/> <source>No syntax error message available.</source> <translation>No hay mensajes de error de sintaxis disponibles.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6189"/> + <location filename="../QScintilla/Editor.py" line="6191"/> <source>Macro Name</source> <translation>Nombre de macro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6189"/> + <location filename="../QScintilla/Editor.py" line="6191"/> <source>Select a macro name:</source> <translation>Seleccione un nombre de macro:</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6217"/> + <location filename="../QScintilla/Editor.py" line="6219"/> <source>Load macro file</source> <translation>Cargar archivo de macro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6260"/> + <location filename="../QScintilla/Editor.py" line="6262"/> <source>Macro files (*.macro)</source> <translation>Archivos de Macro (*.macro)</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6240"/> + <location filename="../QScintilla/Editor.py" line="6242"/> <source>Error loading macro</source> <translation>Error al cargar macro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6260"/> + <location filename="../QScintilla/Editor.py" line="6262"/> <source>Save macro file</source> <translation>Guardar archivo de macro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6277"/> + <location filename="../QScintilla/Editor.py" line="6279"/> <source>Save macro</source> <translation>Guardar macro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6293"/> + <location filename="../QScintilla/Editor.py" line="6295"/> <source>Error saving macro</source> <translation>Error al guardar macro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6306"/> + <location filename="../QScintilla/Editor.py" line="6308"/> <source>Start Macro Recording</source> <translation>Comenzar grabación de macro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6306"/> + <location filename="../QScintilla/Editor.py" line="6308"/> <source>Macro recording is already active. Start new?</source> <translation>Grabación de macro ya está activada. ¿Comenzar una nueva?</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6332"/> + <location filename="../QScintilla/Editor.py" line="6334"/> <source>Macro Recording</source> <translation>Grabando macro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6332"/> + <location filename="../QScintilla/Editor.py" line="6334"/> <source>Enter name of the macro:</source> <translation>Introduzca el nombre de la macro:</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6470"/> + <location filename="../QScintilla/Editor.py" line="6472"/> <source>File changed</source> <translation>Archivo modificado</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6774"/> + <location filename="../QScintilla/Editor.py" line="6776"/> <source>Drop Error</source> <translation>Error al soltar</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6795"/> - <source>Resources</source> - <translation>Recursos</translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="6797"/> - <source>Add file...</source> - <translation>Añadir archivo...</translation> + <source>Resources</source> + <translation>Recursos</translation> </message> <message> <location filename="../QScintilla/Editor.py" line="6799"/> - <source>Add files...</source> - <translation>Añadir archivos...</translation> + <source>Add file...</source> + <translation>Añadir archivo...</translation> </message> <message> <location filename="../QScintilla/Editor.py" line="6801"/> + <source>Add files...</source> + <translation>Añadir archivos...</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="6803"/> <source>Add aliased file...</source> <translation>Añadir archivo con un alias...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6804"/> + <location filename="../QScintilla/Editor.py" line="6806"/> <source>Add localized resource...</source> <translation>Añadir recursos localizados...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6808"/> + <location filename="../QScintilla/Editor.py" line="6810"/> <source>Add resource frame</source> <translation>Añadir ventana de recursos</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6827"/> + <location filename="../QScintilla/Editor.py" line="6829"/> <source>Add file resource</source> <translation>Añadir archivo de recursos</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6843"/> + <location filename="../QScintilla/Editor.py" line="6845"/> <source>Add file resources</source> <translation>Añadir archivo de recursos</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6871"/> + <location filename="../QScintilla/Editor.py" line="6873"/> <source>Add aliased file resource</source> <translation>Añadir archivo de recursos con un alias</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6935"/> + <location filename="../QScintilla/Editor.py" line="6937"/> <source>Package Diagram</source> <translation>Digrama de paquetes</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6935"/> + <location filename="../QScintilla/Editor.py" line="6937"/> <source>Include class attributes?</source> <translation>¿Incluir atributos de clase?</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6955"/> + <location filename="../QScintilla/Editor.py" line="6957"/> <source>Imports Diagram</source> <translation>Diagrama de imports</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6955"/> + <location filename="../QScintilla/Editor.py" line="6957"/> <source>Include imports from external modules?</source> <translation>¿Incluir los imports de módulos externos?</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6969"/> + <location filename="../QScintilla/Editor.py" line="6971"/> <source>Application Diagram</source> <translation>Diagrama de aplicación</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6969"/> + <location filename="../QScintilla/Editor.py" line="6971"/> <source>Include module names?</source> <translation>¿Incluir nombres de módulos?</translation> </message> @@ -9615,7 +9615,7 @@ <translation>Seleccionar el Analizador Léxico de Pygments.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7247"/> + <location filename="../QScintilla/Editor.py" line="7249"/> <source>Check spelling...</source> <translation>Corrección ortográfica...</translation> </message> @@ -9625,12 +9625,12 @@ <translation>Corrección ortográfica de la selección...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7250"/> + <location filename="../QScintilla/Editor.py" line="7252"/> <source>Add to dictionary</source> <translation>Añadir al diccionario</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7252"/> + <location filename="../QScintilla/Editor.py" line="7254"/> <source>Ignore All</source> <translation>Ignorar Todo</translation> </message> @@ -9655,47 +9655,47 @@ <translation>Alternativas ({0})</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="2826"/> + <location filename="../QScintilla/Editor.py" line="2828"/> <source><p>The file <b>{0}</b> has unsaved changes.</p></source> <translation><p>El archivo <b>{0}</b> tiene cambios sin guardar.</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="2881"/> + <location filename="../QScintilla/Editor.py" line="2883"/> <source><p>The file <b>{0}</b> could not be opened.</p><p>Reason: {1}</p></source> <translation><p>El archivo<b>{0}</b> no puede ser abierto.<br />Causa: {1}</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="2985"/> + <location filename="../QScintilla/Editor.py" line="2987"/> <source><p>The file <b>{0}</b> could not be saved.<br/>Reason: {1}</p></source> <translation><p>El archivo <b>{0}</b> no puede ser guardado.<br>Causa: {1}</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6231"/> + <location filename="../QScintilla/Editor.py" line="6233"/> <source><p>The macro file <b>{0}</b> could not be read.</p></source> <translation><p>El archivo de macro <b>{0}</b> no se puede leer.</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6240"/> + <location filename="../QScintilla/Editor.py" line="6242"/> <source><p>The macro file <b>{0}</b> is corrupt.</p></source> <translation><p>El archivo de macro <b>{0}</b> está dañado</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6293"/> + <location filename="../QScintilla/Editor.py" line="6295"/> <source><p>The macro file <b>{0}</b> could not be written.</p></source> <translation><p>El archivo de macro <b>{0}</b> no se puede escribir.</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6634"/> + <location filename="../QScintilla/Editor.py" line="6636"/> <source>{0} (ro)</source> <translation>{0} (ro)</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6774"/> + <location filename="../QScintilla/Editor.py" line="6776"/> <source><p><b>{0}</b> is not a file.</p></source> <translation><p><b>{0}</b> no es un archivo.</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6871"/> + <location filename="../QScintilla/Editor.py" line="6873"/> <source>Alias for file <b>{0}</b>:</source> <translation>Alias para el archivo <b>{0}</b>:</translation> </message> @@ -9720,47 +9720,47 @@ <translation>Limpiar advertencias</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="3044"/> + <location filename="../QScintilla/Editor.py" line="3046"/> <source><p>The file <b>{0}</b> already exists. Overwrite it?</p></source> <translation><p>El archivo <b>{0}</b> ya existe. ¿Desea sobreescribirlo?</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6277"/> + <location filename="../QScintilla/Editor.py" line="6279"/> <source><p>The macro file <b>{0}</b> already exists. Overwrite it?</p></source> <translation><p>El archivo de macro <b>{0}</b> ya existe. ¿Desea sobreescribirlo?</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6128"/> + <location filename="../QScintilla/Editor.py" line="6130"/> <source>Warning: {0}</source> <translation>Advertencia: {0}</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6135"/> + <location filename="../QScintilla/Editor.py" line="6137"/> <source>Error: {0}</source> <translation>Error: {0}</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6466"/> + <location filename="../QScintilla/Editor.py" line="6468"/> <source><br><b>Warning:</b> You will lose your changes upon reopening it.</source> <translation><br><b>Advertencia:</b> Perderá los cambios si lo reabre.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4537"/> + <location filename="../QScintilla/Editor.py" line="4539"/> <source>Activating Auto-Completion Provider</source> <translation>Activando el Proveedor de Autocompletado</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4537"/> + <location filename="../QScintilla/Editor.py" line="4539"/> <source>Auto-completion provider cannot be connected because there is already another one active. Please check your configuration.</source> <translation>El proveedor de autocompletado no puede ser conectado porque ya hay uno activo. Por favor revise la configuración.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4857"/> + <location filename="../QScintilla/Editor.py" line="4859"/> <source>Activating Calltip Provider</source> <translation>Activando Proveedor de Calltip</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4857"/> + <location filename="../QScintilla/Editor.py" line="4859"/> <source>Calltip provider cannot be connected because there is already another one active. Please check your configuration.</source> <translation>El proveedor de calltip no puede ser conectado porque ya hay uno activo. Por favor revise la configuración.</translation> </message> @@ -9785,27 +9785,27 @@ <translation>Cambio anterior</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7664"/> + <location filename="../QScintilla/Editor.py" line="7666"/> <source>Sort Lines</source> <translation>Ordenar Líneas</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7664"/> + <location filename="../QScintilla/Editor.py" line="7666"/> <source>The selection contains illegal data for a numerical sort.</source> <translation>La selección contiene datos ilegales para una ordenación numérica.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6064"/> + <location filename="../QScintilla/Editor.py" line="6066"/> <source>Warning</source> <translation>Advertencia</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6064"/> + <location filename="../QScintilla/Editor.py" line="6066"/> <source>No warning messages available.</source> <translation>No hay mensajes de advertencia disponibles.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6125"/> + <location filename="../QScintilla/Editor.py" line="6127"/> <source>Style: {0}</source> <translation>Estilo: {0}</translation> </message> @@ -9830,7 +9830,7 @@ <translation>Reabrir Con Codificación</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6460"/> + <location filename="../QScintilla/Editor.py" line="6462"/> <source><p>The file <b>{0}</b> has been changed while it was opened in eric6. Reread it?</p></source> <translation><p>El archivo <b>{0}</b> ha cambiado mientras estaba abierto en eric6. ¿Desea volver a cargarlo?</p></translation> </message> @@ -9845,32 +9845,32 @@ <translation>Completo</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4586"/> + <location filename="../QScintilla/Editor.py" line="4588"/> <source>Auto-Completion Provider</source> <translation>Proveedor de Autocompletado</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4586"/> + <location filename="../QScintilla/Editor.py" line="4588"/> <source>The completion list provider '{0}' was already registered. Ignoring duplicate request.</source> <translation>El proveedor de lista de completado'{0}' ya está registrado. Se ignora la solicitud duplicada.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4900"/> + <location filename="../QScintilla/Editor.py" line="4902"/> <source>Call-Tips Provider</source> <translation>Proveedor de Call-Tips</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4900"/> + <location filename="../QScintilla/Editor.py" line="4902"/> <source>The call-tips provider '{0}' was already registered. Ignoring duplicate request.</source> <translation>El proveedor de call-tips'{0}' ya está registrado. Se ignora la solicitud duplicada.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7751"/> + <location filename="../QScintilla/Editor.py" line="7753"/> <source>Register Mouse Click Handler</source> <translation>Registrar Manejador de Clicks de Ratón</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7751"/> + <location filename="../QScintilla/Editor.py" line="7753"/> <source>A mouse click handler for "{0}" was already registered by "{1}". Aborting request by "{2}"...</source> <translation>Un manejador de clicks de ratón para "{0}" ya está registrado por "{1}". Abortando solicitud por "{2}"...</translation> </message> @@ -24348,17 +24348,17 @@ <translation>Seleccione el campo de filtrado</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="98"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="101"/> <source>Revision</source> <translation>Revisión</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="99"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="102"/> <source>Author</source> <translation>Autor</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="100"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="103"/> <source>Message</source> <translation>Mensaje</translation> </message> @@ -24398,97 +24398,97 @@ <translation>Introduzca el límite de entradas a recuperar</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="339"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="326"/> <source>Select to stop listing log messages at a copy or move</source> <translation>Seleccione para detener el listado de mensajes de log de copy o move</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="342"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="329"/> <source>Stop on Copy/Move</source> <translation>Detener en copy/move</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="369"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="389"/> <source>Press to compare two revisions</source> <translation>Pulse para comparar dos revisiones</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="372"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="392"/> <source>&Compare Revisions</source> <translation>&Comparar Revisiones</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="433"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="453"/> <source>Errors</source> <translation>Errores</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="439"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="459"/> <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="455"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="475"/> <source>Input</source> <translation>Input</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="477"/> - <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="480"/> - <source>&Send</source> - <translation>&Enviar</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="483"/> - <source>Alt+S</source> - <translation>Alt+S</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="490"/> - <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="497"/> - <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>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="500"/> - <source>&Password Mode</source> - <translation>&Modo de contraseña</translation> + <source>&Send</source> + <translation>&Enviar</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="503"/> + <source>Alt+S</source> + <translation>Alt+S</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="510"/> + <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="517"/> + <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="520"/> + <source>&Password Mode</source> + <translation>&Modo de contraseña</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="523"/> <source>Alt+P</source> <translation>Alt+P</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="161"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="164"/> <source>Added</source> <translation>Añadido</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="162"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="165"/> <source>Deleted</source> <translation>Borrado</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="163"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="166"/> <source>Modified</source> <translation>Modificado</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="905"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="913"/> <source>Process Generation Error</source> <translation>Error de Generación de Proceso</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="905"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="913"/> <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> @@ -24503,17 +24503,17 @@ <translation>Tags</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="672"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="680"/> <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="675"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="683"/> <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="678"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="686"/> <source>Mercurial Error</source> <translation>Error de Mercurial</translation> </message> @@ -24523,22 +24523,22 @@ <translation>Gráficos</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="349"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="369"/> <source>Press to generate a diff to the first parent revision</source> <translation>Pulse para generar un diff con la revisión primer padre</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="352"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="372"/> <source>Diff to Parent &1</source> <translation>Diff con el padre &1</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="359"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="379"/> <source>Press to generate a diff to the second parent revision</source> <translation>Pulse para generar un diff con la segunda revisión padre</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="362"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="382"/> <source>Diff to Parent &2</source> <translation>Diff con el padre &2</translation> </message> @@ -24553,7 +24553,7 @@ <translation>Seleccione la branch para filtrar</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="141"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="144"/> <source>All</source> <translation>Todo</translation> </message> @@ -24568,17 +24568,17 @@ <translation>Mercurial Log (Saliente)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="178"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="181"/> <source>Bookmarks</source> <translation>Marcadores</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="87"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="90"/> <source>Press to refresh the list of changesets</source> <translation>Pulsar para actualizar la lista de changesets</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="85"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="88"/> <source>&Refresh</source> <translation>Actualiza&r</translation> </message> @@ -24588,84 +24588,84 @@ <translation>Fase</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="198"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="206"/> <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.py" line="200"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="208"/> <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.py" line="196"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="204"/> <source>Change Phase</source> <translation>Cambiar Fase</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1752"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1795"/> <source>Copy Changesets</source> <translation>Copiar Changesets</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1944"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1987"/> <source>The project should be reread. Do this now?</source> <translation>El proyecto debería ser cargado de nuevo. ¿Desea hacerlo ahora?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="405"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="435"/> <source>Select to show differences side-by-side</source> <translation>Seleccionar para mostrar diferencias lado a lado</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="408"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="438"/> <source>Show differences side-by-side</source> <translation>Mostrar diferencias lado a lado</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="415"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="412"/> <source>Select action from menu</source> <translation>Seleccionar acción del menú</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="193"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="201"/> <source>Copy the selected changesets to the current branch</source> <translation>Pulsar para copiar los changesets seleccionados a la branch actual</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="205"/> - <source>Tag</source> - <translation>Aplicar Tag</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="208"/> - <source>Tag the selected revision</source> - <translation>Aplicar Tag a la revisión seleccionada</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1804"/> - <source>Switch</source> - <translation>Hacer switch</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="213"/> + <source>Tag</source> + <translation>Aplicar Tag</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="216"/> + <source>Tag the selected revision</source> + <translation>Aplicar Tag a la revisión seleccionada</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1847"/> + <source>Switch</source> + <translation>Hacer switch</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="221"/> <source>Switch the working directory to the selected revision</source> <translation>Hacer switch del directorio de trabajo a la revisión seleccionada</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="236"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="244"/> <source>Pull Large Files</source> <translation>Hacer pull de archivos grandes</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="238"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="246"/> <source>Pull large files for selected revisions</source> <translation>Hacer pull de archivos grandes para revisiones seleccionadas</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="996"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1004"/> <source>{0} (large file)</source> <translation>{0} (archivo grande)</translation> </message> @@ -24690,12 +24690,12 @@ <translation>Pulsar para encontrar la ocurrencia siguiente</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="95"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="98"/> <source>Find</source> <translation>Buscar</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="96"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="99"/> <source>Filter</source> <translation>Filtro</translation> </message> @@ -24705,145 +24705,155 @@ <translation type="obsolete"><table><tr><td><b>Revisión</b></td><td>{0}</td></tr><tr><td><b>Fecha</b></td><td>{1}</td></tr><tr><td><b>Autor</b></td><td>{2}</td></tr><tr><td><b>Branch</b></td><td>{3}</td></tr><tr><td><b>Parents</b></td><td>{4}</td></tr>{5}</table></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="123"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="126"/> <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Etiquetas</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="126"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="129"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Marcadores</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2045"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2088"/> <source>Find Commit</source> <translation>Buscar Commit</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2045"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2088"/> <source>'{0}' was not found.</source> <translation>'{0}' no se ha encontrado.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="101"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="104"/> <source>File</source> <translation>Archivo</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="167"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="170"/> <source>Draft</source> <translation>Borrador</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="168"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="171"/> <source>Public</source> <translation>Público</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="169"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="172"/> <source>Secret</source> <translation>Secreto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1902"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1945"/> <source>Pull Changes</source> <translation>Hacer Pull de Cambios</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="234"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="242"/> <source>Pull changes from a remote repository</source> <translation>Hacer pull de cambios desde un repositorio remoto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="247"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="255"/> <source>Push Selected Changes</source> <translation>Hacer Pull de Cambios Seleccionados</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="258"/> + <source>Push changes of the selected changeset and its ancestors to a remote repository</source> + <translation>Hacer push de cambios del changeset seleccionado y sus ancestores a un repositorio remoto</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="261"/> + <source>Push All Changes</source> + <translation>Hacer Push de Todos los Cambios</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="264"/> + <source>Push all changes to a remote repository</source> + <translation>Hacer push de todos los cambios a un repositorio remoto</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1926"/> + <source>Fetch Changes</source> + <translation>Fetch (recuperación) de cambios</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1987"/> + <source>Strip Changesets</source> + <translation>Hacer strip de Changesets</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="250"/> - <source>Push changes of the selected changeset and its ancestors to a remote repository</source> - <translation>Hacer push de cambios del changeset seleccionado y sus ancestores a un repositorio remoto</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="253"/> - <source>Push All Changes</source> - <translation>Hacer Push de Todos los Cambios</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="256"/> - <source>Push all changes to a remote repository</source> - <translation>Hacer push de todos los cambios a un repositorio remoto</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1883"/> - <source>Fetch Changes</source> - <translation>Fetch (recuperación) de cambios</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1944"/> - <source>Strip Changesets</source> - <translation>Hacer strip de Changesets</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="242"/> <source>Fetch changes from a remote repository</source> <translation>Fetch (recuperación) de cambios desde un repositorio remoto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="264"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="272"/> <source>Strip changesets from a repository</source> <translation>Hacer strip de changesets desde un repositorio remoto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="218"/> - <source>Define Bookmark...</source> - <translation>Definir marcador...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="221"/> - <source>Bookmark the selected revision</source> - <translation>Establecer marcador para la revisión seleccionada</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="223"/> - <source>Move Bookmark...</source> - <translation>Mover Marcador...</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="226"/> + <source>Define Bookmark...</source> + <translation>Definir marcador...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="229"/> + <source>Bookmark the selected revision</source> + <translation>Establecer marcador para la revisión seleccionada</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="231"/> + <source>Move Bookmark...</source> + <translation>Mover Marcador...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="234"/> <source>Move bookmark to the selected revision</source> <translation>Mover marcador a la revisión seleccionada</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1825"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1868"/> <source>Define Bookmark</source> <translation>Definir Marcador</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1825"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1868"/> <source>Enter bookmark name for changeset "{0}":</source> <translation>Introducir nombre de marcador para el changeset "{0}":</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1847"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1890"/> <source>Move Bookmark</source> <translation>Mover Marcador</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1847"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1890"/> <source>Select the bookmark to be moved to changeset "{0}":</source> <translation>Seleccionar el marcador a mover al changeset "{0}":</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1790"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1833"/> <source>Select bookmark to switch to (leave empty to use revision):</source> <translation>Seleccionar marcador al que cambiar (dejar vacío para usar revisión):</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="112"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="115"/> <source><table><tr><td><b>Revision</b></td><td>{0}</td></tr><tr><td><b>Date</b></td><td>{1}</td></tr><tr><td><b>Author</b></td><td>{2}</td></tr><tr><td><b>Branch</b></td><td>{3}</td></tr><tr><td><b>Parents</b></td><td>{4}</td></tr><tr><td><b>Children</b></td><td>{5}</td></tr>{6}</table></source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="349"/> + <source>Press to move up in the log list</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="359"/> + <source>Press to move down in the log list</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgLogDialog</name> @@ -53786,17 +53796,17 @@ <translation>Seleccione el campo de filtrado</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="621"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="643"/> <source>Revision</source> <translation>Revisión</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="618"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="640"/> <source>Author</source> <translation>Autor</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="141"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="150"/> <source>Message</source> <translation>Mensaje</translation> </message> @@ -53856,120 +53866,130 @@ <translation>Detener en copy/move</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="241"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="261"/> <source>Press to generate a diff to the previous revision</source> <translation>Pulse para generar un diff con la anterior revisión</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="244"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="264"/> <source>&Diff to Previous</source> <translation>&Diff con la anterior</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="251"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="271"/> <source>Press to compare two revisions</source> <translation>Pulse para comparar dos revisiones</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="254"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="274"/> <source>&Compare Revisions</source> <translation>&Comparar Revisiones</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="292"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="312"/> <source>Errors</source> <translation>Errores</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="298"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="318"/> <source><b>Subversion log errors</b><p>This shows possible error messages of the svn log command.</p></source> <translation><b>Errores de Subversion log</b><p>Muestra los posibles mensajes de error del comando svn log.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="314"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="334"/> <source>Input</source> <translation>Input</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="336"/> - <source>Press to send the input to the subversion process</source> - <translation>Pulsar para enviar el input al proceso de subversion</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="339"/> - <source>&Send</source> - <translation>&Enviar</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="342"/> - <source>Alt+S</source> - <translation>Alt+E</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="349"/> - <source>Enter data to be sent to the subversion process</source> - <translation>Introducir datos a enviar al proceso de subversion</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="356"/> - <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>Press to send the input to the subversion process</source> + <translation>Pulsar para enviar el input al proceso de subversion</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="359"/> - <source>&Password Mode</source> - <translation>&Modo de contraseña</translation> + <source>&Send</source> + <translation>&Enviar</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="362"/> + <source>Alt+S</source> + <translation>Alt+E</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="369"/> + <source>Enter data to be sent to the subversion process</source> + <translation>Introducir datos a enviar al proceso de subversion</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="376"/> + <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/vcsSubversion/SvnLogBrowserDialog.ui" line="379"/> + <source>&Password Mode</source> + <translation>&Modo de contraseña</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="382"/> <source>Alt+P</source> <translation>Alt+M</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="89"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="93"/> <source>Added</source> <translation>Añadido</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="90"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="94"/> <source>Deleted</source> <translation>Borrado</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="91"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="95"/> <source>Modified</source> <translation>Modificado</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnLogBrowserDialog.py" line="504"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnLogBrowserDialog.py" line="527"/> <source>Subversion Error</source> <translation>Error de Subversion</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="289"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="298"/> <source>Process Generation Error</source> <translation>Error de Generación de Proceso</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="289"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="298"/> <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> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="92"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="96"/> <source>Replaced</source> <translation>Reemplazado</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="274"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="294"/> <source>Select to show differences side-by-side</source> <translation>Seleccionar para mostrar diferencias lado a lado</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="277"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="297"/> <source>Show differences side-by-side</source> <translation>Mostrar diferencias lado a lado</translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="241"/> + <source>Press to move up in the log list</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="251"/> + <source>Press to move down in the log list</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>SvnLogDialog</name>
--- a/i18n/eric6_fr.ts Sat Jan 28 12:39:43 2017 +0100 +++ b/i18n/eric6_fr.ts Sat Jan 28 14:22:00 2017 +0100 @@ -9444,7 +9444,7 @@ <translation>Éditer le point d'arrêt...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5159"/> + <location filename="../QScintilla/Editor.py" line="5161"/> <source>Enable breakpoint</source> <translation>Activer le point d'arrêt</translation> </message> @@ -9474,142 +9474,142 @@ <translation>Le click principal place les points d'arrêts</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1755"/> + <location filename="../QScintilla/Editor.py" line="1757"/> <source>Modification of Read Only file</source> <translation>Modification de la lecture seule</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1755"/> + <location filename="../QScintilla/Editor.py" line="1757"/> <source>You are attempting to change a read only file. Please save to a different file first.</source> <translation>Le fichier est en lecture seule. Sauvez d'abord votre fichier sous un autre nom.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="2446"/> + <location filename="../QScintilla/Editor.py" line="2448"/> <source>Printing...</source> <translation>Impression....</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="2463"/> - <source>Printing completed</source> - <translation>Impression terminée</translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="2465"/> + <source>Printing completed</source> + <translation>Impression terminée</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="2467"/> <source>Error while printing</source> <translation>Erreur durant l'impression</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="2468"/> + <location filename="../QScintilla/Editor.py" line="2470"/> <source>Printing aborted</source> <translation>Impression abandonnée</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="2881"/> + <location filename="../QScintilla/Editor.py" line="2883"/> <source>Open File</source> <translation>Ouvrir Fichier</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="3044"/> + <location filename="../QScintilla/Editor.py" line="3046"/> <source>Save File</source> <translation>Enregistrer Fichier</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="2826"/> + <location filename="../QScintilla/Editor.py" line="2828"/> <source>File Modified</source> <translation>Fichier Modifié</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4432"/> + <location filename="../QScintilla/Editor.py" line="4434"/> <source>Autocompletion</source> <translation>Autocompletion</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4432"/> + <location filename="../QScintilla/Editor.py" line="4434"/> <source>Autocompletion is not available because there is no autocompletion source set.</source> <translation>L'autocompletion n'est pas disponible car aucune source d'autocomplétion n'est définie.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5162"/> + <location filename="../QScintilla/Editor.py" line="5164"/> <source>Disable breakpoint</source> <translation>Désactiver le point d'arrêt</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5536"/> + <location filename="../QScintilla/Editor.py" line="5538"/> <source>Code Coverage</source> <translation>Code Coverage</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5536"/> + <location filename="../QScintilla/Editor.py" line="5538"/>