Tue, 26 Sep 2023 18:26:21 +0200
Mercurial Interface
- Added the capability to select the branches to be shown to the Log Browser window.
--- a/docs/changelog.md Mon Sep 25 12:09:23 2023 +0200 +++ b/docs/changelog.md Tue Sep 26 18:26:21 2023 +0200 @@ -9,6 +9,9 @@ - Enhanced the existing completers slightly. - Enhanced the 'Search & Replace' widget to allow a mode switching using a mode switch button and keyboard shortcuts (see issue 511) +- Mercurial Interface + - Added the capability to select the branches to be shown to the Log Browser + window. - MicroPython - Updated the list of known CircuitPython boards. - pip Interface
--- a/src/eric7/APIs/Python3/eric7.api Mon Sep 25 12:09:23 2023 +0200 +++ b/src/eric7/APIs/Python3/eric7.api Tue Sep 26 18:26:21 2023 +0200 @@ -1436,7 +1436,8 @@ eric7.EricWidgets.EricListSelectionDialog.EricListSelectionDialog.on_selectionList_itemChanged?4(itm) eric7.EricWidgets.EricListSelectionDialog.EricListSelectionDialog.on_selectionList_itemDoubleClicked?4(item) eric7.EricWidgets.EricListSelectionDialog.EricListSelectionDialog.on_selectionList_itemSelectionChanged?4() -eric7.EricWidgets.EricListSelectionDialog.EricListSelectionDialog?1(entries, selectionMode=QAbstractItemView.SelectionMode.ExtendedSelection, title="", message="", checkBoxSelection=False, doubleClickOk=False, parent=None, ) +eric7.EricWidgets.EricListSelectionDialog.EricListSelectionDialog.setSelection?4(selection) +eric7.EricWidgets.EricListSelectionDialog.EricListSelectionDialog?1(entries, selectionMode=QAbstractItemView.SelectionMode.ExtendedSelection, title="", message="", checkBoxSelection=False, doubleClickOk=False, emptySelectionOk=False, showSelectAll=False, parent=None, ) eric7.EricWidgets.EricListView.EricListView.keyPressEvent?4(evt) eric7.EricWidgets.EricListView.EricListView.removeAll?4() eric7.EricWidgets.EricListView.EricListView.removeSelected?4() @@ -6238,7 +6239,7 @@ eric7.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgExport?4() eric7.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgExtendedDiff?4(name) eric7.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgGetBookmarksList?4() -eric7.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgGetBranchesList?4() +eric7.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgGetBranchesList?4(withState=False, withDefault=False) eric7.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgGetCurrentBranch?4() eric7.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgGetTagsList?4(withType=False) eric7.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgGraft?4(revs=None)
--- a/src/eric7/Documentation/Help/source.qhp Mon Sep 25 12:09:23 2023 +0200 +++ b/src/eric7/Documentation/Help/source.qhp Tue Sep 26 18:26:21 2023 +0200 @@ -5598,10 +5598,12 @@ <keyword name="EricListSelectionDialog" id="EricListSelectionDialog" ref="eric7.EricWidgets.EricListSelectionDialog.html#EricListSelectionDialog" /> <keyword name="EricListSelectionDialog (Constructor)" id="EricListSelectionDialog (Constructor)" ref="eric7.EricWidgets.EricListSelectionDialog.html#EricListSelectionDialog.__init__" /> <keyword name="EricListSelectionDialog (Module)" id="EricListSelectionDialog (Module)" ref="eric7.EricWidgets.EricListSelectionDialog.html" /> + <keyword name="EricListSelectionDialog.__selectAll" id="EricListSelectionDialog.__selectAll" ref="eric7.EricWidgets.EricListSelectionDialog.html#EricListSelectionDialog.__selectAll" /> <keyword name="EricListSelectionDialog.getSelection" id="EricListSelectionDialog.getSelection" ref="eric7.EricWidgets.EricListSelectionDialog.html#EricListSelectionDialog.getSelection" /> <keyword name="EricListSelectionDialog.on_selectionList_itemChanged" id="EricListSelectionDialog.on_selectionList_itemChanged" ref="eric7.EricWidgets.EricListSelectionDialog.html#EricListSelectionDialog.on_selectionList_itemChanged" /> <keyword name="EricListSelectionDialog.on_selectionList_itemDoubleClicked" id="EricListSelectionDialog.on_selectionList_itemDoubleClicked" ref="eric7.EricWidgets.EricListSelectionDialog.html#EricListSelectionDialog.on_selectionList_itemDoubleClicked" /> <keyword name="EricListSelectionDialog.on_selectionList_itemSelectionChanged" id="EricListSelectionDialog.on_selectionList_itemSelectionChanged" ref="eric7.EricWidgets.EricListSelectionDialog.html#EricListSelectionDialog.on_selectionList_itemSelectionChanged" /> + <keyword name="EricListSelectionDialog.setSelection" id="EricListSelectionDialog.setSelection" ref="eric7.EricWidgets.EricListSelectionDialog.html#EricListSelectionDialog.setSelection" /> <keyword name="EricListView" id="EricListView" ref="eric7.EricWidgets.EricListView.html#EricListView" /> <keyword name="EricListView (Module)" id="EricListView (Module)" ref="eric7.EricWidgets.EricListView.html" /> <keyword name="EricListView.keyPressEvent" id="EricListView.keyPressEvent" ref="eric7.EricWidgets.EricListView.html#EricListView.keyPressEvent" /> @@ -8853,6 +8855,7 @@ <keyword name="HgLogBrowserDialog.__restoreSplitterStates" id="HgLogBrowserDialog.__restoreSplitterStates" ref="eric7.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.__restoreSplitterStates" /> <keyword name="HgLogBrowserDialog.__revisionClicked" id="HgLogBrowserDialog.__revisionClicked" ref="eric7.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.__revisionClicked" /> <keyword name="HgLogBrowserDialog.__selectAllActTriggered" id="HgLogBrowserDialog.__selectAllActTriggered" ref="eric7.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.__selectAllActTriggered" /> + <keyword name="HgLogBrowserDialog.__selectBranches" id="HgLogBrowserDialog.__selectBranches" ref="eric7.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.__selectBranches" /> <keyword name="HgLogBrowserDialog.__showError" id="HgLogBrowserDialog.__showError" ref="eric7.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.__showError" /> <keyword name="HgLogBrowserDialog.__stripActTriggered" id="HgLogBrowserDialog.__stripActTriggered" ref="eric7.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.__stripActTriggered" /> <keyword name="HgLogBrowserDialog.__switchActTriggered" id="HgLogBrowserDialog.__switchActTriggered" ref="eric7.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.__switchActTriggered" />
--- a/src/eric7/Documentation/Source/eric7.EricWidgets.EricListSelectionDialog.html Mon Sep 25 12:09:23 2023 +0200 +++ b/src/eric7/Documentation/Source/eric7.EricWidgets.EricListSelectionDialog.html Tue Sep 26 18:26:21 2023 +0200 @@ -59,6 +59,10 @@ <td>Constructor</td> </tr> <tr> +<td><a href="#EricListSelectionDialog.__selectAll">__selectAll</a></td> +<td>Private method to select or deselect all entries.</td> +</tr> +<tr> <td><a href="#EricListSelectionDialog.getSelection">getSelection</a></td> <td>Public method to retrieve the selected items.</td> </tr> @@ -74,6 +78,10 @@ <td><a href="#EricListSelectionDialog.on_selectionList_itemSelectionChanged">on_selectionList_itemSelectionChanged</a></td> <td>Private slot handling a change of the selection.</td> </tr> +<tr> +<td><a href="#EricListSelectionDialog.setSelection">setSelection</a></td> +<td>Public method to preselect a list of entries.</td> +</tr> </table> <h3>Static Methods</h3> @@ -83,14 +91,14 @@ <a NAME="EricListSelectionDialog.__init__" ID="EricListSelectionDialog.__init__"></a> <h4>EricListSelectionDialog (Constructor)</h4> -<b>EricListSelectionDialog</b>(<i>entries, selectionMode=QAbstractItemView.SelectionMode.ExtendedSelection, title="", message="", checkBoxSelection=False, doubleClickOk=False, parent=None, </i>) +<b>EricListSelectionDialog</b>(<i>entries, selectionMode=QAbstractItemView.SelectionMode.ExtendedSelection, title="", message="", checkBoxSelection=False, doubleClickOk=False, emptySelectionOk=False, showSelectAll=False, parent=None, </i>) <p> Constructor </p> <dl> -<dt><i>entries</i> (list of str)</dt> +<dt><i>entries</i> (list of str or list of tuple of (str, Any))</dt> <dd> list of entries to select from </dd> @@ -116,11 +124,33 @@ flag indicating to accept the dialog upon a double click of an item (single selection only) </dd> +<dt><i>emptySelectionOk</i> (bool)</dt> +<dd> +flag indicating that an empty selection is allowed +</dd> +<dt><i>showSelectAll</i> (bool)</dt> +<dd> +flag indicating to show a 'Select All' button +</dd> <dt><i>parent</i> (QWidget)</dt> <dd> reference to the parent widget </dd> </dl> +<a NAME="EricListSelectionDialog.__selectAll" ID="EricListSelectionDialog.__selectAll"></a> +<h4>EricListSelectionDialog.__selectAll</h4> +<b>__selectAll</b>(<i>state</i>) + +<p> + Private method to select or deselect all entries. +</p> +<dl> + +<dt><i>state</i> (bool)</dt> +<dd> +flag indicating the desired selection state +</dd> +</dl> <a NAME="EricListSelectionDialog.getSelection" ID="EricListSelectionDialog.getSelection"></a> <h4>EricListSelectionDialog.getSelection</h4> <b>getSelection</b>(<i></i>) @@ -137,7 +167,7 @@ <dl> <dt>Return Type:</dt> <dd> -list of str +list of str or list of tuple of (str, Any) </dd> </dl> <a NAME="EricListSelectionDialog.on_selectionList_itemChanged" ID="EricListSelectionDialog.on_selectionList_itemChanged"></a> @@ -175,6 +205,20 @@ <p> Private slot handling a change of the selection. </p> +<a NAME="EricListSelectionDialog.setSelection" ID="EricListSelectionDialog.setSelection"></a> +<h4>EricListSelectionDialog.setSelection</h4> +<b>setSelection</b>(<i>selection</i>) + +<p> + Public method to preselect a list of entries. +</p> +<dl> + +<dt><i>selection</i> (list of str)</dt> +<dd> +list of selected entries +</dd> +</dl> <div align="right"><a href="#top">Up</a></div> <hr /> </body></html> \ No newline at end of file
--- a/src/eric7/Documentation/Source/eric7.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html Mon Sep 25 12:09:23 2023 +0200 +++ b/src/eric7/Documentation/Source/eric7.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html Tue Sep 26 18:26:21 2023 +0200 @@ -239,6 +239,10 @@ <td>Private method to select or unselect all log entries.</td> </tr> <tr> +<td><a href="#HgLogBrowserDialog.__selectBranches">__selectBranches</a></td> +<td>Private slot to select the branches to be shown.</td> +</tr> +<tr> <td><a href="#HgLogBrowserDialog.__showError">__showError</a></td> <td>Private slot to show some error.</td> </tr> @@ -1018,6 +1022,21 @@ flag indicating to select all entries </dd> </dl> +<a NAME="HgLogBrowserDialog.__selectBranches" ID="HgLogBrowserDialog.__selectBranches"></a> +<h4>HgLogBrowserDialog.__selectBranches</h4> +<b>__selectBranches</b>(<i>stateFilter=None</i>) + +<p> + Private slot to select the branches to be shown. +</p> +<dl> + +<dt><i>stateFilter</i> (list of str (optional))</dt> +<dd> +list of state filters ("", "C" or "I") to be presented for + selection (None or empty list means all) (defaults to None) +</dd> +</dl> <a NAME="HgLogBrowserDialog.__showError" ID="HgLogBrowserDialog.__showError"></a> <h4>HgLogBrowserDialog.__showError</h4> <b>__showError</b>(<i>out</i>)
--- a/src/eric7/Documentation/Source/eric7.Plugins.VcsPlugins.vcsMercurial.hg.html Mon Sep 25 12:09:23 2023 +0200 +++ b/src/eric7/Documentation/Source/eric7.Plugins.VcsPlugins.vcsMercurial.hg.html Tue Sep 26 18:26:21 2023 +0200 @@ -1259,15 +1259,35 @@ </dl> <a NAME="Hg.hgGetBranchesList" ID="Hg.hgGetBranchesList"></a> <h4>Hg.hgGetBranchesList</h4> -<b>hgGetBranchesList</b>(<i></i>) +<b>hgGetBranchesList</b>(<i>withState=False, withDefault=False</i>) <p> Public method to get the list of branches. </p> <dl> + +<dt><i>withState</i> (bool (optional))</dt> +<dd> +flag indicating to include a state indication (defaults to + False) +</dd> +<dt><i>withDefault</i> (bool (optional))</dt> +<dd> +flag indicating to include the 'default' branch, if that + is present (defaults to False) +</dd> +</dl> +<dl> <dt>Return:</dt> <dd> -list of branches (list of string) +list of branches with optional state indication ('' for an active + branch, 'C' for a closed branch or 'I' for an inactive branch) +</dd> +</dl> +<dl> +<dt>Return Type:</dt> +<dd> +list of str or list of tuple of (str, str) </dd> </dl> <a NAME="Hg.hgGetCurrentBranch" ID="Hg.hgGetCurrentBranch"></a>
--- a/src/eric7/EricWidgets/EricListSelectionDialog.py Mon Sep 25 12:09:23 2023 +0200 +++ b/src/eric7/EricWidgets/EricListSelectionDialog.py Tue Sep 26 18:26:21 2023 +0200 @@ -31,13 +31,15 @@ message="", checkBoxSelection=False, doubleClickOk=False, + emptySelectionOk=False, + showSelectAll=False, parent=None, ): """ Constructor @param entries list of entries to select from - @type list of str + @type list of str or list of tuple of (str, Any) @param selectionMode selection mode for the list @type QAbstractItemView.SelectionMode @param title title of the dialog @@ -50,6 +52,10 @@ @param doubleClickOk flag indicating to accept the dialog upon a double click of an item (single selection only) @type bool + @param emptySelectionOk flag indicating that an empty selection is allowed + @type bool + @param showSelectAll flag indicating to show a 'Select All' button + @type bool @param parent reference to the parent widget @type QWidget """ @@ -63,22 +69,39 @@ self.__checkCount = 0 self.__isCheckBoxSelection = checkBoxSelection - if self.__isCheckBoxSelection: - self.selectionList.setSelectionMode( - QAbstractItemView.SelectionMode.NoSelection - ) - for entry in entries: + self.__doubleClickOk = doubleClickOk + self.__emptySelectionOk = emptySelectionOk + + self.selectionList.setSelectionMode( + QAbstractItemView.SelectionMode.NoSelection + if self.__isCheckBoxSelection + else selectionMode + ) + + for entry in entries: + if isinstance(entry, tuple): + itm = QListWidgetItem(entry[0]) + itm.setData(Qt.ItemDataRole.UserRole, entry[1]) + else: itm = QListWidgetItem(entry) + if self.__isCheckBoxSelection: itm.setFlags( Qt.ItemFlag.ItemIsUserCheckable | Qt.ItemFlag.ItemIsEnabled ) itm.setCheckState(Qt.CheckState.Unchecked) - self.selectionList.addItem(itm) - else: - self.selectionList.setSelectionMode(selectionMode) - self.selectionList.addItems(entries) + self.selectionList.addItem(itm) - self.buttonBox.button(QDialogButtonBox.StandardButton.Ok).setEnabled(False) + if showSelectAll: + self.buttonBox.addButton( + self.tr("Deselect All"), QDialogButtonBox.ButtonRole.ActionRole + ).clicked.connect(lambda: self.__selectAll(False)) + self.buttonBox.addButton( + self.tr("Select All"), QDialogButtonBox.ButtonRole.ActionRole + ).clicked.connect(lambda: self.__selectAll(True)) + + self.buttonBox.button(QDialogButtonBox.StandardButton.Ok).setEnabled( + emptySelectionOk + ) @pyqtSlot() def on_selectionList_itemSelectionChanged(self): @@ -87,9 +110,10 @@ """ if not self.__isCheckBoxSelection: self.buttonBox.button(QDialogButtonBox.StandardButton.Ok).setEnabled( - len(self.selectionList.selectedItems()) > 0 + len(self.selectionList.selectedItems()) > 0 or self.__emptySelectionOk ) + @pyqtSlot(QListWidgetItem) def on_selectionList_itemChanged(self, itm): """ Private slot handling a change of an item. @@ -103,7 +127,7 @@ elif self.__checkCount > 0: self.__checkCount -= 1 self.buttonBox.button(QDialogButtonBox.StandardButton.Ok).setEnabled( - self.__checkCount > 0 + self.__checkCount > 0 or self.__emptySelectionOk ) @pyqtSlot(QListWidgetItem) @@ -118,23 +142,66 @@ not self.__isCheckBoxSelection and self.selectionList.selectionMode() == QAbstractItemView.SelectionMode.SingleSelection + and self.__doubleClickOk ): self.accept() + def __selectAll(self, state): + """ + Private method to select or deselect all entries. + + @param state flag indicating the desired selection state + @type bool + """ + for row in range(self.selectionList.count()): + item = self.selectionList.item(row) + if self.__isCheckBoxSelection: + if state: + item.setCheckState(Qt.CheckState.Checked) + else: + item.setCheckState(Qt.CheckState.Unchecked) + else: + item.setSelected(state) + + def setSelection(self, selection): + """ + Public method to preselect a list of entries. + + @param selection list of selected entries + @type list of str + """ + for name in selection: + itemList = self.selectionList.findItems( + name, Qt.MatchFlag.MatchCaseSensitive | Qt.MatchFlag.MatchStartsWith + ) + if itemList: + if self.__isCheckBoxSelection: + itemList[0].setCheckState(Qt.CheckState.Checked) + else: + itemList[0].setSelected(True) + def getSelection(self): """ Public method to retrieve the selected items. @return selected entries - @rtype list of str + @rtype list of str or list of tuple of (str, Any) """ entries = [] if self.__isCheckBoxSelection: for row in range(self.selectionList.count()): item = self.selectionList.item(row) if item.checkState() == Qt.CheckState.Checked: - entries.append(item.text()) + data = item.data(Qt.ItemDataRole.UserRole) + if data is None: + entries.append(item.text()) + else: + entries.append((item.text(), data)) else: for item in self.selectionList.selectedItems(): - entries.append(item.text()) + data = item.data(Qt.ItemDataRole.UserRole) + if data is None: + entries.append(item.text()) + else: + entries.append((item.text(), data)) return entries
--- a/src/eric7/Plugins/PluginVcsMercurial.py Mon Sep 25 12:09:23 2023 +0200 +++ b/src/eric7/Plugins/PluginVcsMercurial.py Tue Sep 26 18:26:21 2023 +0200 @@ -270,7 +270,7 @@ @param key the key of the value to get @return the requested setting """ - if key in [ + if key in ( "StopLogOnCopy", "PullUpdate", "PreferUnbundle", @@ -278,36 +278,36 @@ "InternalMerge", "ConsiderHidden", "LogBrowserShowFullLog", - ]: + ): return Preferences.toBool( Preferences.getSettings().value( "Mercurial/" + key, cls.MercurialDefaults[key] ) ) - elif key in [ + elif key in ( "LogLimit", "CommitAuthorsLimit", "ServerPort", "LogMessageColumnWidth", - ]: + ): return int( Preferences.getSettings().value( "Mercurial/" + key, cls.MercurialDefaults[key] ) ) - elif key in ["Commits", "CommitAuthors", "RepositoryUrlHistory"]: + elif key in ("Commits", "CommitAuthors", "RepositoryUrlHistory"): return Preferences.toList( Preferences.getSettings().value( "Mercurial/" + key, cls.MercurialDefaults[key] ) ) - elif key in [ + elif key in ( "LogBrowserGeometry", "StatusDialogGeometry", "StatusDialogSplitterState", "MqStatusDialogGeometry", "MqStatusDialogSplitterState", - ]: + ): # QByteArray values v = Preferences.getSettings().value("Mercurial/" + key) if v is not None:
--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py Mon Sep 25 12:09:23 2023 +0200 +++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py Tue Sep 26 18:26:21 2023 +0200 @@ -26,6 +26,7 @@ ) from PyQt6.QtWidgets import ( QApplication, + QDialog, QDialogButtonBox, QHeaderView, QInputDialog, @@ -224,6 +225,7 @@ self.__initData() self.__allBranchesFilter = self.tr("All") + self.__branchesFilterList = [] # list of branches to retrieve via hg self.fromDate.setDisplayFormat("yyyy-MM-dd") self.toDate.setDisplayFormat("yyyy-MM-dd") @@ -290,10 +292,52 @@ """ Private method to initialize the actions menu. """ + # create the "View" submenu + self.__viewMenu = QMenu(self.tr("View")) + self.__viewMenu.addAction( + self.tr("Select Branches"), lambda: self.__selectBranches(stateFilter=None) + ).setToolTip( + self.tr( + "Select the branches to be shown from a list of all branches and" + " refresh the display" + ) + ) + self.__viewMenu.addAction( + self.tr("Select Branches (active branches only)"), + lambda: self.__selectBranches(stateFilter=[""]), + ).setToolTip( + self.tr( + "Select the branches to be shown from a list of active branches and" + " refresh the display" + ) + ) + self.__viewMenu.addAction( + self.tr("Select Branches (inactive branches only)"), + lambda: self.__selectBranches(stateFilter=["I"]), + ).setToolTip( + self.tr( + "Select the branches to be shown from a list of inactive branches and" + " refresh the display" + ) + ) + self.__viewMenu.addAction( + self.tr("Select Branches (closed branches only)"), + lambda: self.__selectBranches(stateFilter=["C"]), + ).setToolTip( + self.tr( + "Select the branches to be shown from a list of closed branches and" + " refresh the display" + ) + ) + + # create the main actions menu self.__actionsMenu = QMenu() self.__actionsMenu.setTearOffEnabled(True) self.__actionsMenu.setToolTipsVisible(True) + self.__actionsMenu.addMenu(self.__viewMenu) + self.__actionsMenu.addSeparator() + self.__graftAct = self.__actionsMenu.addAction( EricPixmapCache.getIcon("vcsGraft"), self.tr("Copy Changesets"), @@ -1086,6 +1130,8 @@ "logBrowserBookmarkPhase.tmpl", ) ) + for branch in self.__branchesFilterList: + args.extend(["--branch", branch]) if self.commandMode == "incoming": if self.__bundle: args.append(self.__bundle) @@ -2899,3 +2945,44 @@ if scheme == "sbsdiff" and "_" in path: rev1, rev2 = path.split("_", 1) self.vcs.vcsSbsDiff(self.__filename, revisions=(rev1, rev2)) + + def __selectBranches(self, stateFilter=None): + """ + Private slot to select the branches to be shown. + + @param stateFilter list of state filters ("", "C" or "I") to be presented for + selection (None or empty list means all) (defaults to None) + @type list of str (optional) + """ + from eric7.EricWidgets.EricListSelectionDialog import EricListSelectionDialog + + states = { + "C": self.tr("closed"), + "I": self.tr("inactive"), + } + + if not stateFilter: + stateFilter = ["", "C", "I"] + + rawBranchesList = self.vcs.hgGetBranchesList(withState=True, withDefault=True) + branchesList = sorted( + ( + b[0] if b[1] == "" else self.tr("{0} ({1})").format(b[0], states[b[1]]), + b[0], + ) + for b in rawBranchesList + if b[1] in stateFilter + ) + dlg = EricListSelectionDialog( + branchesList, + title=self.tr("Select Branches"), + message=self.tr("Select the branches to be shown (none for 'All'):"), + checkBoxSelection=True, + emptySelectionOk=True, + showSelectAll=True, + parent=self, + ) + dlg.setSelection(self.__branchesFilterList) + if dlg.exec() == QDialog.DialogCode.Accepted: + self.__branchesFilterList = [b[1] for b in dlg.getSelection()] + self.on_refreshButton_clicked()
--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/hg.py Mon Sep 25 12:09:23 2023 +0200 +++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/hg.py Tue Sep 26 18:26:21 2023 +0200 @@ -1429,11 +1429,19 @@ self.tagsList = tagsList return self.tagsList[:] - def hgGetBranchesList(self): + def hgGetBranchesList(self, withState=False, withDefault=False): """ Public method to get the list of branches. - @return list of branches (list of string) + @param withState flag indicating to include a state indication (defaults to + False) + @type bool (optional) + @param withDefault flag indicating to include the 'default' branch, if that + is present (defaults to False) + @type bool (optional) + @return list of branches with optional state indication ('' for an active + branch, 'C' for a closed branch or 'I' for an inactive branch) + @rtype list of str or list of tuple of (str, str) """ args = self.initCommand("branches") args.append("--closed") @@ -1447,11 +1455,18 @@ if li[-1][0] in "1234567890": # last element is a rev:changeset del li[-1] + state = "" else: + state = "C" if li[-1] == "(closed)" else "I" del li[-2:] name = " ".join(li) - if name not in ["tip", "default"]: - self.branchesList.append(name) + if name not in ["tip", "default"] or ( + name == "default" and withDefault + ): + if withState: + self.branchesList.append((name, state)) + else: + self.branchesList.append(name) return self.branchesList[:]
--- a/src/eric7/i18n/eric7_cs.ts Mon Sep 25 12:09:23 2023 +0200 +++ b/src/eric7/i18n/eric7_cs.ts Tue Sep 26 18:26:21 2023 +0200 @@ -18695,6 +18695,16 @@ <context> <name>EricListSelectionDialog</name> <message> + <location filename="../EricWidgets/EricListSelectionDialog.py" line="96" /> + <source>Deselect All</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../EricWidgets/EricListSelectionDialog.py" line="99" /> + <source>Select All</source> + <translation type="unfinished">Vybrat vše</translation> + </message> + <message> <location filename="../EricWidgets/EricListSelectionDialog.ui" line="0" /> <source>Select from List</source> <translation type="unfinished" /> @@ -33517,334 +33527,334 @@ <translation>Mercurial příkaz</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1377" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1381" /> <source>Copying {0}</source> <translation>Kopírování {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1616" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1604" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1595" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1635" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1623" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1614" /> <source>Mercurial Side-by-Side Difference</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1617" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1636" /> <source><p>The file <b>{0}</b> could not be read.</p></source> <translation type="unfinished"><p>Soubor <b>{0}</b> nelze přečíst.</p></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2297" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2286" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2276" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1711" /> + <source>Apply changegroups</source> + <translation>Použít skupinu změn</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1714" /> + <source>Pulling from a remote Mercurial repository</source> + <translation>Stažení (pull) z Mercurial repozitáře</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1756" /> + <source>Pushing to a remote Mercurial repository</source> + <translation>Odeslání (push) do Mercurial repozitáře</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1894" /> + <source>Marking as 'unresolved'</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1896" /> + <source>Marking as 'resolved'</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1918" /> + <source>Aborting uncommitted merge</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1941" /> + <source>Creating branch in the Mercurial repository</source> + <translation>Vytvoření větve v Mercurial repozitáři</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1949" /> + <source>Created new branch <{0}>.</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1958" /> + <source>Showing current branch</source> + <translation>Zobrazení aktuální větve</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2045" /> + <source>Verifying the integrity of the Mercurial repository</source> + <translation>Ověřit integritu Mercurial repozitáře</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2058" /> + <source>Showing the combined configuration settings</source> + <translation>Zobrazení nastavení kombinovaných konfigurací</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2069" /> + <source>Showing aliases for remote repositories</source> + <translation>Zobrazení aliasů pro vzdálené úložiště</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2080" /> + <source>Recovering from interrupted transaction</source> + <translation>Obnovení z přerušené transakce</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2091" /> + <source>Identifying project directory</source> + <translation>Rozpoznat složku projektu</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2133" /> + <source>Create .hgignore file</source> + <translation>Vytvořit soubor .hgignore</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2134" /> + <source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source> + <translation><p>Soubor <b>{0}</b> již existuje.</p><p>Má se přepsat?</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2235" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2209" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2191" /> + <source>Create changegroup</source> + <translation>Vytvořit skupinu změn</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2193" /> + <source>Mercurial Changegroup Files (*.hg)</source> + <translation>Soubory Mercurial skupiny změn (*.hg)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2210" /> + <source><p>The Mercurial changegroup file <b>{0}</b> already exists. Overwrite it?</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2249" /> + <source>Preview changegroup</source> + <translation>Náhled skupiny změn</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2278" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2267" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2257" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1692" /> - <source>Apply changegroups</source> - <translation>Použít skupinu změn</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1695" /> - <source>Pulling from a remote Mercurial repository</source> - <translation>Stažení (pull) z Mercurial repozitáře</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1737" /> - <source>Pushing to a remote Mercurial repository</source> - <translation>Odeslání (push) do Mercurial repozitáře</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1875" /> - <source>Marking as 'unresolved'</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1877" /> - <source>Marking as 'resolved'</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1899" /> - <source>Aborting uncommitted merge</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1922" /> - <source>Creating branch in the Mercurial repository</source> - <translation>Vytvoření větve v Mercurial repozitáři</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1930" /> - <source>Created new branch <{0}>.</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1939" /> - <source>Showing current branch</source> - <translation>Zobrazení aktuální větve</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2026" /> - <source>Verifying the integrity of the Mercurial repository</source> - <translation>Ověřit integritu Mercurial repozitáře</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2039" /> - <source>Showing the combined configuration settings</source> - <translation>Zobrazení nastavení kombinovaných konfigurací</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2050" /> - <source>Showing aliases for remote repositories</source> - <translation>Zobrazení aliasů pro vzdálené úložiště</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2061" /> - <source>Recovering from interrupted transaction</source> - <translation>Obnovení z přerušené transakce</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2072" /> - <source>Identifying project directory</source> - <translation>Rozpoznat složku projektu</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2114" /> - <source>Create .hgignore file</source> - <translation>Vytvořit soubor .hgignore</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2115" /> - <source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source> - <translation><p>Soubor <b>{0}</b> již existuje.</p><p>Má se přepsat?</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2216" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2190" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2172" /> - <source>Create changegroup</source> - <translation>Vytvořit skupinu změn</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2174" /> - <source>Mercurial Changegroup Files (*.hg)</source> - <translation>Soubory Mercurial skupiny změn (*.hg)</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2191" /> - <source><p>The Mercurial changegroup file <b>{0}</b> already exists. Overwrite it?</p></source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2230" /> - <source>Preview changegroup</source> - <translation>Náhled skupiny změn</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2259" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2232" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2251" /> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation>Soubory Mercurial skupiny změn (*.hg);;Všechny soubory (*)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2268" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2287" /> <source>Shall the working directory be updated?</source> <translation>Má být pracovní adresář aktualizován?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2300" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2319" /> <source>Bisect subcommand ({0}) invalid.</source> <translation>Neplatný bisect podpříkaz ({0}).</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2320" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2339" /> <source>Mercurial Bisect ({0})</source> <translation>Mercurial Bisect ({0})</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2343" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2362" /> <source>Removing files from the Mercurial repository only</source> <translation>Odebrat soubory jen z Mercurial úložiště</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2406" /> <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2387" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2368" /> <source>Backing out changeset</source> <translation>Zálohovat skupinu změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2369" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2388" /> <source>No revision given. Aborting...</source> <translation>Nebyla dána žádná revize. Ruším...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2403" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2398" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2422" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2417" /> <source>Rollback last transaction</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2399" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2418" /> <source>Are you sure you want to rollback the last transaction?</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2465" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2484" /> <source>Import Patch</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2513" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2532" /> <source>Export Patches</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2553" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2572" /> <source>Change Phase</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2607" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2626" /> <source>Copy Changesets</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2646" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2665" /> <source>Copy Changesets (Continue)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2656" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2675" /> <source>Copy Changesets (Stop)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2666" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2685" /> <source>Copy Changesets (Abort)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2689" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2708" /> <source>Create Unversioned Archive</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2703" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2722" /> <source>Delete All Backups</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2704" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2723" /> <source><p>Do you really want to delete all backup bundles stored in the backup area?<br/><b>{0}</b></p></source> <translation type="unfinished" /> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2812" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2792" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2781" /> + <source>Add Sub-repository</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2851" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2782" /> + <source><p>The sub-repositories file .hgsub could not be read.</p><p>Reason: {0}</p></source> + <translation type="unfinished" /> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2793" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2773" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2762" /> - <source>Add Sub-repository</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2832" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2763" /> - <source><p>The sub-repositories file .hgsub could not be read.</p><p>Reason: {0}</p></source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2774" /> <source><p>The sub-repositories file .hgsub already contains an entry <b>{0}</b>. Aborting...</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2850" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2794" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2869" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2813" /> <source><p>The sub-repositories file .hgsub could not be written to.</p><p>Reason: {0}</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2849" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2831" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2817" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2868" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2850" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2836" /> <source>Remove Sub-repositories</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2818" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2837" /> <source><p>The sub-repositories file .hgsub does not exist. Aborting...</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3066" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2929" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3085" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2948" /> <source>Mercurial Command Server</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2930" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2949" /> <source><p>The Mercurial Command Server could not be restarted.</p><p>Reason: {0}</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3067" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3086" /> <source><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3183" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3202" /> <source>Mercurial Bookmark</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3199" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3218" /> <source>Delete Bookmark</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3200" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3219" /> <source>Select the bookmark to be deleted:</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3210" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3229" /> <source>Delete Mercurial Bookmark</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3235" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3254" /> <source>Rename Mercurial Bookmark</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3272" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3291" /> <source>Move Mercurial Bookmark</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3345" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3364" /> <source>Pull Bookmark</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3346" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3365" /> <source>Select the bookmark to be pulled:</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3358" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3377" /> <source>Pulling bookmark from a remote Mercurial repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3384" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3403" /> <source>Push Bookmark</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3385" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3404" /> <source>Select the bookmark to be push:</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3400" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3419" /> <source>Pushing bookmark to a remote Mercurial repository</source> <translation type="unfinished" /> </message> @@ -35973,465 +35983,531 @@ <name>HgLogBrowserDialog</name> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="0" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="139" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="140" /> <source>Mercurial Log</source> <translation /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="141" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="142" /> <source>Mercurial Log (Incoming)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="143" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="144" /> <source>Mercurial Log (Outgoing)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="145" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="146" /> <source>Mercurial Full Log</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="157" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="158" /> <source>&Refresh</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="160" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="161" /> <source>Press to refresh the list of changesets</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="168" /> - <source>Find</source> - <translation type="unfinished">Hledat</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="169" /> + <source>Find</source> + <translation type="unfinished">Hledat</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="170" /> <source>Filter</source> <translation type="unfinished">Filtr</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="0" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="171" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="172" /> <source>Revision</source> <translation>Revize</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="0" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="172" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="173" /> <source>Author</source> <translation>Autor</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="0" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="173" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="174" /> <source>Message</source> <translation>Zpráva</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="174" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="175" /> <source>File</source> <translation type="unfinished">Soubor</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="0" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="175" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="176" /> <source>Phase</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="196" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="197" /> <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>{4}<tr><td><b>Message</b></td><td>{5}</td></tr></table></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="206" /> - <source><tr><td><b>Parents</b></td><td>{0}</td></tr></source> - <translation type="unfinished"><tr><td><b>Rodiče</b></td><td>{0}</td></tr></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="207" /> + <source><tr><td><b>Parents</b></td><td>{0}</td></tr></source> + <translation type="unfinished"><tr><td><b>Rodiče</b></td><td>{0}</td></tr></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="208" /> <source><tr><td><b>Children</b></td><td>{0}</td></tr></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="210" /> - <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="211" /> + <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="212" /> <source><tr><td><b>Latest Tag</b></td><td>{0}</td></tr></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="214" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="215" /> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="226" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="227" /> <source>All</source> <translation type="unfinished">Vše</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="244" /> - <source>Added</source> - <translation>Přidáno</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="245" /> - <source>Deleted</source> - <translation>Smazáno</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="246" /> + <source>Added</source> + <translation>Přidáno</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="247" /> + <source>Deleted</source> + <translation>Smazáno</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="248" /> <source>Modified</source> <translation>Změněno</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="250" /> - <source>Draft</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="251" /> - <source>Public</source> - <translation type="unfinished" /> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="252" /> + <source>Draft</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="253" /> + <source>Public</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="254" /> <source>Secret</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="260" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="262" /> <source>Bookmarks</source> <translation type="unfinished">Záložky</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2146" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="299" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="296" /> + <source>View</source> + <translation type="unfinished">Pohled</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2978" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="298" /> + <source>Select Branches</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="300" /> + <source>Select the branches to be shown from a list of all branches and refresh the display</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="306" /> + <source>Select Branches (active branches only)</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="309" /> + <source>Select the branches to be shown from a list of active branches and refresh the display</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="315" /> + <source>Select Branches (inactive branches only)</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="318" /> + <source>Select the branches to be shown from a list of inactive branches and refresh the display</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="324" /> + <source>Select Branches (closed branches only)</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="327" /> + <source>Select the branches to be shown from a list of closed branches and refresh the display</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2187" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="343" /> <source>Copy Changesets</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="303" /> - <source>Copy the selected changesets to the current branch</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="308" /> - <source>Merge with Changeset</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="312" /> - <source>Merge the working directory with the selected changeset</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="316" /> - <source>Change Phase</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="319" /> - <source>Change the phase of the selected revisions</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="322" /> - <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" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="330" /> - <source>Tag</source> - <translation type="unfinished">Tag</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="332" /> - <source>Tag the selected revision</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="336" /> - <source>Close Heads</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="339" /> - <source>Close the selected heads</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2240" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2223" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="343" /> - <source>Switch</source> - <translation type="unfinished">Přepnout</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="347" /> - <source>Switch the working directory to the selected revision</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="354" /> - <source>Define Bookmark...</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="357" /> - <source>Bookmark the selected revision</source> + <source>Copy the selected changesets to the current branch</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="352" /> + <source>Merge with Changeset</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="356" /> + <source>Merge the working directory with the selected changeset</source> <translation type="unfinished" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="360" /> - <source>Move Bookmark...</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="364" /> - <source>Move bookmark to the selected revision</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2358" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1558" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="371" /> - <source>Pull Changes</source> + <source>Change Phase</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="363" /> + <source>Change the phase of the selected revisions</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="366" /> + <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" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="374" /> - <source>Pull changes from a remote repository</source> - <translation type="unfinished">Stáhnout změny (pull) ze vzdáleného repozitáře</translation> + <source>Tag</source> + <translation type="unfinished">Tag</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="376" /> - <source>Pull Large Files</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="378" /> - <source>Pull large files for selected revisions</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="384" /> - <source>Push Selected Changes</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="388" /> - <source>Push changes of the selected changeset and its ancestors to a remote repository</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="395" /> - <source>Push All Changes</source> + <source>Tag the selected revision</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="380" /> + <source>Close Heads</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="383" /> + <source>Close the selected heads</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2281" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2264" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="387" /> + <source>Switch</source> + <translation type="unfinished">Přepnout</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="391" /> + <source>Switch the working directory to the selected revision</source> <translation type="unfinished" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="398" /> - <source>Push all changes to a remote repository</source> + <source>Define Bookmark...</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="401" /> + <source>Bookmark the selected revision</source> <translation type="unfinished" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="404" /> - <source>Create Changegroup</source> + <source>Move Bookmark...</source> <translation type="unfinished" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="408" /> - <source>Create a changegroup file containing the selected changesets</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="411" /> - <source><b>Create Changegroup</b> -<p>This creates a changegroup file containing the selected revisions. If no revisions are selected, all changesets will be bundled. If one revision is selected, it will be interpreted as the base revision. Otherwise the lowest revision will be used as the base revision and all other revision will be bundled. If the dialog is showing outgoing changesets, all selected changesets will be bundled.</p></source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2497" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="424" /> - <source>Apply Changegroup</source> + <source>Move bookmark to the selected revision</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2399" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1599" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="415" /> + <source>Pull Changes</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="418" /> + <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="420" /> + <source>Pull Large Files</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="422" /> + <source>Pull large files for selected revisions</source> <translation type="unfinished" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="428" /> - <source>Apply the currently viewed changegroup file</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="435" /> - <source>Sign Revisions</source> + <source>Push Selected Changes</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="432" /> + <source>Push changes of the selected changeset and its ancestors to a remote repository</source> <translation type="unfinished" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="439" /> + <source>Push All Changes</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="442" /> + <source>Push all changes to a remote repository</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="448" /> + <source>Create Changegroup</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="452" /> + <source>Create a changegroup file containing the selected changesets</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="455" /> + <source><b>Create Changegroup</b> +<p>This creates a changegroup file containing the selected revisions. If no revisions are selected, all changesets will be bundled. If one revision is selected, it will be interpreted as the base revision. Otherwise the lowest revision will be used as the base revision and all other revision will be bundled. If the dialog is showing outgoing changesets, all selected changesets will be bundled.</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2538" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="468" /> + <source>Apply Changegroup</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="472" /> + <source>Apply the currently viewed changegroup file</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="479" /> + <source>Sign Revisions</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="483" /> <source>Add a signature for the selected revisions</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="443" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="487" /> <source>Verify Signatures</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="447" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="491" /> <source>Verify all signatures there may be for the selected revision</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2404" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="454" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2445" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="498" /> <source>Strip Changesets</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="457" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="501" /> <source>Strip changesets from a repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="462" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="506" /> <source>Select All Entries</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="465" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="509" /> <source>Deselect All Entries</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="910" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="886" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="863" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="837" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="949" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="925" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="902" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="876" /> <source>Mercurial Error</source> <translation>Mercurial chyba</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1210" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1251" /> <source>{0} (large file)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1468" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1509" /> <source>Side-by-Side Diff to Parent {0}</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1479" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1520" /> <source><a href="sbsdiff:{0}_{1}">Side-by-Side Compare</a></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1637" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1556" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1678" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1597" /> <source>Pull Selected Changes</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2498" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2405" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2359" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2241" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2147" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2539" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2446" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2400" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2282" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2188" /> <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.py" line="2224" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2265" /> <source>Select bookmark to switch to (leave empty to use revision):</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2269" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2310" /> <source>Define Bookmark</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2270" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2311" /> <source>Enter bookmark name for changeset "{0}":</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2299" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2340" /> <source>Move Bookmark</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2300" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2341" /> <source>Select the bookmark to be moved to changeset "{0}":</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2637" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2678" /> <source>Find Commit</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2638" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2679" /> <source>'{0}' was not found.</source> <translation type="unfinished">'{0}' nebyl nalezen.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2685" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2726" /> <source>Generating differences ...</source> <translation type="unfinished" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="0" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2686" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2727" /> <source>Differences</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2697" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2738" /> <source>Differences to Parent {0}</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2713" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2754" /> <source>Diff to Parent {0}{1}</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2736" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2777" /> <source>There is no difference.</source> <translation type="unfinished">Žádné rozdíly nebyly nalezeny.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2887" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2871" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2853" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2928" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2912" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2894" /> <source>Save Diff</source> <translation type="unfinished">Uložit Diff</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2855" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2896" /> <source>Patch Files (*.diff)</source> <translation type="unfinished">Patch soubory (*.diff)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2872" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2913" /> <source><p>The patch file <b>{0}</b> already exists. Overwrite it?</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2888" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2929" /> <source><p>The patch file <b>{0}</b> could not be saved.<br>Reason: {1}</p></source> <translation type="unfinished"><p>Patch soubor <b>{0}</b> nelze uložit.<br />Důvod: {1}</p></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2960" /> + <source>closed</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2961" /> + <source>inactive</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2970" /> + <source>{0} ({1})</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2979" /> + <source>Select the branches to be shown (none for 'All'):</source> + <translation type="unfinished" /> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="0" /> <source>Select action from menu</source> <translation type="unfinished" /> @@ -58761,22 +58837,22 @@ <translation>Nekompatibilní metoda aktivace pluginu.</translation> </message> <message> - <location filename="../PluginManager/PluginManager.py" line="1222" /> + <location filename="../PluginManager/PluginManager.py" line="1216" /> <source>Plugin Manager Error</source> <translation>Chyba plugin manažeru</translation> </message> <message> - <location filename="../PluginManager/PluginManager.py" line="1223" /> + <location filename="../PluginManager/PluginManager.py" line="1217" /> <source><p>The plugin download directory <b>{0}</b> could not be created. Please configure it via the configuration dialog.</p><p>Reason: {1}</p></source> <translation><p>Download plugin adresář <b>{0}</b> se nepodařilo vytvořit. Prosím, upravte nastavení přes konfigurační dialog.</p><p>Důvod: {1}</p></translation> </message> <message> - <location filename="../PluginManager/PluginManager.py" line="1311" /> + <location filename="../PluginManager/PluginManager.py" line="1305" /> <source>Error downloading file</source> <translation type="unfinished">Chyba při stahování souboru</translation> </message> <message> - <location filename="../PluginManager/PluginManager.py" line="1312" /> + <location filename="../PluginManager/PluginManager.py" line="1306" /> <source><p>Could not download the requested file from {0}.</p><p>Error: {1}</p></source> <translation type="unfinished"><p>Nelze stáhnout požadovaný soubor z {0}.</p><p>Chyba: {1}</p></translation> </message> @@ -83692,7 +83768,7 @@ <translation>Beze jména {0}</translation> </message> <message> - <location filename="../Plugins/ViewManagerPlugins/Tabview/Tabview.py" line="1502" /> + <location filename="../Plugins/ViewManagerPlugins/Tabview/Tabview.py" line="1500" /> <location filename="../Plugins/ViewManagerPlugins/Tabview/Tabview.py" line="1111" /> <location filename="../Plugins/ViewManagerPlugins/Tabview/Tabview.py" line="1056" /> <source>{0} (ro)</source> @@ -102303,38 +102379,38 @@ <context> <name>mercurial</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1274" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1278" /> <source><tr><td><b>Parent #{0}</b></td><td></td></tr> <tr><td><b>Changeset</b></td><td>{1}</td></tr></source> <translation><tr><td><b>Rodič #{0}</b></td><td></td></tr><tr><td><b>Množina změn</b></td><td>{1}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1805" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1282" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1824" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1286" /> <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Tagy</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1811" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1288" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1830" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1292" /> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1818" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1295" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1837" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1299" /> <source><tr><td><b>Branches</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Větve</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1301" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1305" /> <source><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr></source> <translation><tr><td><b>Poslední autor</b></td><td>{0}</td></tr><tr><td><b>Datum zapsání změn</b></td><td>{1}</td></tr><tr><td><b>Čas zapsání změn</b></td><td>{2}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1320" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1324" /> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -102345,35 +102421,35 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1779" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1798" /> <source><tr><td><b>Head #{0}</b></td><td></td></tr> </source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1786" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1805" /> <source><tr><td><b>Parent #{0}</b></td><td></td></tr> </source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1793" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1812" /> <source><tr><td><b>Tip</b></td><td></td></tr> </source> <translation><tr><td><b>Tip</b></td><td></td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1798" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1817" /> <source><tr><td><b>Changeset</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Množina změn</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1825" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1844" /> <source><tr><td><b>Parents</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Rodiče</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1831" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1850" /> <source><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr>
--- a/src/eric7/i18n/eric7_de.ts Mon Sep 25 12:09:23 2023 +0200 +++ b/src/eric7/i18n/eric7_de.ts Tue Sep 26 18:26:21 2023 +0200 @@ -18605,6 +18605,16 @@ <context> <name>EricListSelectionDialog</name> <message> + <location filename="../EricWidgets/EricListSelectionDialog.py" line="96" /> + <source>Deselect All</source> + <translation>Alle abwählen</translation> + </message> + <message> + <location filename="../EricWidgets/EricListSelectionDialog.py" line="99" /> + <source>Select All</source> + <translation>Alles auswählen</translation> + </message> + <message> <location filename="../EricWidgets/EricListSelectionDialog.ui" line="0" /> <source>Select from List</source> <translation>Aus der Liste wählen</translation> @@ -33395,334 +33405,334 @@ <translation>Mercurial-Befehl</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1377" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1381" /> <source>Copying {0}</source> <translation>Kopiere {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1616" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1604" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1595" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1635" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1623" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1614" /> <source>Mercurial Side-by-Side Difference</source> <translation>Mercurial Unterschiede nebeneinander anzeigen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1617" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1636" /> <source><p>The file <b>{0}</b> could not be read.</p></source> <translation><p>Die Datei <b>{0}</b> konnte nicht gelesen werden.</p></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2297" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2286" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2276" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1711" /> + <source>Apply changegroups</source> + <translation>Änderungsgruppen anwenden</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1714" /> + <source>Pulling from a remote Mercurial repository</source> + <translation>Pull von einem entfernten Mercurial-Repository</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1756" /> + <source>Pushing to a remote Mercurial repository</source> + <translation>Push in ein entferntes Mercurial-Repository</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1894" /> + <source>Marking as 'unresolved'</source> + <translation>Markiere als 'nicht aufgelöst'</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1896" /> + <source>Marking as 'resolved'</source> + <translation>Markiere als 'aufgelöst'</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1918" /> + <source>Aborting uncommitted merge</source> + <translation>Breche Zusammenführung ab</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1941" /> + <source>Creating branch in the Mercurial repository</source> + <translation>Erzeuge Zweig im Mercurial-Repository</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1949" /> + <source>Created new branch <{0}>.</source> + <translation>Neuer Zweig <{0}> wurde angelegt.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1958" /> + <source>Showing current branch</source> + <translation>Zeige aktuellen Zweig</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2045" /> + <source>Verifying the integrity of the Mercurial repository</source> + <translation>Verifiziere die Integrität des Mercurial-Repository</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2058" /> + <source>Showing the combined configuration settings</source> + <translation>Zeige die kombinierten Einstellungen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2069" /> + <source>Showing aliases for remote repositories</source> + <translation>Zeige Namen für entfernte Repositorys</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2080" /> + <source>Recovering from interrupted transaction</source> + <translation>Setze abgebrochene Transaktion zurück</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2091" /> + <source>Identifying project directory</source> + <translation>Projektverzeichnis identifizieren</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2133" /> + <source>Create .hgignore file</source> + <translation>.hgignore-Datei erstellen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2134" /> + <source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source> + <translation><p>Die Datei <b>{0}</b> existiert bereits. Überschreiben?</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2235" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2209" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2191" /> + <source>Create changegroup</source> + <translation>Änderungsgruppe erzeugen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2193" /> + <source>Mercurial Changegroup Files (*.hg)</source> + <translation>Mercurial-Änderungsgruppendateien (*.hg)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2210" /> + <source><p>The Mercurial changegroup file <b>{0}</b> already exists. Overwrite it?</p></source> + <translation><p>Die Mercurial-Änderungsgruppendatei <b>{0}</b> existiert bereits. Überschreiben?</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2249" /> + <source>Preview changegroup</source> + <translation>Änderungsgruppe ansehen</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2278" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2267" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2257" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1692" /> - <source>Apply changegroups</source> - <translation>Änderungsgruppen anwenden</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1695" /> - <source>Pulling from a remote Mercurial repository</source> - <translation>Pull von einem entfernten Mercurial-Repository</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1737" /> - <source>Pushing to a remote Mercurial repository</source> - <translation>Push in ein entferntes Mercurial-Repository</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1875" /> - <source>Marking as 'unresolved'</source> - <translation>Markiere als 'nicht aufgelöst'</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1877" /> - <source>Marking as 'resolved'</source> - <translation>Markiere als 'aufgelöst'</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1899" /> - <source>Aborting uncommitted merge</source> - <translation>Breche Zusammenführung ab</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1922" /> - <source>Creating branch in the Mercurial repository</source> - <translation>Erzeuge Zweig im Mercurial-Repository</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1930" /> - <source>Created new branch <{0}>.</source> - <translation>Neuer Zweig <{0}> wurde angelegt.</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1939" /> - <source>Showing current branch</source> - <translation>Zeige aktuellen Zweig</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2026" /> - <source>Verifying the integrity of the Mercurial repository</source> - <translation>Verifiziere die Integrität des Mercurial-Repository</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2039" /> - <source>Showing the combined configuration settings</source> - <translation>Zeige die kombinierten Einstellungen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2050" /> - <source>Showing aliases for remote repositories</source> - <translation>Zeige Namen für entfernte Repositorys</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2061" /> - <source>Recovering from interrupted transaction</source> - <translation>Setze abgebrochene Transaktion zurück</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2072" /> - <source>Identifying project directory</source> - <translation>Projektverzeichnis identifizieren</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2114" /> - <source>Create .hgignore file</source> - <translation>.hgignore-Datei erstellen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2115" /> - <source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source> - <translation><p>Die Datei <b>{0}</b> existiert bereits. Überschreiben?</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2216" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2190" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2172" /> - <source>Create changegroup</source> - <translation>Änderungsgruppe erzeugen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2174" /> - <source>Mercurial Changegroup Files (*.hg)</source> - <translation>Mercurial-Änderungsgruppendateien (*.hg)</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2191" /> - <source><p>The Mercurial changegroup file <b>{0}</b> already exists. Overwrite it?</p></source> - <translation><p>Die Mercurial-Änderungsgruppendatei <b>{0}</b> existiert bereits. Überschreiben?</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2230" /> - <source>Preview changegroup</source> - <translation>Änderungsgruppe ansehen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2259" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2232" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2251" /> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation>Mercurial-Änderungsgruppendateien (*.hg);;Alle Dateien (*)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2268" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2287" /> <source>Shall the working directory be updated?</source> <translation>Soll das Arbeitsverzeichnis aktualisiert werden?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2300" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2319" /> <source>Bisect subcommand ({0}) invalid.</source> <translation>Ungültiger Bisect Unterbefehl ({0}).</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2320" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2339" /> <source>Mercurial Bisect ({0})</source> <translation>Mercurial-Bisect ({0})</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2343" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2362" /> <source>Removing files from the Mercurial repository only</source> <translation>Lösche Dateien nur aus dem Mercurial-Repository</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2406" /> <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2387" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2368" /> <source>Backing out changeset</source> <translation>Änderungssatz umkehren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2369" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2388" /> <source>No revision given. Aborting...</source> <translation>Keine Revision angegeben. Abbruch...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2403" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2398" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2422" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2417" /> <source>Rollback last transaction</source> <translation>Letzte Transaktion zurücksetzen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2399" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2418" /> <source>Are you sure you want to rollback the last transaction?</source> <translation>Wollen Sie die letzte Transaktion wirklich zurücksetzen?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2465" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2484" /> <source>Import Patch</source> <translation>Patch importieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2513" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2532" /> <source>Export Patches</source> <translation>Patches exportieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2553" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2572" /> <source>Change Phase</source> <translation>Phase ändern</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2607" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2626" /> <source>Copy Changesets</source> <translation>Änderungssätze kopieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2646" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2665" /> <source>Copy Changesets (Continue)</source> <translation>Änderungssätze kopieren (Fortsetzung)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2656" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2675" /> <source>Copy Changesets (Stop)</source> <translation>Änderungssätze kopieren (Stopp)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2666" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2685" /> <source>Copy Changesets (Abort)</source> <translation>Änderungssätze kopieren (Abbruch)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2689" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2708" /> <source>Create Unversioned Archive</source> <translation>Erzeuge nicht versioniertes Archiv</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2703" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2722" /> <source>Delete All Backups</source> <translation>Alle Backups löschen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2704" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2723" /> <source><p>Do you really want to delete all backup bundles stored in the backup area?<br/><b>{0}</b></p></source> <translation><p>Sollen wirklich alle Backupdateien des Backupbereiches gelöscht werden?<br/><b>{0}</b></p></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2812" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2792" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2781" /> + <source>Add Sub-repository</source> + <translation>Unterrepository hinzufügen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2851" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2782" /> + <source><p>The sub-repositories file .hgsub could not be read.</p><p>Reason: {0}</p></source> + <translation><p>Die Unterrepositorydatei .hgsub konnte nicht gelesen werden.</p><p>Ursache: {0}</p></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2793" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2773" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2762" /> - <source>Add Sub-repository</source> - <translation>Unterrepository hinzufügen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2832" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2763" /> - <source><p>The sub-repositories file .hgsub could not be read.</p><p>Reason: {0}</p></source> - <translation><p>Die Unterrepositorydatei .hgsub konnte nicht gelesen werden.</p><p>Ursache: {0}</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2774" /> <source><p>The sub-repositories file .hgsub already contains an entry <b>{0}</b>. Aborting...</p></source> <translation><p>Die Unterrepositorydatei .hgsub enthält bereits einen Eintrag <b>{0}</b>. Abbruch...</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2850" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2794" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2869" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2813" /> <source><p>The sub-repositories file .hgsub could not be written to.</p><p>Reason: {0}</p></source> <translation><p>Die Unterrepositorydatei .hgsub konnte nicht gespeichert werden.</p><p>Ursache: {0}</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2849" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2831" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2817" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2868" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2850" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2836" /> <source>Remove Sub-repositories</source> <translation>Unterrepositorys löschen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2818" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2837" /> <source><p>The sub-repositories file .hgsub does not exist. Aborting...</p></source> <translation><p>Die Unterrepositorydatei .hgsub existiert nicht. Abbruch...</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3066" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2929" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3085" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2948" /> <source>Mercurial Command Server</source> <translation>Mercurial-Befehlsserver</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2930" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2949" /> <source><p>The Mercurial Command Server could not be restarted.</p><p>Reason: {0}</p></source> <translation><p>Der Mercurial-Befehlsserver konnte nicht wiedergestartet werden.</p><p>Ursache: {0}</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3067" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3086" /> <source><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></source> <translation><p>Der Mercurial-Befehlsserver konnte nicht gestartet werden.</p><p>Ursache: {0}</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3183" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3202" /> <source>Mercurial Bookmark</source> <translation>Mercurial-Lesezeichen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3199" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3218" /> <source>Delete Bookmark</source> <translation>Lesezeichen löschen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3200" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3219" /> <source>Select the bookmark to be deleted:</source> <translation>Wähle das zu löschende Lesezeichen aus:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3210" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3229" /> <source>Delete Mercurial Bookmark</source> <translation>Mercurial-Lesezeichen löschen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3235" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3254" /> <source>Rename Mercurial Bookmark</source> <translation>Mercurial-Lesezeichen umbenennen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3272" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3291" /> <source>Move Mercurial Bookmark</source> <translation>Mercurial-Lesezeichen verschieben</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3345" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3364" /> <source>Pull Bookmark</source> <translation>Lesezeichen herunterladen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3346" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3365" /> <source>Select the bookmark to be pulled:</source> <translation>Wähle das herunterzuladende Lesezeichen:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3358" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3377" /> <source>Pulling bookmark from a remote Mercurial repository</source> <translation>Lade Lesezeichen von einem entfernten Mercurial-Repository herunter</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3384" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3403" /> <source>Push Bookmark</source> <translation>Lesezeichen hochladen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3385" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3404" /> <source>Select the bookmark to be push:</source> <translation>Wähle das hochzuladende Lesezeichen:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3400" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3419" /> <source>Pushing bookmark to a remote Mercurial repository</source> <translation>Lade Lesezeichen zu einem entfernten Mercurial-Repository hoch</translation> </message> @@ -35874,466 +35884,532 @@ <name>HgLogBrowserDialog</name> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="0" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="139" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="140" /> <source>Mercurial Log</source> <translation>Mercurial-Log</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="141" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="142" /> <source>Mercurial Log (Incoming)</source> <translation>Mercurial-Log (Eingang)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="143" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="144" /> <source>Mercurial Log (Outgoing)</source> <translation>Mercurial-Log (Ausgang)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="145" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="146" /> <source>Mercurial Full Log</source> <translation>Mercurial-Log (vollständig)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="157" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="158" /> <source>&Refresh</source> <translation>&Erneuern</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="160" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="161" /> <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="168" /> - <source>Find</source> - <translation>Suchen</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="169" /> + <source>Find</source> + <translation>Suchen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="170" /> <source>Filter</source> <translation>Filter</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="0" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="171" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="172" /> <source>Revision</source> <translation>Revision</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="0" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="172" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="173" /> <source>Author</source> <translation>Autor</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="0" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="173" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="174" /> <source>Message</source> <translation>Nachricht</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="174" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="175" /> <source>File</source> <translation>Datei</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="0" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="175" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="176" /> <source>Phase</source> <translation>Phase</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="196" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="197" /> <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>{4}<tr><td><b>Message</b></td><td>{5}</td></tr></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>{4}<tr><td><b>Nachricht</b></td><td>{5}</td></tr></table></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="206" /> - <source><tr><td><b>Parents</b></td><td>{0}</td></tr></source> - <translation><tr><td><b>Vorgänger</b></td><td>{0}</td></tr></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="207" /> + <source><tr><td><b>Parents</b></td><td>{0}</td></tr></source> + <translation><tr><td><b>Vorgänger</b></td><td>{0}</td></tr></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="208" /> <source><tr><td><b>Children</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Nachfolger</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="210" /> - <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="211" /> + <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="212" /> <source><tr><td><b>Latest Tag</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Letzte Marke</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="214" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="215" /> <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="226" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="227" /> <source>All</source> <translation>Alle</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="244" /> - <source>Added</source> - <translation>Hinzugefügt</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="245" /> - <source>Deleted</source> - <translation>Gelöscht</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="246" /> + <source>Added</source> + <translation>Hinzugefügt</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="247" /> + <source>Deleted</source> + <translation>Gelöscht</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="248" /> <source>Modified</source> <translation>Modifiziert</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="250" /> - <source>Draft</source> - <translation>Entwurf</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="251" /> - <source>Public</source> - <translation>Öffentlich</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="252" /> + <source>Draft</source> + <translation>Entwurf</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="253" /> + <source>Public</source> + <translation>Öffentlich</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="254" /> <source>Secret</source> <translation>Geheim</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="260" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="262" /> <source>Bookmarks</source> <translation>Lesezeichen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2146" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="299" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="296" /> + <source>View</source> + <translation>Ansicht</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2978" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="298" /> + <source>Select Branches</source> + <translation>Zweige auswählen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="300" /> + <source>Select the branches to be shown from a list of all branches and refresh the display</source> + <translation>Wähle die anzuzeigenden Zweige aus einer Liste aller Zweigen und erneuere den Dialog</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="306" /> + <source>Select Branches (active branches only)</source> + <translation>Zweige auswählen (nur aktive Zweige)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="309" /> + <source>Select the branches to be shown from a list of active branches and refresh the display</source> + <translation>Wähle die anzuzeigenden Zweige aus einer Liste aktiver Zweigen und erneuere den Dialog</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="315" /> + <source>Select Branches (inactive branches only)</source> + <translation>Zweige auswählen (nur inaktive Zweige)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="318" /> + <source>Select the branches to be shown from a list of inactive branches and refresh the display</source> + <translation>Wähle die anzuzeigenden Zweige aus einer Liste inaktiver Zweigen und erneuere den Dialog</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="324" /> + <source>Select Branches (closed branches only)</source> + <translation>Zweige auswählen (nur geschlossene Zweige)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="327" /> + <source>Select the branches to be shown from a list of closed branches and refresh the display</source> + <translation>Wähle die anzuzeigenden Zweige aus einer Liste geschlossener Zweigen und erneuere den Dialog</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2187" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="343" /> <source>Copy Changesets</source> <translation>Änderungssätze kopieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="303" /> - <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="308" /> - <source>Merge with Changeset</source> - <translation>Mit Änderungssatz zusammenführen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="312" /> - <source>Merge the working directory with the selected changeset</source> - <translation>Führe das Arbeitsverzeichnis mit dem gewählten Änderungssatz zusammen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="316" /> - <source>Change Phase</source> - <translation>Phase ändern</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="319" /> - <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="322" /> - <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="330" /> - <source>Tag</source> - <translation>Marke setzen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="332" /> - <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="336" /> - <source>Close Heads</source> - <translation>Köpfe schließen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="339" /> - <source>Close the selected heads</source> - <translation>Schließe die ausgewählten Köpfe</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2240" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2223" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="343" /> - <source>Switch</source> - <translation>Umschalten</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="347" /> - <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="354" /> - <source>Define Bookmark...</source> - <translation>Lesezeichen hinzufügen …</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="357" /> - <source>Bookmark the selected revision</source> - <translation>Lesezeichen für die ausgewählte Revision erzeugen</translation> + <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="352" /> + <source>Merge with Changeset</source> + <translation>Mit Änderungssatz zusammenführen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="356" /> + <source>Merge the working directory with the selected changeset</source> + <translation>Führe das Arbeitsverzeichnis mit dem gewählten Änderungssatz zusammen</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="360" /> - <source>Move Bookmark...</source> - <translation>Lesezeichen verschieben …</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="364" /> - <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="2358" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1558" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="371" /> - <source>Pull Changes</source> - <translation>Änderungen herunterladen</translation> + <source>Change Phase</source> + <translation>Phase ändern</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="363" /> + <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="366" /> + <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="374" /> - <source>Pull changes from a remote repository</source> - <translation>Änderungen von einem entfernten Repository herunterladen</translation> + <source>Tag</source> + <translation>Marke setzen</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="376" /> - <source>Pull Large Files</source> - <translation>Binärriesen herunterladen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="378" /> - <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="384" /> - <source>Push Selected Changes</source> - <translation>Ausgewählte Änderungen hochladen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="388" /> - <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="395" /> - <source>Push All Changes</source> - <translation>Alle Änderungen hochladen</translation> + <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="380" /> + <source>Close Heads</source> + <translation>Köpfe schließen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="383" /> + <source>Close the selected heads</source> + <translation>Schließe die ausgewählten Köpfe</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2281" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2264" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="387" /> + <source>Switch</source> + <translation>Umschalten</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="391" /> + <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="398" /> - <source>Push all changes to a remote repository</source> - <translation>Alle Änderungen an ein entferntes Repository hochladen</translation> + <source>Define Bookmark...</source> + <translation>Lesezeichen hinzufügen …</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="401" /> + <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="404" /> - <source>Create Changegroup</source> - <translation>Änderungsgruppe erzeugen</translation> + <source>Move Bookmark...</source> + <translation>Lesezeichen verschieben …</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="408" /> + <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="2399" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1599" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="415" /> + <source>Pull Changes</source> + <translation>Änderungen herunterladen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="418" /> + <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="420" /> + <source>Pull Large Files</source> + <translation>Binärriesen herunterladen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="422" /> + <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="428" /> + <source>Push Selected Changes</source> + <translation>Ausgewählte Änderungen hochladen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="432" /> + <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="439" /> + <source>Push All Changes</source> + <translation>Alle Änderungen hochladen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="442" /> + <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="448" /> + <source>Create Changegroup</source> + <translation>Änderungsgruppe erzeugen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="452" /> <source>Create a changegroup file containing the selected changesets</source> <translation>Erzeuge eine Änderungsgruppendatei für die ausgewählten Änderungssätze</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="411" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="455" /> <source><b>Create Changegroup</b> <p>This creates a changegroup file containing the selected revisions. If no revisions are selected, all changesets will be bundled. If one revision is selected, it will be interpreted as the base revision. Otherwise the lowest revision will be used as the base revision and all other revision will be bundled. If the dialog is showing outgoing changesets, all selected changesets will be bundled.</p></source> <translation><b>Änderungsgruppe erzeugen</b> <p>Dies erzeugt eine Änderungsgruppendatei für die ausgewählten Änderungssätze. Ist keine Änderung ausgewählt, werden alle in die Datei geschrieben. Ist ein Änderungssatz ausgewählt, so wird er als Basis verwendet. Ansonsten wird die kleinste, ausgewählte Revision als Basis verwendet und alle anderen werden in die Datei geschrieben. Zeigt der Dialog ausgehende Änderungssätze an, so werden alle ausgewählten in die Datei geschrieben.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2497" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="424" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2538" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="468" /> <source>Apply Changegroup</source> <translation>Änderungsgruppe anwenden</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="428" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="472" /> <source>Apply the currently viewed changegroup file</source> <translation>Wende die aktuell inspizierte Änderungsgruppendatei an</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="435" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="479" /> <source>Sign Revisions</source> <translation>Revisionen signieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="439" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="483" /> <source>Add a signature for the selected revisions</source> <translation>Den ausgewählten Revisionen eine Signatur hinzufügen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="443" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="487" /> <source>Verify Signatures</source> <translation>Signaturen verifizieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="447" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="491" /> <source>Verify all signatures there may be for the selected revision</source> <translation>Alle Signaturen der ausgewählten Revision verifizieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2404" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="454" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2445" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="498" /> <source>Strip Changesets</source> <translation>Änderungssätze löschen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="457" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="501" /> <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="462" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="506" /> <source>Select All Entries</source> <translation>Alle Einträge auswählen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="465" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="509" /> <source>Deselect All Entries</source> <translation>Alle Einträge abwählen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="910" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="886" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="863" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="837" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="949" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="925" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="902" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="876" /> <source>Mercurial Error</source> <translation>Mercurial-Fehler</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1210" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1251" /> <source>{0} (large file)</source> <translation>{0} (Binärriese)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1468" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1509" /> <source>Side-by-Side Diff to Parent {0}</source> <translation>Unterschiede nebeneinander zu Vorgänger {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1479" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1520" /> <source><a href="sbsdiff:{0}_{1}">Side-by-Side Compare</a></source> <translation><a href="sbsdiff:{0}_{1}">Unterschiede nebeneinander</a></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1637" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1556" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1678" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1597" /> <source>Pull Selected Changes</source> <translation>Ausgewählte Änderungen herunterladen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2498" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2405" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2359" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2241" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2147" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2539" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2446" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2400" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2282" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2188" /> <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.py" line="2224" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2265" /> <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="2269" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2310" /> <source>Define Bookmark</source> <translation>Lesezeichen hinzufügen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2270" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2311" /> <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="2299" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2340" /> <source>Move Bookmark</source> <translation>Lesezeichen verschieben</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2300" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2341" /> <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="2637" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2678" /> <source>Find Commit</source> <translation>Revision finden</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2638" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2679" /> <source>'{0}' was not found.</source> <translation>„{0}“ wurde nicht gefunden.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2685" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2726" /> <source>Generating differences ...</source> <translation>Erzeuge Unterschiede ...</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="0" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2686" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2727" /> <source>Differences</source> <translation>Unterschiede</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2697" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2738" /> <source>Differences to Parent {0}</source> <translation>Unterschiede zu Vorgänger {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2713" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2754" /> <source>Diff to Parent {0}{1}</source> <translation>Diff zu Vorgänger {0}{1}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2736" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2777" /> <source>There is no difference.</source> <translation>Es gibt keinen Unterschied.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2887" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2871" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2853" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2928" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2912" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2894" /> <source>Save Diff</source> <translation>Diff speichern</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2855" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2896" /> <source>Patch Files (*.diff)</source> <translation>Patchdateien (*.diff)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2872" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2913" /> <source><p>The patch file <b>{0}</b> already exists. Overwrite it?</p></source> <translation><p>Die Patchdatei <b>{0}</b> existiert bereits. Überschreiben?</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2888" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2929" /> <source><p>The patch file <b>{0}</b> could not be saved.<br>Reason: {1}</p></source> <translation><p>Die Patchdatei <b>{0}</b> konnte nicht gespeichert werden.<br>Grund: {1}</p></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2960" /> + <source>closed</source> + <translation>geschlossen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2961" /> + <source>inactive</source> + <translation>inaktiv</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2970" /> + <source>{0} ({1})</source> + <translation>{0} ({1})</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2979" /> + <source>Select the branches to be shown (none for 'All'):</source> + <translation>Wähle die anzuzeigenden Zweige (keinen für 'Alle'):</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="0" /> <source>Select action from menu</source> <translation>Wähle eine Aktion aus dem Menü</translation> @@ -58612,22 +58688,22 @@ <translation>Nicht kompatible Plugin-Aktivierungsmethode.</translation> </message> <message> - <location filename="../PluginManager/PluginManager.py" line="1222" /> + <location filename="../PluginManager/PluginManager.py" line="1216" /> <source>Plugin Manager Error</source> <translation>Pluginmanager-Fehler</translation> </message> <message> - <location filename="../PluginManager/PluginManager.py" line="1223" /> + <location filename="../PluginManager/PluginManager.py" line="1217" /> <source><p>The plugin download directory <b>{0}</b> could not be created. Please configure it via the configuration dialog.</p><p>Reason: {1}</p></source> <translation><p>Das Downloadverzeichnis für Plugins <b>{0}</b> konnte nicht erzeugt werden. Bitte über den Konfigurationsdialog einstellen.</p><p>Ursache: {1}</p></translation> </message> <message> - <location filename="../PluginManager/PluginManager.py" line="1311" /> + <location filename="../PluginManager/PluginManager.py" line="1305" /> <source>Error downloading file</source> <translation>Fehler beim Herunterladen der Datei</translation> </message> <message> - <location filename="../PluginManager/PluginManager.py" line="1312" /> + <location filename="../PluginManager/PluginManager.py" line="1306" /> <source><p>Could not download the requested file from {0}.</p><p>Error: {1}</p></source> <translation><p>Die angefragte Datei konnte nicht von {0} gedownloaded werden.</p><p>Fehler: {1}</p></translation> </message> @@ -83399,7 +83475,7 @@ <translation>Unbenannt {0}</translation> </message> <message> - <location filename="../Plugins/ViewManagerPlugins/Tabview/Tabview.py" line="1502" /> + <location filename="../Plugins/ViewManagerPlugins/Tabview/Tabview.py" line="1500" /> <location filename="../Plugins/ViewManagerPlugins/Tabview/Tabview.py" line="1111" /> <location filename="../Plugins/ViewManagerPlugins/Tabview/Tabview.py" line="1056" /> <source>{0} (ro)</source> @@ -102073,32 +102149,32 @@ <context> <name>mercurial</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1274" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1278" /> <source><tr><td><b>Parent #{0}</b></td><td></td></tr> <tr><td><b>Changeset</b></td><td>{1}</td></tr></source> <translation><tr><td><b>Vorgänger #{0}</b></td><td></td></tr> <tr><td><b>Änderungssatz</b></td><td>{1}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1805" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1282" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1824" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1286" /> <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/hg.py" line="1811" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1288" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1830" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1292" /> <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/hg.py" line="1818" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1295" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1837" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1299" /> <source><tr><td><b>Branches</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Zweige</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1301" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1305" /> <source><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr></source> @@ -102107,7 +102183,7 @@ <tr><td><b>Committed um</b></td><td>{2}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1320" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1324" /> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -102118,38 +102194,38 @@ <translation /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1779" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1798" /> <source><tr><td><b>Head #{0}</b></td><td></td></tr> </source> <translation><tr><td><b>Kopf #{0}</b></td><td></td></tr> </translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1786" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1805" /> <source><tr><td><b>Parent #{0}</b></td><td></td></tr> </source> <translation><tr><td><b>Vorgänger #{0}</b></td><td></td></tr> </translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1793" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1812" /> <source><tr><td><b>Tip</b></td><td></td></tr> </source> <translation><tr><td><b>Spitze</b></td><td></td></tr> </translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1798" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1817" /> <source><tr><td><b>Changeset</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Änderungssatz</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1825" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1844" /> <source><tr><td><b>Parents</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Vorgänger</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1831" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1850" /> <source><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr>
--- a/src/eric7/i18n/eric7_empty.ts Mon Sep 25 12:09:23 2023 +0200 +++ b/src/eric7/i18n/eric7_empty.ts Tue Sep 26 18:26:21 2023 +0200 @@ -18498,6 +18498,16 @@ <context> <name>EricListSelectionDialog</name> <message> + <location filename="../EricWidgets/EricListSelectionDialog.py" line="96" /> + <source>Deselect All</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../EricWidgets/EricListSelectionDialog.py" line="99" /> + <source>Select All</source> + <translation type="unfinished" /> + </message> + <message> <location filename="../EricWidgets/EricListSelectionDialog.ui" line="0" /> <source>Select from List</source> <translation type="unfinished" /> @@ -33230,334 +33240,334 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1377" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1381" /> <source>Copying {0}</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1616" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1604" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1595" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1635" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1623" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1614" /> <source>Mercurial Side-by-Side Difference</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1617" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1636" /> <source><p>The file <b>{0}</b> could not be read.</p></source> <translation type="unfinished" /> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2297" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2286" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2276" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1711" /> + <source>Apply changegroups</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1714" /> + <source>Pulling from a remote Mercurial repository</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1756" /> + <source>Pushing to a remote Mercurial repository</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1894" /> + <source>Marking as 'unresolved'</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1896" /> + <source>Marking as 'resolved'</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1918" /> + <source>Aborting uncommitted merge</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1941" /> + <source>Creating branch in the Mercurial repository</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1949" /> + <source>Created new branch <{0}>.</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1958" /> + <source>Showing current branch</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2045" /> + <source>Verifying the integrity of the Mercurial repository</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2058" /> + <source>Showing the combined configuration settings</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2069" /> + <source>Showing aliases for remote repositories</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2080" /> + <source>Recovering from interrupted transaction</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2091" /> + <source>Identifying project directory</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2133" /> + <source>Create .hgignore file</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2134" /> + <source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2235" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2209" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2191" /> + <source>Create changegroup</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2193" /> + <source>Mercurial Changegroup Files (*.hg)</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2210" /> + <source><p>The Mercurial changegroup file <b>{0}</b> already exists. Overwrite it?</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2249" /> + <source>Preview changegroup</source> + <translation type="unfinished" /> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2278" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2267" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2257" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1692" /> - <source>Apply changegroups</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1695" /> - <source>Pulling from a remote Mercurial repository</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1737" /> - <source>Pushing to a remote Mercurial repository</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1875" /> - <source>Marking as 'unresolved'</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1877" /> - <source>Marking as 'resolved'</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1899" /> - <source>Aborting uncommitted merge</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1922" /> - <source>Creating branch in the Mercurial repository</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1930" /> - <source>Created new branch <{0}>.</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1939" /> - <source>Showing current branch</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2026" /> - <source>Verifying the integrity of the Mercurial repository</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2039" /> - <source>Showing the combined configuration settings</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2050" /> - <source>Showing aliases for remote repositories</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2061" /> - <source>Recovering from interrupted transaction</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2072" /> - <source>Identifying project directory</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2114" /> - <source>Create .hgignore file</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2115" /> - <source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2216" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2190" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2172" /> - <source>Create changegroup</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2174" /> - <source>Mercurial Changegroup Files (*.hg)</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2191" /> - <source><p>The Mercurial changegroup file <b>{0}</b> already exists. Overwrite it?</p></source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2230" /> - <source>Preview changegroup</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2259" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2232" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2251" /> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2268" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2287" /> <source>Shall the working directory be updated?</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2300" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2319" /> <source>Bisect subcommand ({0}) invalid.</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2320" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2339" /> <source>Mercurial Bisect ({0})</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2343" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2362" /> <source>Removing files from the Mercurial repository only</source> <translation type="unfinished" /> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2406" /> <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2387" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2368" /> <source>Backing out changeset</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2369" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2388" /> <source>No revision given. Aborting...</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2403" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2398" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2422" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2417" /> <source>Rollback last transaction</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2399" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2418" /> <source>Are you sure you want to rollback the last transaction?</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2465" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2484" /> <source>Import Patch</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2513" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2532" /> <source>Export Patches</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2553" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2572" /> <source>Change Phase</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2607" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2626" /> <source>Copy Changesets</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2646" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2665" /> <source>Copy Changesets (Continue)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2656" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2675" /> <source>Copy Changesets (Stop)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2666" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2685" /> <source>Copy Changesets (Abort)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2689" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2708" /> <source>Create Unversioned Archive</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2703" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2722" /> <source>Delete All Backups</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2704" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2723" /> <source><p>Do you really want to delete all backup bundles stored in the backup area?<br/><b>{0}</b></p></source> <translation type="unfinished" /> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2812" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2792" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2781" /> + <source>Add Sub-repository</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2851" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2782" /> + <source><p>The sub-repositories file .hgsub could not be read.</p><p>Reason: {0}</p></source> + <translation type="unfinished" /> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2793" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2773" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2762" /> - <source>Add Sub-repository</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2832" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2763" /> - <source><p>The sub-repositories file .hgsub could not be read.</p><p>Reason: {0}</p></source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2774" /> <source><p>The sub-repositories file .hgsub already contains an entry <b>{0}</b>. Aborting...</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2850" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2794" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2869" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2813" /> <source><p>The sub-repositories file .hgsub could not be written to.</p><p>Reason: {0}</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2849" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2831" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2817" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2868" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2850" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2836" /> <source>Remove Sub-repositories</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2818" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2837" /> <source><p>The sub-repositories file .hgsub does not exist. Aborting...</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3066" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2929" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3085" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2948" /> <source>Mercurial Command Server</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2930" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2949" /> <source><p>The Mercurial Command Server could not be restarted.</p><p>Reason: {0}</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3067" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3086" /> <source><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3183" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3202" /> <source>Mercurial Bookmark</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3199" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3218" /> <source>Delete Bookmark</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3200" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3219" /> <source>Select the bookmark to be deleted:</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3210" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3229" /> <source>Delete Mercurial Bookmark</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3235" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3254" /> <source>Rename Mercurial Bookmark</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3272" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3291" /> <source>Move Mercurial Bookmark</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3345" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3364" /> <source>Pull Bookmark</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3346" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3365" /> <source>Select the bookmark to be pulled:</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3358" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3377" /> <source>Pulling bookmark from a remote Mercurial repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3384" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3403" /> <source>Push Bookmark</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3385" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3404" /> <source>Select the bookmark to be push:</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3400" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3419" /> <source>Pushing bookmark to a remote Mercurial repository</source> <translation type="unfinished" /> </message> @@ -35685,465 +35695,531 @@ <name>HgLogBrowserDialog</name> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="0" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="139" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="140" /> <source>Mercurial Log</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="141" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="142" /> <source>Mercurial Log (Incoming)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="143" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="144" /> <source>Mercurial Log (Outgoing)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="145" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="146" /> <source>Mercurial Full Log</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="157" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="158" /> <source>&Refresh</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="160" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="161" /> <source>Press to refresh the list of changesets</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="168" /> - <source>Find</source> - <translation type="unfinished" /> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="169" /> + <source>Find</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="170" /> <source>Filter</source> <translation type="unfinished" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="0" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="171" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="172" /> <source>Revision</source> <translation type="unfinished" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="0" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="172" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="173" /> <source>Author</source> <translation type="unfinished" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="0" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="173" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="174" /> <source>Message</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="174" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="175" /> <source>File</source> <translation type="unfinished" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="0" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="175" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="176" /> <source>Phase</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="196" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="197" /> <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>{4}<tr><td><b>Message</b></td><td>{5}</td></tr></table></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="206" /> - <source><tr><td><b>Parents</b></td><td>{0}</td></tr></source> - <translation type="unfinished" /> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="207" /> + <source><tr><td><b>Parents</b></td><td>{0}</td></tr></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="208" /> <source><tr><td><b>Children</b></td><td>{0}</td></tr></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="210" /> - <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> - <translation type="unfinished" /> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="211" /> + <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="212" /> <source><tr><td><b>Latest Tag</b></td><td>{0}</td></tr></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="214" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="215" /> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="226" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="227" /> <source>All</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="244" /> - <source>Added</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="245" /> - <source>Deleted</source> - <translation type="unfinished" /> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="246" /> + <source>Added</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="247" /> + <source>Deleted</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="248" /> <source>Modified</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="250" /> - <source>Draft</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="251" /> - <source>Public</source> - <translation type="unfinished" /> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="252" /> + <source>Draft</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="253" /> + <source>Public</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="254" /> <source>Secret</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="260" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="262" /> <source>Bookmarks</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2146" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="299" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="296" /> + <source>View</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2978" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="298" /> + <source>Select Branches</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="300" /> + <source>Select the branches to be shown from a list of all branches and refresh the display</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="306" /> + <source>Select Branches (active branches only)</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="309" /> + <source>Select the branches to be shown from a list of active branches and refresh the display</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="315" /> + <source>Select Branches (inactive branches only)</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="318" /> + <source>Select the branches to be shown from a list of inactive branches and refresh the display</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="324" /> + <source>Select Branches (closed branches only)</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="327" /> + <source>Select the branches to be shown from a list of closed branches and refresh the display</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2187" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="343" /> <source>Copy Changesets</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="303" /> - <source>Copy the selected changesets to the current branch</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="308" /> - <source>Merge with Changeset</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="312" /> - <source>Merge the working directory with the selected changeset</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="316" /> - <source>Change Phase</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="319" /> - <source>Change the phase of the selected revisions</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="322" /> - <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" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="330" /> - <source>Tag</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="332" /> - <source>Tag the selected revision</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="336" /> - <source>Close Heads</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="339" /> - <source>Close the selected heads</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2240" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2223" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="343" /> - <source>Switch</source> - <translation type="unfinished" /> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="347" /> - <source>Switch the working directory to the selected revision</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="354" /> - <source>Define Bookmark...</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="357" /> - <source>Bookmark the selected revision</source> + <source>Copy the selected changesets to the current branch</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="352" /> + <source>Merge with Changeset</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="356" /> + <source>Merge the working directory with the selected changeset</source> <translation type="unfinished" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="360" /> - <source>Move Bookmark...</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="364" /> - <source>Move bookmark to the selected revision</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2358" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1558" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="371" /> - <source>Pull Changes</source> + <source>Change Phase</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="363" /> + <source>Change the phase of the selected revisions</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="366" /> + <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" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="374" /> - <source>Pull changes from a remote repository</source> + <source>Tag</source> <translation type="unfinished" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="376" /> - <source>Pull Large Files</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="378" /> - <source>Pull large files for selected revisions</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="384" /> - <source>Push Selected Changes</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="388" /> - <source>Push changes of the selected changeset and its ancestors to a remote repository</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="395" /> - <source>Push All Changes</source> + <source>Tag the selected revision</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="380" /> + <source>Close Heads</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="383" /> + <source>Close the selected heads</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2281" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2264" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="387" /> + <source>Switch</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="391" /> + <source>Switch the working directory to the selected revision</source> <translation type="unfinished" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="398" /> - <source>Push all changes to a remote repository</source> + <source>Define Bookmark...</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="401" /> + <source>Bookmark the selected revision</source> <translation type="unfinished" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="404" /> - <source>Create Changegroup</source> + <source>Move Bookmark...</source> <translation type="unfinished" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="408" /> - <source>Create a changegroup file containing the selected changesets</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="411" /> - <source><b>Create Changegroup</b> -<p>This creates a changegroup file containing the selected revisions. If no revisions are selected, all changesets will be bundled. If one revision is selected, it will be interpreted as the base revision. Otherwise the lowest revision will be used as the base revision and all other revision will be bundled. If the dialog is showing outgoing changesets, all selected changesets will be bundled.</p></source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2497" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="424" /> - <source>Apply Changegroup</source> + <source>Move bookmark to the selected revision</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2399" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1599" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="415" /> + <source>Pull Changes</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="418" /> + <source>Pull changes from a remote repository</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="420" /> + <source>Pull Large Files</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="422" /> + <source>Pull large files for selected revisions</source> <translation type="unfinished" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="428" /> - <source>Apply the currently viewed changegroup file</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="435" /> - <source>Sign Revisions</source> + <source>Push Selected Changes</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="432" /> + <source>Push changes of the selected changeset and its ancestors to a remote repository</source> <translation type="unfinished" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="439" /> + <source>Push All Changes</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="442" /> + <source>Push all changes to a remote repository</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="448" /> + <source>Create Changegroup</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="452" /> + <source>Create a changegroup file containing the selected changesets</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="455" /> + <source><b>Create Changegroup</b> +<p>This creates a changegroup file containing the selected revisions. If no revisions are selected, all changesets will be bundled. If one revision is selected, it will be interpreted as the base revision. Otherwise the lowest revision will be used as the base revision and all other revision will be bundled. If the dialog is showing outgoing changesets, all selected changesets will be bundled.</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2538" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="468" /> + <source>Apply Changegroup</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="472" /> + <source>Apply the currently viewed changegroup file</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="479" /> + <source>Sign Revisions</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="483" /> <source>Add a signature for the selected revisions</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="443" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="487" /> <source>Verify Signatures</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="447" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="491" /> <source>Verify all signatures there may be for the selected revision</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2404" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="454" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2445" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="498" /> <source>Strip Changesets</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="457" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="501" /> <source>Strip changesets from a repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="462" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="506" /> <source>Select All Entries</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="465" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="509" /> <source>Deselect All Entries</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="910" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="886" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="863" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="837" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="949" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="925" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="902" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="876" /> <source>Mercurial Error</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1210" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1251" /> <source>{0} (large file)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1468" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1509" /> <source>Side-by-Side Diff to Parent {0}</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1479" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1520" /> <source><a href="sbsdiff:{0}_{1}">Side-by-Side Compare</a></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1637" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1556" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1678" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1597" /> <source>Pull Selected Changes</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2498" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2405" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2359" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2241" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2147" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2539" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2446" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2400" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2282" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2188" /> <source>The project should be reread. Do this now?</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2224" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2265" /> <source>Select bookmark to switch to (leave empty to use revision):</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2269" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2310" /> <source>Define Bookmark</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2270" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2311" /> <source>Enter bookmark name for changeset "{0}":</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2299" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2340" /> <source>Move Bookmark</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2300" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2341" /> <source>Select the bookmark to be moved to changeset "{0}":</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2637" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2678" /> <source>Find Commit</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2638" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2679" /> <source>'{0}' was not found.</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2685" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2726" /> <source>Generating differences ...</source> <translation type="unfinished" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="0" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2686" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2727" /> <source>Differences</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2697" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2738" /> <source>Differences to Parent {0}</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2713" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2754" /> <source>Diff to Parent {0}{1}</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2736" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2777" /> <source>There is no difference.</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2887" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2871" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2853" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2928" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2912" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2894" /> <source>Save Diff</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2855" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2896" /> <source>Patch Files (*.diff)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2872" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2913" /> <source><p>The patch file <b>{0}</b> already exists. Overwrite it?</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2888" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2929" /> <source><p>The patch file <b>{0}</b> could not be saved.<br>Reason: {1}</p></source> <translation type="unfinished" /> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2960" /> + <source>closed</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2961" /> + <source>inactive</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2970" /> + <source>{0} ({1})</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2979" /> + <source>Select the branches to be shown (none for 'All'):</source> + <translation type="unfinished" /> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="0" /> <source>Select action from menu</source> <translation type="unfinished" /> @@ -58345,22 +58421,22 @@ <translation type="unfinished" /> </message> <message> - <location filename="../PluginManager/PluginManager.py" line="1222" /> + <location filename="../PluginManager/PluginManager.py" line="1216" /> <source>Plugin Manager Error</source> <translation type="unfinished" /> </message> <message> - <location filename="../PluginManager/PluginManager.py" line="1223" /> + <location filename="../PluginManager/PluginManager.py" line="1217" /> <source><p>The plugin download directory <b>{0}</b> could not be created. Please configure it via the configuration dialog.</p><p>Reason: {1}</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../PluginManager/PluginManager.py" line="1311" /> + <location filename="../PluginManager/PluginManager.py" line="1305" /> <source>Error downloading file</source> <translation type="unfinished" /> </message> <message> - <location filename="../PluginManager/PluginManager.py" line="1312" /> + <location filename="../PluginManager/PluginManager.py" line="1306" /> <source><p>Could not download the requested file from {0}.</p><p>Error: {1}</p></source> <translation type="unfinished" /> </message> @@ -82842,7 +82918,7 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/ViewManagerPlugins/Tabview/Tabview.py" line="1502" /> + <location filename="../Plugins/ViewManagerPlugins/Tabview/Tabview.py" line="1500" /> <location filename="../Plugins/ViewManagerPlugins/Tabview/Tabview.py" line="1111" /> <location filename="../Plugins/ViewManagerPlugins/Tabview/Tabview.py" line="1056" /> <source>{0} (ro)</source> @@ -101395,38 +101471,38 @@ <context> <name>mercurial</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1274" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1278" /> <source><tr><td><b>Parent #{0}</b></td><td></td></tr> <tr><td><b>Changeset</b></td><td>{1}</td></tr></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1805" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1282" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1824" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1286" /> <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1811" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1288" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1830" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1292" /> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1818" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1295" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1837" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1299" /> <source><tr><td><b>Branches</b></td><td>{0}</td></tr></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1301" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1305" /> <source><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1320" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1324" /> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -101437,35 +101513,35 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1779" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1798" /> <source><tr><td><b>Head #{0}</b></td><td></td></tr> </source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1786" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1805" /> <source><tr><td><b>Parent #{0}</b></td><td></td></tr> </source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1793" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1812" /> <source><tr><td><b>Tip</b></td><td></td></tr> </source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1798" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1817" /> <source><tr><td><b>Changeset</b></td><td>{0}</td></tr></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1825" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1844" /> <source><tr><td><b>Parents</b></td><td>{0}</td></tr></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1831" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1850" /> <source><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr>
--- a/src/eric7/i18n/eric7_en.ts Mon Sep 25 12:09:23 2023 +0200 +++ b/src/eric7/i18n/eric7_en.ts Tue Sep 26 18:26:21 2023 +0200 @@ -18514,6 +18514,16 @@ <context> <name>EricListSelectionDialog</name> <message> + <location filename="../EricWidgets/EricListSelectionDialog.py" line="96" /> + <source>Deselect All</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../EricWidgets/EricListSelectionDialog.py" line="99" /> + <source>Select All</source> + <translation type="unfinished" /> + </message> + <message> <location filename="../EricWidgets/EricListSelectionDialog.ui" line="0" /> <source>Select from List</source> <translation type="unfinished" /> @@ -33254,334 +33264,334 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1377" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1381" /> <source>Copying {0}</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1616" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1604" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1595" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1635" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1623" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1614" /> <source>Mercurial Side-by-Side Difference</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1617" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1636" /> <source><p>The file <b>{0}</b> could not be read.</p></source> <translation type="unfinished" /> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2297" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2286" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2276" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1711" /> + <source>Apply changegroups</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1714" /> + <source>Pulling from a remote Mercurial repository</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1756" /> + <source>Pushing to a remote Mercurial repository</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1894" /> + <source>Marking as 'unresolved'</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1896" /> + <source>Marking as 'resolved'</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1918" /> + <source>Aborting uncommitted merge</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1941" /> + <source>Creating branch in the Mercurial repository</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1949" /> + <source>Created new branch <{0}>.</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1958" /> + <source>Showing current branch</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2045" /> + <source>Verifying the integrity of the Mercurial repository</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2058" /> + <source>Showing the combined configuration settings</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2069" /> + <source>Showing aliases for remote repositories</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2080" /> + <source>Recovering from interrupted transaction</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2091" /> + <source>Identifying project directory</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2133" /> + <source>Create .hgignore file</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2134" /> + <source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2235" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2209" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2191" /> + <source>Create changegroup</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2193" /> + <source>Mercurial Changegroup Files (*.hg)</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2210" /> + <source><p>The Mercurial changegroup file <b>{0}</b> already exists. Overwrite it?</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2249" /> + <source>Preview changegroup</source> + <translation type="unfinished" /> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2278" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2267" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2257" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1692" /> - <source>Apply changegroups</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1695" /> - <source>Pulling from a remote Mercurial repository</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1737" /> - <source>Pushing to a remote Mercurial repository</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1875" /> - <source>Marking as 'unresolved'</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1877" /> - <source>Marking as 'resolved'</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1899" /> - <source>Aborting uncommitted merge</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1922" /> - <source>Creating branch in the Mercurial repository</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1930" /> - <source>Created new branch <{0}>.</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1939" /> - <source>Showing current branch</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2026" /> - <source>Verifying the integrity of the Mercurial repository</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2039" /> - <source>Showing the combined configuration settings</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2050" /> - <source>Showing aliases for remote repositories</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2061" /> - <source>Recovering from interrupted transaction</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2072" /> - <source>Identifying project directory</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2114" /> - <source>Create .hgignore file</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2115" /> - <source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2216" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2190" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2172" /> - <source>Create changegroup</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2174" /> - <source>Mercurial Changegroup Files (*.hg)</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2191" /> - <source><p>The Mercurial changegroup file <b>{0}</b> already exists. Overwrite it?</p></source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2230" /> - <source>Preview changegroup</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2259" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2232" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2251" /> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2268" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2287" /> <source>Shall the working directory be updated?</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2300" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2319" /> <source>Bisect subcommand ({0}) invalid.</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2320" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2339" /> <source>Mercurial Bisect ({0})</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2343" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2362" /> <source>Removing files from the Mercurial repository only</source> <translation type="unfinished" /> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2406" /> <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2387" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2368" /> <source>Backing out changeset</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2369" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2388" /> <source>No revision given. Aborting...</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2403" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2398" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2422" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2417" /> <source>Rollback last transaction</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2399" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2418" /> <source>Are you sure you want to rollback the last transaction?</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2465" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2484" /> <source>Import Patch</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2513" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2532" /> <source>Export Patches</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2553" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2572" /> <source>Change Phase</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2607" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2626" /> <source>Copy Changesets</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2646" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2665" /> <source>Copy Changesets (Continue)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2656" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2675" /> <source>Copy Changesets (Stop)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2666" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2685" /> <source>Copy Changesets (Abort)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2689" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2708" /> <source>Create Unversioned Archive</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2703" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2722" /> <source>Delete All Backups</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2704" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2723" /> <source><p>Do you really want to delete all backup bundles stored in the backup area?<br/><b>{0}</b></p></source> <translation type="unfinished" /> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2812" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2792" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2781" /> + <source>Add Sub-repository</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2851" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2782" /> + <source><p>The sub-repositories file .hgsub could not be read.</p><p>Reason: {0}</p></source> + <translation type="unfinished" /> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2793" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2773" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2762" /> - <source>Add Sub-repository</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2832" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2763" /> - <source><p>The sub-repositories file .hgsub could not be read.</p><p>Reason: {0}</p></source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2774" /> <source><p>The sub-repositories file .hgsub already contains an entry <b>{0}</b>. Aborting...</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2850" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2794" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2869" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2813" /> <source><p>The sub-repositories file .hgsub could not be written to.</p><p>Reason: {0}</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2849" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2831" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2817" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2868" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2850" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2836" /> <source>Remove Sub-repositories</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2818" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2837" /> <source><p>The sub-repositories file .hgsub does not exist. Aborting...</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3066" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2929" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3085" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2948" /> <source>Mercurial Command Server</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2930" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2949" /> <source><p>The Mercurial Command Server could not be restarted.</p><p>Reason: {0}</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3067" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3086" /> <source><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3183" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3202" /> <source>Mercurial Bookmark</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3199" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3218" /> <source>Delete Bookmark</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3200" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3219" /> <source>Select the bookmark to be deleted:</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3210" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3229" /> <source>Delete Mercurial Bookmark</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3235" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3254" /> <source>Rename Mercurial Bookmark</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3272" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3291" /> <source>Move Mercurial Bookmark</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3345" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3364" /> <source>Pull Bookmark</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3346" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3365" /> <source>Select the bookmark to be pulled:</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3358" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3377" /> <source>Pulling bookmark from a remote Mercurial repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3384" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3403" /> <source>Push Bookmark</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3385" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3404" /> <source>Select the bookmark to be push:</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3400" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3419" /> <source>Pushing bookmark to a remote Mercurial repository</source> <translation type="unfinished" /> </message> @@ -35709,465 +35719,531 @@ <name>HgLogBrowserDialog</name> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="0" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="139" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="140" /> <source>Mercurial Log</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="141" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="142" /> <source>Mercurial Log (Incoming)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="143" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="144" /> <source>Mercurial Log (Outgoing)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="145" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="146" /> <source>Mercurial Full Log</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="157" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="158" /> <source>&Refresh</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="160" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="161" /> <source>Press to refresh the list of changesets</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="168" /> - <source>Find</source> - <translation type="unfinished" /> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="169" /> + <source>Find</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="170" /> <source>Filter</source> <translation type="unfinished" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="0" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="171" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="172" /> <source>Revision</source> <translation type="unfinished" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="0" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="172" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="173" /> <source>Author</source> <translation type="unfinished" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="0" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="173" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="174" /> <source>Message</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="174" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="175" /> <source>File</source> <translation type="unfinished" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="0" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="175" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="176" /> <source>Phase</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="196" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="197" /> <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>{4}<tr><td><b>Message</b></td><td>{5}</td></tr></table></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="206" /> - <source><tr><td><b>Parents</b></td><td>{0}</td></tr></source> - <translation type="unfinished" /> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="207" /> + <source><tr><td><b>Parents</b></td><td>{0}</td></tr></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="208" /> <source><tr><td><b>Children</b></td><td>{0}</td></tr></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="210" /> - <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> - <translation type="unfinished" /> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="211" /> + <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="212" /> <source><tr><td><b>Latest Tag</b></td><td>{0}</td></tr></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="214" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="215" /> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="226" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="227" /> <source>All</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="244" /> - <source>Added</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="245" /> - <source>Deleted</source> - <translation type="unfinished" /> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="246" /> + <source>Added</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="247" /> + <source>Deleted</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="248" /> <source>Modified</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="250" /> - <source>Draft</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="251" /> - <source>Public</source> - <translation type="unfinished" /> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="252" /> + <source>Draft</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="253" /> + <source>Public</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="254" /> <source>Secret</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="260" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="262" /> <source>Bookmarks</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2146" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="299" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="296" /> + <source>View</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2978" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="298" /> + <source>Select Branches</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="300" /> + <source>Select the branches to be shown from a list of all branches and refresh the display</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="306" /> + <source>Select Branches (active branches only)</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="309" /> + <source>Select the branches to be shown from a list of active branches and refresh the display</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="315" /> + <source>Select Branches (inactive branches only)</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="318" /> + <source>Select the branches to be shown from a list of inactive branches and refresh the display</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="324" /> + <source>Select Branches (closed branches only)</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="327" /> + <source>Select the branches to be shown from a list of closed branches and refresh the display</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2187" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="343" /> <source>Copy Changesets</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="303" /> - <source>Copy the selected changesets to the current branch</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="308" /> - <source>Merge with Changeset</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="312" /> - <source>Merge the working directory with the selected changeset</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="316" /> - <source>Change Phase</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="319" /> - <source>Change the phase of the selected revisions</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="322" /> - <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" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="330" /> - <source>Tag</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="332" /> - <source>Tag the selected revision</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="336" /> - <source>Close Heads</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="339" /> - <source>Close the selected heads</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2240" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2223" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="343" /> - <source>Switch</source> - <translation type="unfinished" /> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="347" /> - <source>Switch the working directory to the selected revision</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="354" /> - <source>Define Bookmark...</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="357" /> - <source>Bookmark the selected revision</source> + <source>Copy the selected changesets to the current branch</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="352" /> + <source>Merge with Changeset</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="356" /> + <source>Merge the working directory with the selected changeset</source> <translation type="unfinished" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="360" /> - <source>Move Bookmark...</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="364" /> - <source>Move bookmark to the selected revision</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2358" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1558" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="371" /> - <source>Pull Changes</source> + <source>Change Phase</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="363" /> + <source>Change the phase of the selected revisions</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="366" /> + <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" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="374" /> - <source>Pull changes from a remote repository</source> + <source>Tag</source> <translation type="unfinished" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="376" /> - <source>Pull Large Files</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="378" /> - <source>Pull large files for selected revisions</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="384" /> - <source>Push Selected Changes</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="388" /> - <source>Push changes of the selected changeset and its ancestors to a remote repository</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="395" /> - <source>Push All Changes</source> + <source>Tag the selected revision</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="380" /> + <source>Close Heads</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="383" /> + <source>Close the selected heads</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2281" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2264" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="387" /> + <source>Switch</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="391" /> + <source>Switch the working directory to the selected revision</source> <translation type="unfinished" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="398" /> - <source>Push all changes to a remote repository</source> + <source>Define Bookmark...</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="401" /> + <source>Bookmark the selected revision</source> <translation type="unfinished" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="404" /> - <source>Create Changegroup</source> + <source>Move Bookmark...</source> <translation type="unfinished" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="408" /> - <source>Create a changegroup file containing the selected changesets</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="411" /> - <source><b>Create Changegroup</b> -<p>This creates a changegroup file containing the selected revisions. If no revisions are selected, all changesets will be bundled. If one revision is selected, it will be interpreted as the base revision. Otherwise the lowest revision will be used as the base revision and all other revision will be bundled. If the dialog is showing outgoing changesets, all selected changesets will be bundled.</p></source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2497" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="424" /> - <source>Apply Changegroup</source> + <source>Move bookmark to the selected revision</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2399" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1599" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="415" /> + <source>Pull Changes</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="418" /> + <source>Pull changes from a remote repository</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="420" /> + <source>Pull Large Files</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="422" /> + <source>Pull large files for selected revisions</source> <translation type="unfinished" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="428" /> - <source>Apply the currently viewed changegroup file</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="435" /> - <source>Sign Revisions</source> + <source>Push Selected Changes</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="432" /> + <source>Push changes of the selected changeset and its ancestors to a remote repository</source> <translation type="unfinished" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="439" /> + <source>Push All Changes</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="442" /> + <source>Push all changes to a remote repository</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="448" /> + <source>Create Changegroup</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="452" /> + <source>Create a changegroup file containing the selected changesets</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="455" /> + <source><b>Create Changegroup</b> +<p>This creates a changegroup file containing the selected revisions. If no revisions are selected, all changesets will be bundled. If one revision is selected, it will be interpreted as the base revision. Otherwise the lowest revision will be used as the base revision and all other revision will be bundled. If the dialog is showing outgoing changesets, all selected changesets will be bundled.</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2538" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="468" /> + <source>Apply Changegroup</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="472" /> + <source>Apply the currently viewed changegroup file</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="479" /> + <source>Sign Revisions</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="483" /> <source>Add a signature for the selected revisions</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="443" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="487" /> <source>Verify Signatures</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="447" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="491" /> <source>Verify all signatures there may be for the selected revision</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2404" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="454" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2445" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="498" /> <source>Strip Changesets</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="457" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="501" /> <source>Strip changesets from a repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="462" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="506" /> <source>Select All Entries</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="465" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="509" /> <source>Deselect All Entries</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="910" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="886" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="863" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="837" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="949" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="925" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="902" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="876" /> <source>Mercurial Error</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1210" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1251" /> <source>{0} (large file)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1468" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1509" /> <source>Side-by-Side Diff to Parent {0}</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1479" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1520" /> <source><a href="sbsdiff:{0}_{1}">Side-by-Side Compare</a></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1637" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1556" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1678" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1597" /> <source>Pull Selected Changes</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2498" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2405" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2359" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2241" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2147" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2539" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2446" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2400" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2282" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2188" /> <source>The project should be reread. Do this now?</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2224" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2265" /> <source>Select bookmark to switch to (leave empty to use revision):</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2269" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2310" /> <source>Define Bookmark</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2270" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2311" /> <source>Enter bookmark name for changeset "{0}":</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2299" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2340" /> <source>Move Bookmark</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2300" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2341" /> <source>Select the bookmark to be moved to changeset "{0}":</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2637" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2678" /> <source>Find Commit</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2638" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2679" /> <source>'{0}' was not found.</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2685" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2726" /> <source>Generating differences ...</source> <translation type="unfinished" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="0" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2686" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2727" /> <source>Differences</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2697" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2738" /> <source>Differences to Parent {0}</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2713" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2754" /> <source>Diff to Parent {0}{1}</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2736" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2777" /> <source>There is no difference.</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2887" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2871" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2853" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2928" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2912" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2894" /> <source>Save Diff</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2855" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2896" /> <source>Patch Files (*.diff)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2872" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2913" /> <source><p>The patch file <b>{0}</b> already exists. Overwrite it?</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2888" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2929" /> <source><p>The patch file <b>{0}</b> could not be saved.<br>Reason: {1}</p></source> <translation type="unfinished" /> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2960" /> + <source>closed</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2961" /> + <source>inactive</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2970" /> + <source>{0} ({1})</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2979" /> + <source>Select the branches to be shown (none for 'All'):</source> + <translation type="unfinished" /> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="0" /> <source>Select action from menu</source> <translation type="unfinished" /> @@ -58397,22 +58473,22 @@ <translation type="unfinished" /> </message> <message> - <location filename="../PluginManager/PluginManager.py" line="1222" /> + <location filename="../PluginManager/PluginManager.py" line="1216" /> <source>Plugin Manager Error</source> <translation type="unfinished" /> </message> <message> - <location filename="../PluginManager/PluginManager.py" line="1223" /> + <location filename="../PluginManager/PluginManager.py" line="1217" /> <source><p>The plugin download directory <b>{0}</b> could not be created. Please configure it via the configuration dialog.</p><p>Reason: {1}</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../PluginManager/PluginManager.py" line="1311" /> + <location filename="../PluginManager/PluginManager.py" line="1305" /> <source>Error downloading file</source> <translation type="unfinished" /> </message> <message> - <location filename="../PluginManager/PluginManager.py" line="1312" /> + <location filename="../PluginManager/PluginManager.py" line="1306" /> <source><p>Could not download the requested file from {0}.</p><p>Error: {1}</p></source> <translation type="unfinished" /> </message> @@ -82897,7 +82973,7 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/ViewManagerPlugins/Tabview/Tabview.py" line="1502" /> + <location filename="../Plugins/ViewManagerPlugins/Tabview/Tabview.py" line="1500" /> <location filename="../Plugins/ViewManagerPlugins/Tabview/Tabview.py" line="1111" /> <location filename="../Plugins/ViewManagerPlugins/Tabview/Tabview.py" line="1056" /> <source>{0} (ro)</source> @@ -101458,38 +101534,38 @@ <context> <name>mercurial</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1274" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1278" /> <source><tr><td><b>Parent #{0}</b></td><td></td></tr> <tr><td><b>Changeset</b></td><td>{1}</td></tr></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1805" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1282" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1824" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1286" /> <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1811" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1288" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1830" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1292" /> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1818" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1295" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1837" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1299" /> <source><tr><td><b>Branches</b></td><td>{0}</td></tr></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1301" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1305" /> <source><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1320" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1324" /> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -101500,35 +101576,35 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1779" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1798" /> <source><tr><td><b>Head #{0}</b></td><td></td></tr> </source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1786" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1805" /> <source><tr><td><b>Parent #{0}</b></td><td></td></tr> </source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1793" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1812" /> <source><tr><td><b>Tip</b></td><td></td></tr> </source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1798" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1817" /> <source><tr><td><b>Changeset</b></td><td>{0}</td></tr></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1825" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1844" /> <source><tr><td><b>Parents</b></td><td>{0}</td></tr></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1831" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1850" /> <source><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr>
--- a/src/eric7/i18n/eric7_es.ts Mon Sep 25 12:09:23 2023 +0200 +++ b/src/eric7/i18n/eric7_es.ts Tue Sep 26 18:26:21 2023 +0200 @@ -18619,6 +18619,16 @@ <context> <name>EricListSelectionDialog</name> <message> + <location filename="../EricWidgets/EricListSelectionDialog.py" line="96" /> + <source>Deselect All</source> + <translation type="unfinished">Deseleccionar Todo</translation> + </message> + <message> + <location filename="../EricWidgets/EricListSelectionDialog.py" line="99" /> + <source>Select All</source> + <translation type="unfinished">Seleccionar todo</translation> + </message> + <message> <location filename="../EricWidgets/EricListSelectionDialog.ui" line="0" /> <source>Select from List</source> <translation>Seleccionar de la Lista</translation> @@ -33406,334 +33416,334 @@ <translation>Comando de Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1377" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1381" /> <source>Copying {0}</source> <translation>Copiando {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1616" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1604" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1595" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1635" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1623" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1614" /> <source>Mercurial Side-by-Side Difference</source> <translation>Diferencia Lado a Lado Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1617" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1636" /> <source><p>The file <b>{0}</b> could not be read.</p></source> <translation><p>El archivo <b>{0}</b> no se ha podido leer.</p></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2297" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2286" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2276" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1711" /> + <source>Apply changegroups</source> + <translation>Aplicar changegroups</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1714" /> + <source>Pulling from a remote Mercurial repository</source> + <translation>Haciendo pull de un repositorio remoto Mercurial</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1756" /> + <source>Pushing to a remote Mercurial repository</source> + <translation>Haciendo push a un repositorio remoto Mercurial</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1894" /> + <source>Marking as 'unresolved'</source> + <translation>Marcando como 'unresolved'</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1896" /> + <source>Marking as 'resolved'</source> + <translation>Marcando como 'resolved'</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1918" /> + <source>Aborting uncommitted merge</source> + <translation>Abortando merge sin commit</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1941" /> + <source>Creating branch in the Mercurial repository</source> + <translation>Creando branch en el repositorio Mercurial</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1949" /> + <source>Created new branch <{0}>.</source> + <translation>Creada nueva branch <{0}>.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1958" /> + <source>Showing current branch</source> + <translation>Mostrando la branch actual</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2045" /> + <source>Verifying the integrity of the Mercurial repository</source> + <translation>Verificando la integridad del repositorio Mercurial</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2058" /> + <source>Showing the combined configuration settings</source> + <translation>Mostrando los ajustes de configuración combinados</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2069" /> + <source>Showing aliases for remote repositories</source> + <translation>Mostrando alias para repositorios remotos</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2080" /> + <source>Recovering from interrupted transaction</source> + <translation>Recuperando de transacción interrumpida</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2091" /> + <source>Identifying project directory</source> + <translation>Identificando directorio de proyecto</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2133" /> + <source>Create .hgignore file</source> + <translation>Crear archivo .hgignore</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2134" /> + <source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source> + <translation><p>El archivo <b>{0}</b> ya existe. ¿Desea sobreescribirlo?</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2235" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2209" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2191" /> + <source>Create changegroup</source> + <translation>Crear changegroup</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2193" /> + <source>Mercurial Changegroup Files (*.hg)</source> + <translation>Archivos Changegroup de Mercurial (*.hg)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2210" /> + <source><p>The Mercurial changegroup file <b>{0}</b> already exists. Overwrite it?</p></source> + <translation><p>El archivo changegroup de Mercurial <b>{0}</b> ya existe. ¿Desea sobreescribirlo?</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2249" /> + <source>Preview changegroup</source> + <translation>Previsualizar changegroup</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2278" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2267" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2257" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1692" /> - <source>Apply changegroups</source> - <translation>Aplicar changegroups</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1695" /> - <source>Pulling from a remote Mercurial repository</source> - <translation>Haciendo pull de un repositorio remoto Mercurial</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1737" /> - <source>Pushing to a remote Mercurial repository</source> - <translation>Haciendo push a un repositorio remoto Mercurial</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1875" /> - <source>Marking as 'unresolved'</source> - <translation>Marcando como 'unresolved'</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1877" /> - <source>Marking as 'resolved'</source> - <translation>Marcando como 'resolved'</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1899" /> - <source>Aborting uncommitted merge</source> - <translation>Abortando merge sin commit</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1922" /> - <source>Creating branch in the Mercurial repository</source> - <translation>Creando branch en el repositorio Mercurial</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1930" /> - <source>Created new branch <{0}>.</source> - <translation>Creada nueva branch <{0}>.</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1939" /> - <source>Showing current branch</source> - <translation>Mostrando la branch actual</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2026" /> - <source>Verifying the integrity of the Mercurial repository</source> - <translation>Verificando la integridad del repositorio Mercurial</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2039" /> - <source>Showing the combined configuration settings</source> - <translation>Mostrando los ajustes de configuración combinados</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2050" /> - <source>Showing aliases for remote repositories</source> - <translation>Mostrando alias para repositorios remotos</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2061" /> - <source>Recovering from interrupted transaction</source> - <translation>Recuperando de transacción interrumpida</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2072" /> - <source>Identifying project directory</source> - <translation>Identificando directorio de proyecto</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2114" /> - <source>Create .hgignore file</source> - <translation>Crear archivo .hgignore</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2115" /> - <source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source> - <translation><p>El archivo <b>{0}</b> ya existe. ¿Desea sobreescribirlo?</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2216" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2190" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2172" /> - <source>Create changegroup</source> - <translation>Crear changegroup</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2174" /> - <source>Mercurial Changegroup Files (*.hg)</source> - <translation>Archivos Changegroup de Mercurial (*.hg)</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2191" /> - <source><p>The Mercurial changegroup file <b>{0}</b> already exists. Overwrite it?</p></source> - <translation><p>El archivo changegroup de Mercurial <b>{0}</b> ya existe. ¿Desea sobreescribirlo?</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2230" /> - <source>Preview changegroup</source> - <translation>Previsualizar changegroup</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2259" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2232" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2251" /> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation>Archivos Changegroup de Mercurial (*.hg);;Todos los Archivos (*)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2268" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2287" /> <source>Shall the working directory be updated?</source> <translation>¿Debe ser actualizado el directorio de trabajo?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2300" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2319" /> <source>Bisect subcommand ({0}) invalid.</source> <translation>Subcomando bisect ({0}) inválido.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2320" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2339" /> <source>Mercurial Bisect ({0})</source> <translation>Mercurial Bisect ({0})</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2343" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2362" /> <source>Removing files from the Mercurial repository only</source> <translation>Eliminando archivos unicamente del repositorio Mercurial</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2406" /> <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2387" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2368" /> <source>Backing out changeset</source> <translation>Haciendo respaldo de changeset</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2369" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2388" /> <source>No revision given. Aborting...</source> <translation>No se ha proporcionado revisión. Abortando...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2403" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2398" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2422" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2417" /> <source>Rollback last transaction</source> <translation>Hacer Rollback de la última transacción</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2399" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2418" /> <source>Are you sure you want to rollback the last transaction?</source> <translation>¿Está seguro de que quiere aplicar un rollback a la última transacción?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2465" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2484" /> <source>Import Patch</source> <translation>Importar Patch</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2513" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2532" /> <source>Export Patches</source> <translation>Exportar Patches</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2553" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2572" /> <source>Change Phase</source> <translation>Cambiar Fase</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2607" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2626" /> <source>Copy Changesets</source> <translation>Copiar Changesets</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2646" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2665" /> <source>Copy Changesets (Continue)</source> <translation>Copiar Changesets (Continuar)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2656" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2675" /> <source>Copy Changesets (Stop)</source> <translation>Copiar Changesets (Stop)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2666" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2685" /> <source>Copy Changesets (Abort)</source> <translation>Copiar Changesets (Abortar)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2689" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2708" /> <source>Create Unversioned Archive</source> <translation>Crear Archivo Sin Versionar</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2703" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2722" /> <source>Delete All Backups</source> <translation>Borrar todas las Copias de Seguridad</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2704" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2723" /> <source><p>Do you really want to delete all backup bundles stored in the backup area?<br/><b>{0}</b></p></source> <translation><p>¿Desea realmente borrar todos los bundles de copia de seguridad almacenados en el área de copias de seguridad?<br/><b>{0}</b></p></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2812" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2792" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2781" /> + <source>Add Sub-repository</source> + <translation>Añadir Sub-repositorio</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2851" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2782" /> + <source><p>The sub-repositories file .hgsub could not be read.</p><p>Reason: {0}</p></source> + <translation><p>No se ha podido leer el archivo .hgsub de sub-repositorios.</p><p>Razón: {0}</p></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2793" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2773" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2762" /> - <source>Add Sub-repository</source> - <translation>Añadir Sub-repositorio</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2832" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2763" /> - <source><p>The sub-repositories file .hgsub could not be read.</p><p>Reason: {0}</p></source> - <translation><p>No se ha podido leer el archivo .hgsub de sub-repositorios.</p><p>Razón: {0}</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2774" /> <source><p>The sub-repositories file .hgsub already contains an entry <b>{0}</b>. Aborting...</p></source> <translation><p>El archivo .hgsub de sub-repositorios ya contiene una entrada.</p><p>Abortando...</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2850" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2794" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2869" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2813" /> <source><p>The sub-repositories file .hgsub could not be written to.</p><p>Reason: {0}</p></source> <translation><p>No se ha podido escribir al archivo .hgsub de sub-repositorios.</p><p>Razón: {0}</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2849" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2831" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2817" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2868" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2850" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2836" /> <source>Remove Sub-repositories</source> <translation>Eliminar Sub-repositorios</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2818" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2837" /> <source><p>The sub-repositories file .hgsub does not exist. Aborting...</p></source> <translation><p>El archivo de subrepositorios .hgsub no existe. Abortando...</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3066" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2929" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3085" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2948" /> <source>Mercurial Command Server</source> <translation>Servidor de Comandos de Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2930" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2949" /> <source><p>The Mercurial Command Server could not be restarted.</p><p>Reason: {0}</p></source> <translation><p>El Servidor de Comandos de Mercurial no ha podido reiniciarse.</p><p>Razón: {0}</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3067" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3086" /> <source><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></source> <translation><p>El Servidor de Comandos de Mercurial no ha podido iniciarse.</p><p>Razón: {0}</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3183" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3202" /> <source>Mercurial Bookmark</source> <translation>Marcador de Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3199" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3218" /> <source>Delete Bookmark</source> <translation>Borrar Marcador</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3200" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3219" /> <source>Select the bookmark to be deleted:</source> <translation>Seleccionar el marcador a borrar:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3210" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3229" /> <source>Delete Mercurial Bookmark</source> <translation>Borrar Marcador de Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3235" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3254" /> <source>Rename Mercurial Bookmark</source> <translation>Renombrar Marcador de Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3272" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3291" /> <source>Move Mercurial Bookmark</source> <translation>Mover Marcador de Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3345" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3364" /> <source>Pull Bookmark</source> <translation>Pull de Marcador</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3346" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3365" /> <source>Select the bookmark to be pulled:</source> <translation>Seleccinar el marcador sobre el que hacer pull:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3358" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3377" /> <source>Pulling bookmark from a remote Mercurial repository</source> <translation>Haciendo pull de marcador desde un repositorio Mercurial remoto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3384" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3403" /> <source>Push Bookmark</source> <translation>Push de Marcador</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3385" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3404" /> <source>Select the bookmark to be push:</source> <translation>Seleccinar el marcador sobre el que hacer push:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3400" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3419" /> <source>Pushing bookmark to a remote Mercurial repository</source> <translation>Haciendo push de marcador desde un repositorio Mercurial remoto</translation> </message> @@ -35885,467 +35895,533 @@ <name>HgLogBrowserDialog</name> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="0" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="139" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="140" /> <source>Mercurial Log</source> <translation>Registro de Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="141" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="142" /> <source>Mercurial Log (Incoming)</source> <translation>Mercurial Log (Entrante)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="143" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="144" /> <source>Mercurial Log (Outgoing)</source> <translation>Mercurial Log (Saliente)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="145" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="146" /> <source>Mercurial Full Log</source> <translation>Registro completo de Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="157" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="158" /> <source>&Refresh</source> <translation>Actualiza&r</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="160" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="161" /> <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="168" /> - <source>Find</source> - <translation>Buscar</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="169" /> + <source>Find</source> + <translation>Buscar</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="170" /> <source>Filter</source> <translation>Filtro</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="0" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="171" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="172" /> <source>Revision</source> <translation>Revisión</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="0" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="172" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="173" /> <source>Author</source> <translation>Autor</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="0" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="173" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="174" /> <source>Message</source> <translation>Mensaje</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="174" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="175" /> <source>File</source> <translation>Archivo</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="0" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="175" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="176" /> <source>Phase</source> <translation>Fase</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="196" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="197" /> <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>{4}<tr><td><b>Message</b></td><td>{5}</td></tr></table></source> <translation><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>{4}<tr><td><b>Mensaje</b></td><td>{5}</td></tr></table></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="206" /> - <source><tr><td><b>Parents</b></td><td>{0}</td></tr></source> - <translation><tr><td><b>Padres</b></td><td>{0}</td></tr></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="207" /> + <source><tr><td><b>Parents</b></td><td>{0}</td></tr></source> + <translation><tr><td><b>Padres</b></td><td>{0}</td></tr></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="208" /> <source><tr><td><b>Children</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Hijos</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="210" /> - <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="211" /> + <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="212" /> <source><tr><td><b>Latest Tag</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Último Tag</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="214" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="215" /> <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="226" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="227" /> <source>All</source> <translation>Todo</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="244" /> - <source>Added</source> - <translation>Añadido</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="245" /> - <source>Deleted</source> - <translation>Borrado</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="246" /> + <source>Added</source> + <translation>Añadido</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="247" /> + <source>Deleted</source> + <translation>Borrado</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="248" /> <source>Modified</source> <translation>Modificado</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="250" /> - <source>Draft</source> - <translation>Borrador</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="251" /> - <source>Public</source> - <translation>Público</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="252" /> + <source>Draft</source> + <translation>Borrador</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="253" /> + <source>Public</source> + <translation>Público</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="254" /> <source>Secret</source> <translation>Secreto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="260" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="262" /> <source>Bookmarks</source> <translation>Marcadores</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2146" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="299" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="296" /> + <source>View</source> + <translation type="unfinished">Ver</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2978" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="298" /> + <source>Select Branches</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="300" /> + <source>Select the branches to be shown from a list of all branches and refresh the display</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="306" /> + <source>Select Branches (active branches only)</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="309" /> + <source>Select the branches to be shown from a list of active branches and refresh the display</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="315" /> + <source>Select Branches (inactive branches only)</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="318" /> + <source>Select the branches to be shown from a list of inactive branches and refresh the display</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="324" /> + <source>Select Branches (closed branches only)</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="327" /> + <source>Select the branches to be shown from a list of closed branches and refresh the display</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2187" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="343" /> <source>Copy Changesets</source> <translation>Copiar Changesets</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="303" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="347" /> <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="308" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="352" /> <source>Merge with Changeset</source> <translation>Hacer merge con Chageset</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="312" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="356" /> <source>Merge the working directory with the selected changeset</source> <translation>Hacer merge del directorio de trabajo con el changeset seleccionado</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="316" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="360" /> <source>Change Phase</source> <translation>Cambiar Fase</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="319" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="363" /> <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="322" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="366" /> <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="330" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="374" /> <source>Tag</source> <translation>Aplicar Tag</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="332" /> - <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="336" /> - <source>Close Heads</source> - <translation>Cerrar Heads</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="339" /> - <source>Close the selected heads</source> - <translation>Cerrar las heads seleccionadas</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2240" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2223" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="343" /> - <source>Switch</source> - <translation>Hacer switch</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="347" /> - <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="354" /> - <source>Define Bookmark...</source> - <translation>Definir marcador...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="357" /> - <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="360" /> - <source>Move Bookmark...</source> - <translation>Mover Marcador...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="364" /> - <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="2358" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1558" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="371" /> - <source>Pull Changes</source> - <translation>Hacer Pull de Cambios</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="374" /> - <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="376" /> - <source>Pull Large Files</source> - <translation>Hacer pull de archivos grandes</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="378" /> - <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="384" /> - <source>Push Selected Changes</source> - <translation>Hacer Pull de Cambios Seleccionados</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="388" /> - <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="395" /> - <source>Push All Changes</source> - <translation>Hacer Push de Todos los Cambios</translation> + <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="380" /> + <source>Close Heads</source> + <translation>Cerrar Heads</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="383" /> + <source>Close the selected heads</source> + <translation>Cerrar las heads seleccionadas</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2281" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2264" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="387" /> + <source>Switch</source> + <translation>Hacer switch</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="391" /> + <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="398" /> - <source>Push all changes to a remote repository</source> - <translation>Hacer push de todos los cambios a un repositorio remoto</translation> + <source>Define Bookmark...</source> + <translation>Definir marcador...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="401" /> + <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="404" /> - <source>Create Changegroup</source> - <translation>Crear Changegroup</translation> + <source>Move Bookmark...</source> + <translation>Mover Marcador...</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="408" /> + <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="2399" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1599" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="415" /> + <source>Pull Changes</source> + <translation>Hacer Pull de Cambios</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="418" /> + <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="420" /> + <source>Pull Large Files</source> + <translation>Hacer pull de archivos grandes</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="422" /> + <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="428" /> + <source>Push Selected Changes</source> + <translation>Hacer Pull de Cambios Seleccionados</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="432" /> + <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="439" /> + <source>Push All Changes</source> + <translation>Hacer Push de Todos los Cambios</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="442" /> + <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="448" /> + <source>Create Changegroup</source> + <translation>Crear Changegroup</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="452" /> <source>Create a changegroup file containing the selected changesets</source> <translation>Crear un archivo de changegroup conteniendo los changesets seleccionados</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="411" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="455" /> <source><b>Create Changegroup</b> <p>This creates a changegroup file containing the selected revisions. If no revisions are selected, all changesets will be bundled. If one revision is selected, it will be interpreted as the base revision. Otherwise the lowest revision will be used as the base revision and all other revision will be bundled. If the dialog is showing outgoing changesets, all selected changesets will be bundled.</p></source> <translation><b>Crear Changegroup</b> <p>Esto crea un archivo de changegroup que contiene las revisiones seleccionadas. Si no se han seleccionado revisiones, se incluirán todos los changesets. Si se ha seleccionado una revisión, se tomará como revisión base. En cualquier otro lugar, la revisión más baja se usará como revisión base y todas las otras revisiones se incluirán en el archivo. Si el diálogo muestra changesets salientes, todos los changesets seleccionados se incluirán en el archivo.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2497" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="424" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2538" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="468" /> <source>Apply Changegroup</source> <translation>Aplicar Changegroup</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="428" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="472" /> <source>Apply the currently viewed changegroup file</source> <translation>Aplicar el archivo de changegroup mostrado actualmente</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="435" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="479" /> <source>Sign Revisions</source> <translation>Firmar Revisiones</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="439" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="483" /> <source>Add a signature for the selected revisions</source> <translation>Añadir una firma para las revisiones seleccionadas</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="443" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="487" /> <source>Verify Signatures</source> <translation>Verificar Firmas</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="447" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="491" /> <source>Verify all signatures there may be for the selected revision</source> <translation>Verificar todas las firmas que puede haber para la revisión seleccionada</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2404" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="454" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2445" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="498" /> <source>Strip Changesets</source> <translation>Hacer strip de Changesets</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="457" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="501" /> <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="462" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="506" /> <source>Select All Entries</source> <translation>Seleccionar Todas las Entradas</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="465" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="509" /> <source>Deselect All Entries</source> <translation>Quitar Selección de Todas las Entradas</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="910" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="886" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="863" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="837" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="949" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="925" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="902" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="876" /> <source>Mercurial Error</source> <translation>Error de Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1210" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1251" /> <source>{0} (large file)</source> <translation>{0} (archivo grande)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1468" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1509" /> <source>Side-by-Side Diff to Parent {0}</source> <translation>Mostrar Diff lado a lado con el Parent {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1479" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1520" /> <source><a href="sbsdiff:{0}_{1}">Side-by-Side Compare</a></source> <translation><a href="sbsdiff:{0}_{1}">Comparar lado a lado</a></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1637" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1556" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1678" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1597" /> <source>Pull Selected Changes</source> <translation>Hacer Pull de Cambios Seleccionados</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2498" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2405" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2359" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2241" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2147" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2539" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2446" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2400" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2282" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2188" /> <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.py" line="2224" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2265" /> <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="2269" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2310" /> <source>Define Bookmark</source> <translation>Definir Marcador</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2270" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2311" /> <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="2299" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2340" /> <source>Move Bookmark</source> <translation>Mover Marcador</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2300" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2341" /> <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="2637" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2678" /> <source>Find Commit</source> <translation>Buscar Commit</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2638" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2679" /> <source>'{0}' was not found.</source> <translation>'{0}' no se ha encontrado.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2685" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2726" /> <source>Generating differences ...</source> <translation>Generando diferencias ...</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="0" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2686" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2727" /> <source>Differences</source> <translation>Diferencias</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2697" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2738" /> <source>Differences to Parent {0}</source> <translation>Diferencias con el Parent {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2713" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2754" /> <source>Diff to Parent {0}{1}</source> <translation>Diff con el Parent {0}{1}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2736" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2777" /> <source>There is no difference.</source> <translation>No hay ninguna diferencia.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2887" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2871" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2853" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2928" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2912" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2894" /> <source>Save Diff</source> <translation>Guardar Diff</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2855" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2896" /> <source>Patch Files (*.diff)</source> <translation>Archivos de Parche (*.diff)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2872" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2913" /> <source><p>The patch file <b>{0}</b> already exists. Overwrite it?</p></source> <translation><p>El archivo de parche <b>{0}</b> ya existe. ¿Desea sobreescribirlo?</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2888" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2929" /> <source><p>The patch file <b>{0}</b> could not be saved.<br>Reason: {1}</p></source> <translation><p>El archivo de parche <b>{0}</b> no puede ser guardado.<br />Causa: {1}</p></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2960" /> + <source>closed</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2961" /> + <source>inactive</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2970" /> + <source>{0} ({1})</source> + <translation type="unfinished">{0} ({1})</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2979" /> + <source>Select the branches to be shown (none for 'All'):</source> + <translation type="unfinished" /> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="0" /> <source>Select action from menu</source> <translation>Seleccionar acción del menú</translation> @@ -58636,22 +58712,22 @@ <translation>Metodo de activación del plugin incompatible.</translation> </message> <message> - <location filename="../PluginManager/PluginManager.py" line="1222" /> + <location filename="../PluginManager/PluginManager.py" line="1216" /> <source>Plugin Manager Error</source> <translation>Error del Gestor de Plugins</translation> </message> <message> - <location filename="../PluginManager/PluginManager.py" line="1223" /> + <location filename="../PluginManager/PluginManager.py" line="1217" /> <source><p>The plugin download directory <b>{0}</b> could not be created. Please configure it via the configuration dialog.</p><p>Reason: {1}</p></source> <translation><p>El directorio de descaga del plugin <b>{0}</b> no ha podido ser creado. Por favor, configúrelo a través del diálogo de configuración.</p><p>Razón: {1}</p></translation> </message> <message> - <location filename="../PluginManager/PluginManager.py" line="1311" /> + <location filename="../PluginManager/PluginManager.py" line="1305" /> <source>Error downloading file</source> <translation>Error al descargar el fichero</translation> </message> <message> - <location filename="../PluginManager/PluginManager.py" line="1312" /> + <location filename="../PluginManager/PluginManager.py" line="1306" /> <source><p>Could not download the requested file from {0}.</p><p>Error: {1}</p></source> <translation><p>No se pudo descargar el archivo solicitado desde {0}.</p><p>Error: {1}</p></translation> </message> @@ -83403,7 +83479,7 @@ <translation>Sin título {0}</translation> </message> <message> - <location filename="../Plugins/ViewManagerPlugins/Tabview/Tabview.py" line="1502" /> + <location filename="../Plugins/ViewManagerPlugins/Tabview/Tabview.py" line="1500" /> <location filename="../Plugins/ViewManagerPlugins/Tabview/Tabview.py" line="1111" /> <location filename="../Plugins/ViewManagerPlugins/Tabview/Tabview.py" line="1056" /> <source>{0} (ro)</source> @@ -102075,32 +102151,32 @@ <context> <name>mercurial</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1274" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1278" /> <source><tr><td><b>Parent #{0}</b></td><td></td></tr> <tr><td><b>Changeset</b></td><td>{1}</td></tr></source> <translation><tr><td><b>Padre #{0}</b></td><td></td></tr> <tr><td><b>Changeset</b></td><td>{1}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1805" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1282" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1824" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1286" /> <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/hg.py" line="1811" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1288" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1830" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1292" /> <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/hg.py" line="1818" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1295" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1837" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1299" /> <source><tr><td><b>Branches</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Branches</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1301" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1305" /> <source><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr></source> @@ -102109,7 +102185,7 @@ <tr><td><b>Hora de commit</b></td><td>{2}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1320" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1324" /> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -102126,38 +102202,38 @@ </translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1779" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1798" /> <source><tr><td><b>Head #{0}</b></td><td></td></tr> </source> <translation><tr><td><b>Head #{0}</b></td><td></td></tr> </translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1786" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1805" /> <source><tr><td><b>Parent #{0}</b></td><td></td></tr> </source> <translation><tr><td><b>Parent #{0}</b></td><td></td></tr> </translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1793" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1812" /> <source><tr><td><b>Tip</b></td><td></td></tr> </source> <translation><tr><td><b>Pista</b></td><td></td></tr> </translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1798" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1817" /> <source><tr><td><b>Changeset</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Changeset</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1825" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1844" /> <source><tr><td><b>Parents</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Padres</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1831" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1850" /> <source><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr>
--- a/src/eric7/i18n/eric7_fr.ts Mon Sep 25 12:09:23 2023 +0200 +++ b/src/eric7/i18n/eric7_fr.ts Tue Sep 26 18:26:21 2023 +0200 @@ -18779,6 +18779,16 @@ <context> <name>EricListSelectionDialog</name> <message> + <location filename="../EricWidgets/EricListSelectionDialog.py" line="96" /> + <source>Deselect All</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../EricWidgets/EricListSelectionDialog.py" line="99" /> + <source>Select All</source> + <translation type="unfinished">Tout sélectionner</translation> + </message> + <message> <location filename="../EricWidgets/EricListSelectionDialog.ui" line="0" /> <source>Select from List</source> <translation type="unfinished">Sélectionner à partir de la liste</translation> @@ -33635,334 +33645,334 @@ <translation>Commande Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1377" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1381" /> <source>Copying {0}</source> <translation>Copie en cours {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1616" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1604" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1595" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1635" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1623" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1614" /> <source>Mercurial Side-by-Side Difference</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1617" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1636" /> <source><p>The file <b>{0}</b> could not be read.</p></source> <translation><p>Le fichier <b>{0}</b> n'a pas pu être lu.</p></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2297" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2286" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2276" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1711" /> + <source>Apply changegroups</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1714" /> + <source>Pulling from a remote Mercurial repository</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1756" /> + <source>Pushing to a remote Mercurial repository</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1894" /> + <source>Marking as 'unresolved'</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1896" /> + <source>Marking as 'resolved'</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1918" /> + <source>Aborting uncommitted merge</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1941" /> + <source>Creating branch in the Mercurial repository</source> + <translation>Création en cours d'une branche sur le dépot Mercurial</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1949" /> + <source>Created new branch <{0}>.</source> + <translation>Nouvelle branche créée <{0}>.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1958" /> + <source>Showing current branch</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2045" /> + <source>Verifying the integrity of the Mercurial repository</source> + <translation>Vérification en cours de l'intégrité du dépot Mercurial</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2058" /> + <source>Showing the combined configuration settings</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2069" /> + <source>Showing aliases for remote repositories</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2080" /> + <source>Recovering from interrupted transaction</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2091" /> + <source>Identifying project directory</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2133" /> + <source>Create .hgignore file</source> + <translation>Créer un fichier .hgignore</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2134" /> + <source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source> + <translation><p>Le fichier <b>{0}</b>existe déjà. L'écraser ?</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2235" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2209" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2191" /> + <source>Create changegroup</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2193" /> + <source>Mercurial Changegroup Files (*.hg)</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2210" /> + <source><p>The Mercurial changegroup file <b>{0}</b> already exists. Overwrite it?</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2249" /> + <source>Preview changegroup</source> + <translation type="unfinished" /> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2278" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2267" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2257" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1692" /> - <source>Apply changegroups</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1695" /> - <source>Pulling from a remote Mercurial repository</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1737" /> - <source>Pushing to a remote Mercurial repository</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1875" /> - <source>Marking as 'unresolved'</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1877" /> - <source>Marking as 'resolved'</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1899" /> - <source>Aborting uncommitted merge</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1922" /> - <source>Creating branch in the Mercurial repository</source> - <translation>Création en cours d'une branche sur le dépot Mercurial</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1930" /> - <source>Created new branch <{0}>.</source> - <translation>Nouvelle branche créée <{0}>.</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1939" /> - <source>Showing current branch</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2026" /> - <source>Verifying the integrity of the Mercurial repository</source> - <translation>Vérification en cours de l'intégrité du dépot Mercurial</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2039" /> - <source>Showing the combined configuration settings</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2050" /> - <source>Showing aliases for remote repositories</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2061" /> - <source>Recovering from interrupted transaction</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2072" /> - <source>Identifying project directory</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2114" /> - <source>Create .hgignore file</source> - <translation>Créer un fichier .hgignore</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2115" /> - <source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source> - <translation><p>Le fichier <b>{0}</b>existe déjà. L'écraser ?</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2216" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2190" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2172" /> - <source>Create changegroup</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2174" /> - <source>Mercurial Changegroup Files (*.hg)</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2191" /> - <source><p>The Mercurial changegroup file <b>{0}</b> already exists. Overwrite it?</p></source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2230" /> - <source>Preview changegroup</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2259" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2232" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2251" /> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2268" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2287" /> <source>Shall the working directory be updated?</source> <translation>Faut-il mettre à jour le répertoire de travail ?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2300" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2319" /> <source>Bisect subcommand ({0}) invalid.</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2320" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2339" /> <source>Mercurial Bisect ({0})</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2343" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2362" /> <source>Removing files from the Mercurial repository only</source> <translation>Supprimer les fichiers de dépot Mercurial uniquement</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2406" /> <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2387" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2368" /> <source>Backing out changeset</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2369" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2388" /> <source>No revision given. Aborting...</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2403" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2398" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2422" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2417" /> <source>Rollback last transaction</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2399" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2418" /> <source>Are you sure you want to rollback the last transaction?</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2465" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2484" /> <source>Import Patch</source> <translation>Importer un patch</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2513" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2532" /> <source>Export Patches</source> <translation>Exporter des patches</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2553" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2572" /> <source>Change Phase</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2607" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2626" /> <source>Copy Changesets</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2646" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2665" /> <source>Copy Changesets (Continue)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2656" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2675" /> <source>Copy Changesets (Stop)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2666" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2685" /> <source>Copy Changesets (Abort)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2689" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2708" /> <source>Create Unversioned Archive</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2703" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2722" /> <source>Delete All Backups</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2704" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2723" /> <source><p>Do you really want to delete all backup bundles stored in the backup area?<br/><b>{0}</b></p></source> <translation type="unfinished" /> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2812" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2792" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2781" /> + <source>Add Sub-repository</source> + <translation>Ajouter un sous-dépot</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2851" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2782" /> + <source><p>The sub-repositories file .hgsub could not be read.</p><p>Reason: {0}</p></source> + <translation type="unfinished" /> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2793" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2773" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2762" /> - <source>Add Sub-repository</source> - <translation>Ajouter un sous-dépot</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2832" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2763" /> - <source><p>The sub-repositories file .hgsub could not be read.</p><p>Reason: {0}</p></source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2774" /> <source><p>The sub-repositories file .hgsub already contains an entry <b>{0}</b>. Aborting...</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2850" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2794" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2869" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2813" /> <source><p>The sub-repositories file .hgsub could not be written to.</p><p>Reason: {0}</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2849" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2831" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2817" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2868" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2850" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2836" /> <source>Remove Sub-repositories</source> <translation>Supprimer un sous-répertoire</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2818" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2837" /> <source><p>The sub-repositories file .hgsub does not exist. Aborting...</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3066" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2929" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3085" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2948" /> <source>Mercurial Command Server</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2930" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2949" /> <source><p>The Mercurial Command Server could not be restarted.</p><p>Reason: {0}</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3067" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3086" /> <source><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3183" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3202" /> <source>Mercurial Bookmark</source> <translation>Signet Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3199" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3218" /> <source>Delete Bookmark</source> <translation>Supprimer le signet</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3200" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3219" /> <source>Select the bookmark to be deleted:</source> <translation>Selectionner le signet à supprimer :</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3210" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3229" /> <source>Delete Mercurial Bookmark</source> <translation>Supprimer le signet Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3235" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3254" /> <source>Rename Mercurial Bookmark</source> <translation>Renommer le signet Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3272" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3291" /> <source>Move Mercurial Bookmark</source> <translation>Déplacer le signet Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3345" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3364" /> <source>Pull Bookmark</source> <translation>Récuperer le signet</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3346" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3365" /> <source>Select the bookmark to be pulled:</source> <translation>Sélectionner le signet à récuperer:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3358" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3377" /> <source>Pulling bookmark from a remote Mercurial repository</source> <translation>Récupérant le signet d'un dépôt Mercurial distant</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3384" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3403" /> <source>Push Bookmark</source> <translation>Envoyer signet</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3385" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3404" /> <source>Select the bookmark to be push:</source> <translation>Sélectionner le signet à envoyer:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3400" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3419" /> <source>Pushing bookmark to a remote Mercurial repository</source> <translation>À envoyer le signet à un dépôt Mercurial distant</translation> </message> @@ -36095,465 +36105,531 @@ <name>HgLogBrowserDialog</name> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="0" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="139" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="140" /> <source>Mercurial Log</source> <translation>Historique Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="141" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="142" /> <source>Mercurial Log (Incoming)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="143" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="144" /> <source>Mercurial Log (Outgoing)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="145" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="146" /> <source>Mercurial Full Log</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="157" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="158" /> <source>&Refresh</source> <translation>&Rafraichir</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="160" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="161" /> <source>Press to refresh the list of changesets</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="168" /> - <source>Find</source> - <translation>Chercher</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="169" /> + <source>Find</source> + <translation>Chercher</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="170" /> <source>Filter</source> <translation>Filtrer</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="0" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="171" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="172" /> <source>Revision</source> <translation>Révision</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="0" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="172" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="173" /> <source>Author</source> <translation>Auteur</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="0" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="173" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="174" /> <source>Message</source> <translation>Message</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="174" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="175" /> <source>File</source> <translation>Fichier</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="0" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="175" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="176" /> <source>Phase</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="196" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="197" /> <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>{4}<tr><td><b>Message</b></td><td>{5}</td></tr></table></source> <translation><table><tr><td><b>Révision</b></td><td>{0}</td></tr><tr><td><b>Date</b></td><td>{1}</td></tr><tr><td><b>Auteur</b></td><td>{2}</td></tr><tr><td><b>Branche</b></td><td>{3}</td></tr>{4}<tr><td><b>Message</b></td><td>{5}</td></tr></table></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="206" /> - <source><tr><td><b>Parents</b></td><td>{0}</td></tr></source> - <translation><tr><td><b>Parents</b></td><td>{0}</td></tr></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="207" /> + <source><tr><td><b>Parents</b></td><td>{0}</td></tr></source> + <translation><tr><td><b>Parents</b></td><td>{0}</td></tr></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="208" /> <source><tr><td><b>Children</b></td><td>{0}</td></tr></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="210" /> - <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> - <translation><tr><td><b>Étiquettes</b></td><td>{0}</td></tr></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="211" /> + <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> + <translation><tr><td><b>Étiquettes</b></td><td>{0}</td></tr></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="212" /> <source><tr><td><b>Latest Tag</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Dernière étiquette</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="214" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="215" /> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Signets</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="226" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="227" /> <source>All</source> <translation>Tous</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="244" /> - <source>Added</source> - <translation>Ajouté</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="245" /> - <source>Deleted</source> - <translation>Supprimé</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="246" /> + <source>Added</source> + <translation>Ajouté</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="247" /> + <source>Deleted</source> + <translation>Supprimé</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="248" /> <source>Modified</source> <translation>Modifié</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="250" /> - <source>Draft</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="251" /> - <source>Public</source> - <translation type="unfinished" /> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="252" /> + <source>Draft</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="253" /> + <source>Public</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="254" /> <source>Secret</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="260" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="262" /> <source>Bookmarks</source> <translation>Signets</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2146" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="299" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="296" /> + <source>View</source> + <translation type="unfinished">Affichage</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2978" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="298" /> + <source>Select Branches</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="300" /> + <source>Select the branches to be shown from a list of all branches and refresh the display</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="306" /> + <source>Select Branches (active branches only)</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="309" /> + <source>Select the branches to be shown from a list of active branches and refresh the display</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="315" /> + <source>Select Branches (inactive branches only)</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="318" /> + <source>Select the branches to be shown from a list of inactive branches and refresh the display</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="324" /> + <source>Select Branches (closed branches only)</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="327" /> + <source>Select the branches to be shown from a list of closed branches and refresh the display</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2187" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="343" /> <source>Copy Changesets</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="303" /> - <source>Copy the selected changesets to the current branch</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="308" /> - <source>Merge with Changeset</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="312" /> - <source>Merge the working directory with the selected changeset</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="316" /> - <source>Change Phase</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="319" /> - <source>Change the phase of the selected revisions</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="322" /> - <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" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="330" /> - <source>Tag</source> - <translation>Étiquette</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="332" /> - <source>Tag the selected revision</source> - <translation>Étiquetter la révision sélectionnée</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="336" /> - <source>Close Heads</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="339" /> - <source>Close the selected heads</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2240" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2223" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="343" /> - <source>Switch</source> - <translation>Basculer de version</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="347" /> - <source>Switch the working directory to the selected revision</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="354" /> - <source>Define Bookmark...</source> - <translation>Définir un signet...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="357" /> - <source>Bookmark the selected revision</source> + <source>Copy the selected changesets to the current branch</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="352" /> + <source>Merge with Changeset</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="356" /> + <source>Merge the working directory with the selected changeset</source> <translation type="unfinished" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="360" /> - <source>Move Bookmark...</source> - <translation>Déplacer le signet...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="364" /> - <source>Move bookmark to the selected revision</source> - <translation>Déplacer le signet vers la révision sélectionnée</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2358" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1558" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="371" /> - <source>Pull Changes</source> + <source>Change Phase</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="363" /> + <source>Change the phase of the selected revisions</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="366" /> + <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" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="374" /> - <source>Pull changes from a remote repository</source> - <translation type="unfinished" /> + <source>Tag</source> + <translation>Étiquette</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="376" /> - <source>Pull Large Files</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="378" /> - <source>Pull large files for selected revisions</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="384" /> - <source>Push Selected Changes</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="388" /> - <source>Push changes of the selected changeset and its ancestors to a remote repository</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="395" /> - <source>Push All Changes</source> + <source>Tag the selected revision</source> + <translation>Étiquetter la révision sélectionnée</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="380" /> + <source>Close Heads</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="383" /> + <source>Close the selected heads</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2281" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2264" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="387" /> + <source>Switch</source> + <translation>Basculer de version</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="391" /> + <source>Switch the working directory to the selected revision</source> <translation type="unfinished" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="398" /> - <source>Push all changes to a remote repository</source> + <source>Define Bookmark...</source> + <translation>Définir un signet...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="401" /> + <source>Bookmark the selected revision</source> <translation type="unfinished" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="404" /> - <source>Create Changegroup</source> - <translation type="unfinished" /> + <source>Move Bookmark...</source> + <translation>Déplacer le signet...</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="408" /> - <source>Create a changegroup file containing the selected changesets</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="411" /> - <source><b>Create Changegroup</b> -<p>This creates a changegroup file containing the selected revisions. If no revisions are selected, all changesets will be bundled. If one revision is selected, it will be interpreted as the base revision. Otherwise the lowest revision will be used as the base revision and all other revision will be bundled. If the dialog is showing outgoing changesets, all selected changesets will be bundled.</p></source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2497" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="424" /> - <source>Apply Changegroup</source> + <source>Move bookmark to the selected revision</source> + <translation>Déplacer le signet vers la révision sélectionnée</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2399" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1599" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="415" /> + <source>Pull Changes</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="418" /> + <source>Pull changes from a remote repository</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="420" /> + <source>Pull Large Files</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="422" /> + <source>Pull large files for selected revisions</source> <translation type="unfinished" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="428" /> - <source>Apply the currently viewed changegroup file</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="435" /> - <source>Sign Revisions</source> + <source>Push Selected Changes</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="432" /> + <source>Push changes of the selected changeset and its ancestors to a remote repository</source> <translation type="unfinished" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="439" /> + <source>Push All Changes</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="442" /> + <source>Push all changes to a remote repository</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="448" /> + <source>Create Changegroup</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="452" /> + <source>Create a changegroup file containing the selected changesets</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="455" /> + <source><b>Create Changegroup</b> +<p>This creates a changegroup file containing the selected revisions. If no revisions are selected, all changesets will be bundled. If one revision is selected, it will be interpreted as the base revision. Otherwise the lowest revision will be used as the base revision and all other revision will be bundled. If the dialog is showing outgoing changesets, all selected changesets will be bundled.</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2538" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="468" /> + <source>Apply Changegroup</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="472" /> + <source>Apply the currently viewed changegroup file</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="479" /> + <source>Sign Revisions</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="483" /> <source>Add a signature for the selected revisions</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="443" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="487" /> <source>Verify Signatures</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="447" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="491" /> <source>Verify all signatures there may be for the selected revision</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2404" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="454" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2445" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="498" /> <source>Strip Changesets</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="457" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="501" /> <source>Strip changesets from a repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="462" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="506" /> <source>Select All Entries</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="465" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="509" /> <source>Deselect All Entries</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="910" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="886" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="863" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="837" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="949" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="925" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="902" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="876" /> <source>Mercurial Error</source> <translation>Erreur Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1210" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1251" /> <source>{0} (large file)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1468" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1509" /> <source>Side-by-Side Diff to Parent {0}</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1479" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1520" /> <source><a href="sbsdiff:{0}_{1}">Side-by-Side Compare</a></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1637" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1556" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1678" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1597" /> <source>Pull Selected Changes</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2498" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2405" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2359" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2241" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2147" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2539" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2446" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2400" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2282" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2188" /> <source>The project should be reread. Do this now?</source> <translation>Le projet devrai être relu. Le faire maintenant ?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2224" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2265" /> <source>Select bookmark to switch to (leave empty to use revision):</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2269" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2310" /> <source>Define Bookmark</source> <translation>Définir un signet</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2270" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2311" /> <source>Enter bookmark name for changeset "{0}":</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2299" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2340" /> <source>Move Bookmark</source> <translation>Déplacer un signet</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2300" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2341" /> <source>Select the bookmark to be moved to changeset "{0}":</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2637" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2678" /> <source>Find Commit</source> <translation>Chercher le commit</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2638" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2679" /> <source>'{0}' was not found.</source> <translation>'{0}' n'a pas été trouvé.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2685" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2726" /> <source>Generating differences ...</source> <translation type="unfinished" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="0" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2686" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2727" /> <source>Differences</source> <translation>Différences</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2697" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2738" /> <source>Differences to Parent {0}</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2713" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2754" /> <source>Diff to Parent {0}{1}</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2736" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2777" /> <source>There is no difference.</source> <translation>Aucune différence.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2887" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2871" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2853" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2928" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2912" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2894" /> <source>Save Diff</source> <translation>Enregistrer Diff</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2855" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2896" /> <source>Patch Files (*.diff)</source> <translation>Fichiers Patch (*.diff)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2872" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2913" /> <source><p>The patch file <b>{0}</b> already exists. Overwrite it?</p></source> <translation><p>Le fichier patch <b>{0}</b>existe déjà. Écraser ?</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2888" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2929" /> <source><p>The patch file <b>{0}</b> could not be saved.<br>Reason: {1}</p></source> <translation><p>Le fichier patch <b>{0}</b> ne peut être enregistré.<br>Rasion : {1}</p></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2960" /> + <source>closed</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2961" /> + <source>inactive</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2970" /> + <source>{0} ({1})</source> + <translation type="unfinished">{0} ({1})</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2979" /> + <source>Select the branches to be shown (none for 'All'):</source> + <translation type="unfinished" /> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="0" /> <source>Select action from menu</source> <translation>Sélectionner l'action à partir du menu</translation> @@ -59018,22 +59094,22 @@ <translation>Méthode d'activation du plugin incompatible.</translation> </message> <message> - <location filename="../PluginManager/PluginManager.py" line="1222" /> + <location filename="../PluginManager/PluginManager.py" line="1216" /> <source>Plugin Manager Error</source> <translation>Erreur du gestionnaire de plugins</translation> </message> <message> - <location filename="../PluginManager/PluginManager.py" line="1223" /> + <location filename="../PluginManager/PluginManager.py" line="1217" /> <source><p>The plugin download directory <b>{0}</b> could not be created. Please configure it via the configuration dialog.</p><p>Reason: {1}</p></source> <translation><p>Le répertoire de téléchargement de plugin<b>{0}</b> n'a pas pu être créé. Veuillez le reconfigurer.</p><p>Raison : {1}</p></translation> </message> <message> - <location filename="../PluginManager/PluginManager.py" line="1311" /> + <location filename="../PluginManager/PluginManager.py" line="1305" /> <source>Error downloading file</source> <translation>Erreur de téléchargement du fichier</translation> </message> <message> - <location filename="../PluginManager/PluginManager.py" line="1312" /> + <location filename="../PluginManager/PluginManager.py" line="1306" /> <source><p>Could not download the requested file from {0}.</p><p>Error: {1}</p></source> <translation><p>Ne peut télécharger le fichier demandé depuis {0}.</p><p>Erreur : {1}</p></translation> </message> @@ -84126,7 +84202,7 @@ <translation>SansTitre {0}</translation> </message> <message> - <location filename="../Plugins/ViewManagerPlugins/Tabview/Tabview.py" line="1502" /> + <location filename="../Plugins/ViewManagerPlugins/Tabview/Tabview.py" line="1500" /> <location filename="../Plugins/ViewManagerPlugins/Tabview/Tabview.py" line="1111" /> <location filename="../Plugins/ViewManagerPlugins/Tabview/Tabview.py" line="1056" /> <source>{0} (ro)</source> @@ -102798,32 +102874,32 @@ <context> <name>mercurial</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1274" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1278" /> <source><tr><td><b>Parent #{0}</b></td><td></td></tr> <tr><td><b>Changeset</b></td><td>{1}</td></tr></source> <translation><tr><td><b>Parent #{0}</b></td><td></td></tr> <tr><td><b>Modifications</b></td><td>{1}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1805" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1282" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1824" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1286" /> <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Étiquettes</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1811" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1288" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1830" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1292" /> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Signets</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1818" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1295" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1837" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1299" /> <source><tr><td><b>Branches</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Branches</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1301" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1305" /> <source><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr></source> @@ -102832,7 +102908,7 @@ <tr><td><b>Heure de soumission</b></td><td>{2}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1320" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1324" /> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -102843,36 +102919,36 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1779" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1798" /> <source><tr><td><b>Head #{0}</b></td><td></td></tr> </source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1786" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1805" /> <source><tr><td><b>Parent #{0}</b></td><td></td></tr> </source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1793" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1812" /> <source><tr><td><b>Tip</b></td><td></td></tr> </source> <translation><tr><td><b>Suggestion</b></td><td></td></tr> </translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1798" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1817" /> <source><tr><td><b>Changeset</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Modifications</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1825" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1844" /> <source><tr><td><b>Parents</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Parents</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1831" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1850" /> <source><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr>
--- a/src/eric7/i18n/eric7_it.ts Mon Sep 25 12:09:23 2023 +0200 +++ b/src/eric7/i18n/eric7_it.ts Tue Sep 26 18:26:21 2023 +0200 @@ -18743,6 +18743,16 @@ <context> <name>EricListSelectionDialog</name> <message> + <location filename="../EricWidgets/EricListSelectionDialog.py" line="96" /> + <source>Deselect All</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../EricWidgets/EricListSelectionDialog.py" line="99" /> + <source>Select All</source> + <translation type="unfinished">Seleziona tutti</translation> + </message> + <message> <location filename="../EricWidgets/EricListSelectionDialog.ui" line="0" /> <source>Select from List</source> <translation type="unfinished" /> @@ -33579,334 +33589,334 @@ <translation>Comando Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1377" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1381" /> <source>Copying {0}</source> <translation>Copia di {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1616" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1604" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1595" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1635" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1623" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1614" /> <source>Mercurial Side-by-Side Difference</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1617" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1636" /> <source><p>The file <b>{0}</b> could not be read.</p></source> <translation type="unfinished"><p>Il file <b>{0}</b> non può essere letto.</p></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2297" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2286" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2276" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1711" /> + <source>Apply changegroups</source> + <translation>Applica changegroup</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1714" /> + <source>Pulling from a remote Mercurial repository</source> + <translation>Pulling da un repository Mercurial remoto</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1756" /> + <source>Pushing to a remote Mercurial repository</source> + <translation>Pushing in un repository Mercurial remoto</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1894" /> + <source>Marking as 'unresolved'</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1896" /> + <source>Marking as 'resolved'</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1918" /> + <source>Aborting uncommitted merge</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1941" /> + <source>Creating branch in the Mercurial repository</source> + <translation>Creazione Branch nel repository Mercurial</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1949" /> + <source>Created new branch <{0}>.</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1958" /> + <source>Showing current branch</source> + <translation>Visualizzazione branch corrente</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2045" /> + <source>Verifying the integrity of the Mercurial repository</source> + <translation>Verifica dell'integrità del repository Mercurial</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2058" /> + <source>Showing the combined configuration settings</source> + <translation>Visualizzazione combinata della impostazioni di configurazione</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2069" /> + <source>Showing aliases for remote repositories</source> + <translation>Visualizzazione degli alias per i repository remoti</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2080" /> + <source>Recovering from interrupted transaction</source> + <translation>Recupero da una transazione interrotta</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2091" /> + <source>Identifying project directory</source> + <translation>Identificazione directory del progetto</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2133" /> + <source>Create .hgignore file</source> + <translation>Crea il file .hgignore</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2134" /> + <source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source> + <translation><p>Il file <b>{0}</b> esiste già. Sovrascriverlo ?</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2235" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2209" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2191" /> + <source>Create changegroup</source> + <translation>Crea changegroup</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2193" /> + <source>Mercurial Changegroup Files (*.hg)</source> + <translation>Mercurial Changegroup Files (*.hg)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2210" /> + <source><p>The Mercurial changegroup file <b>{0}</b> already exists. Overwrite it?</p></source> + <translation><p>Il file changegroup di Mercurial<b>{0}</b> esiste già. Sovrascriverlo ?</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2249" /> + <source>Preview changegroup</source> + <translation>Anteprima changegroup</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2278" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2267" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2257" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1692" /> - <source>Apply changegroups</source> - <translation>Applica changegroup</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1695" /> - <source>Pulling from a remote Mercurial repository</source> - <translation>Pulling da un repository Mercurial remoto</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1737" /> - <source>Pushing to a remote Mercurial repository</source> - <translation>Pushing in un repository Mercurial remoto</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1875" /> - <source>Marking as 'unresolved'</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1877" /> - <source>Marking as 'resolved'</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1899" /> - <source>Aborting uncommitted merge</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1922" /> - <source>Creating branch in the Mercurial repository</source> - <translation>Creazione Branch nel repository Mercurial</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1930" /> - <source>Created new branch <{0}>.</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1939" /> - <source>Showing current branch</source> - <translation>Visualizzazione branch corrente</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2026" /> - <source>Verifying the integrity of the Mercurial repository</source> - <translation>Verifica dell'integrità del repository Mercurial</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2039" /> - <source>Showing the combined configuration settings</source> - <translation>Visualizzazione combinata della impostazioni di configurazione</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2050" /> - <source>Showing aliases for remote repositories</source> - <translation>Visualizzazione degli alias per i repository remoti</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2061" /> - <source>Recovering from interrupted transaction</source> - <translation>Recupero da una transazione interrotta</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2072" /> - <source>Identifying project directory</source> - <translation>Identificazione directory del progetto</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2114" /> - <source>Create .hgignore file</source> - <translation>Crea il file .hgignore</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2115" /> - <source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source> - <translation><p>Il file <b>{0}</b> esiste già. Sovrascriverlo ?</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2216" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2190" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2172" /> - <source>Create changegroup</source> - <translation>Crea changegroup</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2174" /> - <source>Mercurial Changegroup Files (*.hg)</source> - <translation>Mercurial Changegroup Files (*.hg)</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2191" /> - <source><p>The Mercurial changegroup file <b>{0}</b> already exists. Overwrite it?</p></source> - <translation><p>Il file changegroup di Mercurial<b>{0}</b> esiste già. Sovrascriverlo ?</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2230" /> - <source>Preview changegroup</source> - <translation>Anteprima changegroup</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2259" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2232" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2251" /> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation>Mercurial Changegroup Files (*.hg);;All Files (*)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2268" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2287" /> <source>Shall the working directory be updated?</source> <translation>Le directory di lavoro devono essere aggiornate ?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2300" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2319" /> <source>Bisect subcommand ({0}) invalid.</source> <translation>Sottocomando Bisect ({0}) non valido.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2320" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2339" /> <source>Mercurial Bisect ({0})</source> <translation>Mercurial Bisect ({0})</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2343" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2362" /> <source>Removing files from the Mercurial repository only</source> <translation>Rimozione di file dal solo repository Mercurial</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2406" /> <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2387" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2368" /> <source>Backing out changeset</source> <translation>Ritiro changeset</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2369" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2388" /> <source>No revision given. Aborting...</source> <translation>Nessuna revisione fornita. Termino...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2403" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2398" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2422" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2417" /> <source>Rollback last transaction</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2399" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2418" /> <source>Are you sure you want to rollback the last transaction?</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2465" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2484" /> <source>Import Patch</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2513" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2532" /> <source>Export Patches</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2553" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2572" /> <source>Change Phase</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2607" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2626" /> <source>Copy Changesets</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2646" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2665" /> <source>Copy Changesets (Continue)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2656" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2675" /> <source>Copy Changesets (Stop)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2666" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2685" /> <source>Copy Changesets (Abort)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2689" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2708" /> <source>Create Unversioned Archive</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2703" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2722" /> <source>Delete All Backups</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2704" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2723" /> <source><p>Do you really want to delete all backup bundles stored in the backup area?<br/><b>{0}</b></p></source> <translation type="unfinished" /> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2812" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2792" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2781" /> + <source>Add Sub-repository</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2851" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2782" /> + <source><p>The sub-repositories file .hgsub could not be read.</p><p>Reason: {0}</p></source> + <translation type="unfinished" /> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2793" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2773" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2762" /> - <source>Add Sub-repository</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2832" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2763" /> - <source><p>The sub-repositories file .hgsub could not be read.</p><p>Reason: {0}</p></source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2774" /> <source><p>The sub-repositories file .hgsub already contains an entry <b>{0}</b>. Aborting...</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2850" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2794" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2869" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2813" /> <source><p>The sub-repositories file .hgsub could not be written to.</p><p>Reason: {0}</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2849" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2831" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2817" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2868" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2850" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2836" /> <source>Remove Sub-repositories</source> <translation type="unfinished">Rimuovi sotto-archivi</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2818" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2837" /> <source><p>The sub-repositories file .hgsub does not exist. Aborting...</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3066" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2929" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3085" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2948" /> <source>Mercurial Command Server</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2930" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2949" /> <source><p>The Mercurial Command Server could not be restarted.</p><p>Reason: {0}</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3067" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3086" /> <source><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3183" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3202" /> <source>Mercurial Bookmark</source> <translation type="unfinished">Segnalibro Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3199" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3218" /> <source>Delete Bookmark</source> <translation type="unfinished">Cancella segnalibro</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3200" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3219" /> <source>Select the bookmark to be deleted:</source> <translation type="unfinished">Seleziona il segnalibro da cancellare:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3210" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3229" /> <source>Delete Mercurial Bookmark</source> <translation type="unfinished">Cancella Segnalibro Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3235" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3254" /> <source>Rename Mercurial Bookmark</source> <translation type="unfinished">Rinomina Segnalibro Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3272" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3291" /> <source>Move Mercurial Bookmark</source> <translation type="unfinished">Sposta Segnalibro Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3345" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3364" /> <source>Pull Bookmark</source> <translation type="unfinished">Estrai Segnalibro</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3346" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3365" /> <source>Select the bookmark to be pulled:</source> <translation type="unfinished">Seleziona il segnalibro da estrarre:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3358" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3377" /> <source>Pulling bookmark from a remote Mercurial repository</source> <translation type="unfinished">Etrae segnalibro da un repository Mercurial remoto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3384" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3403" /> <source>Push Bookmark</source> <translation type="unfinished">Inserisce Segnalibro</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3385" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3404" /> <source>Select the bookmark to be push:</source> <translation type="unfinished">Seleziona il segnalibro da inserire:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3400" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3419" /> <source>Pushing bookmark to a remote Mercurial repository</source> <translation type="unfinished">Inserisce segnalibro in un repository Mercurial remoto</translation> </message> @@ -36039,465 +36049,531 @@ <name>HgLogBrowserDialog</name> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="0" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="139" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="140" /> <source>Mercurial Log</source> <translation>Mercurial Log</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="141" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="142" /> <source>Mercurial Log (Incoming)</source> <translation>Mercurial Log (Incoming)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="143" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="144" /> <source>Mercurial Log (Outgoing)</source> <translation>Mercurial Log (Outgoing)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="145" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="146" /> <source>Mercurial Full Log</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="157" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="158" /> <source>&Refresh</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="160" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="161" /> <source>Press to refresh the list of changesets</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="168" /> - <source>Find</source> - <translation type="unfinished">Trova</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="169" /> + <source>Find</source> + <translation type="unfinished">Trova</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="170" /> <source>Filter</source> <translation type="unfinished">Filtro</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="0" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="171" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="172" /> <source>Revision</source> <translation>Revisione</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="0" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="172" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="173" /> <source>Author</source> <translation>Autore</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="0" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="173" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="174" /> <source>Message</source> <translation>Messaggio</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="174" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="175" /> <source>File</source> <translation type="unfinished" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="0" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="175" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="176" /> <source>Phase</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="196" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="197" /> <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>{4}<tr><td><b>Message</b></td><td>{5}</td></tr></table></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="206" /> - <source><tr><td><b>Parents</b></td><td>{0}</td></tr></source> - <translation type="unfinished"><tr><td><b>Origini</b></td><td>{0}</td></tr></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="207" /> + <source><tr><td><b>Parents</b></td><td>{0}</td></tr></source> + <translation type="unfinished"><tr><td><b>Origini</b></td><td>{0}</td></tr></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="208" /> <source><tr><td><b>Children</b></td><td>{0}</td></tr></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="210" /> - <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> - <translation type="unfinished"><tr><td><b>Tags</b></td><td>{0}</td></tr></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="211" /> + <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> + <translation type="unfinished"><tr><td><b>Tags</b></td><td>{0}</td></tr></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="212" /> <source><tr><td><b>Latest Tag</b></td><td>{0}</td></tr></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="214" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="215" /> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation type="unfinished"><tr><td><b>Segnalibri</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="226" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="227" /> <source>All</source> <translation>Tutti</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="244" /> - <source>Added</source> - <translation>Aggiunto</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="245" /> - <source>Deleted</source> - <translation>Cancellato</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="246" /> + <source>Added</source> + <translation>Aggiunto</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="247" /> + <source>Deleted</source> + <translation>Cancellato</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="248" /> <source>Modified</source> <translation>Modificato</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="250" /> - <source>Draft</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="251" /> - <source>Public</source> - <translation type="unfinished" /> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="252" /> + <source>Draft</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="253" /> + <source>Public</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="254" /> <source>Secret</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="260" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="262" /> <source>Bookmarks</source> <translation type="unfinished">Segnalibri</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2146" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="299" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="296" /> + <source>View</source> + <translation type="unfinished">Visualizza</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2978" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="298" /> + <source>Select Branches</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="300" /> + <source>Select the branches to be shown from a list of all branches and refresh the display</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="306" /> + <source>Select Branches (active branches only)</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="309" /> + <source>Select the branches to be shown from a list of active branches and refresh the display</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="315" /> + <source>Select Branches (inactive branches only)</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="318" /> + <source>Select the branches to be shown from a list of inactive branches and refresh the display</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="324" /> + <source>Select Branches (closed branches only)</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="327" /> + <source>Select the branches to be shown from a list of closed branches and refresh the display</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2187" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="343" /> <source>Copy Changesets</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="303" /> - <source>Copy the selected changesets to the current branch</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="308" /> - <source>Merge with Changeset</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="312" /> - <source>Merge the working directory with the selected changeset</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="316" /> - <source>Change Phase</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="319" /> - <source>Change the phase of the selected revisions</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="322" /> - <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" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="330" /> - <source>Tag</source> - <translation type="unfinished">Tag</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="332" /> - <source>Tag the selected revision</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="336" /> - <source>Close Heads</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="339" /> - <source>Close the selected heads</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2240" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2223" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="343" /> - <source>Switch</source> - <translation type="unfinished" /> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="347" /> - <source>Switch the working directory to the selected revision</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="354" /> - <source>Define Bookmark...</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="357" /> - <source>Bookmark the selected revision</source> + <source>Copy the selected changesets to the current branch</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="352" /> + <source>Merge with Changeset</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="356" /> + <source>Merge the working directory with the selected changeset</source> <translation type="unfinished" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="360" /> - <source>Move Bookmark...</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="364" /> - <source>Move bookmark to the selected revision</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2358" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1558" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="371" /> - <source>Pull Changes</source> + <source>Change Phase</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="363" /> + <source>Change the phase of the selected revisions</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="366" /> + <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" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="374" /> - <source>Pull changes from a remote repository</source> - <translation type="unfinished">Pull changes da un repository remoto</translation> + <source>Tag</source> + <translation type="unfinished">Tag</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="376" /> - <source>Pull Large Files</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="378" /> - <source>Pull large files for selected revisions</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="384" /> - <source>Push Selected Changes</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="388" /> - <source>Push changes of the selected changeset and its ancestors to a remote repository</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="395" /> - <source>Push All Changes</source> + <source>Tag the selected revision</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="380" /> + <source>Close Heads</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="383" /> + <source>Close the selected heads</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2281" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2264" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="387" /> + <source>Switch</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="391" /> + <source>Switch the working directory to the selected revision</source> <translation type="unfinished" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="398" /> - <source>Push all changes to a remote repository</source> + <source>Define Bookmark...</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="401" /> + <source>Bookmark the selected revision</source> <translation type="unfinished" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="404" /> - <source>Create Changegroup</source> + <source>Move Bookmark...</source> <translation type="unfinished" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="408" /> - <source>Create a changegroup file containing the selected changesets</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="411" /> - <source><b>Create Changegroup</b> -<p>This creates a changegroup file containing the selected revisions. If no revisions are selected, all changesets will be bundled. If one revision is selected, it will be interpreted as the base revision. Otherwise the lowest revision will be used as the base revision and all other revision will be bundled. If the dialog is showing outgoing changesets, all selected changesets will be bundled.</p></source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2497" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="424" /> - <source>Apply Changegroup</source> + <source>Move bookmark to the selected revision</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2399" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1599" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="415" /> + <source>Pull Changes</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="418" /> + <source>Pull changes from a remote repository</source> + <translation type="unfinished">Pull changes da un repository remoto</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="420" /> + <source>Pull Large Files</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="422" /> + <source>Pull large files for selected revisions</source> <translation type="unfinished" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="428" /> - <source>Apply the currently viewed changegroup file</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="435" /> - <source>Sign Revisions</source> + <source>Push Selected Changes</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="432" /> + <source>Push changes of the selected changeset and its ancestors to a remote repository</source> <translation type="unfinished" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="439" /> + <source>Push All Changes</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="442" /> + <source>Push all changes to a remote repository</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="448" /> + <source>Create Changegroup</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="452" /> + <source>Create a changegroup file containing the selected changesets</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="455" /> + <source><b>Create Changegroup</b> +<p>This creates a changegroup file containing the selected revisions. If no revisions are selected, all changesets will be bundled. If one revision is selected, it will be interpreted as the base revision. Otherwise the lowest revision will be used as the base revision and all other revision will be bundled. If the dialog is showing outgoing changesets, all selected changesets will be bundled.</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2538" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="468" /> + <source>Apply Changegroup</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="472" /> + <source>Apply the currently viewed changegroup file</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="479" /> + <source>Sign Revisions</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="483" /> <source>Add a signature for the selected revisions</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="443" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="487" /> <source>Verify Signatures</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="447" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="491" /> <source>Verify all signatures there may be for the selected revision</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2404" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="454" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2445" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="498" /> <source>Strip Changesets</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="457" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="501" /> <source>Strip changesets from a repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="462" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="506" /> <source>Select All Entries</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="465" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="509" /> <source>Deselect All Entries</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="910" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="886" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="863" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="837" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="949" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="925" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="902" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="876" /> <source>Mercurial Error</source> <translation>Mercurial Error</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1210" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1251" /> <source>{0} (large file)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1468" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1509" /> <source>Side-by-Side Diff to Parent {0}</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1479" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1520" /> <source><a href="sbsdiff:{0}_{1}">Side-by-Side Compare</a></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1637" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1556" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1678" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1597" /> <source>Pull Selected Changes</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2498" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2405" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2359" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2241" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2147" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2539" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2446" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2400" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2282" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2188" /> <source>The project should be reread. Do this now?</source> <translation type="unfinished">Il progetto deve essere riletto. Farlo ora ?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2224" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2265" /> <source>Select bookmark to switch to (leave empty to use revision):</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2269" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2310" /> <source>Define Bookmark</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2270" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2311" /> <source>Enter bookmark name for changeset "{0}":</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2299" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2340" /> <source>Move Bookmark</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2300" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2341" /> <source>Select the bookmark to be moved to changeset "{0}":</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2637" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2678" /> <source>Find Commit</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2638" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2679" /> <source>'{0}' was not found.</source> <translation type="unfinished">'{0}' non è stato trovato.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2685" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2726" /> <source>Generating differences ...</source> <translation type="unfinished" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="0" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2686" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2727" /> <source>Differences</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2697" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2738" /> <source>Differences to Parent {0}</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2713" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2754" /> <source>Diff to Parent {0}{1}</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2736" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2777" /> <source>There is no difference.</source> <translation type="unfinished">Non ci sono differenze.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2887" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2871" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2853" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2928" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2912" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2894" /> <source>Save Diff</source> <translation type="unfinished">Salva Diff</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2855" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2896" /> <source>Patch Files (*.diff)</source> <translation type="unfinished">File Patch (*.diff)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2872" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2913" /> <source><p>The patch file <b>{0}</b> already exists. Overwrite it?</p></source> <translation type="unfinished"><p>Il file patch <b>{0}</b> esiste già.Sovrascriverlo ?</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2888" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2929" /> <source><p>The patch file <b>{0}</b> could not be saved.<br>Reason: {1}</p></source> <translation type="unfinished"><p>Il file <b>{0}</b> non può essere salvato.<br />Motivo: {1}</p></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2960" /> + <source>closed</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2961" /> + <source>inactive</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2970" /> + <source>{0} ({1})</source> + <translation type="unfinished">{0} ({1})</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2979" /> + <source>Select the branches to be shown (none for 'All'):</source> + <translation type="unfinished" /> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="0" /> <source>Select action from menu</source> <translation type="unfinished" /> @@ -58884,22 +58960,22 @@ <translation>Metodo di attivazione del plugin incompatibile.</translation> </message> <message> - <location filename="../PluginManager/PluginManager.py" line="1222" /> + <location filename="../PluginManager/PluginManager.py" line="1216" /> <source>Plugin Manager Error</source> <translation>Errore del gestore dei Plugin</translation> </message> <message> - <location filename="../PluginManager/PluginManager.py" line="1223" /> + <location filename="../PluginManager/PluginManager.py" line="1217" /> <source><p>The plugin download directory <b>{0}</b> could not be created. Please configure it via the configuration dialog.</p><p>Reason: {1}</p></source> <translation><p>La directory di download dei plugin <b>{0}</b> non può essere creata. Per favore configurarla con il dialogo di configurazione.</p><p>Motivo: {1}</p></translation> </message> <message> - <location filename="../PluginManager/PluginManager.py" line="1311" /> + <location filename="../PluginManager/PluginManager.py" line="1305" /> <source>Error downloading file</source> <translation>Errone nello scaricamento del file</translation> </message> <message> - <location filename="../PluginManager/PluginManager.py" line="1312" /> + <location filename="../PluginManager/PluginManager.py" line="1306" /> <source><p>Could not download the requested file from {0}.</p><p>Error: {1}</p></source> <translation><p>Non posso scaricare il file richiesto da {0}</p><p>Errore: {1}</p></translation> </message> @@ -83854,7 +83930,7 @@ <translation>Senza titolo {0}</translation> </message> <message> - <location filename="../Plugins/ViewManagerPlugins/Tabview/Tabview.py" line="1502" /> + <location filename="../Plugins/ViewManagerPlugins/Tabview/Tabview.py" line="1500" /> <location filename="../Plugins/ViewManagerPlugins/Tabview/Tabview.py" line="1111" /> <location filename="../Plugins/ViewManagerPlugins/Tabview/Tabview.py" line="1056" /> <source>{0} (ro)</source> @@ -102470,32 +102546,32 @@ <context> <name>mercurial</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1274" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1278" /> <source><tr><td><b>Parent #{0}</b></td><td></td></tr> <tr><td><b>Changeset</b></td><td>{1}</td></tr></source> <translation><tr><td><b>Origine #{0}</b></td><td></td></tr> <tr><td><b>Changeset</b></td><td>{1}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1805" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1282" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1824" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1286" /> <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Tags</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1811" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1288" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1830" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1292" /> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Segnalibri</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1818" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1295" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1837" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1299" /> <source><tr><td><b>Branches</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Branches</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1301" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1305" /> <source><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr></source> @@ -102504,7 +102580,7 @@ <tr><td><b>Committed time</b></td><td>{2}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1320" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1324" /> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -102521,36 +102597,36 @@ </translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1779" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1798" /> <source><tr><td><b>Head #{0}</b></td><td></td></tr> </source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1786" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1805" /> <source><tr><td><b>Parent #{0}</b></td><td></td></tr> </source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1793" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1812" /> <source><tr><td><b>Tip</b></td><td></td></tr> </source> <translation><tr><td><b>Tip</b></td><td></td></tr> </translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1798" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1817" /> <source><tr><td><b>Changeset</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Changeset</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1825" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1844" /> <source><tr><td><b>Parents</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Origini</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1831" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1850" /> <source><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr>
--- a/src/eric7/i18n/eric7_pt.ts Mon Sep 25 12:09:23 2023 +0200 +++ b/src/eric7/i18n/eric7_pt.ts Tue Sep 26 18:26:21 2023 +0200 @@ -18755,6 +18755,16 @@ <context> <name>EricListSelectionDialog</name> <message> + <location filename="../EricWidgets/EricListSelectionDialog.py" line="96" /> + <source>Deselect All</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../EricWidgets/EricListSelectionDialog.py" line="99" /> + <source>Select All</source> + <translation type="unfinished">Selecionar Tudo</translation> + </message> + <message> <location filename="../EricWidgets/EricListSelectionDialog.ui" line="0" /> <source>Select from List</source> <translation type="unfinished" /> @@ -33579,334 +33589,334 @@ <translation>Comando de Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1377" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1381" /> <source>Copying {0}</source> <translation>A copiar {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1616" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1604" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1595" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1635" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1623" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1614" /> <source>Mercurial Side-by-Side Difference</source> <translation>Diferenças lado a lado de Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1617" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1636" /> <source><p>The file <b>{0}</b> could not be read.</p></source> <translation><p>O ficheiro <b>{0}</b> não se pôde ler.</p></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2297" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2286" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2276" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1711" /> + <source>Apply changegroups</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1714" /> + <source>Pulling from a remote Mercurial repository</source> + <translation>A puxar dum repositorio Mercurial remoto</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1756" /> + <source>Pushing to a remote Mercurial repository</source> + <translation>A empurrar a um repositorio Mercurial remoto</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1894" /> + <source>Marking as 'unresolved'</source> + <translation>A marcar como 'sem resolver'</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1896" /> + <source>Marking as 'resolved'</source> + <translation>A marcar como 'resolvido'</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1918" /> + <source>Aborting uncommitted merge</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1941" /> + <source>Creating branch in the Mercurial repository</source> + <translation>A criar ramo no repositorio Mercurial</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1949" /> + <source>Created new branch <{0}>.</source> + <translation>Criado o novo ramo <{0}>.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1958" /> + <source>Showing current branch</source> + <translation>A mostrar o ramo atual</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2045" /> + <source>Verifying the integrity of the Mercurial repository</source> + <translation>A verificar a integridade do repositorio Mercurial</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2058" /> + <source>Showing the combined configuration settings</source> + <translation>A mostrar as definições de configuração combinadas</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2069" /> + <source>Showing aliases for remote repositories</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2080" /> + <source>Recovering from interrupted transaction</source> + <translation>A recuperar duma transação interrompida</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2091" /> + <source>Identifying project directory</source> + <translation>A identificar o diretorio do projeto</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2133" /> + <source>Create .hgignore file</source> + <translation>Criar ficheiro .hgignore</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2134" /> + <source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source> + <translation><p>O ficheiro <b>{0}</b> já existe. Sobreescrever?</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2235" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2209" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2191" /> + <source>Create changegroup</source> + <translation>Criar conjunto de alterações</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2193" /> + <source>Mercurial Changegroup Files (*.hg)</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2210" /> + <source><p>The Mercurial changegroup file <b>{0}</b> already exists. Overwrite it?</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2249" /> + <source>Preview changegroup</source> + <translation type="unfinished" /> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2278" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2267" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2257" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1692" /> - <source>Apply changegroups</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1695" /> - <source>Pulling from a remote Mercurial repository</source> - <translation>A puxar dum repositorio Mercurial remoto</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1737" /> - <source>Pushing to a remote Mercurial repository</source> - <translation>A empurrar a um repositorio Mercurial remoto</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1875" /> - <source>Marking as 'unresolved'</source> - <translation>A marcar como 'sem resolver'</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1877" /> - <source>Marking as 'resolved'</source> - <translation>A marcar como 'resolvido'</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1899" /> - <source>Aborting uncommitted merge</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1922" /> - <source>Creating branch in the Mercurial repository</source> - <translation>A criar ramo no repositorio Mercurial</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1930" /> - <source>Created new branch <{0}>.</source> - <translation>Criado o novo ramo <{0}>.</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1939" /> - <source>Showing current branch</source> - <translation>A mostrar o ramo atual</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2026" /> - <source>Verifying the integrity of the Mercurial repository</source> - <translation>A verificar a integridade do repositorio Mercurial</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2039" /> - <source>Showing the combined configuration settings</source> - <translation>A mostrar as definições de configuração combinadas</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2050" /> - <source>Showing aliases for remote repositories</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2061" /> - <source>Recovering from interrupted transaction</source> - <translation>A recuperar duma transação interrompida</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2072" /> - <source>Identifying project directory</source> - <translation>A identificar o diretorio do projeto</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2114" /> - <source>Create .hgignore file</source> - <translation>Criar ficheiro .hgignore</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2115" /> - <source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source> - <translation><p>O ficheiro <b>{0}</b> já existe. Sobreescrever?</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2216" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2190" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2172" /> - <source>Create changegroup</source> - <translation>Criar conjunto de alterações</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2174" /> - <source>Mercurial Changegroup Files (*.hg)</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2191" /> - <source><p>The Mercurial changegroup file <b>{0}</b> already exists. Overwrite it?</p></source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2230" /> - <source>Preview changegroup</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2259" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2232" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2251" /> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2268" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2287" /> <source>Shall the working directory be updated?</source> <translation>O diretorio de trabalho deve ser atualizado?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2300" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2319" /> <source>Bisect subcommand ({0}) invalid.</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2320" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2339" /> <source>Mercurial Bisect ({0})</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2343" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2362" /> <source>Removing files from the Mercurial repository only</source> <translation>A retirar ficheiros apenas do repositorio Mercurial</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2406" /> <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2387" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2368" /> <source>Backing out changeset</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2369" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2388" /> <source>No revision given. Aborting...</source> <translation>Não foi dada revisão. Terminando...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2403" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2398" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2422" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2417" /> <source>Rollback last transaction</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2399" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2418" /> <source>Are you sure you want to rollback the last transaction?</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2465" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2484" /> <source>Import Patch</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2513" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2532" /> <source>Export Patches</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2553" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2572" /> <source>Change Phase</source> <translation>Mudar Fase</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2607" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2626" /> <source>Copy Changesets</source> <translation type="unfinished">Copiar Conjuntos de Alterações</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2646" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2665" /> <source>Copy Changesets (Continue)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2656" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2675" /> <source>Copy Changesets (Stop)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2666" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2685" /> <source>Copy Changesets (Abort)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2689" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2708" /> <source>Create Unversioned Archive</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2703" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2722" /> <source>Delete All Backups</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2704" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2723" /> <source><p>Do you really want to delete all backup bundles stored in the backup area?<br/><b>{0}</b></p></source> <translation type="unfinished" /> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2812" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2792" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2781" /> + <source>Add Sub-repository</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2851" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2782" /> + <source><p>The sub-repositories file .hgsub could not be read.</p><p>Reason: {0}</p></source> + <translation type="unfinished" /> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2793" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2773" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2762" /> - <source>Add Sub-repository</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2832" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2763" /> - <source><p>The sub-repositories file .hgsub could not be read.</p><p>Reason: {0}</p></source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2774" /> <source><p>The sub-repositories file .hgsub already contains an entry <b>{0}</b>. Aborting...</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2850" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2794" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2869" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2813" /> <source><p>The sub-repositories file .hgsub could not be written to.</p><p>Reason: {0}</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2849" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2831" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2817" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2868" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2850" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2836" /> <source>Remove Sub-repositories</source> <translation>Retirar Sub Repositórios</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2818" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2837" /> <source><p>The sub-repositories file .hgsub does not exist. Aborting...</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3066" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2929" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3085" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2948" /> <source>Mercurial Command Server</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2930" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2949" /> <source><p>The Mercurial Command Server could not be restarted.</p><p>Reason: {0}</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3067" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3086" /> <source><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3183" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3202" /> <source>Mercurial Bookmark</source> <translation>Marcador de Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3199" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3218" /> <source>Delete Bookmark</source> <translation>Apagar Marcador</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3200" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3219" /> <source>Select the bookmark to be deleted:</source> <translation>Selecionar o marcador a apagar:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3210" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3229" /> <source>Delete Mercurial Bookmark</source> <translation>Apagar o Marcador de Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3235" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3254" /> <source>Rename Mercurial Bookmark</source> <translation>Renomear o Marcador de Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3272" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3291" /> <source>Move Mercurial Bookmark</source> <translation>Mover o Marcador de Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3345" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3364" /> <source>Pull Bookmark</source> <translation>Puxar Marcador</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3346" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3365" /> <source>Select the bookmark to be pulled:</source> <translation>Selecionar o marcador a puxar:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3358" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3377" /> <source>Pulling bookmark from a remote Mercurial repository</source> <translation>A puxar marcador desde o repositório remoto de Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3384" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3403" /> <source>Push Bookmark</source> <translation>Empurrar Marcador</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3385" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3404" /> <source>Select the bookmark to be push:</source> <translation>Selecione o marcador a empurrar:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3400" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3419" /> <source>Pushing bookmark to a remote Mercurial repository</source> <translation>A empurrar marcador a um repositório remoto de Mercurial</translation> </message> @@ -36044,466 +36054,532 @@ <name>HgLogBrowserDialog</name> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="0" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="139" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="140" /> <source>Mercurial Log</source> <translation>Registo de Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="141" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="142" /> <source>Mercurial Log (Incoming)</source> <translation>Registo de Mercurial (Entrante)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="143" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="144" /> <source>Mercurial Log (Outgoing)</source> <translation>Registo de Mercurial (Sainte)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="145" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="146" /> <source>Mercurial Full Log</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="157" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="158" /> <source>&Refresh</source> <translation>Atualiza&r</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="160" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="161" /> <source>Press to refresh the list of changesets</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="168" /> - <source>Find</source> - <translation>Encontrar</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="169" /> + <source>Find</source> + <translation>Encontrar</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="170" /> <source>Filter</source> <translation>Filtro</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="0" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="171" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="172" /> <source>Revision</source> <translation>Revisão</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="0" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="172" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="173" /> <source>Author</source> <translation>Autor</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="0" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="173" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="174" /> <source>Message</source> <translation>Mensagem</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="174" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="175" /> <source>File</source> <translation>Ficheiro</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="0" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="175" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="176" /> <source>Phase</source> <translation>Fase</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="196" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="197" /> <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>{4}<tr><td><b>Message</b></td><td>{5}</td></tr></table></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="206" /> - <source><tr><td><b>Parents</b></td><td>{0}</td></tr></source> - <translation type="unfinished"><tr><td><b>Pais</b></td><td>{0}</td></tr></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="207" /> + <source><tr><td><b>Parents</b></td><td>{0}</td></tr></source> + <translation type="unfinished"><tr><td><b>Pais</b></td><td>{0}</td></tr></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="208" /> <source><tr><td><b>Children</b></td><td>{0}</td></tr></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="210" /> - <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="211" /> + <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="212" /> <source><tr><td><b>Latest Tag</b></td><td>{0}</td></tr></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="214" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="215" /> <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="226" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="227" /> <source>All</source> <translation>Tudo</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="244" /> - <source>Added</source> - <translation>Adicionado</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="245" /> - <source>Deleted</source> - <translation>Apagado</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="246" /> + <source>Added</source> + <translation>Adicionado</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="247" /> + <source>Deleted</source> + <translation>Apagado</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="248" /> <source>Modified</source> <translation>Alterado</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="250" /> - <source>Draft</source> - <translation type="unfinished">Rascunho</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="251" /> - <source>Public</source> - <translation type="unfinished">Público</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="252" /> + <source>Draft</source> + <translation type="unfinished">Rascunho</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="253" /> + <source>Public</source> + <translation type="unfinished">Público</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="254" /> <source>Secret</source> <translation type="unfinished">Secreto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="260" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="262" /> <source>Bookmarks</source> <translation>Marcadores</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2146" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="299" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="296" /> + <source>View</source> + <translation type="unfinished">Vista</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2978" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="298" /> + <source>Select Branches</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="300" /> + <source>Select the branches to be shown from a list of all branches and refresh the display</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="306" /> + <source>Select Branches (active branches only)</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="309" /> + <source>Select the branches to be shown from a list of active branches and refresh the display</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="315" /> + <source>Select Branches (inactive branches only)</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="318" /> + <source>Select the branches to be shown from a list of inactive branches and refresh the display</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="324" /> + <source>Select Branches (closed branches only)</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="327" /> + <source>Select the branches to be shown from a list of closed branches and refresh the display</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2187" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="343" /> <source>Copy Changesets</source> <translation type="unfinished">Copiar Conjuntos de Alterações</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="303" /> - <source>Copy the selected changesets to the current branch</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="308" /> - <source>Merge with Changeset</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="312" /> - <source>Merge the working directory with the selected changeset</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="316" /> - <source>Change Phase</source> - <translation>Mudar Fase</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="319" /> - <source>Change the phase of the selected revisions</source> - <translation>Alterar a fase das revisões selecionadas</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="322" /> - <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>Mudar Fase</b> -<p>Muda a fase das revisões selecionadas. As revisões selecionadas devem ter a mesma fase atual.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="330" /> - <source>Tag</source> - <translation>Etiquetar</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="332" /> - <source>Tag the selected revision</source> - <translation>Etiqueta a revisão selecionada</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="336" /> - <source>Close Heads</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="339" /> - <source>Close the selected heads</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2240" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2223" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="343" /> - <source>Switch</source> - <translation type="unfinished">Mudar</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="347" /> - <source>Switch the working directory to the selected revision</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="354" /> - <source>Define Bookmark...</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="357" /> - <source>Bookmark the selected revision</source> + <source>Copy the selected changesets to the current branch</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="352" /> + <source>Merge with Changeset</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="356" /> + <source>Merge the working directory with the selected changeset</source> <translation type="unfinished" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="360" /> - <source>Move Bookmark...</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="364" /> - <source>Move bookmark to the selected revision</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2358" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1558" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="371" /> - <source>Pull Changes</source> - <translation type="unfinished" /> + <source>Change Phase</source> + <translation>Mudar Fase</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="363" /> + <source>Change the phase of the selected revisions</source> + <translation>Alterar a fase das revisões selecionadas</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="366" /> + <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>Mudar Fase</b> +<p>Muda a fase das revisões selecionadas. As revisões selecionadas devem ter a mesma fase atual.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="374" /> - <source>Pull changes from a remote repository</source> - <translation type="unfinished">Puxar alterações do repositorio remoto</translation> + <source>Tag</source> + <translation>Etiquetar</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="376" /> - <source>Pull Large Files</source> - <translation>Puxar Ficheiros Grandes</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="378" /> - <source>Pull large files for selected revisions</source> - <translation>Puxar os ficheiros grandes das revisões selecionadas</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="384" /> - <source>Push Selected Changes</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="388" /> - <source>Push changes of the selected changeset and its ancestors to a remote repository</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="395" /> - <source>Push All Changes</source> + <source>Tag the selected revision</source> + <translation>Etiqueta a revisão selecionada</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="380" /> + <source>Close Heads</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="383" /> + <source>Close the selected heads</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2281" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2264" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="387" /> + <source>Switch</source> + <translation type="unfinished">Mudar</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="391" /> + <source>Switch the working directory to the selected revision</source> <translation type="unfinished" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="398" /> - <source>Push all changes to a remote repository</source> + <source>Define Bookmark...</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="401" /> + <source>Bookmark the selected revision</source> <translation type="unfinished" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="404" /> - <source>Create Changegroup</source> + <source>Move Bookmark...</source> <translation type="unfinished" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="408" /> - <source>Create a changegroup file containing the selected changesets</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="411" /> - <source><b>Create Changegroup</b> -<p>This creates a changegroup file containing the selected revisions. If no revisions are selected, all changesets will be bundled. If one revision is selected, it will be interpreted as the base revision. Otherwise the lowest revision will be used as the base revision and all other revision will be bundled. If the dialog is showing outgoing changesets, all selected changesets will be bundled.</p></source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2497" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="424" /> - <source>Apply Changegroup</source> - <translation type="unfinished" /> + <source>Move bookmark to the selected revision</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2399" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1599" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="415" /> + <source>Pull Changes</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="418" /> + <source>Pull changes from a remote repository</source> + <translation type="unfinished">Puxar alterações do repositorio remoto</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="420" /> + <source>Pull Large Files</source> + <translation>Puxar Ficheiros Grandes</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="422" /> + <source>Pull large files for selected revisions</source> + <translation>Puxar os ficheiros grandes das revisões selecionadas</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="428" /> - <source>Apply the currently viewed changegroup file</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="435" /> - <source>Sign Revisions</source> + <source>Push Selected Changes</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="432" /> + <source>Push changes of the selected changeset and its ancestors to a remote repository</source> <translation type="unfinished" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="439" /> + <source>Push All Changes</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="442" /> + <source>Push all changes to a remote repository</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="448" /> + <source>Create Changegroup</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="452" /> + <source>Create a changegroup file containing the selected changesets</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="455" /> + <source><b>Create Changegroup</b> +<p>This creates a changegroup file containing the selected revisions. If no revisions are selected, all changesets will be bundled. If one revision is selected, it will be interpreted as the base revision. Otherwise the lowest revision will be used as the base revision and all other revision will be bundled. If the dialog is showing outgoing changesets, all selected changesets will be bundled.</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2538" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="468" /> + <source>Apply Changegroup</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="472" /> + <source>Apply the currently viewed changegroup file</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="479" /> + <source>Sign Revisions</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="483" /> <source>Add a signature for the selected revisions</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="443" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="487" /> <source>Verify Signatures</source> <translation type="unfinished">Verificar Assinaturas</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="447" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="491" /> <source>Verify all signatures there may be for the selected revision</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2404" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="454" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2445" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="498" /> <source>Strip Changesets</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="457" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="501" /> <source>Strip changesets from a repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="462" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="506" /> <source>Select All Entries</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="465" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="509" /> <source>Deselect All Entries</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="910" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="886" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="863" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="837" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="949" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="925" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="902" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="876" /> <source>Mercurial Error</source> <translation>Erro de Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1210" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1251" /> <source>{0} (large file)</source> <translation>{0} (ficheiro grande)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1468" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1509" /> <source>Side-by-Side Diff to Parent {0}</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1479" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1520" /> <source><a href="sbsdiff:{0}_{1}">Side-by-Side Compare</a></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1637" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1556" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1678" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1597" /> <source>Pull Selected Changes</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2498" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2405" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2359" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2241" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2147" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2539" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2446" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2400" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2282" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2188" /> <source>The project should be reread. Do this now?</source> <translation>O projecto deve ser recarregado. Fazer-lo agora?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2224" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2265" /> <source>Select bookmark to switch to (leave empty to use revision):</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2269" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2310" /> <source>Define Bookmark</source> <translation type="unfinished">Definir Marcador</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2270" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2311" /> <source>Enter bookmark name for changeset "{0}":</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2299" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2340" /> <source>Move Bookmark</source> <translation type="unfinished">Mover marcador</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2300" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2341" /> <source>Select the bookmark to be moved to changeset "{0}":</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2637" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2678" /> <source>Find Commit</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2638" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2679" /> <source>'{0}' was not found.</source> <translation>'{0}' não foi encontrado.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2685" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2726" /> <source>Generating differences ...</source> <translation type="unfinished" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="0" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2686" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2727" /> <source>Differences</source> <translation type="unfinished">Diferenças</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2697" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2738" /> <source>Differences to Parent {0}</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2713" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2754" /> <source>Diff to Parent {0}{1}</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2736" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2777" /> <source>There is no difference.</source> <translation type="unfinished">Não há diferenças.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2887" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2871" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2853" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2928" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2912" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2894" /> <source>Save Diff</source> <translation type="unfinished">Gravar Diff</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2855" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2896" /> <source>Patch Files (*.diff)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2872" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2913" /> <source><p>The patch file <b>{0}</b> already exists. Overwrite it?</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2888" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2929" /> <source><p>The patch file <b>{0}</b> could not be saved.<br>Reason: {1}</p></source> <translation type="unfinished"><p>O ficheiro remendo <b>{0}</b> não se pôde gravar.<br />Motivo: {1}</p></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2960" /> + <source>closed</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2961" /> + <source>inactive</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2970" /> + <source>{0} ({1})</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2979" /> + <source>Select the branches to be shown (none for 'All'):</source> + <translation type="unfinished" /> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="0" /> <source>Select action from menu</source> <translation>Selecionar ação do menu</translation> @@ -58855,22 +58931,22 @@ <translation type="unfinished" /> </message> <message> - <location filename="../PluginManager/PluginManager.py" line="1222" /> + <location filename="../PluginManager/PluginManager.py" line="1216" /> <source>Plugin Manager Error</source> <translation>Erro do Gestor de Complementos</translation> </message> <message> - <location filename="../PluginManager/PluginManager.py" line="1223" /> + <location filename="../PluginManager/PluginManager.py" line="1217" /> <source><p>The plugin download directory <b>{0}</b> could not be created. Please configure it via the configuration dialog.</p><p>Reason: {1}</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../PluginManager/PluginManager.py" line="1311" /> + <location filename="../PluginManager/PluginManager.py" line="1305" /> <source>Error downloading file</source> <translation>Erro ao descarregar ficheiro</translation> </message> <message> - <location filename="../PluginManager/PluginManager.py" line="1312" /> + <location filename="../PluginManager/PluginManager.py" line="1306" /> <source><p>Could not download the requested file from {0}.</p><p>Error: {1}</p></source> <translation type="unfinished" /> </message> @@ -83656,7 +83732,7 @@ <translation>Sem título {0}</translation> </message> <message> - <location filename="../Plugins/ViewManagerPlugins/Tabview/Tabview.py" line="1502" /> + <location filename="../Plugins/ViewManagerPlugins/Tabview/Tabview.py" line="1500" /> <location filename="../Plugins/ViewManagerPlugins/Tabview/Tabview.py" line="1111" /> <location filename="../Plugins/ViewManagerPlugins/Tabview/Tabview.py" line="1056" /> <source>{0} (ro)</source> @@ -102253,32 +102329,32 @@ <context> <name>mercurial</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1274" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1278" /> <source><tr><td><b>Parent #{0}</b></td><td></td></tr> <tr><td><b>Changeset</b></td><td>{1}</td></tr></source> <translation><tr><td><b>Pai #{0}</b></td><td></td></tr> <tr><td><b>Conjunto de Alterações</b></td><td>{1}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1805" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1282" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1824" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1286" /> <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/hg.py" line="1811" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1288" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1830" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1292" /> <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/hg.py" line="1818" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1295" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1837" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1299" /> <source><tr><td><b>Branches</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Ramos</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1301" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1305" /> <source><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr></source> @@ -102287,7 +102363,7 @@ <tr><td><b>Hora do Cometido</b></td><td>{2}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1320" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1324" /> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -102304,36 +102380,36 @@ </translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1779" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1798" /> <source><tr><td><b>Head #{0}</b></td><td></td></tr> </source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1786" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1805" /> <source><tr><td><b>Parent #{0}</b></td><td></td></tr> </source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1793" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1812" /> <source><tr><td><b>Tip</b></td><td></td></tr> </source> <translation><tr><td><b>Dica</b></td><td></td></tr> </translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1798" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1817" /> <source><tr><td><b>Changeset</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Conjunto de Alterações</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1825" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1844" /> <source><tr><td><b>Parents</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Pais</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1831" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1850" /> <source><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr>
--- a/src/eric7/i18n/eric7_ru.ts Mon Sep 25 12:09:23 2023 +0200 +++ b/src/eric7/i18n/eric7_ru.ts Tue Sep 26 18:26:21 2023 +0200 @@ -18657,6 +18657,16 @@ <context> <name>EricListSelectionDialog</name> <message> + <location filename="../EricWidgets/EricListSelectionDialog.py" line="96" /> + <source>Deselect All</source> + <translation type="unfinished">Скрыть все</translation> + </message> + <message> + <location filename="../EricWidgets/EricListSelectionDialog.py" line="99" /> + <source>Select All</source> + <translation type="unfinished">Выделить всё</translation> + </message> + <message> <location filename="../EricWidgets/EricListSelectionDialog.ui" line="0" /> <source>Select from List</source> <translation>Выбор из списка</translation> @@ -33456,334 +33466,334 @@ <translation>Mercurial: Команда</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1377" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1381" /> <source>Copying {0}</source> <translation>Копирование {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1616" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1604" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1595" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1635" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1623" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1614" /> <source>Mercurial Side-by-Side Difference</source> <translation>Mercurial: Построчный просмотр различий</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1617" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1636" /> <source><p>The file <b>{0}</b> could not be read.</p></source> <translation><p>Невозможно прочитать файл <b>{0}</b>.</p></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2297" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2286" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2276" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1711" /> + <source>Apply changegroups</source> + <translation>Применить группу изменений</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1714" /> + <source>Pulling from a remote Mercurial repository</source> + <translation>Затягивание изменений из удалённого Mercurial репозитория</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1756" /> + <source>Pushing to a remote Mercurial repository</source> + <translation>Mercurial: Проталкивание изменений в удалённый репозиторий</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1894" /> + <source>Marking as 'unresolved'</source> + <translation>Помеченные как 'unresolved'</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1896" /> + <source>Marking as 'resolved'</source> + <translation>Помеченные как 'resolved'</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1918" /> + <source>Aborting uncommitted merge</source> + <translation>Отмена незавершенного слияния</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1941" /> + <source>Creating branch in the Mercurial repository</source> + <translation>Создание ветки в Mercurial репозитории</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1949" /> + <source>Created new branch <{0}>.</source> + <translation>Создана новая ветка <{0}>.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1958" /> + <source>Showing current branch</source> + <translation>Отображение текущей ветки</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2045" /> + <source>Verifying the integrity of the Mercurial repository</source> + <translation>Mercurial: Проверка целостности репозитория</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2058" /> + <source>Showing the combined configuration settings</source> + <translation>Отображение обобщенных параметров конфигурации</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2069" /> + <source>Showing aliases for remote repositories</source> + <translation>Отображение алиасов удалённых репозиториев</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2080" /> + <source>Recovering from interrupted transaction</source> + <translation>Восстановление после прерванной транзакции</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2091" /> + <source>Identifying project directory</source> + <translation>Идентификация директории проекта</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2133" /> + <source>Create .hgignore file</source> + <translation>Создать файл .hgignore</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2134" /> + <source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source> + <translation><p>Файл <b>{0}</b> уже существует. Перезаписать?</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2235" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2209" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2191" /> + <source>Create changegroup</source> + <translation>Создать группу изменений</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2193" /> + <source>Mercurial Changegroup Files (*.hg)</source> + <translation>Файлы группы изменений Mercurial (*.hg)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2210" /> + <source><p>The Mercurial changegroup file <b>{0}</b> already exists. Overwrite it?</p></source> + <translation><p>Файл группы изменений Mercurial<b>{0}</b> уже существует. Переписать?</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2249" /> + <source>Preview changegroup</source> + <translation>Просмотр группы изменений</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2278" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2267" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2257" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1692" /> - <source>Apply changegroups</source> - <translation>Применить группу изменений</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1695" /> - <source>Pulling from a remote Mercurial repository</source> - <translation>Затягивание изменений из удалённого Mercurial репозитория</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1737" /> - <source>Pushing to a remote Mercurial repository</source> - <translation>Mercurial: Проталкивание изменений в удалённый репозиторий</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1875" /> - <source>Marking as 'unresolved'</source> - <translation>Помеченные как 'unresolved'</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1877" /> - <source>Marking as 'resolved'</source> - <translation>Помеченные как 'resolved'</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1899" /> - <source>Aborting uncommitted merge</source> - <translation>Отмена незавершенного слияния</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1922" /> - <source>Creating branch in the Mercurial repository</source> - <translation>Создание ветки в Mercurial репозитории</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1930" /> - <source>Created new branch <{0}>.</source> - <translation>Создана новая ветка <{0}>.</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1939" /> - <source>Showing current branch</source> - <translation>Отображение текущей ветки</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2026" /> - <source>Verifying the integrity of the Mercurial repository</source> - <translation>Mercurial: Проверка целостности репозитория</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2039" /> - <source>Showing the combined configuration settings</source> - <translation>Отображение обобщенных параметров конфигурации</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2050" /> - <source>Showing aliases for remote repositories</source> - <translation>Отображение алиасов удалённых репозиториев</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2061" /> - <source>Recovering from interrupted transaction</source> - <translation>Восстановление после прерванной транзакции</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2072" /> - <source>Identifying project directory</source> - <translation>Идентификация директории проекта</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2114" /> - <source>Create .hgignore file</source> - <translation>Создать файл .hgignore</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2115" /> - <source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source> - <translation><p>Файл <b>{0}</b> уже существует. Перезаписать?</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2216" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2190" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2172" /> - <source>Create changegroup</source> - <translation>Создать группу изменений</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2174" /> - <source>Mercurial Changegroup Files (*.hg)</source> - <translation>Файлы группы изменений Mercurial (*.hg)</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2191" /> - <source><p>The Mercurial changegroup file <b>{0}</b> already exists. Overwrite it?</p></source> - <translation><p>Файл группы изменений Mercurial<b>{0}</b> уже существует. Переписать?</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2230" /> - <source>Preview changegroup</source> - <translation>Просмотр группы изменений</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2259" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2232" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2251" /> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation>Файлы группы изменений Mercurial (*.hg);;Все файлы (*)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2268" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2287" /> <source>Shall the working directory be updated?</source> <translation>Обновить рабочую директорию?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2300" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2319" /> <source>Bisect subcommand ({0}) invalid.</source> <translation>Bisect: Недействительная подкоманда ({0}).</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2320" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2339" /> <source>Mercurial Bisect ({0})</source> <translation>Mercurial: Bisect ({0})</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2343" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2362" /> <source>Removing files from the Mercurial repository only</source> <translation>Mercurial: Удаление файлов только из репозитория</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2406" /> <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2387" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2368" /> <source>Backing out changeset</source> <translation>Отмена набора изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2369" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2388" /> <source>No revision given. Aborting...</source> <translation>Не задана ревизия. Отмена...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2403" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2398" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2422" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2417" /> <source>Rollback last transaction</source> <translation>Откатить последнюю транзакцию</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2399" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2418" /> <source>Are you sure you want to rollback the last transaction?</source> <translation>Вы действительно хотите откатить последнюю транзакцию?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2465" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2484" /> <source>Import Patch</source> <translation>Импорт патча</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2513" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2532" /> <source>Export Patches</source> <translation>Экспорт патчей</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2553" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2572" /> <source>Change Phase</source> <translation>Изменить фазу</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2607" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2626" /> <source>Copy Changesets</source> <translation>Копировать наборы изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2646" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2665" /> <source>Copy Changesets (Continue)</source> <translation>Копировать наборы изменений (продолжение)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2656" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2675" /> <source>Copy Changesets (Stop)</source> <translation>Копировать наборы изменений (Stop)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2666" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2685" /> <source>Copy Changesets (Abort)</source> <translation>Копировать наборы изменений (Abort)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2689" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2708" /> <source>Create Unversioned Archive</source> <translation>Создать неверсированный архив</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2703" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2722" /> <source>Delete All Backups</source> <translation>Удалить все резервные копии</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2704" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2723" /> <source><p>Do you really want to delete all backup bundles stored in the backup area?<br/><b>{0}</b></p></source> <translation><p>Вы действительно хотите удалить все резервные комплекты, сохраненные в области резервного копирования'?<br/><b>{0}</b></p></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2812" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2792" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2781" /> + <source>Add Sub-repository</source> + <translation>Добавить субрепозиторий</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2851" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2782" /> + <source><p>The sub-repositories file .hgsub could not be read.</p><p>Reason: {0}</p></source> + <translation><p>Невозможно прочитать файл субрепозиториев .hgsub.<b></b>Причина {0}</p></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2793" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2773" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2762" /> - <source>Add Sub-repository</source> - <translation>Добавить субрепозиторий</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2832" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2763" /> - <source><p>The sub-repositories file .hgsub could not be read.</p><p>Reason: {0}</p></source> - <translation><p>Невозможно прочитать файл субрепозиториев .hgsub.<b></b>Причина {0}</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2774" /> <source><p>The sub-repositories file .hgsub already contains an entry <b>{0}</b>. Aborting...</p></source> <translation><p>Файл субрепозиториев .hgsub уже содержит запись <b>{0}</b>. Отмена...</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2850" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2794" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2869" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2813" /> <source><p>The sub-repositories file .hgsub could not be written to.</p><p>Reason: {0}</p></source> <translation><p>Невозможно записать файл субрепозиториев .hgsub.<p><p>Причина: {0}</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2849" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2831" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2817" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2868" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2850" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2836" /> <source>Remove Sub-repositories</source> <translation>Удалить субрепозитории</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2818" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2837" /> <source><p>The sub-repositories file .hgsub does not exist. Aborting...</p></source> <translation><p>Отсутствует файл субрепозиториев .hgsub. Отмена...</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3066" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2929" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3085" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2948" /> <source>Mercurial Command Server</source> <translation>Mercurial: Сервер команд</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2930" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2949" /> <source><p>The Mercurial Command Server could not be restarted.</p><p>Reason: {0}</p></source> <translation><p>Mercurial: Невозможно перезапустить сервер.<br>Причина: {0}.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3067" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3086" /> <source><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></source> <translation><p>Mercurial: Невозможно запустить сервер.<br>Причина: {0}.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3183" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3202" /> <source>Mercurial Bookmark</source> <translation>Mercurial: Закладка</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3199" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3218" /> <source>Delete Bookmark</source> <translation>Удалить закладку</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3200" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3219" /> <source>Select the bookmark to be deleted:</source> <translation>Выберите закладку для удаления:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3210" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3229" /> <source>Delete Mercurial Bookmark</source> <translation>Mercurial: Удалить закладку</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3235" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3254" /> <source>Rename Mercurial Bookmark</source> <translation>Mercurial: Переименовать закладку</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3272" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3291" /> <source>Move Mercurial Bookmark</source> <translation>Mercurial: Переместить закладку</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3345" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3364" /> <source>Pull Bookmark</source> <translation>Затянуть закладку</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3346" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3365" /> <source>Select the bookmark to be pulled:</source> <translation>Выберите закладку для затягивания:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3358" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3377" /> <source>Pulling bookmark from a remote Mercurial repository</source> <translation>Затянуть закладку из удалённого Mercurial репозитория</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3384" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3403" /> <source>Push Bookmark</source> <translation>Протолкнуть закладку</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3385" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3404" /> <source>Select the bookmark to be push:</source> <translation>Выберите закладку для проталкивания:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3400" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3419" /> <source>Pushing bookmark to a remote Mercurial repository</source> <translation>Mercurial: Проталкивание закладки в удалённый репозиторий</translation> </message> @@ -35934,467 +35944,533 @@ <name>HgLogBrowserDialog</name> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="0" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="139" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="140" /> <source>Mercurial Log</source> <translation>Mercurial: Журнал истории</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="141" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="142" /> <source>Mercurial Log (Incoming)</source> <translation>Mercurial: Журнал (входящие)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="143" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="144" /> <source>Mercurial Log (Outgoing)</source> <translation>Mercurial: Журнал (исходящие)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="145" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="146" /> <source>Mercurial Full Log</source> <translation>Mercurial: Полный журнал</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="157" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="158" /> <source>&Refresh</source> <translation>&Освежить</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="160" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="161" /> <source>Press to refresh the list of changesets</source> <translation>Освежить список наборов изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="168" /> - <source>Find</source> - <translation>Найти</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="169" /> + <source>Find</source> + <translation>Найти</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="170" /> <source>Filter</source> <translation>Фильтр</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="0" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="171" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="172" /> <source>Revision</source> <translation>Ревизия</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="0" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="172" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="173" /> <source>Author</source> <translation>Автор</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="0" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="173" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="174" /> <source>Message</source> <translation>Сообщение</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="174" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="175" /> <source>File</source> <translation>Файл</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="0" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="175" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="176" /> <source>Phase</source> <translation>Фаза</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="196" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="197" /> <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>{4}<tr><td><b>Message</b></td><td>{5}</td></tr></table></source> <translation><table><tr><td><b>Ревизия</b></td><td>{0}</td></tr><tr><td><b>Дата</b></td><td>{1}</td></tr><tr><td><b>Автор</b></td><td>{2}</td></tr><tr><td><b>Ветка</b></td><td>{3}</td></tr>{4}<tr><td><b>Сообщение</b></td><td>{5}</td></tr></table></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="206" /> - <source><tr><td><b>Parents</b></td><td>{0}</td></tr></source> - <translation><tr><td><b>Предки</b></td><td>{0}</td></tr></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="207" /> + <source><tr><td><b>Parents</b></td><td>{0}</td></tr></source> + <translation><tr><td><b>Предки</b></td><td>{0}</td></tr></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="208" /> <source><tr><td><b>Children</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Потомки</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="210" /> - <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> - <translation><tr><td><b>Теги</b></td><td>{0}</td></tr></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="211" /> + <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> + <translation><tr><td><b>Теги</b></td><td>{0}</td></tr></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="212" /> <source><tr><td><b>Latest Tag</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Последний тег</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="214" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="215" /> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Закладки</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="226" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="227" /> <source>All</source> <translation>Все</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="244" /> - <source>Added</source> - <translation>Добавлен</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="245" /> - <source>Deleted</source> - <translation>Удален</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="246" /> + <source>Added</source> + <translation>Добавлен</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="247" /> + <source>Deleted</source> + <translation>Удален</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="248" /> <source>Modified</source> <translation>Изменен</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="250" /> - <source>Draft</source> - <translation>Draft</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="251" /> - <source>Public</source> - <translation>Public</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="252" /> + <source>Draft</source> + <translation>Draft</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="253" /> + <source>Public</source> + <translation>Public</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="254" /> <source>Secret</source> <translation>Secret</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="260" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="262" /> <source>Bookmarks</source> <translation>Закладки</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2146" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="299" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="296" /> + <source>View</source> + <translation type="unfinished">Вид</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2978" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="298" /> + <source>Select Branches</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="300" /> + <source>Select the branches to be shown from a list of all branches and refresh the display</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="306" /> + <source>Select Branches (active branches only)</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="309" /> + <source>Select the branches to be shown from a list of active branches and refresh the display</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="315" /> + <source>Select Branches (inactive branches only)</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="318" /> + <source>Select the branches to be shown from a list of inactive branches and refresh the display</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="324" /> + <source>Select Branches (closed branches only)</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="327" /> + <source>Select the branches to be shown from a list of closed branches and refresh the display</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2187" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="343" /> <source>Copy Changesets</source> <translation>Копировать наборы изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="303" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="347" /> <source>Copy the selected changesets to the current branch</source> <translation>Копировать выбранные наборы изменений в текущую ветку</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="308" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="352" /> <source>Merge with Changeset</source> <translation>Слить с набором изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="312" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="356" /> <source>Merge the working directory with the selected changeset</source> <translation>Слияние рабочей директории с выбранным набором изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="316" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="360" /> <source>Change Phase</source> <translation>Изменить фазу</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="319" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="363" /> <source>Change the phase of the selected revisions</source> <translation>Изменить фазу выбранных ревизий</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="322" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="366" /> <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>Изменить фазу</b> <p>Изменение фазы выбранных ревизий. Выбранные ревизии должны иметь одинаковую фазу.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="330" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="374" /> <source>Tag</source> <translation>Тег</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="332" /> - <source>Tag the selected revision</source> - <translation>Тег выбранной ревизии</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="336" /> - <source>Close Heads</source> - <translation>Закрыть головные ревизии</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="339" /> - <source>Close the selected heads</source> - <translation>Закрыть выбранные головные ревизии</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2240" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2223" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="343" /> - <source>Switch</source> - <translation>Переключиться</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="347" /> - <source>Switch the working directory to the selected revision</source> - <translation>Переключить рабочую директорию на выбранную ревизию</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="354" /> - <source>Define Bookmark...</source> - <translation>Определить закладку...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="357" /> - <source>Bookmark the selected revision</source> - <translation>Закладка для выбранной ревизии</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="360" /> - <source>Move Bookmark...</source> - <translation>Переместить закладку...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="364" /> - <source>Move bookmark to the selected revision</source> - <translation>Переместить закладку в выбранную ревизию</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2358" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1558" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="371" /> - <source>Pull Changes</source> - <translation>Затянуть изменения</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="374" /> - <source>Pull changes from a remote repository</source> - <translation>Затянуть изменения из удалённого репозитория</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="376" /> - <source>Pull Large Files</source> - <translation>Загрузить большие файлы</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="378" /> - <source>Pull large files for selected revisions</source> - <translation>Загрузить (затянуть) большие файлы для выбранных ревизий</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="384" /> - <source>Push Selected Changes</source> - <translation>Протолкнуть выбранные изменения</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="388" /> - <source>Push changes of the selected changeset and its ancestors to a remote repository</source> - <translation>Протолкнуть выбранный набор изменений и его предков в удаленный репозиторий</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="395" /> - <source>Push All Changes</source> - <translation>Протолкнуть все изменения</translation> + <source>Tag the selected revision</source> + <translation>Тег выбранной ревизии</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="380" /> + <source>Close Heads</source> + <translation>Закрыть головные ревизии</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="383" /> + <source>Close the selected heads</source> + <translation>Закрыть выбранные головные ревизии</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2281" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2264" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="387" /> + <source>Switch</source> + <translation>Переключиться</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="391" /> + <source>Switch the working directory to the selected revision</source> + <translation>Переключить рабочую директорию на выбранную ревизию</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="398" /> - <source>Push all changes to a remote repository</source> - <translation>Протолкнуть все изменения в удаленный репозиторий</translation> + <source>Define Bookmark...</source> + <translation>Определить закладку...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="401" /> + <source>Bookmark the selected revision</source> + <translation>Закладка для выбранной ревизии</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="404" /> - <source>Create Changegroup</source> - <translation>Создать группу изменений</translation> + <source>Move Bookmark...</source> + <translation>Переместить закладку...</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="408" /> + <source>Move bookmark to the selected revision</source> + <translation>Переместить закладку в выбранную ревизию</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2399" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1599" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="415" /> + <source>Pull Changes</source> + <translation>Затянуть изменения</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="418" /> + <source>Pull changes from a remote repository</source> + <translation>Затянуть изменения из удалённого репозитория</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="420" /> + <source>Pull Large Files</source> + <translation>Загрузить большие файлы</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="422" /> + <source>Pull large files for selected revisions</source> + <translation>Загрузить (затянуть) большие файлы для выбранных ревизий</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="428" /> + <source>Push Selected Changes</source> + <translation>Протолкнуть выбранные изменения</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="432" /> + <source>Push changes of the selected changeset and its ancestors to a remote repository</source> + <translation>Протолкнуть выбранный набор изменений и его предков в удаленный репозиторий</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="439" /> + <source>Push All Changes</source> + <translation>Протолкнуть все изменения</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="442" /> + <source>Push all changes to a remote repository</source> + <translation>Протолкнуть все изменения в удаленный репозиторий</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="448" /> + <source>Create Changegroup</source> + <translation>Создать группу изменений</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="452" /> <source>Create a changegroup file containing the selected changesets</source> <translation>Создать файл группы изменений, содержащий выбранные наборы изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="411" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="455" /> <source><b>Create Changegroup</b> <p>This creates a changegroup file containing the selected revisions. If no revisions are selected, all changesets will be bundled. If one revision is selected, it will be interpreted as the base revision. Otherwise the lowest revision will be used as the base revision and all other revision will be bundled. If the dialog is showing outgoing changesets, all selected changesets will be bundled.</p></source> <translation><b>Создать группу изменений</b> <p>Создание файла группы изменений, содержащего выбранные ревизии. Если не выбрано ни одного набора, будут скомплектованы все наборы изменений. Если выбрана одна ревизия, то она будет интерпретирована как базовая ревизия. В противном случае самая младшая ревизия будет использована как базовая ревизия а все остальные изменения будут скомплектованы. Если диалог отображает исходящие наборы изменений, все помеченные наборы изменений будут собраны в комплект.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2497" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="424" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2538" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="468" /> <source>Apply Changegroup</source> <translation>Применить группу изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="428" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="472" /> <source>Apply the currently viewed changegroup file</source> <translation>Применить просматриваемый в настоящее время файл группы изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="435" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="479" /> <source>Sign Revisions</source> <translation>Подписать ревизию</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="439" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="483" /> <source>Add a signature for the selected revisions</source> <translation>Добавить подпись для выбранной ревизии</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="443" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="487" /> <source>Verify Signatures</source> <translation>Проверить подписи</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="447" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="491" /> <source>Verify all signatures there may be for the selected revision</source> <translation>Проверить все подписи, которые могут быть для отмеченных ревизий</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2404" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="454" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2445" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="498" /> <source>Strip Changesets</source> <translation>Срезать наборы изменений (strip)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="457" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="501" /> <source>Strip changesets from a repository</source> <translation>Срезать наборы изменений из репозитория</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="462" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="506" /> <source>Select All Entries</source> <translation>Выбрать все записи</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="465" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="509" /> <source>Deselect All Entries</source> <translation>Снять выделение всех записей</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="910" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="886" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="863" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="837" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="949" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="925" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="902" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="876" /> <source>Mercurial Error</source> <translation>Mercurial: Ошибка</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1210" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1251" /> <source>{0} (large file)</source> <translation>{0} большой файл</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1468" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1509" /> <source>Side-by-Side Diff to Parent {0}</source> <translation>Построчные различия с предком {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1479" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1520" /> <source><a href="sbsdiff:{0}_{1}">Side-by-Side Compare</a></source> <translation><a href="sbsdiff:{0}_{1}">Построчное сравнение</a></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1637" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1556" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1678" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1597" /> <source>Pull Selected Changes</source> <translation>Затянуть помеченные изменения</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2498" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2405" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2359" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2241" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2147" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2539" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2446" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2400" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2282" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2188" /> <source>The project should be reread. Do this now?</source> <translation>Проект должен быть перепрочитан. Сделать это сейчас?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2224" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2265" /> <source>Select bookmark to switch to (leave empty to use revision):</source> <translation>Выберите закладку для переключения (оставьте поле пустым для использования ревизии):</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2269" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2310" /> <source>Define Bookmark</source> <translation>Определить закладку</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2270" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2311" /> <source>Enter bookmark name for changeset "{0}":</source> <translation>Введите имя закладки для набора изменений "{0}":</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2299" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2340" /> <source>Move Bookmark</source> <translation>Переместить закладку</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2300" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2341" /> <source>Select the bookmark to be moved to changeset "{0}":</source> <translation>Выберите закладку для перемещения в набор изменений "{0}":</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2637" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2678" /> <source>Find Commit</source> <translation>Поиск фиксации</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2638" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2679" /> <source>'{0}' was not found.</source> <translation>'{0}' не найден.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2685" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2726" /> <source>Generating differences ...</source> <translation>Генерация различий...</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="0" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2686" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2727" /> <source>Differences</source> <translation>Различия</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2697" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2738" /> <source>Differences to Parent {0}</source> <translation>Различия с предком {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2713" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2754" /> <source>Diff to Parent {0}{1}</source> <translation>Различия с предком {0}{1}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2736" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2777" /> <source>There is no difference.</source> <translation>Различий нет.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2887" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2871" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2853" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2928" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2912" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2894" /> <source>Save Diff</source> <translation>Сохранить различия</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2855" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2896" /> <source>Patch Files (*.diff)</source> <translation>Файлы патчей (*.diff)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2872" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2913" /> <source><p>The patch file <b>{0}</b> already exists. Overwrite it?</p></source> <translation><p>Файл патча <b>{0}</b> уже существует. Переписать?</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2888" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2929" /> <source><p>The patch file <b>{0}</b> could not be saved.<br>Reason: {1}</p></source> <translation><p>Невозможно сохранить файл патча <b>{0}</b>.<br>Причина: {1}</p></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2960" /> + <source>closed</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2961" /> + <source>inactive</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2970" /> + <source>{0} ({1})</source> + <translation type="unfinished">{0} ({1})</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2979" /> + <source>Select the branches to be shown (none for 'All'):</source> + <translation type="unfinished" /> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="0" /> <source>Select action from menu</source> <translation>Выберите действие из меню</translation> @@ -58725,22 +58801,22 @@ <translation>Несовместимый метод активации плагина.</translation> </message> <message> - <location filename="../PluginManager/PluginManager.py" line="1222" /> + <location filename="../PluginManager/PluginManager.py" line="1216" /> <source>Plugin Manager Error</source> <translation>Ошибка менеджера плагинов</translation> </message> <message> - <location filename="../PluginManager/PluginManager.py" line="1223" /> + <location filename="../PluginManager/PluginManager.py" line="1217" /> <source><p>The plugin download directory <b>{0}</b> could not be created. Please configure it via the configuration dialog.</p><p>Reason: {1}</p></source> <translation><p>Директория для загрузки плагинов <b>{0}</b> не может быть создана. Задайте её посредством диалога конфигурации.</p><p>Причина:{1}</p></translation> </message> <message> - <location filename="../PluginManager/PluginManager.py" line="1311" /> + <location filename="../PluginManager/PluginManager.py" line="1305" /> <source>Error downloading file</source> <translation>Ошибка загрузки файла</translation> </message> <message> - <location filename="../PluginManager/PluginManager.py" line="1312" /> + <location filename="../PluginManager/PluginManager.py" line="1306" /> <source><p>Could not download the requested file from {0}.</p><p>Error: {1}</p></source> <translation><p>Не удалось загрузить запрашиваемый файл из {0}.</p><p>Ошибка: {1}</p></translation> </message> @@ -83568,7 +83644,7 @@ <translation>Untitled {0}</translation> </message> <message> - <location filename="../Plugins/ViewManagerPlugins/Tabview/Tabview.py" line="1502" /> + <location filename="../Plugins/ViewManagerPlugins/Tabview/Tabview.py" line="1500" /> <location filename="../Plugins/ViewManagerPlugins/Tabview/Tabview.py" line="1111" /> <location filename="../Plugins/ViewManagerPlugins/Tabview/Tabview.py" line="1056" /> <source>{0} (ro)</source> @@ -102310,32 +102386,32 @@ <context> <name>mercurial</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1274" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1278" /> <source><tr><td><b>Parent #{0}</b></td><td></td></tr> <tr><td><b>Changeset</b></td><td>{1}</td></tr></source> <translation><tr><td><b>Предок #{0}</b></td><td></td></tr> <tr><td><b>Набор изменений</b></td><td>{1}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1805" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1282" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1824" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1286" /> <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Теги</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1811" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1288" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1830" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1292" /> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Закладки</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1818" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1295" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1837" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1299" /> <source><tr><td><b>Branches</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Ветви</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1301" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1305" /> <source><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr></source> @@ -102345,7 +102421,7 @@ </table></p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1320" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1324" /> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -102362,38 +102438,38 @@ </translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1779" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1798" /> <source><tr><td><b>Head #{0}</b></td><td></td></tr> </source> <translation><tr><td><b>Головная ревизия #{0}</b></td><td></td></tr> </translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1786" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1805" /> <source><tr><td><b>Parent #{0}</b></td><td></td></tr> </source> <translation><tr><td><b>Предок #{0}</b></td><td></td></tr> </translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1793" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1812" /> <source><tr><td><b>Tip</b></td><td></td></tr> </source> <translation><tr><td><b>Вершина</b></td><td></td></tr> </translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1798" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1817" /> <source><tr><td><b>Changeset</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Набор изменений</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1825" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1844" /> <source><tr><td><b>Parents</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Предки</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1831" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1850" /> <source><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr>
--- a/src/eric7/i18n/eric7_tr.ts Mon Sep 25 12:09:23 2023 +0200 +++ b/src/eric7/i18n/eric7_tr.ts Tue Sep 26 18:26:21 2023 +0200 @@ -18678,6 +18678,16 @@ <context> <name>EricListSelectionDialog</name> <message> + <location filename="../EricWidgets/EricListSelectionDialog.py" line="96" /> + <source>Deselect All</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../EricWidgets/EricListSelectionDialog.py" line="99" /> + <source>Select All</source> + <translation type="unfinished">Hepsini Seç</translation> + </message> + <message> <location filename="../EricWidgets/EricListSelectionDialog.ui" line="0" /> <source>Select from List</source> <translation type="unfinished" /> @@ -33504,334 +33514,334 @@ <translation>Mercurial komut</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1377" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1381" /> <source>Copying {0}</source> <translation>Kopyalanıyor {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1616" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1604" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1595" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1635" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1623" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1614" /> <source>Mercurial Side-by-Side Difference</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1617" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1636" /> <source><p>The file <b>{0}</b> could not be read.</p></source> <translation type="unfinished"><p>Dosya <b>{0}</b> okunamıyor.</p></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2297" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2286" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2276" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1711" /> + <source>Apply changegroups</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1714" /> + <source>Pulling from a remote Mercurial repository</source> + <translation>Uzak Mercurial kaynak havuzundan çekiliyor</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1756" /> + <source>Pushing to a remote Mercurial repository</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1894" /> + <source>Marking as 'unresolved'</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1896" /> + <source>Marking as 'resolved'</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1918" /> + <source>Aborting uncommitted merge</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1941" /> + <source>Creating branch in the Mercurial repository</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1949" /> + <source>Created new branch <{0}>.</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1958" /> + <source>Showing current branch</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2045" /> + <source>Verifying the integrity of the Mercurial repository</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2058" /> + <source>Showing the combined configuration settings</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2069" /> + <source>Showing aliases for remote repositories</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2080" /> + <source>Recovering from interrupted transaction</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2091" /> + <source>Identifying project directory</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2133" /> + <source>Create .hgignore file</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2134" /> + <source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source> + <translation><p><b>{0}</b> dosyası halihazırda bulunuyor. Üzerine yazılsın mı?</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2235" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2209" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2191" /> + <source>Create changegroup</source> + <translation>Değişimgrubu oluştur</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2193" /> + <source>Mercurial Changegroup Files (*.hg)</source> + <translation>Mercurial Değiştirme grubu Dosyaları (*.hg)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2210" /> + <source><p>The Mercurial changegroup file <b>{0}</b> already exists. Overwrite it?</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2249" /> + <source>Preview changegroup</source> + <translation>Değişimgrubu öngörünümü</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2278" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2267" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2257" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1692" /> - <source>Apply changegroups</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1695" /> - <source>Pulling from a remote Mercurial repository</source> - <translation>Uzak Mercurial kaynak havuzundan çekiliyor</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1737" /> - <source>Pushing to a remote Mercurial repository</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1875" /> - <source>Marking as 'unresolved'</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1877" /> - <source>Marking as 'resolved'</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1899" /> - <source>Aborting uncommitted merge</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1922" /> - <source>Creating branch in the Mercurial repository</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1930" /> - <source>Created new branch <{0}>.</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1939" /> - <source>Showing current branch</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2026" /> - <source>Verifying the integrity of the Mercurial repository</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2039" /> - <source>Showing the combined configuration settings</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2050" /> - <source>Showing aliases for remote repositories</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2061" /> - <source>Recovering from interrupted transaction</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2072" /> - <source>Identifying project directory</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2114" /> - <source>Create .hgignore file</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2115" /> - <source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source> - <translation><p><b>{0}</b> dosyası halihazırda bulunuyor. Üzerine yazılsın mı?</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2216" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2190" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2172" /> - <source>Create changegroup</source> - <translation>Değişimgrubu oluştur</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2174" /> - <source>Mercurial Changegroup Files (*.hg)</source> - <translation>Mercurial Değiştirme grubu Dosyaları (*.hg)</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2191" /> - <source><p>The Mercurial changegroup file <b>{0}</b> already exists. Overwrite it?</p></source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2230" /> - <source>Preview changegroup</source> - <translation>Değişimgrubu öngörünümü</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2259" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2232" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2251" /> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation>Mercurial Değişimgrubu Dosyaları (*.hg);;Tüm Dosyalar (*)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2268" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2287" /> <source>Shall the working directory be updated?</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2300" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2319" /> <source>Bisect subcommand ({0}) invalid.</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2320" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2339" /> <source>Mercurial Bisect ({0})</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2343" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2362" /> <source>Removing files from the Mercurial repository only</source> <translation type="unfinished" /> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2406" /> <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2387" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2368" /> <source>Backing out changeset</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2369" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2388" /> <source>No revision given. Aborting...</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2403" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2398" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2422" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2417" /> <source>Rollback last transaction</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2399" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2418" /> <source>Are you sure you want to rollback the last transaction?</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2465" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2484" /> <source>Import Patch</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2513" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2532" /> <source>Export Patches</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2553" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2572" /> <source>Change Phase</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2607" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2626" /> <source>Copy Changesets</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2646" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2665" /> <source>Copy Changesets (Continue)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2656" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2675" /> <source>Copy Changesets (Stop)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2666" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2685" /> <source>Copy Changesets (Abort)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2689" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2708" /> <source>Create Unversioned Archive</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2703" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2722" /> <source>Delete All Backups</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2704" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2723" /> <source><p>Do you really want to delete all backup bundles stored in the backup area?<br/><b>{0}</b></p></source> <translation type="unfinished" /> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2812" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2792" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2781" /> + <source>Add Sub-repository</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2851" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2782" /> + <source><p>The sub-repositories file .hgsub could not be read.</p><p>Reason: {0}</p></source> + <translation type="unfinished" /> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2793" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2773" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2762" /> - <source>Add Sub-repository</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2832" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2763" /> - <source><p>The sub-repositories file .hgsub could not be read.</p><p>Reason: {0}</p></source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2774" /> <source><p>The sub-repositories file .hgsub already contains an entry <b>{0}</b>. Aborting...</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2850" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2794" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2869" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2813" /> <source><p>The sub-repositories file .hgsub could not be written to.</p><p>Reason: {0}</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2849" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2831" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2817" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2868" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2850" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2836" /> <source>Remove Sub-repositories</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2818" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2837" /> <source><p>The sub-repositories file .hgsub does not exist. Aborting...</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3066" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2929" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3085" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2948" /> <source>Mercurial Command Server</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2930" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2949" /> <source><p>The Mercurial Command Server could not be restarted.</p><p>Reason: {0}</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3067" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3086" /> <source><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3183" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3202" /> <source>Mercurial Bookmark</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3199" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3218" /> <source>Delete Bookmark</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3200" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3219" /> <source>Select the bookmark to be deleted:</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3210" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3229" /> <source>Delete Mercurial Bookmark</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3235" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3254" /> <source>Rename Mercurial Bookmark</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3272" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3291" /> <source>Move Mercurial Bookmark</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3345" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3364" /> <source>Pull Bookmark</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3346" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3365" /> <source>Select the bookmark to be pulled:</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3358" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3377" /> <source>Pulling bookmark from a remote Mercurial repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3384" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3403" /> <source>Push Bookmark</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3385" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3404" /> <source>Select the bookmark to be push:</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3400" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3419" /> <source>Pushing bookmark to a remote Mercurial repository</source> <translation type="unfinished" /> </message> @@ -35961,465 +35971,531 @@ <name>HgLogBrowserDialog</name> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="0" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="139" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="140" /> <source>Mercurial Log</source> <translation>Mercurial Günlüğü</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="141" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="142" /> <source>Mercurial Log (Incoming)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="143" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="144" /> <source>Mercurial Log (Outgoing)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="145" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="146" /> <source>Mercurial Full Log</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="157" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="158" /> <source>&Refresh</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="160" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="161" /> <source>Press to refresh the list of changesets</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="168" /> - <source>Find</source> - <translation type="unfinished">Bul</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="169" /> + <source>Find</source> + <translation type="unfinished">Bul</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="170" /> <source>Filter</source> <translation type="unfinished">Süzgeç</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="0" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="171" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="172" /> <source>Revision</source> <translation>Gözden Geçirme</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="0" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="172" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="173" /> <source>Author</source> <translation>Yazar</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="0" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="173" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="174" /> <source>Message</source> <translation>Mesaj</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="174" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="175" /> <source>File</source> <translation type="unfinished">Dosya</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="0" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="175" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="176" /> <source>Phase</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="196" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="197" /> <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>{4}<tr><td><b>Message</b></td><td>{5}</td></tr></table></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="206" /> - <source><tr><td><b>Parents</b></td><td>{0}</td></tr></source> - <translation type="unfinished"><tr><td><b>Esas</b></td><td>{0}</td></tr></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="207" /> + <source><tr><td><b>Parents</b></td><td>{0}</td></tr></source> + <translation type="unfinished"><tr><td><b>Esas</b></td><td>{0}</td></tr></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="208" /> <source><tr><td><b>Children</b></td><td>{0}</td></tr></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="210" /> - <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> - <translation type="unfinished"><tr><td><b>Etiketler</b></td><td>{0}</td></tr></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="211" /> + <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> + <translation type="unfinished"><tr><td><b>Etiketler</b></td><td>{0}</td></tr></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="212" /> <source><tr><td><b>Latest Tag</b></td><td>{0}</td></tr></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="214" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="215" /> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="226" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="227" /> <source>All</source> <translation>Hepsi</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="244" /> - <source>Added</source> - <translation>Eklendi</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="245" /> - <source>Deleted</source> - <translation>Silindi</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="246" /> + <source>Added</source> + <translation>Eklendi</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="247" /> + <source>Deleted</source> + <translation>Silindi</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="248" /> <source>Modified</source> <translation>Değiştirildi</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="250" /> - <source>Draft</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="251" /> - <source>Public</source> - <translation type="unfinished" /> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="252" /> + <source>Draft</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="253" /> + <source>Public</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="254" /> <source>Secret</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="260" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="262" /> <source>Bookmarks</source> <translation type="unfinished">Yerimleri</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2146" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="299" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="296" /> + <source>View</source> + <translation type="unfinished">Görünüm</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2978" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="298" /> + <source>Select Branches</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="300" /> + <source>Select the branches to be shown from a list of all branches and refresh the display</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="306" /> + <source>Select Branches (active branches only)</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="309" /> + <source>Select the branches to be shown from a list of active branches and refresh the display</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="315" /> + <source>Select Branches (inactive branches only)</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="318" /> + <source>Select the branches to be shown from a list of inactive branches and refresh the display</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="324" /> + <source>Select Branches (closed branches only)</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="327" /> + <source>Select the branches to be shown from a list of closed branches and refresh the display</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2187" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="343" /> <source>Copy Changesets</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="303" /> - <source>Copy the selected changesets to the current branch</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="308" /> - <source>Merge with Changeset</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="312" /> - <source>Merge the working directory with the selected changeset</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="316" /> - <source>Change Phase</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="319" /> - <source>Change the phase of the selected revisions</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="322" /> - <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" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="330" /> - <source>Tag</source> - <translation type="unfinished">Etiket</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="332" /> - <source>Tag the selected revision</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="336" /> - <source>Close Heads</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="339" /> - <source>Close the selected heads</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2240" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2223" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="343" /> - <source>Switch</source> - <translation type="unfinished">Değiştirmek</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="347" /> - <source>Switch the working directory to the selected revision</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="354" /> - <source>Define Bookmark...</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="357" /> - <source>Bookmark the selected revision</source> + <source>Copy the selected changesets to the current branch</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="352" /> + <source>Merge with Changeset</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="356" /> + <source>Merge the working directory with the selected changeset</source> <translation type="unfinished" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="360" /> - <source>Move Bookmark...</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="364" /> - <source>Move bookmark to the selected revision</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2358" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1558" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="371" /> - <source>Pull Changes</source> + <source>Change Phase</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="363" /> + <source>Change the phase of the selected revisions</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="366" /> + <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" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="374" /> - <source>Pull changes from a remote repository</source> - <translation type="unfinished">Değişiklileri uzak kaynak havuzundan çek</translation> + <source>Tag</source> + <translation type="unfinished">Etiket</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="376" /> - <source>Pull Large Files</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="378" /> - <source>Pull large files for selected revisions</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="384" /> - <source>Push Selected Changes</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="388" /> - <source>Push changes of the selected changeset and its ancestors to a remote repository</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="395" /> - <source>Push All Changes</source> + <source>Tag the selected revision</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="380" /> + <source>Close Heads</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="383" /> + <source>Close the selected heads</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2281" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2264" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="387" /> + <source>Switch</source> + <translation type="unfinished">Değiştirmek</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="391" /> + <source>Switch the working directory to the selected revision</source> <translation type="unfinished" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="398" /> - <source>Push all changes to a remote repository</source> + <source>Define Bookmark...</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="401" /> + <source>Bookmark the selected revision</source> <translation type="unfinished" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="404" /> - <source>Create Changegroup</source> + <source>Move Bookmark...</source> <translation type="unfinished" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="408" /> - <source>Create a changegroup file containing the selected changesets</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="411" /> - <source><b>Create Changegroup</b> -<p>This creates a changegroup file containing the selected revisions. If no revisions are selected, all changesets will be bundled. If one revision is selected, it will be interpreted as the base revision. Otherwise the lowest revision will be used as the base revision and all other revision will be bundled. If the dialog is showing outgoing changesets, all selected changesets will be bundled.</p></source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2497" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="424" /> - <source>Apply Changegroup</source> + <source>Move bookmark to the selected revision</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2399" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1599" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="415" /> + <source>Pull Changes</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="418" /> + <source>Pull changes from a remote repository</source> + <translation type="unfinished">Değişiklileri uzak kaynak havuzundan çek</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="420" /> + <source>Pull Large Files</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="422" /> + <source>Pull large files for selected revisions</source> <translation type="unfinished" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="428" /> - <source>Apply the currently viewed changegroup file</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="435" /> - <source>Sign Revisions</source> + <source>Push Selected Changes</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="432" /> + <source>Push changes of the selected changeset and its ancestors to a remote repository</source> <translation type="unfinished" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="439" /> + <source>Push All Changes</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="442" /> + <source>Push all changes to a remote repository</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="448" /> + <source>Create Changegroup</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="452" /> + <source>Create a changegroup file containing the selected changesets</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="455" /> + <source><b>Create Changegroup</b> +<p>This creates a changegroup file containing the selected revisions. If no revisions are selected, all changesets will be bundled. If one revision is selected, it will be interpreted as the base revision. Otherwise the lowest revision will be used as the base revision and all other revision will be bundled. If the dialog is showing outgoing changesets, all selected changesets will be bundled.</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2538" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="468" /> + <source>Apply Changegroup</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="472" /> + <source>Apply the currently viewed changegroup file</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="479" /> + <source>Sign Revisions</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="483" /> <source>Add a signature for the selected revisions</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="443" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="487" /> <source>Verify Signatures</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="447" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="491" /> <source>Verify all signatures there may be for the selected revision</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2404" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="454" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2445" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="498" /> <source>Strip Changesets</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="457" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="501" /> <source>Strip changesets from a repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="462" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="506" /> <source>Select All Entries</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="465" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="509" /> <source>Deselect All Entries</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="910" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="886" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="863" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="837" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="949" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="925" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="902" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="876" /> <source>Mercurial Error</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1210" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1251" /> <source>{0} (large file)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1468" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1509" /> <source>Side-by-Side Diff to Parent {0}</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1479" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1520" /> <source><a href="sbsdiff:{0}_{1}">Side-by-Side Compare</a></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1637" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1556" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1678" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1597" /> <source>Pull Selected Changes</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2498" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2405" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2359" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2241" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2147" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2539" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2446" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2400" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2282" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2188" /> <source>The project should be reread. Do this now?</source> <translation type="unfinished">Projenin yeniden okunması gerekiyor. Şimdi yapılsın mı?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2224" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2265" /> <source>Select bookmark to switch to (leave empty to use revision):</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2269" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2310" /> <source>Define Bookmark</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2270" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2311" /> <source>Enter bookmark name for changeset "{0}":</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2299" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2340" /> <source>Move Bookmark</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2300" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2341" /> <source>Select the bookmark to be moved to changeset "{0}":</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2637" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2678" /> <source>Find Commit</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2638" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2679" /> <source>'{0}' was not found.</source> <translation type="unfinished">'{0}' bulunamadı.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2685" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2726" /> <source>Generating differences ...</source> <translation type="unfinished" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="0" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2686" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2727" /> <source>Differences</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2697" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2738" /> <source>Differences to Parent {0}</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2713" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2754" /> <source>Diff to Parent {0}{1}</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2736" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2777" /> <source>There is no difference.</source> <translation type="unfinished">Herhangi bir farklılık bulunamadı.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2887" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2871" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2853" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2928" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2912" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2894" /> <source>Save Diff</source> <translation type="unfinished">Farklılıkları Kaydet</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2855" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2896" /> <source>Patch Files (*.diff)</source> <translation type="unfinished">Patch Dosyaları (*.diff)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2872" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2913" /> <source><p>The patch file <b>{0}</b> already exists. Overwrite it?</p></source> <translation type="unfinished"><p>Yama dosyası <b>{0}</b> zaten var. Üzerine yazılsın mı?</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2888" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2929" /> <source><p>The patch file <b>{0}</b> could not be saved.<br>Reason: {1}</p></source> <translation type="unfinished"><p><b>{0}</b>yama kaydedilemedi.<br>Sebep: {1}</p></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2960" /> + <source>closed</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2961" /> + <source>inactive</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2970" /> + <source>{0} ({1})</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2979" /> + <source>Select the branches to be shown (none for 'All'):</source> + <translation type="unfinished" /> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="0" /> <source>Select action from menu</source> <translation type="unfinished" /> @@ -58733,22 +58809,22 @@ <translation>Eklenti etkinleştirme yöntemi uyuşmuyor.</translation> </message> <message> - <location filename="../PluginManager/PluginManager.py" line="1222" /> + <location filename="../PluginManager/PluginManager.py" line="1216" /> <source>Plugin Manager Error</source> <translation>Eklenti Yöneticisi Hatası</translation> </message> <message> - <location filename="../PluginManager/PluginManager.py" line="1223" /> + <location filename="../PluginManager/PluginManager.py" line="1217" /> <source><p>The plugin download directory <b>{0}</b> could not be created. Please configure it via the configuration dialog.</p><p>Reason: {1}</p></source> <translation><p>eklenti dizini <b>{0}</b> oluşturulamıyor. Lütfen ayarlama diyaloğu aracılığı ile düzenleyin.</p><p>Sebep: {1}</p></translation> </message> <message> - <location filename="../PluginManager/PluginManager.py" line="1311" /> + <location filename="../PluginManager/PluginManager.py" line="1305" /> <source>Error downloading file</source> <translation type="unfinished">Dosya yüklenirken hata</translation> </message> <message> - <location filename="../PluginManager/PluginManager.py" line="1312" /> + <location filename="../PluginManager/PluginManager.py" line="1306" /> <source><p>Could not download the requested file from {0}.</p><p>Error: {1}</p></source> <translation type="unfinished" /> </message> @@ -83569,7 +83645,7 @@ <translation>Başlıksız {0}</translation> </message> <message> - <location filename="../Plugins/ViewManagerPlugins/Tabview/Tabview.py" line="1502" /> + <location filename="../Plugins/ViewManagerPlugins/Tabview/Tabview.py" line="1500" /> <location filename="../Plugins/ViewManagerPlugins/Tabview/Tabview.py" line="1111" /> <location filename="../Plugins/ViewManagerPlugins/Tabview/Tabview.py" line="1056" /> <source>{0} (ro)</source> @@ -102151,32 +102227,32 @@ <context> <name>mercurial</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1274" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1278" /> <source><tr><td><b>Parent #{0}</b></td><td></td></tr> <tr><td><b>Changeset</b></td><td>{1}</td></tr></source> <translation><tr><td><b>Esas #{0}</b></td><td></td></tr> <tr><td><b>Değişiklik seti</b></td><td>{1}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1805" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1282" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1824" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1286" /> <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Etiketler</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1811" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1288" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1830" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1292" /> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1818" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1295" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1837" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1299" /> <source><tr><td><b>Branches</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Branşlar</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1301" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1305" /> <source><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr></source> @@ -102185,7 +102261,7 @@ <tr><td><b>Teslim zamnanı</b></td><td>{2}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1320" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1324" /> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -102196,35 +102272,35 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1779" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1798" /> <source><tr><td><b>Head #{0}</b></td><td></td></tr> </source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1786" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1805" /> <source><tr><td><b>Parent #{0}</b></td><td></td></tr> </source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1793" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1812" /> <source><tr><td><b>Tip</b></td><td></td></tr> </source> <translation><tr><td><b>İp ucu</b></td><td></td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1798" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1817" /> <source><tr><td><b>Changeset</b></td><td>{0}</td></tr></source> <translation><tr><td><b>DEğişiklik seti</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1825" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1844" /> <source><tr><td><b>Parents</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Esas</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1831" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1850" /> <source><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr>
--- a/src/eric7/i18n/eric7_zh_CN.ts Mon Sep 25 12:09:23 2023 +0200 +++ b/src/eric7/i18n/eric7_zh_CN.ts Tue Sep 26 18:26:21 2023 +0200 @@ -18757,6 +18757,16 @@ <context> <name>EricListSelectionDialog</name> <message> + <location filename="../EricWidgets/EricListSelectionDialog.py" line="96" /> + <source>Deselect All</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../EricWidgets/EricListSelectionDialog.py" line="99" /> + <source>Select All</source> + <translation type="unfinished">全选</translation> + </message> + <message> <location filename="../EricWidgets/EricListSelectionDialog.ui" line="0" /> <source>Select from List</source> <translation type="unfinished" /> @@ -33581,334 +33591,334 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1377" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1381" /> <source>Copying {0}</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1616" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1604" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1595" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1635" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1623" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1614" /> <source>Mercurial Side-by-Side Difference</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1617" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1636" /> <source><p>The file <b>{0}</b> could not be read.</p></source> <translation><p>文件 <b>{0}</b> 无法读取。</p></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2297" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2286" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2276" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1711" /> + <source>Apply changegroups</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1714" /> + <source>Pulling from a remote Mercurial repository</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1756" /> + <source>Pushing to a remote Mercurial repository</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1894" /> + <source>Marking as 'unresolved'</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1896" /> + <source>Marking as 'resolved'</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1918" /> + <source>Aborting uncommitted merge</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1941" /> + <source>Creating branch in the Mercurial repository</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1949" /> + <source>Created new branch <{0}>.</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1958" /> + <source>Showing current branch</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2045" /> + <source>Verifying the integrity of the Mercurial repository</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2058" /> + <source>Showing the combined configuration settings</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2069" /> + <source>Showing aliases for remote repositories</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2080" /> + <source>Recovering from interrupted transaction</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2091" /> + <source>Identifying project directory</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2133" /> + <source>Create .hgignore file</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2134" /> + <source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source> + <translation><p>文件 <b>{0}</b> 已经存在。是否覆盖?</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2235" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2209" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2191" /> + <source>Create changegroup</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2193" /> + <source>Mercurial Changegroup Files (*.hg)</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2210" /> + <source><p>The Mercurial changegroup file <b>{0}</b> already exists. Overwrite it?</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2249" /> + <source>Preview changegroup</source> + <translation type="unfinished" /> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2278" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2267" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2257" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1692" /> - <source>Apply changegroups</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1695" /> - <source>Pulling from a remote Mercurial repository</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1737" /> - <source>Pushing to a remote Mercurial repository</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1875" /> - <source>Marking as 'unresolved'</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1877" /> - <source>Marking as 'resolved'</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1899" /> - <source>Aborting uncommitted merge</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1922" /> - <source>Creating branch in the Mercurial repository</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1930" /> - <source>Created new branch <{0}>.</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1939" /> - <source>Showing current branch</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2026" /> - <source>Verifying the integrity of the Mercurial repository</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2039" /> - <source>Showing the combined configuration settings</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2050" /> - <source>Showing aliases for remote repositories</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2061" /> - <source>Recovering from interrupted transaction</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2072" /> - <source>Identifying project directory</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2114" /> - <source>Create .hgignore file</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2115" /> - <source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source> - <translation><p>文件 <b>{0}</b> 已经存在。是否覆盖?</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2216" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2190" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2172" /> - <source>Create changegroup</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2174" /> - <source>Mercurial Changegroup Files (*.hg)</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2191" /> - <source><p>The Mercurial changegroup file <b>{0}</b> already exists. Overwrite it?</p></source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2230" /> - <source>Preview changegroup</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2259" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2232" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2251" /> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2268" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2287" /> <source>Shall the working directory be updated?</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2300" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2319" /> <source>Bisect subcommand ({0}) invalid.</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2320" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2339" /> <source>Mercurial Bisect ({0})</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2343" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2362" /> <source>Removing files from the Mercurial repository only</source> <translation type="unfinished" /> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2406" /> <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2387" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2368" /> <source>Backing out changeset</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2369" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2388" /> <source>No revision given. Aborting...</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2403" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2398" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2422" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2417" /> <source>Rollback last transaction</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2399" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2418" /> <source>Are you sure you want to rollback the last transaction?</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2465" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2484" /> <source>Import Patch</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2513" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2532" /> <source>Export Patches</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2553" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2572" /> <source>Change Phase</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2607" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2626" /> <source>Copy Changesets</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2646" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2665" /> <source>Copy Changesets (Continue)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2656" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2675" /> <source>Copy Changesets (Stop)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2666" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2685" /> <source>Copy Changesets (Abort)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2689" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2708" /> <source>Create Unversioned Archive</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2703" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2722" /> <source>Delete All Backups</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2704" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2723" /> <source><p>Do you really want to delete all backup bundles stored in the backup area?<br/><b>{0}</b></p></source> <translation type="unfinished" /> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2812" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2792" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2781" /> + <source>Add Sub-repository</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2851" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2782" /> + <source><p>The sub-repositories file .hgsub could not be read.</p><p>Reason: {0}</p></source> + <translation type="unfinished" /> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2793" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2773" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2762" /> - <source>Add Sub-repository</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2832" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2763" /> - <source><p>The sub-repositories file .hgsub could not be read.</p><p>Reason: {0}</p></source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2774" /> <source><p>The sub-repositories file .hgsub already contains an entry <b>{0}</b>. Aborting...</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2850" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2794" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2869" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2813" /> <source><p>The sub-repositories file .hgsub could not be written to.</p><p>Reason: {0}</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2849" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2831" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2817" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2868" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2850" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2836" /> <source>Remove Sub-repositories</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2818" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2837" /> <source><p>The sub-repositories file .hgsub does not exist. Aborting...</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3066" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2929" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3085" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2948" /> <source>Mercurial Command Server</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2930" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2949" /> <source><p>The Mercurial Command Server could not be restarted.</p><p>Reason: {0}</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3067" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3086" /> <source><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3183" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3202" /> <source>Mercurial Bookmark</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3199" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3218" /> <source>Delete Bookmark</source> <translation type="unfinished">删除书签</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3200" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3219" /> <source>Select the bookmark to be deleted:</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3210" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3229" /> <source>Delete Mercurial Bookmark</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3235" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3254" /> <source>Rename Mercurial Bookmark</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3272" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3291" /> <source>Move Mercurial Bookmark</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3345" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3364" /> <source>Pull Bookmark</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3346" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3365" /> <source>Select the bookmark to be pulled:</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3358" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3377" /> <source>Pulling bookmark from a remote Mercurial repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3384" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3403" /> <source>Push Bookmark</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3385" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3404" /> <source>Select the bookmark to be push:</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3400" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3419" /> <source>Pushing bookmark to a remote Mercurial repository</source> <translation type="unfinished" /> </message> @@ -36038,465 +36048,531 @@ <name>HgLogBrowserDialog</name> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="0" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="139" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="140" /> <source>Mercurial Log</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="141" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="142" /> <source>Mercurial Log (Incoming)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="143" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="144" /> <source>Mercurial Log (Outgoing)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="145" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="146" /> <source>Mercurial Full Log</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="157" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="158" /> <source>&Refresh</source> <translation type="unfinished">刷新(&R)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="160" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="161" /> <source>Press to refresh the list of changesets</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="168" /> - <source>Find</source> - <translation type="unfinished">查找</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="169" /> + <source>Find</source> + <translation type="unfinished">查找</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="170" /> <source>Filter</source> <translation type="unfinished">过滤器</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="0" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="171" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="172" /> <source>Revision</source> <translation type="unfinished">修订</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="0" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="172" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="173" /> <source>Author</source> <translation type="unfinished">作者</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="0" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="173" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="174" /> <source>Message</source> <translation type="unfinished">消息</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="174" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="175" /> <source>File</source> <translation type="unfinished">文件</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="0" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="175" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="176" /> <source>Phase</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="196" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="197" /> <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>{4}<tr><td><b>Message</b></td><td>{5}</td></tr></table></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="206" /> - <source><tr><td><b>Parents</b></td><td>{0}</td></tr></source> - <translation type="unfinished" /> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="207" /> + <source><tr><td><b>Parents</b></td><td>{0}</td></tr></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="208" /> <source><tr><td><b>Children</b></td><td>{0}</td></tr></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="210" /> - <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> - <translation type="unfinished" /> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="211" /> + <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="212" /> <source><tr><td><b>Latest Tag</b></td><td>{0}</td></tr></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="214" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="215" /> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="226" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="227" /> <source>All</source> <translation type="unfinished">全部</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="244" /> - <source>Added</source> - <translation type="unfinished">已添加</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="245" /> - <source>Deleted</source> - <translation type="unfinished">已删除</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="246" /> + <source>Added</source> + <translation type="unfinished">已添加</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="247" /> + <source>Deleted</source> + <translation type="unfinished">已删除</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="248" /> <source>Modified</source> <translation type="unfinished">已修改</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="250" /> - <source>Draft</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="251" /> - <source>Public</source> - <translation type="unfinished" /> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="252" /> + <source>Draft</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="253" /> + <source>Public</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="254" /> <source>Secret</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="260" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="262" /> <source>Bookmarks</source> <translation type="unfinished">书签</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2146" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="299" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="296" /> + <source>View</source> + <translation type="unfinished">视图</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2978" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="298" /> + <source>Select Branches</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="300" /> + <source>Select the branches to be shown from a list of all branches and refresh the display</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="306" /> + <source>Select Branches (active branches only)</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="309" /> + <source>Select the branches to be shown from a list of active branches and refresh the display</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="315" /> + <source>Select Branches (inactive branches only)</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="318" /> + <source>Select the branches to be shown from a list of inactive branches and refresh the display</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="324" /> + <source>Select Branches (closed branches only)</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="327" /> + <source>Select the branches to be shown from a list of closed branches and refresh the display</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2187" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="343" /> <source>Copy Changesets</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="303" /> - <source>Copy the selected changesets to the current branch</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="308" /> - <source>Merge with Changeset</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="312" /> - <source>Merge the working directory with the selected changeset</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="316" /> - <source>Change Phase</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="319" /> - <source>Change the phase of the selected revisions</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="322" /> - <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" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="330" /> - <source>Tag</source> - <translation type="unfinished">标签</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="332" /> - <source>Tag the selected revision</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="336" /> - <source>Close Heads</source> - <translation type="unfinished">关闭头文件</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="339" /> - <source>Close the selected heads</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2240" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2223" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="343" /> - <source>Switch</source> - <translation type="unfinished">转换</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="347" /> - <source>Switch the working directory to the selected revision</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="354" /> - <source>Define Bookmark...</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="357" /> - <source>Bookmark the selected revision</source> + <source>Copy the selected changesets to the current branch</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="352" /> + <source>Merge with Changeset</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="356" /> + <source>Merge the working directory with the selected changeset</source> <translation type="unfinished" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="360" /> - <source>Move Bookmark...</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="364" /> - <source>Move bookmark to the selected revision</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2358" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1558" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="371" /> - <source>Pull Changes</source> + <source>Change Phase</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="363" /> + <source>Change the phase of the selected revisions</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="366" /> + <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" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="374" /> - <source>Pull changes from a remote repository</source> - <translation type="unfinished" /> + <source>Tag</source> + <translation type="unfinished">标签</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="376" /> - <source>Pull Large Files</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="378" /> - <source>Pull large files for selected revisions</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="384" /> - <source>Push Selected Changes</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="388" /> - <source>Push changes of the selected changeset and its ancestors to a remote repository</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="395" /> - <source>Push All Changes</source> + <source>Tag the selected revision</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="380" /> + <source>Close Heads</source> + <translation type="unfinished">关闭头文件</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="383" /> + <source>Close the selected heads</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2281" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2264" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="387" /> + <source>Switch</source> + <translation type="unfinished">转换</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="391" /> + <source>Switch the working directory to the selected revision</source> <translation type="unfinished" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="398" /> - <source>Push all changes to a remote repository</source> + <source>Define Bookmark...</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="401" /> + <source>Bookmark the selected revision</source> <translation type="unfinished" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="404" /> - <source>Create Changegroup</source> + <source>Move Bookmark...</source> <translation type="unfinished" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="408" /> - <source>Create a changegroup file containing the selected changesets</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="411" /> - <source><b>Create Changegroup</b> -<p>This creates a changegroup file containing the selected revisions. If no revisions are selected, all changesets will be bundled. If one revision is selected, it will be interpreted as the base revision. Otherwise the lowest revision will be used as the base revision and all other revision will be bundled. If the dialog is showing outgoing changesets, all selected changesets will be bundled.</p></source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2497" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="424" /> - <source>Apply Changegroup</source> + <source>Move bookmark to the selected revision</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2399" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1599" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="415" /> + <source>Pull Changes</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="418" /> + <source>Pull changes from a remote repository</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="420" /> + <source>Pull Large Files</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="422" /> + <source>Pull large files for selected revisions</source> <translation type="unfinished" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="428" /> - <source>Apply the currently viewed changegroup file</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="435" /> - <source>Sign Revisions</source> + <source>Push Selected Changes</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="432" /> + <source>Push changes of the selected changeset and its ancestors to a remote repository</source> <translation type="unfinished" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="439" /> + <source>Push All Changes</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="442" /> + <source>Push all changes to a remote repository</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="448" /> + <source>Create Changegroup</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="452" /> + <source>Create a changegroup file containing the selected changesets</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="455" /> + <source><b>Create Changegroup</b> +<p>This creates a changegroup file containing the selected revisions. If no revisions are selected, all changesets will be bundled. If one revision is selected, it will be interpreted as the base revision. Otherwise the lowest revision will be used as the base revision and all other revision will be bundled. If the dialog is showing outgoing changesets, all selected changesets will be bundled.</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2538" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="468" /> + <source>Apply Changegroup</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="472" /> + <source>Apply the currently viewed changegroup file</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="479" /> + <source>Sign Revisions</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="483" /> <source>Add a signature for the selected revisions</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="443" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="487" /> <source>Verify Signatures</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="447" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="491" /> <source>Verify all signatures there may be for the selected revision</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2404" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="454" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2445" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="498" /> <source>Strip Changesets</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="457" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="501" /> <source>Strip changesets from a repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="462" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="506" /> <source>Select All Entries</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="465" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="509" /> <source>Deselect All Entries</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="910" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="886" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="863" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="837" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="949" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="925" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="902" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="876" /> <source>Mercurial Error</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1210" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1251" /> <source>{0} (large file)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1468" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1509" /> <source>Side-by-Side Diff to Parent {0}</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1479" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1520" /> <source><a href="sbsdiff:{0}_{1}">Side-by-Side Compare</a></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1637" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1556" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1678" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1597" /> <source>Pull Selected Changes</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2498" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2405" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2359" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2241" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2147" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2539" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2446" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2400" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2282" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2188" /> <source>The project should be reread. Do this now?</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2224" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2265" /> <source>Select bookmark to switch to (leave empty to use revision):</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2269" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2310" /> <source>Define Bookmark</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2270" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2311" /> <source>Enter bookmark name for changeset "{0}":</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2299" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2340" /> <source>Move Bookmark</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2300" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2341" /> <source>Select the bookmark to be moved to changeset "{0}":</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2637" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2678" /> <source>Find Commit</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2638" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2679" /> <source>'{0}' was not found.</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2685" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2726" /> <source>Generating differences ...</source> <translation type="unfinished" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="0" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2686" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2727" /> <source>Differences</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2697" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2738" /> <source>Differences to Parent {0}</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2713" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2754" /> <source>Diff to Parent {0}{1}</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2736" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2777" /> <source>There is no difference.</source> <translation type="unfinished">没有差异。</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2887" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2871" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2853" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2928" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2912" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2894" /> <source>Save Diff</source> <translation type="unfinished">保存差异</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2855" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2896" /> <source>Patch Files (*.diff)</source> <translation type="unfinished">补丁文件 (*.diff)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2872" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2913" /> <source><p>The patch file <b>{0}</b> already exists. Overwrite it?</p></source> <translation type="unfinished"><p>补丁文件 <b>{0}</b> 已经存在。是否覆盖?</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2888" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2929" /> <source><p>The patch file <b>{0}</b> could not be saved.<br>Reason: {1}</p></source> <translation type="unfinished"><p>补丁文件 <b>{0}</b> 无法保存。<br />原因:{1}</p></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2960" /> + <source>closed</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2961" /> + <source>inactive</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2970" /> + <source>{0} ({1})</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2979" /> + <source>Select the branches to be shown (none for 'All'):</source> + <translation type="unfinished" /> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="0" /> <source>Select action from menu</source> <translation type="unfinished" /> @@ -58869,22 +58945,22 @@ <translation>插件激活方法不兼容。</translation> </message> <message> - <location filename="../PluginManager/PluginManager.py" line="1222" /> + <location filename="../PluginManager/PluginManager.py" line="1216" /> <source>Plugin Manager Error</source> <translation>插件管理错误</translation> </message> <message> - <location filename="../PluginManager/PluginManager.py" line="1223" /> + <location filename="../PluginManager/PluginManager.py" line="1217" /> <source><p>The plugin download directory <b>{0}</b> could not be created. Please configure it via the configuration dialog.</p><p>Reason: {1}</p></source> <translation><p>插件下载目录 <b>{0}</b> 无法创建。请使用配置对话框进行配置。</p><p>原因:{1}</p></translation> </message> <message> - <location filename="../PluginManager/PluginManager.py" line="1311" /> + <location filename="../PluginManager/PluginManager.py" line="1305" /> <source>Error downloading file</source> <translation>下载文件出错</translation> </message> <message> - <location filename="../PluginManager/PluginManager.py" line="1312" /> + <location filename="../PluginManager/PluginManager.py" line="1306" /> <source><p>Could not download the requested file from {0}.</p><p>Error: {1}</p></source> <translation><p>无法从 {0} 下载指定文件。</p><p>错误:{1}</p></translation> </message> @@ -83902,7 +83978,7 @@ <translation>无标题 {0}</translation> </message> <message> - <location filename="../Plugins/ViewManagerPlugins/Tabview/Tabview.py" line="1502" /> + <location filename="../Plugins/ViewManagerPlugins/Tabview/Tabview.py" line="1500" /> <location filename="../Plugins/ViewManagerPlugins/Tabview/Tabview.py" line="1111" /> <location filename="../Plugins/ViewManagerPlugins/Tabview/Tabview.py" line="1056" /> <source>{0} (ro)</source> @@ -102510,38 +102586,38 @@ <context> <name>mercurial</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1274" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1278" /> <source><tr><td><b>Parent #{0}</b></td><td></td></tr> <tr><td><b>Changeset</b></td><td>{1}</td></tr></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1805" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1282" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1824" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1286" /> <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1811" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1288" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1830" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1292" /> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1818" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1295" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1837" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1299" /> <source><tr><td><b>Branches</b></td><td>{0}</td></tr></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1301" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1305" /> <source><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1320" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1324" /> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -102552,35 +102628,35 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1779" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1798" /> <source><tr><td><b>Head #{0}</b></td><td></td></tr> </source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1786" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1805" /> <source><tr><td><b>Parent #{0}</b></td><td></td></tr> </source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1793" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1812" /> <source><tr><td><b>Tip</b></td><td></td></tr> </source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1798" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1817" /> <source><tr><td><b>Changeset</b></td><td>{0}</td></tr></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1825" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1844" /> <source><tr><td><b>Parents</b></td><td>{0}</td></tr></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1831" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1850" /> <source><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr>