Mercurial Repositories > eric / changeset
changeset
Modified the Mercurial log browser window slightly to allow pulling all or just selected changes (later without potentially updating the working directory).
Thu, 19 Dec 2024 19:32:37 +0100
- author
- Detlev Offenbach <detlev@die-offenbachs.de>
- date
- Thu, 19 Dec 2024 19:32:37 +0100
- branch
- eric7
- changeset 11109
- 3de1710db709
- parent 11108
- 62f50b72fbb7
- child 11110
- e61d3653924f
Modified the Mercurial log browser window slightly to allow pulling all or just selected changes (later without potentially updating the working directory).
--- a/src/eric7/APIs/Python3/eric7.api Thu Dec 19 16:06:08 2024 +0100 +++ b/src/eric7/APIs/Python3/eric7.api Thu Dec 19 19:32:37 2024 +0100 @@ -6566,7 +6566,7 @@ eric7.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgOutgoing?4() eric7.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgPhase?4(data=None) eric7.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgPreviewBundle?4() -eric7.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgPull?4(revisions=None) +eric7.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgPull?4(revisions=None, noupdate=False) eric7.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgPush?4(force=False, newBranch=False, rev=None) eric7.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgReMerge?4(name) eric7.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgRecover?4()
--- a/src/eric7/Documentation/Source/eric7.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html Thu Dec 19 16:06:08 2024 +0100 +++ b/src/eric7/Documentation/Source/eric7.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html Thu Dec 19 19:32:37 2024 +0100 @@ -209,7 +209,7 @@ </tr> <tr> <td><a href="#HgLogBrowserDialog.__pullActTriggered">__pullActTriggered</a></td> -<td>Private slot to pull changes from a remote repository.</td> +<td>Private slot to pull all or selected changes from a remote repository.</td> </tr> <tr> <td><a href="#HgLogBrowserDialog.__pushActTriggered">__pushActTriggered</a></td> @@ -980,11 +980,19 @@ <a NAME="HgLogBrowserDialog.__pullActTriggered" ID="HgLogBrowserDialog.__pullActTriggered"></a> <h4>HgLogBrowserDialog.__pullActTriggered</h4> -<b>__pullActTriggered</b>(<i></i>) +<b>__pullActTriggered</b>(<i>selectedOnly=False</i>) <p> - Private slot to pull changes from a remote repository. + Private slot to pull all or selected changes from a remote repository. </p> +<dl> + +<dt><i>selectedOnly</i> (bool (optional))</dt> +<dd> +flag indicating to pull the selected changes only + (defaults to False) +</dd> +</dl> <a NAME="HgLogBrowserDialog.__pushActTriggered" ID="HgLogBrowserDialog.__pushActTriggered"></a> <h4>HgLogBrowserDialog.__pushActTriggered</h4> <b>__pushActTriggered</b>(<i></i>)
--- a/src/eric7/Documentation/Source/eric7.Plugins.VcsPlugins.vcsMercurial.hg.html Thu Dec 19 16:06:08 2024 +0100 +++ b/src/eric7/Documentation/Source/eric7.Plugins.VcsPlugins.vcsMercurial.hg.html Thu Dec 19 19:32:37 2024 +0100 @@ -1685,16 +1685,21 @@ <a NAME="Hg.hgPull" ID="Hg.hgPull"></a> <h4>Hg.hgPull</h4> -<b>hgPull</b>(<i>revisions=None</i>) +<b>hgPull</b>(<i>revisions=None, noupdate=False</i>) <p> Public method used to pull changes from a remote Mercurial repository. </p> <dl> -<dt><i>revisions</i> (list of str)</dt> +<dt><i>revisions</i> (list of str (optional))</dt> <dd> -list of revisions to be pulled +list of revisions to be pulled (defaults to None) +</dd> +<dt><i>noupdate</i> (bool (optional))</dt> +<dd> +flag indicate to not update the working directory (defaults + to False) </dd> </dl> <dl>
--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py Thu Dec 19 16:06:08 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py Thu Dec 19 19:32:37 2024 +0100 @@ -412,10 +412,20 @@ self.__pullAct = self.__actionsMenu.addAction( EricPixmapCache.getIcon("vcsUpdate"), - self.tr("Pull Changes"), - self.__pullActTriggered, + self.tr("Pull Selected Changes"), + lambda: self.__pullActTriggered(selectedOnly=True), + ) + self.__pullAct.setToolTip( + self.tr("Pull selected changes from a remote repository") ) - self.__pullAct.setToolTip(self.tr("Pull changes from a remote repository")) + self.__pullAllAct = self.__actionsMenu.addAction( + EricPixmapCache.getIcon("vcsUpdate"), + self.tr("Pull All Changes"), + lambda: self.__pullActTriggered(selectedOnly=False), + ) + self.__pullAllAct.setToolTip( + self.tr("Pull all changes from a remote repository") + ) self.__lfPullAct = self.__actionsMenu.addAction( self.tr("Pull Large Files"), self.__lfPullActTriggered ) @@ -1616,12 +1626,9 @@ self.__bookmarkAct.setEnabled(selectedItemsCount == 1) self.__bookmarkMoveAct.setEnabled(selectedItemsCount == 1) - if selectedIncomingItemsCount > 0: - self.__pullAct.setText(self.tr("Pull Selected Changes")) - else: - self.__pullAct.setText(self.tr("Pull Changes")) if self.vcs.canPull(): - self.__pullAct.setEnabled(True) + self.__pullAct.setEnabled(selectedIncomingItemsCount > 0) + self.__pullAllAct.setEnabled(True) self.__lfPullAct.setEnabled( self.vcs.isExtensionActive("largefiles") and selectedItemsCount > 0 ) @@ -1698,7 +1705,6 @@ ]: act.setEnabled(False) - self.__pullAct.setText(self.tr("Pull Selected Changes")) if self.vcs.canPull() and not bool(self.__bundle): selectedIncomingItemsCount = len( [ @@ -1708,12 +1714,14 @@ ] ) self.__pullAct.setEnabled(selectedIncomingItemsCount > 0) + self.__pullAllAct.setEnabled(True) self.__lfPullAct.setEnabled( self.vcs.isExtensionActive("largefiles") and selectedIncomingItemsCount > 0 ) else: self.__pullAct.setEnabled(False) + self.__pullAllAct.setEnabled(False) self.__lfPullAct.setEnabled(False) self.__unbundleAct.setEnabled(bool(self.__bundle)) @@ -1731,6 +1739,7 @@ self.__bookmarkAct, self.__bookmarkMoveAct, self.__pullAct, + self.__pullAllAct, self.__lfPullAct, self.__stripAct, self.__gpgSignAct, @@ -2401,9 +2410,13 @@ self.vcs.getExtensionObject("largefiles").hgLfPull(revisions=revs) @pyqtSlot() - def __pullActTriggered(self): + def __pullActTriggered(self, selectedOnly=False): """ - Private slot to pull changes from a remote repository. + Private slot to pull all or selected changes from a remote repository. + + @param selectedOnly flag indicating to pull the selected changes only + (defaults to False) + @type bool (optional) """ shouldReopen = False refresh = False @@ -2411,15 +2424,16 @@ if self.initialCommandMode in ("log", "full_log", "incoming"): revs = [] - for itm in [ - item - for item in self.logTree.selectedItems() - if item.data(0, self.__incomingRole) - ]: - rev = itm.text(self.RevisionColumn).split(":")[1].strip() - if rev: - revs.append(rev) - shouldReopen = self.vcs.hgPull(revisions=revs) + if selectedOnly: + for itm in [ + item + for item in self.logTree.selectedItems() + if item.data(0, self.__incomingRole) + ]: + rev = itm.text(self.RevisionColumn).split(":")[1].strip() + if rev: + revs.append(rev) + shouldReopen = self.vcs.hgPull(revisions=revs, noupdate=bool(revs)) refresh = True if self.initialCommandMode == "incoming": addNext = True
--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/hg.py Thu Dec 19 16:06:08 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/hg.py Thu Dec 19 19:32:37 2024 +0100 @@ -1821,12 +1821,15 @@ self.logBrowserOutgoing.raise_() self.logBrowserOutgoing.start() - def hgPull(self, revisions=None): + def hgPull(self, revisions=None, noupdate=False): """ Public method used to pull changes from a remote Mercurial repository. - @param revisions list of revisions to be pulled - @type list of str + @param revisions list of revisions to be pulled (defaults to None) + @type list of str (optional) + @param noupdate flag indicate to not update the working directory (defaults + to False) + @type bool (optional) @return flag indicating, that the update contained an add or delete @rtype bool @@ -1845,7 +1848,7 @@ args = self.initCommand(command) args.append("-v") - if self.getPlugin().getPreferences("PullUpdate"): + if self.getPlugin().getPreferences("PullUpdate") and not noupdate: args.append("--update") if command == "unbundle": args.append(self.bundleFile)
--- a/src/eric7/i18n/eric7_cs.ts Thu Dec 19 16:06:08 2024 +0100 +++ b/src/eric7/i18n/eric7_cs.ts Thu Dec 19 19:32:37 2024 +0100 @@ -35569,317 +35569,317 @@ <translation type="unfinished"><p>Soubor <b>{0}</b> nelze přečíst.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2463" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2452" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2442" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1841" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2466" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2455" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2445" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1844" /> <source>Apply changegroups</source> <translation>Použít skupinu změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1844" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1847" /> <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="1890" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1893" /> <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="2033" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2036" /> <source>Marking as 'unresolved'</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2035" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2038" /> <source>Marking as 'resolved'</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2057" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2060" /> <source>Aborting uncommitted merge</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2081" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2084" /> <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="2092" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2095" /> <source>Created new branch <{0}>.</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2101" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2104" /> <source>Showing current branch</source> <translation>Zobrazení aktuální větve</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2190" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2193" /> <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="2206" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2209" /> <source>Showing the combined configuration settings</source> <translation>Zobrazení nastavení kombinovaných konfigurací</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2221" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2224" /> <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="2236" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2239" /> <source>Recovering from interrupted transaction</source> <translation>Obnovení z přerušené transakce</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2251" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2254" /> <source>Identifying project directory</source> <translation>Rozpoznat složku projektu</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2297" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2300" /> <source>Create .hgignore file</source> <translation>Vytvořit soubor .hgignore</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2298" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2301" /> <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="2401" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2375" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2357" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2404" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2378" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2360" /> <source>Create changegroup</source> <translation>Vytvořit skupinu změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2359" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2362" /> <source>Mercurial Changegroup Files (*.hg)</source> <translation>Soubory Mercurial skupiny změn (*.hg)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2376" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2379" /> <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="2415" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2418" /> <source>Preview changegroup</source> <translation>Náhled skupiny změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2444" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2417" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2447" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2420" /> <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="2453" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2456" /> <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="2485" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2488" /> <source>Bisect subcommand ({0}) invalid.</source> <translation>Neplatný bisect podpříkaz ({0}).</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2507" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2510" /> <source>Mercurial Bisect ({0})</source> <translation>Mercurial Bisect ({0})</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2533" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2536" /> <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="2582" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2563" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2585" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2566" /> <source>Backing out changeset</source> <translation>Zálohovat skupinu změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2564" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2567" /> <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="2599" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2593" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2602" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2596" /> <source>Rollback last transaction</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2594" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2597" /> <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="2663" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2666" /> <source>Import Patch</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2713" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2716" /> <source>Export Patches</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2755" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2758" /> <source>Change Phase</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2810" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2813" /> <source>Copy Changesets</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2849" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2852" /> <source>Copy Changesets (Continue)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2859" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2862" /> <source>Copy Changesets (Stop)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2869" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2872" /> <source>Copy Changesets (Abort)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2893" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2896" /> <source>Create Unversioned Archive</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2908" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2911" /> <source>Delete All Backups</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2909" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2912" /> <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="3000" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2980" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2969" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3003" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2983" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2972" /> <source>Add Sub-repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3039" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2970" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3042" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2973" /> <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="2981" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2984" /> <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="3057" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3001" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3060" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3004" /> <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="3056" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3038" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3024" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3059" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3041" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3027" /> <source>Remove Sub-repositories</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3025" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3028" /> <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="3317" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3144" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3320" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3147" /> <source>Mercurial Command Server</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3145" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3148" /> <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="3318" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3321" /> <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="3441" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3444" /> <source>Mercurial Bookmark</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3458" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3461" /> <source>Delete Bookmark</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3459" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3462" /> <source>Select the bookmark to be deleted:</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3470" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3473" /> <source>Delete Mercurial Bookmark</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3497" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3500" /> <source>Rename Mercurial Bookmark</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3539" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3542" /> <source>Move Mercurial Bookmark</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3621" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3624" /> <source>Pull Bookmark</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3622" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3625" /> <source>Select the bookmark to be pulled:</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3634" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3637" /> <source>Pulling bookmark from a remote Mercurial repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3662" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3665" /> <source>Push Bookmark</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3663" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3666" /> <source>Select the bookmark to be push:</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3678" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3681" /> <source>Pushing bookmark to a remote Mercurial repository</source> <translation type="unfinished" /> </message> @@ -38225,7 +38225,7 @@ <translation type="unfinished">Pohled</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3049" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3063" /> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="298" /> <source>Select Branches</source> <translation type="unfinished" /> @@ -38266,7 +38266,7 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2218" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2227" /> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="343" /> <source>Copy Changesets</source> <translation type="unfinished" /> @@ -38323,8 +38323,8 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2312" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2295" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2321" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2304" /> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="387" /> <source>Switch</source> <translation type="unfinished">Přepnout</translation> @@ -38355,263 +38355,270 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2430" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1622" /> <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 Selected Changes</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="419" /> + <source>Pull selected changes from a remote repository</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="423" /> + <source>Pull All Changes</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="427" /> + <source>Pull all changes from a remote repository</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="430" /> <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>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> + <source>Pull large files for selected revisions</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="438" /> + <source>Push Selected 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> + <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="449" /> + <source>Push All Changes</source> <translation type="unfinished" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="452" /> + <source>Push all changes to a remote repository</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="458" /> + <source>Create Changegroup</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="462" /> <source>Create a changegroup file containing the selected changesets</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="455" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="465" /> <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="2569" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="468" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2583" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="478" /> <source>Apply Changegroup</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="472" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="482" /> <source>Apply the currently viewed changegroup file</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="479" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="489" /> <source>Sign Revisions</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="483" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="493" /> <source>Add a signature for the selected revisions</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="487" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="497" /> <source>Verify Signatures</source> <translation type="unfinished" /> </message> <message> - <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="2476" /> - <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="501" /> + <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="2490" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="508" /> + <source>Strip Changesets</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="511" /> <source>Strip changesets from a repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="506" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="516" /> <source>Select All Entries</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="509" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="519" /> <source>Deselect All Entries</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="958" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="934" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="911" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="885" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="968" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="944" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="921" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="895" /> <source>Mercurial Error</source> <translation>Mercurial chyba</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1266" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1276" /> <source>{0} (large file)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1532" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1542" /> <source>Side-by-Side Diff to Parent {0}</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1543" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1553" /> <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="1701" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1620" /> - <source>Pull Selected Changes</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2570" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2477" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2431" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2313" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2219" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2584" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2491" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2445" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2322" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2228" /> <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="2296" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2305" /> <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="2341" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2350" /> <source>Define Bookmark</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2342" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2351" /> <source>Enter bookmark name for changeset "{0}":</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2371" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2380" /> <source>Move Bookmark</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2372" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2381" /> <source>Select the bookmark to be moved to changeset '{0}':</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2713" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2444" /> + <source>Pull Changes</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2727" /> <source>Find Commit</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2714" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2728" /> <source>'{0}' was not found.</source> <translation type="unfinished">'{0}' nebyl nalezen.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2774" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2788" /> <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="2775" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2789" /> <source>Differences</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2794" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2808" /> <source>No differences available. Get some more log entries.</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2796" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2810" /> <source>No differences available.</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2807" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2821" /> <source>Differences to Parent {0}</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2823" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2837" /> <source>Diff to Parent {0}{1}</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2846" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2860" /> <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="2999" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2983" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2965" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3013" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2997" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2979" /> <source>Save Diff</source> <translation type="unfinished">Uložit Diff</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2967" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2981" /> <source>Patch Files (*.diff)</source> <translation type="unfinished">Patch soubory (*.diff)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2984" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2998" /> <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="3000" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3014" /> <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="3031" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3045" /> <source>closed</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3032" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3046" /> <source>inactive</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3041" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3055" /> <source>{0} ({1})</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3050" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3064" /> <source>Select the branches to be shown (none for 'All'):</source> <translation type="unfinished" /> </message> @@ -38760,6 +38767,10 @@ <source><b>Mercurial log errors</b><p>This shows possible error messages of the hg log command.</p></source> <translation><b>Mercurial log chyb</b><p>Zobrazí možné chyby z příkazu hg log.</p></translation> </message> + <message> + <source>Pull changes from a remote repository</source> + <translation type="vanished">Stáhnout změny (pull) ze vzdáleného repozitáře</translation> + </message> </context> <context> <name>HgMergeDialog</name> @@ -105986,19 +105997,19 @@ <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="1961" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1964" /> <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1397" /> <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="1967" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1970" /> <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1403" /> <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="1974" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1977" /> <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1410" /> <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> @@ -106022,35 +106033,35 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1935" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1938" /> <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="1942" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1945" /> <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="1949" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1952" /> <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="1954" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1957" /> <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="1981" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1984" /> <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="1987" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1990" /> <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 Thu Dec 19 16:06:08 2024 +0100 +++ b/src/eric7/i18n/eric7_de.ts Thu Dec 19 19:32:37 2024 +0100 @@ -35611,317 +35611,317 @@ <translation><p>Die Datei <b>{0}</b> konnte nicht gelesen werden.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2463" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2452" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2442" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1841" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2466" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2455" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2445" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1844" /> <source>Apply changegroups</source> <translation>Änderungsgruppen anwenden</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1844" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1847" /> <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="1890" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1893" /> <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="2033" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2036" /> <source>Marking as 'unresolved'</source> <translation>Markiere als 'nicht aufgelöst'</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2035" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2038" /> <source>Marking as 'resolved'</source> <translation>Markiere als 'aufgelöst'</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2057" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2060" /> <source>Aborting uncommitted merge</source> <translation>Breche Zusammenführung ab</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2081" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2084" /> <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="2092" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2095" /> <source>Created new branch <{0}>.</source> <translation>Neuer Zweig <{0}> wurde angelegt.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2101" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2104" /> <source>Showing current branch</source> <translation>Zeige aktuellen Zweig</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2190" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2193" /> <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="2206" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2209" /> <source>Showing the combined configuration settings</source> <translation>Zeige die kombinierten Einstellungen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2221" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2224" /> <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="2236" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2239" /> <source>Recovering from interrupted transaction</source> <translation>Setze abgebrochene Transaktion zurück</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2251" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2254" /> <source>Identifying project directory</source> <translation>Projektverzeichnis identifizieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2297" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2300" /> <source>Create .hgignore file</source> <translation>.hgignore-Datei erstellen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2298" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2301" /> <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="2401" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2375" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2357" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2404" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2378" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2360" /> <source>Create changegroup</source> <translation>Änderungsgruppe erzeugen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2359" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2362" /> <source>Mercurial Changegroup Files (*.hg)</source> <translation>Mercurial-Änderungsgruppendateien (*.hg)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2376" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2379" /> <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="2415" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2418" /> <source>Preview changegroup</source> <translation>Änderungsgruppe ansehen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2444" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2417" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2447" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2420" /> <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="2453" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2456" /> <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="2485" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2488" /> <source>Bisect subcommand ({0}) invalid.</source> <translation>Ungültiger Bisect Unterbefehl ({0}).</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2507" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2510" /> <source>Mercurial Bisect ({0})</source> <translation>Mercurial-Bisect ({0})</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2533" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2536" /> <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="2582" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2563" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2585" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2566" /> <source>Backing out changeset</source> <translation>Änderungssatz umkehren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2564" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2567" /> <source>No revision given. Aborting...</source> <translation>Keine Revision angegeben. Abbruch...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2599" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2593" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2602" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2596" /> <source>Rollback last transaction</source> <translation>Letzte Transaktion zurücksetzen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2594" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2597" /> <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="2663" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2666" /> <source>Import Patch</source> <translation>Patch importieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2713" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2716" /> <source>Export Patches</source> <translation>Patches exportieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2755" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2758" /> <source>Change Phase</source> <translation>Phase ändern</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2810" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2813" /> <source>Copy Changesets</source> <translation>Änderungssätze kopieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2849" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2852" /> <source>Copy Changesets (Continue)</source> <translation>Änderungssätze kopieren (Fortsetzung)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2859" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2862" /> <source>Copy Changesets (Stop)</source> <translation>Änderungssätze kopieren (Stopp)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2869" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2872" /> <source>Copy Changesets (Abort)</source> <translation>Änderungssätze kopieren (Abbruch)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2893" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2896" /> <source>Create Unversioned Archive</source> <translation>Erzeuge nicht versioniertes Archiv</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2908" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2911" /> <source>Delete All Backups</source> <translation>Alle Backups löschen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2909" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2912" /> <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="3000" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2980" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2969" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3003" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2983" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2972" /> <source>Add Sub-repository</source> <translation>Unterrepository hinzufügen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3039" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2970" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3042" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2973" /> <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="2981" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2984" /> <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="3057" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3001" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3060" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3004" /> <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="3056" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3038" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3024" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3059" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3041" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3027" /> <source>Remove Sub-repositories</source> <translation>Unterrepositorys löschen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3025" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3028" /> <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="3317" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3144" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3320" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3147" /> <source>Mercurial Command Server</source> <translation>Mercurial-Befehlsserver</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3145" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3148" /> <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="3318" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3321" /> <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="3441" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3444" /> <source>Mercurial Bookmark</source> <translation>Mercurial-Lesezeichen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3458" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3461" /> <source>Delete Bookmark</source> <translation>Lesezeichen löschen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3459" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3462" /> <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="3470" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3473" /> <source>Delete Mercurial Bookmark</source> <translation>Mercurial-Lesezeichen löschen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3497" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3500" /> <source>Rename Mercurial Bookmark</source> <translation>Mercurial-Lesezeichen umbenennen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3539" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3542" /> <source>Move Mercurial Bookmark</source> <translation>Mercurial-Lesezeichen verschieben</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3621" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3624" /> <source>Pull Bookmark</source> <translation>Lesezeichen herunterladen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3622" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3625" /> <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="3634" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3637" /> <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="3662" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3665" /> <source>Push Bookmark</source> <translation>Lesezeichen hochladen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3663" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3666" /> <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="3678" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3681" /> <source>Pushing bookmark to a remote Mercurial repository</source> <translation>Lade Lesezeichen zu einem entfernten Mercurial-Repository hoch</translation> </message> @@ -38290,7 +38290,7 @@ <translation>Ansicht</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3049" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3063" /> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="298" /> <source>Select Branches</source> <translation>Zweige auswählen</translation> @@ -38331,7 +38331,7 @@ <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="2218" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2227" /> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="343" /> <source>Copy Changesets</source> <translation>Änderungssätze kopieren</translation> @@ -38388,8 +38388,8 @@ <translation>Schließe die ausgewählten Köpfe</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2312" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2295" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2321" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2304" /> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="387" /> <source>Switch</source> <translation>Umschalten</translation> @@ -38420,264 +38420,271 @@ <translation>Verschiebe ein Lesezeichen zur ausgewählten Revision</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2430" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1622" /> <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 Selected Changes</source> + <translation>Ausgewählte Änderungen herunterladen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="419" /> + <source>Pull selected changes from a remote repository</source> + <translation>Ausgewählte Änderungen von einem entfernten Repository herunterladen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="423" /> + <source>Pull All Changes</source> + <translation>Alle Änderungen herunterladen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="427" /> + <source>Pull all changes from a remote repository</source> + <translation>Alle Änderungen von einem entfernten Repository herunterladen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="430" /> <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> + <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="438" /> + <source>Push Selected Changes</source> + <translation>Ausgewählte Ä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> + <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="449" /> + <source>Push All Changes</source> + <translation>Alle Änderungen hochladen</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="452" /> + <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="458" /> + <source>Create Changegroup</source> + <translation>Änderungsgruppe erzeugen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="462" /> <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="455" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="465" /> <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="2569" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="468" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2583" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="478" /> <source>Apply Changegroup</source> <translation>Änderungsgruppe anwenden</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="472" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="482" /> <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="479" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="489" /> <source>Sign Revisions</source> <translation>Revisionen signieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="483" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="493" /> <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="487" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="497" /> <source>Verify Signatures</source> <translation>Signaturen verifizieren</translation> </message> <message> - <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="2476" /> - <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="501" /> + <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="2490" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="508" /> + <source>Strip Changesets</source> + <translation>Änderungssätze löschen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="511" /> <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="506" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="516" /> <source>Select All Entries</source> <translation>Alle Einträge auswählen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="509" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="519" /> <source>Deselect All Entries</source> <translation>Alle Einträge abwählen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="958" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="934" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="911" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="885" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="968" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="944" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="921" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="895" /> <source>Mercurial Error</source> <translation>Mercurial-Fehler</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1266" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1276" /> <source>{0} (large file)</source> <translation>{0} (Binärriese)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1532" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1542" /> <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="1543" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1553" /> <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="1701" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1620" /> - <source>Pull Selected Changes</source> - <translation>Ausgewählte Änderungen herunterladen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2570" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2477" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2431" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2313" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2219" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2584" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2491" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2445" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2322" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2228" /> <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="2296" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2305" /> <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="2341" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2350" /> <source>Define Bookmark</source> <translation>Lesezeichen hinzufügen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2342" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2351" /> <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="2371" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2380" /> <source>Move Bookmark</source> <translation>Lesezeichen verschieben</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2372" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2381" /> <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="2713" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2444" /> + <source>Pull Changes</source> + <translation>Änderungen herunterladen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2727" /> <source>Find Commit</source> <translation>Revision finden</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2714" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2728" /> <source>'{0}' was not found.</source> <translation>„{0}“ wurde nicht gefunden.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2774" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2788" /> <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="2775" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2789" /> <source>Differences</source> <translation>Unterschiede</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2794" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2808" /> <source>No differences available. Get some more log entries.</source> <translation>Keine Unterschiede verfügbar. Lade weitere Log-Einträge.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2796" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2810" /> <source>No differences available.</source> <translation>Keine Unterschiede verfügbar.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2807" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2821" /> <source>Differences to Parent {0}</source> <translation>Unterschiede zu Vorgänger {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2823" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2837" /> <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="2846" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2860" /> <source>There is no difference.</source> <translation>Es gibt keinen Unterschied.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2999" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2983" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2965" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3013" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2997" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2979" /> <source>Save Diff</source> <translation>Diff speichern</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2967" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2981" /> <source>Patch Files (*.diff)</source> <translation>Patchdateien (*.diff)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2984" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2998" /> <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="3000" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3014" /> <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="3031" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3045" /> <source>closed</source> <translation>geschlossen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3032" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3046" /> <source>inactive</source> <translation>inaktiv</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3041" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3055" /> <source>{0} ({1})</source> <translation>{0} ({1})</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3050" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3064" /> <source>Select the branches to be shown (none for 'All'):</source> <translation>Wähle die anzuzeigenden Zweige (keinen für 'Alle'):</translation> </message> @@ -106125,19 +106132,19 @@ <tr><td><b>Änderungssatz</b></td><td>{1}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1961" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1964" /> <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1397" /> <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="1967" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1970" /> <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1403" /> <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="1974" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1977" /> <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1410" /> <source><tr><td><b>Branches</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Zweige</b></td><td>{0}</td></tr></translation> @@ -106163,38 +106170,38 @@ <translation /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1935" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1938" /> <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="1942" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1945" /> <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="1949" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1952" /> <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="1954" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1957" /> <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="1981" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1984" /> <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="1987" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1990" /> <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 Thu Dec 19 16:06:08 2024 +0100 +++ b/src/eric7/i18n/eric7_empty.ts Thu Dec 19 19:32:37 2024 +0100 @@ -35435,317 +35435,317 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2463" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2452" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2442" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1841" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2466" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2455" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2445" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1844" /> <source>Apply changegroups</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1844" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1847" /> <source>Pulling from a remote Mercurial repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1890" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1893" /> <source>Pushing to a remote Mercurial repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2033" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2036" /> <source>Marking as 'unresolved'</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2035" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2038" /> <source>Marking as 'resolved'</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2057" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2060" /> <source>Aborting uncommitted merge</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2081" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2084" /> <source>Creating branch in the Mercurial repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2092" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2095" /> <source>Created new branch <{0}>.</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2101" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2104" /> <source>Showing current branch</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2190" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2193" /> <source>Verifying the integrity of the Mercurial repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2206" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2209" /> <source>Showing the combined configuration settings</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2221" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2224" /> <source>Showing aliases for remote repositories</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2236" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2239" /> <source>Recovering from interrupted transaction</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2251" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2254" /> <source>Identifying project directory</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2297" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2300" /> <source>Create .hgignore file</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2298" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2301" /> <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="2401" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2375" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2357" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2404" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2378" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2360" /> <source>Create changegroup</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2359" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2362" /> <source>Mercurial Changegroup Files (*.hg)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2376" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2379" /> <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="2415" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2418" /> <source>Preview changegroup</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2444" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2417" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2447" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2420" /> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2453" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2456" /> <source>Shall the working directory be updated?</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2485" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2488" /> <source>Bisect subcommand ({0}) invalid.</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2507" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2510" /> <source>Mercurial Bisect ({0})</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2533" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2536" /> <source>Removing files from the Mercurial repository only</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2582" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2563" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2585" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2566" /> <source>Backing out changeset</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2564" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2567" /> <source>No revision given. Aborting...</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2599" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2593" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2602" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2596" /> <source>Rollback last transaction</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2594" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2597" /> <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="2663" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2666" /> <source>Import Patch</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2713" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2716" /> <source>Export Patches</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2755" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2758" /> <source>Change Phase</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2810" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2813" /> <source>Copy Changesets</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2849" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2852" /> <source>Copy Changesets (Continue)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2859" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2862" /> <source>Copy Changesets (Stop)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2869" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2872" /> <source>Copy Changesets (Abort)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2893" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2896" /> <source>Create Unversioned Archive</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2908" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2911" /> <source>Delete All Backups</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2909" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2912" /> <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="3000" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2980" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2969" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3003" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2983" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2972" /> <source>Add Sub-repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3039" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2970" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3042" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2973" /> <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="2981" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2984" /> <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="3057" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3001" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3060" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3004" /> <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="3056" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3038" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3024" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3059" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3041" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3027" /> <source>Remove Sub-repositories</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3025" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3028" /> <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="3317" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3144" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3320" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3147" /> <source>Mercurial Command Server</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3145" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3148" /> <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="3318" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3321" /> <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="3441" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3444" /> <source>Mercurial Bookmark</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3458" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3461" /> <source>Delete Bookmark</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3459" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3462" /> <source>Select the bookmark to be deleted:</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3470" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3473" /> <source>Delete Mercurial Bookmark</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3497" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3500" /> <source>Rename Mercurial Bookmark</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3539" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3542" /> <source>Move Mercurial Bookmark</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3621" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3624" /> <source>Pull Bookmark</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3622" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3625" /> <source>Select the bookmark to be pulled:</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3634" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3637" /> <source>Pulling bookmark from a remote Mercurial repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3662" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3665" /> <source>Push Bookmark</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3663" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3666" /> <source>Select the bookmark to be push:</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3678" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3681" /> <source>Pushing bookmark to a remote Mercurial repository</source> <translation type="unfinished" /> </message> @@ -38090,7 +38090,7 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3049" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3063" /> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="298" /> <source>Select Branches</source> <translation type="unfinished" /> @@ -38131,7 +38131,7 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2218" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2227" /> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="343" /> <source>Copy Changesets</source> <translation type="unfinished" /> @@ -38188,8 +38188,8 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2312" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2295" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2321" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2304" /> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="387" /> <source>Switch</source> <translation type="unfinished" /> @@ -38220,263 +38220,270 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2430" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1622" /> <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 Selected Changes</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="419" /> + <source>Pull selected changes from a remote repository</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="423" /> + <source>Pull All Changes</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="427" /> + <source>Pull all changes from a remote repository</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="430" /> <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>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> + <source>Pull large files for selected revisions</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="438" /> + <source>Push Selected 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> + <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="449" /> + <source>Push All Changes</source> <translation type="unfinished" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="452" /> + <source>Push all changes to a remote repository</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="458" /> + <source>Create Changegroup</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="462" /> <source>Create a changegroup file containing the selected changesets</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="455" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="465" /> <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="2569" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="468" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2583" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="478" /> <source>Apply Changegroup</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="472" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="482" /> <source>Apply the currently viewed changegroup file</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="479" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="489" /> <source>Sign Revisions</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="483" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="493" /> <source>Add a signature for the selected revisions</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="487" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="497" /> <source>Verify Signatures</source> <translation type="unfinished" /> </message> <message> - <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="2476" /> - <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="501" /> + <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="2490" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="508" /> + <source>Strip Changesets</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="511" /> <source>Strip changesets from a repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="506" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="516" /> <source>Select All Entries</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="509" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="519" /> <source>Deselect All Entries</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="958" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="934" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="911" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="885" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="968" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="944" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="921" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="895" /> <source>Mercurial Error</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1266" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1276" /> <source>{0} (large file)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1532" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1542" /> <source>Side-by-Side Diff to Parent {0}</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1543" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1553" /> <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="1701" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1620" /> - <source>Pull Selected Changes</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2570" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2477" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2431" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2313" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2219" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2584" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2491" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2445" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2322" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2228" /> <source>The project should be reread. Do this now?</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2296" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2305" /> <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="2341" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2350" /> <source>Define Bookmark</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2342" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2351" /> <source>Enter bookmark name for changeset "{0}":</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2371" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2380" /> <source>Move Bookmark</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2372" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2381" /> <source>Select the bookmark to be moved to changeset '{0}':</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2713" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2444" /> + <source>Pull Changes</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2727" /> <source>Find Commit</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2714" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2728" /> <source>'{0}' was not found.</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2774" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2788" /> <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="2775" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2789" /> <source>Differences</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2794" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2808" /> <source>No differences available. Get some more log entries.</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2796" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2810" /> <source>No differences available.</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2807" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2821" /> <source>Differences to Parent {0}</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2823" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2837" /> <source>Diff to Parent {0}{1}</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2846" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2860" /> <source>There is no difference.</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2999" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2983" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2965" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3013" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2997" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2979" /> <source>Save Diff</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2967" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2981" /> <source>Patch Files (*.diff)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2984" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2998" /> <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="3000" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3014" /> <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="3031" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3045" /> <source>closed</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3032" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3046" /> <source>inactive</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3041" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3055" /> <source>{0} ({1})</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3050" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3064" /> <source>Select the branches to be shown (none for 'All'):</source> <translation type="unfinished" /> </message> @@ -105457,19 +105464,19 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1961" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1964" /> <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1397" /> <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="1967" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1970" /> <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1403" /> <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="1974" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1977" /> <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1410" /> <source><tr><td><b>Branches</b></td><td>{0}</td></tr></source> <translation type="unfinished" /> @@ -105493,35 +105500,35 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1935" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1938" /> <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="1942" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1945" /> <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="1949" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1952" /> <source><tr><td><b>Tip</b></td><td></td></tr> </source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1954" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1957" /> <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="1981" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1984" /> <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="1987" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1990" /> <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 Thu Dec 19 16:06:08 2024 +0100 +++ b/src/eric7/i18n/eric7_en.ts Thu Dec 19 19:32:37 2024 +0100 @@ -35460,317 +35460,317 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2463" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2452" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2442" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1841" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2466" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2455" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2445" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1844" /> <source>Apply changegroups</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1844" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1847" /> <source>Pulling from a remote Mercurial repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1890" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1893" /> <source>Pushing to a remote Mercurial repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2033" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2036" /> <source>Marking as 'unresolved'</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2035" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2038" /> <source>Marking as 'resolved'</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2057" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2060" /> <source>Aborting uncommitted merge</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2081" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2084" /> <source>Creating branch in the Mercurial repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2092" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2095" /> <source>Created new branch <{0}>.</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2101" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2104" /> <source>Showing current branch</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2190" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2193" /> <source>Verifying the integrity of the Mercurial repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2206" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2209" /> <source>Showing the combined configuration settings</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2221" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2224" /> <source>Showing aliases for remote repositories</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2236" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2239" /> <source>Recovering from interrupted transaction</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2251" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2254" /> <source>Identifying project directory</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2297" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2300" /> <source>Create .hgignore file</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2298" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2301" /> <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="2401" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2375" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2357" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2404" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2378" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2360" /> <source>Create changegroup</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2359" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2362" /> <source>Mercurial Changegroup Files (*.hg)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2376" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2379" /> <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="2415" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2418" /> <source>Preview changegroup</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2444" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2417" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2447" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2420" /> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2453" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2456" /> <source>Shall the working directory be updated?</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2485" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2488" /> <source>Bisect subcommand ({0}) invalid.</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2507" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2510" /> <source>Mercurial Bisect ({0})</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2533" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2536" /> <source>Removing files from the Mercurial repository only</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2582" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2563" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2585" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2566" /> <source>Backing out changeset</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2564" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2567" /> <source>No revision given. Aborting...</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2599" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2593" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2602" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2596" /> <source>Rollback last transaction</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2594" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2597" /> <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="2663" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2666" /> <source>Import Patch</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2713" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2716" /> <source>Export Patches</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2755" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2758" /> <source>Change Phase</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2810" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2813" /> <source>Copy Changesets</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2849" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2852" /> <source>Copy Changesets (Continue)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2859" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2862" /> <source>Copy Changesets (Stop)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2869" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2872" /> <source>Copy Changesets (Abort)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2893" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2896" /> <source>Create Unversioned Archive</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2908" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2911" /> <source>Delete All Backups</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2909" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2912" /> <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="3000" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2980" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2969" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3003" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2983" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2972" /> <source>Add Sub-repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3039" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2970" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3042" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2973" /> <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="2981" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2984" /> <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="3057" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3001" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3060" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3004" /> <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="3056" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3038" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3024" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3059" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3041" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3027" /> <source>Remove Sub-repositories</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3025" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3028" /> <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="3317" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3144" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3320" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3147" /> <source>Mercurial Command Server</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3145" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3148" /> <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="3318" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3321" /> <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="3441" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3444" /> <source>Mercurial Bookmark</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3458" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3461" /> <source>Delete Bookmark</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3459" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3462" /> <source>Select the bookmark to be deleted:</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3470" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3473" /> <source>Delete Mercurial Bookmark</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3497" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3500" /> <source>Rename Mercurial Bookmark</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3539" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3542" /> <source>Move Mercurial Bookmark</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3621" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3624" /> <source>Pull Bookmark</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3622" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3625" /> <source>Select the bookmark to be pulled:</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3634" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3637" /> <source>Pulling bookmark from a remote Mercurial repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3662" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3665" /> <source>Push Bookmark</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3663" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3666" /> <source>Select the bookmark to be push:</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3678" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3681" /> <source>Pushing bookmark to a remote Mercurial repository</source> <translation type="unfinished" /> </message> @@ -38115,7 +38115,7 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3049" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3063" /> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="298" /> <source>Select Branches</source> <translation type="unfinished" /> @@ -38156,7 +38156,7 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2218" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2227" /> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="343" /> <source>Copy Changesets</source> <translation type="unfinished" /> @@ -38213,8 +38213,8 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2312" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2295" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2321" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2304" /> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="387" /> <source>Switch</source> <translation type="unfinished" /> @@ -38245,263 +38245,270 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2430" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1622" /> <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 Selected Changes</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="419" /> + <source>Pull selected changes from a remote repository</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="423" /> + <source>Pull All Changes</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="427" /> + <source>Pull all changes from a remote repository</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="430" /> <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>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> + <source>Pull large files for selected revisions</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="438" /> + <source>Push Selected 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> + <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="449" /> + <source>Push All Changes</source> <translation type="unfinished" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="452" /> + <source>Push all changes to a remote repository</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="458" /> + <source>Create Changegroup</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="462" /> <source>Create a changegroup file containing the selected changesets</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="455" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="465" /> <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="2569" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="468" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2583" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="478" /> <source>Apply Changegroup</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="472" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="482" /> <source>Apply the currently viewed changegroup file</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="479" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="489" /> <source>Sign Revisions</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="483" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="493" /> <source>Add a signature for the selected revisions</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="487" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="497" /> <source>Verify Signatures</source> <translation type="unfinished" /> </message> <message> - <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="2476" /> - <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="501" /> + <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="2490" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="508" /> + <source>Strip Changesets</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="511" /> <source>Strip changesets from a repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="506" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="516" /> <source>Select All Entries</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="509" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="519" /> <source>Deselect All Entries</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="958" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="934" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="911" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="885" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="968" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="944" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="921" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="895" /> <source>Mercurial Error</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1266" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1276" /> <source>{0} (large file)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1532" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1542" /> <source>Side-by-Side Diff to Parent {0}</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1543" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1553" /> <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="1701" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1620" /> - <source>Pull Selected Changes</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2570" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2477" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2431" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2313" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2219" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2584" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2491" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2445" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2322" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2228" /> <source>The project should be reread. Do this now?</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2296" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2305" /> <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="2341" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2350" /> <source>Define Bookmark</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2342" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2351" /> <source>Enter bookmark name for changeset "{0}":</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2371" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2380" /> <source>Move Bookmark</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2372" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2381" /> <source>Select the bookmark to be moved to changeset '{0}':</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2713" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2444" /> + <source>Pull Changes</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2727" /> <source>Find Commit</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2714" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2728" /> <source>'{0}' was not found.</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2774" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2788" /> <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="2775" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2789" /> <source>Differences</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2794" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2808" /> <source>No differences available. Get some more log entries.</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2796" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2810" /> <source>No differences available.</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2807" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2821" /> <source>Differences to Parent {0}</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2823" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2837" /> <source>Diff to Parent {0}{1}</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2846" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2860" /> <source>There is no difference.</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2999" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2983" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2965" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3013" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2997" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2979" /> <source>Save Diff</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2967" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2981" /> <source>Patch Files (*.diff)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2984" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2998" /> <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="3000" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3014" /> <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="3031" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3045" /> <source>closed</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3032" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3046" /> <source>inactive</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3041" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3055" /> <source>{0} ({1})</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3050" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3064" /> <source>Select the branches to be shown (none for 'All'):</source> <translation type="unfinished" /> </message> @@ -105522,19 +105529,19 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1961" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1964" /> <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1397" /> <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="1967" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1970" /> <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1403" /> <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="1974" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1977" /> <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1410" /> <source><tr><td><b>Branches</b></td><td>{0}</td></tr></source> <translation type="unfinished" /> @@ -105558,35 +105565,35 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1935" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1938" /> <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="1942" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1945" /> <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="1949" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1952" /> <source><tr><td><b>Tip</b></td><td></td></tr> </source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1954" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1957" /> <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="1981" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1984" /> <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="1987" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1990" /> <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 Thu Dec 19 16:06:08 2024 +0100 +++ b/src/eric7/i18n/eric7_es.ts Thu Dec 19 19:32:37 2024 +0100 @@ -35614,317 +35614,317 @@ <translation><p>El archivo <b>{0}</b> no se ha podido leer.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2463" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2452" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2442" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1841" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2466" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2455" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2445" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1844" /> <source>Apply changegroups</source> <translation>Aplicar changegroups</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1844" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1847" /> <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="1890" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1893" /> <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="2033" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2036" /> <source>Marking as 'unresolved'</source> <translation>Marcando como 'unresolved'</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2035" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2038" /> <source>Marking as 'resolved'</source> <translation>Marcando como 'resolved'</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2057" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2060" /> <source>Aborting uncommitted merge</source> <translation>Abortando merge sin commit</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2081" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2084" /> <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="2092" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2095" /> <source>Created new branch <{0}>.</source> <translation>Creada nueva branch <{0}>.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2101" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2104" /> <source>Showing current branch</source> <translation>Mostrando la branch actual</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2190" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2193" /> <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="2206" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2209" /> <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="2221" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2224" /> <source>Showing aliases for remote repositories</source> <translation>Mostrando alias para repositorios remotos</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2236" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2239" /> <source>Recovering from interrupted transaction</source> <translation>Recuperando de transacción interrumpida</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2251" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2254" /> <source>Identifying project directory</source> <translation>Identificando directorio de proyecto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2297" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2300" /> <source>Create .hgignore file</source> <translation>Crear archivo .hgignore</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2298" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2301" /> <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="2401" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2375" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2357" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2404" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2378" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2360" /> <source>Create changegroup</source> <translation>Crear changegroup</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2359" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2362" /> <source>Mercurial Changegroup Files (*.hg)</source> <translation>Archivos Changegroup de Mercurial (*.hg)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2376" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2379" /> <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="2415" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2418" /> <source>Preview changegroup</source> <translation>Previsualizar changegroup</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2444" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2417" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2447" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2420" /> <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="2453" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2456" /> <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="2485" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2488" /> <source>Bisect subcommand ({0}) invalid.</source> <translation>Subcomando bisect ({0}) inválido.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2507" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2510" /> <source>Mercurial Bisect ({0})</source> <translation>Mercurial Bisect ({0})</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2533" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2536" /> <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="2582" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2563" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2585" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2566" /> <source>Backing out changeset</source> <translation>Haciendo respaldo de changeset</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2564" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2567" /> <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="2599" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2593" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2602" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2596" /> <source>Rollback last transaction</source> <translation>Hacer Rollback de la última transacción</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2594" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2597" /> <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="2663" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2666" /> <source>Import Patch</source> <translation>Importar Patch</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2713" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2716" /> <source>Export Patches</source> <translation>Exportar Patches</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2755" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2758" /> <source>Change Phase</source> <translation>Cambiar Fase</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2810" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2813" /> <source>Copy Changesets</source> <translation>Copiar Changesets</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2849" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2852" /> <source>Copy Changesets (Continue)</source> <translation>Copiar Changesets (Continuar)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2859" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2862" /> <source>Copy Changesets (Stop)</source> <translation>Copiar Changesets (Stop)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2869" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2872" /> <source>Copy Changesets (Abort)</source> <translation>Copiar Changesets (Abortar)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2893" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2896" /> <source>Create Unversioned Archive</source> <translation>Crear Archivo Sin Versionar</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2908" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2911" /> <source>Delete All Backups</source> <translation>Borrar todas las Copias de Seguridad</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2909" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2912" /> <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="3000" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2980" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2969" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3003" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2983" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2972" /> <source>Add Sub-repository</source> <translation>Añadir Sub-repositorio</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3039" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2970" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3042" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2973" /> <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="2981" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2984" /> <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="3057" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3001" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3060" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3004" /> <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="3056" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3038" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3024" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3059" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3041" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3027" /> <source>Remove Sub-repositories</source> <translation>Eliminar Sub-repositorios</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3025" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3028" /> <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="3317" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3144" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3320" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3147" /> <source>Mercurial Command Server</source> <translation>Servidor de Comandos de Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3145" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3148" /> <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="3318" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3321" /> <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="3441" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3444" /> <source>Mercurial Bookmark</source> <translation>Marcador de Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3458" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3461" /> <source>Delete Bookmark</source> <translation>Borrar Marcador</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3459" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3462" /> <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="3470" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3473" /> <source>Delete Mercurial Bookmark</source> <translation>Borrar Marcador de Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3497" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3500" /> <source>Rename Mercurial Bookmark</source> <translation>Renombrar Marcador de Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3539" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3542" /> <source>Move Mercurial Bookmark</source> <translation>Mover Marcador de Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3621" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3624" /> <source>Pull Bookmark</source> <translation>Pull de Marcador</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3622" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3625" /> <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="3634" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3637" /> <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="3662" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3665" /> <source>Push Bookmark</source> <translation>Push de Marcador</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3663" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3666" /> <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="3678" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3681" /> <source>Pushing bookmark to a remote Mercurial repository</source> <translation>Haciendo push de marcador desde un repositorio Mercurial remoto</translation> </message> @@ -38293,7 +38293,7 @@ <translation>Ver</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3049" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3063" /> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="298" /> <source>Select Branches</source> <translation>Seleccionar Branches</translation> @@ -38334,7 +38334,7 @@ <translation>Seleccionar las branchse a mostrar de un listado de todas las branches cerradas y actualizar la pantalla</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2218" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2227" /> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="343" /> <source>Copy Changesets</source> <translation>Copiar Changesets</translation> @@ -38392,8 +38392,8 @@ <translation>Cerrar las heads seleccionadas</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2312" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2295" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2321" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2304" /> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="387" /> <source>Switch</source> <translation>Hacer switch</translation> @@ -38424,264 +38424,271 @@ <translation>Mover marcador a la revisión seleccionada</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2430" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1622" /> <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 Selected Changes</source> + <translation>Hacer Pull de Cambios Seleccionados</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="419" /> + <source>Pull selected changes from a remote repository</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="423" /> + <source>Pull All Changes</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="427" /> + <source>Pull all changes from a remote repository</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="430" /> <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> + <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="438" /> + <source>Push Selected Changes</source> + <translation>Hacer Pull de Cambios Seleccionados</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> + <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="449" /> + <source>Push All Changes</source> + <translation>Hacer Push de Todos los Cambios</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="452" /> + <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="458" /> + <source>Create Changegroup</source> + <translation>Crear Changegroup</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="462" /> <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="455" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="465" /> <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="2569" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="468" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2583" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="478" /> <source>Apply Changegroup</source> <translation>Aplicar Changegroup</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="472" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="482" /> <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="479" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="489" /> <source>Sign Revisions</source> <translation>Firmar Revisiones</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="483" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="493" /> <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="487" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="497" /> <source>Verify Signatures</source> <translation>Verificar Firmas</translation> </message> <message> - <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="2476" /> - <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="501" /> + <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="2490" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="508" /> + <source>Strip Changesets</source> + <translation>Hacer strip de Changesets</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="511" /> <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="506" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="516" /> <source>Select All Entries</source> <translation>Seleccionar Todas las Entradas</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="509" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="519" /> <source>Deselect All Entries</source> <translation>Quitar Selección de Todas las Entradas</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="958" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="934" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="911" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="885" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="968" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="944" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="921" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="895" /> <source>Mercurial Error</source> <translation>Error de Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1266" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1276" /> <source>{0} (large file)</source> <translation>{0} (archivo grande)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1532" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1542" /> <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="1543" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1553" /> <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="1701" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1620" /> - <source>Pull Selected Changes</source> - <translation>Hacer Pull de Cambios Seleccionados</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2570" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2477" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2431" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2313" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2219" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2584" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2491" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2445" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2322" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2228" /> <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="2296" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2305" /> <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="2341" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2350" /> <source>Define Bookmark</source> <translation>Definir Marcador</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2342" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2351" /> <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="2371" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2380" /> <source>Move Bookmark</source> <translation>Mover Marcador</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2372" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2381" /> <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="2713" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2444" /> + <source>Pull Changes</source> + <translation>Hacer Pull de Cambios</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2727" /> <source>Find Commit</source> <translation>Buscar Commit</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2714" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2728" /> <source>'{0}' was not found.</source> <translation>'{0}' no se ha encontrado.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2774" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2788" /> <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="2775" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2789" /> <source>Differences</source> <translation>Diferencias</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2794" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2808" /> <source>No differences available. Get some more log entries.</source> <translation>No hay diferencias disponibles. Obtener más entradas de log.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2796" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2810" /> <source>No differences available.</source> <translation>No hay diferencias disponibles.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2807" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2821" /> <source>Differences to Parent {0}</source> <translation>Diferencias con el Parent {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2823" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2837" /> <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="2846" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2860" /> <source>There is no difference.</source> <translation>No hay ninguna diferencia.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2999" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2983" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2965" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3013" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2997" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2979" /> <source>Save Diff</source> <translation>Guardar Diff</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2967" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2981" /> <source>Patch Files (*.diff)</source> <translation>Archivos de Parche (*.diff)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2984" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2998" /> <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="3000" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3014" /> <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="3031" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3045" /> <source>closed</source> <translation>cerrada</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3032" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3046" /> <source>inactive</source> <translation>inactiva</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3041" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3055" /> <source>{0} ({1})</source> <translation>{0} ({1})</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3050" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3064" /> <source>Select the branches to be shown (none for 'All'):</source> <translation>Seleccionar las branches a mostrar (ninguna para mostrar 'Todas'):</translation> </message> @@ -38830,6 +38837,10 @@ <source><b>Mercurial log errors</b><p>This shows possible error messages of the hg log command.</p></source> <translation><b>Errores de Mercurial log</b><p>Muestra los posibles mensajes de error del comando hg log.</p></translation> </message> + <message> + <source>Pull changes from a remote repository</source> + <translation type="vanished">Hacer pull de cambios desde un repositorio remoto</translation> + </message> </context> <context> <name>HgMergeDialog</name> @@ -106389,19 +106400,19 @@ <tr><td><b>Changeset</b></td><td>{1}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1961" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1964" /> <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1397" /> <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="1967" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1970" /> <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1403" /> <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="1974" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1977" /> <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1410" /> <source><tr><td><b>Branches</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Branches</b></td><td>{0}</td></tr></translation> @@ -106433,38 +106444,38 @@ </translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1935" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1938" /> <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="1942" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1945" /> <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="1949" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1952" /> <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="1954" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1957" /> <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="1981" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1984" /> <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="1987" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1990" /> <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 Thu Dec 19 16:06:08 2024 +0100 +++ b/src/eric7/i18n/eric7_fr.ts Thu Dec 19 19:32:37 2024 +0100 @@ -35619,317 +35619,317 @@ <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="2463" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2452" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2442" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1841" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2466" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2455" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2445" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1844" /> <source>Apply changegroups</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1844" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1847" /> <source>Pulling from a remote Mercurial repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1890" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1893" /> <source>Pushing to a remote Mercurial repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2033" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2036" /> <source>Marking as 'unresolved'</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2035" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2038" /> <source>Marking as 'resolved'</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2057" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2060" /> <source>Aborting uncommitted merge</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2081" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2084" /> <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="2092" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2095" /> <source>Created new branch <{0}>.</source> <translation>Nouvelle branche créée <{0}>.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2101" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2104" /> <source>Showing current branch</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2190" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2193" /> <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="2206" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2209" /> <source>Showing the combined configuration settings</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2221" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2224" /> <source>Showing aliases for remote repositories</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2236" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2239" /> <source>Recovering from interrupted transaction</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2251" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2254" /> <source>Identifying project directory</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2297" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2300" /> <source>Create .hgignore file</source> <translation>Créer un fichier .hgignore</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2298" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2301" /> <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="2401" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2375" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2357" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2404" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2378" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2360" /> <source>Create changegroup</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2359" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2362" /> <source>Mercurial Changegroup Files (*.hg)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2376" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2379" /> <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="2415" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2418" /> <source>Preview changegroup</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2444" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2417" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2447" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2420" /> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2453" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2456" /> <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="2485" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2488" /> <source>Bisect subcommand ({0}) invalid.</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2507" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2510" /> <source>Mercurial Bisect ({0})</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2533" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2536" /> <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="2582" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2563" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2585" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2566" /> <source>Backing out changeset</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2564" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2567" /> <source>No revision given. Aborting...</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2599" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2593" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2602" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2596" /> <source>Rollback last transaction</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2594" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2597" /> <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="2663" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2666" /> <source>Import Patch</source> <translation>Importer un patch</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2713" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2716" /> <source>Export Patches</source> <translation>Exporter des patches</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2755" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2758" /> <source>Change Phase</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2810" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2813" /> <source>Copy Changesets</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2849" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2852" /> <source>Copy Changesets (Continue)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2859" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2862" /> <source>Copy Changesets (Stop)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2869" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2872" /> <source>Copy Changesets (Abort)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2893" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2896" /> <source>Create Unversioned Archive</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2908" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2911" /> <source>Delete All Backups</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2909" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2912" /> <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="3000" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2980" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2969" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3003" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2983" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2972" /> <source>Add Sub-repository</source> <translation>Ajouter un sous-dépot</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3039" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2970" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3042" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2973" /> <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="2981" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2984" /> <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="3057" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3001" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3060" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3004" /> <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="3056" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3038" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3024" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3059" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3041" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3027" /> <source>Remove Sub-repositories</source> <translation>Supprimer un sous-répertoire</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3025" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3028" /> <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="3317" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3144" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3320" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3147" /> <source>Mercurial Command Server</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3145" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3148" /> <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="3318" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3321" /> <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="3441" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3444" /> <source>Mercurial Bookmark</source> <translation>Signet Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3458" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3461" /> <source>Delete Bookmark</source> <translation>Supprimer le signet</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3459" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3462" /> <source>Select the bookmark to be deleted:</source> <translation>Selectionner le signet à supprimer :</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3470" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3473" /> <source>Delete Mercurial Bookmark</source> <translation>Supprimer le signet Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3497" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3500" /> <source>Rename Mercurial Bookmark</source> <translation>Renommer le signet Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3539" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3542" /> <source>Move Mercurial Bookmark</source> <translation>Déplacer le signet Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3621" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3624" /> <source>Pull Bookmark</source> <translation>Récuperer le signet</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3622" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3625" /> <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="3634" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3637" /> <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="3662" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3665" /> <source>Push Bookmark</source> <translation>Envoyer signet</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3663" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3666" /> <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="3678" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3681" /> <source>Pushing bookmark to a remote Mercurial repository</source> <translation>À envoyer le signet à un dépôt Mercurial distant</translation> </message> @@ -38279,7 +38279,7 @@ <translation type="unfinished">Affichage</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3049" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3063" /> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="298" /> <source>Select Branches</source> <translation type="unfinished" /> @@ -38320,7 +38320,7 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2218" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2227" /> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="343" /> <source>Copy Changesets</source> <translation type="unfinished" /> @@ -38377,8 +38377,8 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2312" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2295" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2321" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2304" /> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="387" /> <source>Switch</source> <translation>Basculer de version</translation> @@ -38409,263 +38409,270 @@ <translation>Déplacer le signet vers la révision sélectionnée</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2430" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1622" /> <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 Selected Changes</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="419" /> + <source>Pull selected changes from a remote repository</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="423" /> + <source>Pull All Changes</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="427" /> + <source>Pull all changes from a remote repository</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="430" /> <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>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> + <source>Pull large files for selected revisions</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="438" /> + <source>Push Selected 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> + <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="449" /> + <source>Push All Changes</source> <translation type="unfinished" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="452" /> + <source>Push all changes to a remote repository</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="458" /> + <source>Create Changegroup</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="462" /> <source>Create a changegroup file containing the selected changesets</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="455" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="465" /> <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="2569" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="468" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2583" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="478" /> <source>Apply Changegroup</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="472" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="482" /> <source>Apply the currently viewed changegroup file</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="479" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="489" /> <source>Sign Revisions</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="483" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="493" /> <source>Add a signature for the selected revisions</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="487" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="497" /> <source>Verify Signatures</source> <translation type="unfinished" /> </message> <message> - <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="2476" /> - <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="501" /> + <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="2490" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="508" /> + <source>Strip Changesets</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="511" /> <source>Strip changesets from a repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="506" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="516" /> <source>Select All Entries</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="509" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="519" /> <source>Deselect All Entries</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="958" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="934" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="911" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="885" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="968" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="944" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="921" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="895" /> <source>Mercurial Error</source> <translation>Erreur Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1266" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1276" /> <source>{0} (large file)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1532" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1542" /> <source>Side-by-Side Diff to Parent {0}</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1543" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1553" /> <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="1701" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1620" /> - <source>Pull Selected Changes</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2570" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2477" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2431" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2313" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2219" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2584" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2491" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2445" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2322" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2228" /> <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="2296" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2305" /> <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="2341" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2350" /> <source>Define Bookmark</source> <translation>Définir un signet</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2342" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2351" /> <source>Enter bookmark name for changeset "{0}":</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2371" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2380" /> <source>Move Bookmark</source> <translation>Déplacer un signet</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2372" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2381" /> <source>Select the bookmark to be moved to changeset '{0}':</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2713" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2444" /> + <source>Pull Changes</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2727" /> <source>Find Commit</source> <translation>Chercher le commit</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2714" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2728" /> <source>'{0}' was not found.</source> <translation>'{0}' n'a pas été trouvé.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2774" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2788" /> <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="2775" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2789" /> <source>Differences</source> <translation>Différences</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2794" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2808" /> <source>No differences available. Get some more log entries.</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2796" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2810" /> <source>No differences available.</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2807" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2821" /> <source>Differences to Parent {0}</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2823" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2837" /> <source>Diff to Parent {0}{1}</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2846" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2860" /> <source>There is no difference.</source> <translation>Aucune différence.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2999" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2983" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2965" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3013" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2997" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2979" /> <source>Save Diff</source> <translation>Enregistrer Diff</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2967" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2981" /> <source>Patch Files (*.diff)</source> <translation>Fichiers Patch (*.diff)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2984" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2998" /> <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="3000" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3014" /> <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="3031" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3045" /> <source>closed</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3032" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3046" /> <source>inactive</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3041" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3055" /> <source>{0} ({1})</source> <translation type="unfinished">{0} ({1})</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3050" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3064" /> <source>Select the branches to be shown (none for 'All'):</source> <translation type="unfinished" /> </message> @@ -106261,19 +106268,19 @@ <tr><td><b>Modifications</b></td><td>{1}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1961" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1964" /> <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1397" /> <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="1967" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1970" /> <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1403" /> <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="1974" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1977" /> <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1410" /> <source><tr><td><b>Branches</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Branches</b></td><td>{0}</td></tr></translation> @@ -106299,36 +106306,36 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1935" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1938" /> <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="1942" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1945" /> <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="1949" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1952" /> <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="1954" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1957" /> <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="1981" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1984" /> <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="1987" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1990" /> <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 Thu Dec 19 16:06:08 2024 +0100 +++ b/src/eric7/i18n/eric7_it.ts Thu Dec 19 19:32:37 2024 +0100 @@ -35602,317 +35602,317 @@ <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="2463" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2452" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2442" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1841" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2466" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2455" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2445" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1844" /> <source>Apply changegroups</source> <translation>Applica changegroup</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1844" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1847" /> <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="1890" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1893" /> <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="2033" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2036" /> <source>Marking as 'unresolved'</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2035" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2038" /> <source>Marking as 'resolved'</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2057" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2060" /> <source>Aborting uncommitted merge</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2081" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2084" /> <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="2092" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2095" /> <source>Created new branch <{0}>.</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2101" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2104" /> <source>Showing current branch</source> <translation>Visualizzazione branch corrente</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2190" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2193" /> <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="2206" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2209" /> <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="2221" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2224" /> <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="2236" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2239" /> <source>Recovering from interrupted transaction</source> <translation>Recupero da una transazione interrotta</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2251" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2254" /> <source>Identifying project directory</source> <translation>Identificazione directory del progetto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2297" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2300" /> <source>Create .hgignore file</source> <translation>Crea il file .hgignore</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2298" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2301" /> <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="2401" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2375" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2357" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2404" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2378" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2360" /> <source>Create changegroup</source> <translation>Crea changegroup</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2359" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2362" /> <source>Mercurial Changegroup Files (*.hg)</source> <translation>Mercurial Changegroup Files (*.hg)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2376" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2379" /> <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="2415" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2418" /> <source>Preview changegroup</source> <translation>Anteprima changegroup</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2444" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2417" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2447" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2420" /> <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="2453" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2456" /> <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="2485" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2488" /> <source>Bisect subcommand ({0}) invalid.</source> <translation>Sottocomando Bisect ({0}) non valido.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2507" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2510" /> <source>Mercurial Bisect ({0})</source> <translation>Mercurial Bisect ({0})</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2533" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2536" /> <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="2582" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2563" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2585" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2566" /> <source>Backing out changeset</source> <translation>Ritiro changeset</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2564" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2567" /> <source>No revision given. Aborting...</source> <translation>Nessuna revisione fornita. Termino...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2599" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2593" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2602" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2596" /> <source>Rollback last transaction</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2594" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2597" /> <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="2663" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2666" /> <source>Import Patch</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2713" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2716" /> <source>Export Patches</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2755" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2758" /> <source>Change Phase</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2810" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2813" /> <source>Copy Changesets</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2849" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2852" /> <source>Copy Changesets (Continue)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2859" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2862" /> <source>Copy Changesets (Stop)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2869" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2872" /> <source>Copy Changesets (Abort)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2893" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2896" /> <source>Create Unversioned Archive</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2908" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2911" /> <source>Delete All Backups</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2909" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2912" /> <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="3000" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2980" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2969" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3003" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2983" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2972" /> <source>Add Sub-repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3039" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2970" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3042" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2973" /> <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="2981" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2984" /> <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="3057" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3001" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3060" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3004" /> <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="3056" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3038" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3024" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3059" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3041" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3027" /> <source>Remove Sub-repositories</source> <translation type="unfinished">Rimuovi sotto-archivi</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3025" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3028" /> <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="3317" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3144" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3320" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3147" /> <source>Mercurial Command Server</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3145" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3148" /> <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="3318" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3321" /> <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="3441" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3444" /> <source>Mercurial Bookmark</source> <translation type="unfinished">Segnalibro Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3458" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3461" /> <source>Delete Bookmark</source> <translation type="unfinished">Cancella segnalibro</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3459" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3462" /> <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="3470" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3473" /> <source>Delete Mercurial Bookmark</source> <translation type="unfinished">Cancella Segnalibro Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3497" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3500" /> <source>Rename Mercurial Bookmark</source> <translation type="unfinished">Rinomina Segnalibro Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3539" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3542" /> <source>Move Mercurial Bookmark</source> <translation type="unfinished">Sposta Segnalibro Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3621" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3624" /> <source>Pull Bookmark</source> <translation type="unfinished">Estrai Segnalibro</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3622" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3625" /> <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="3634" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3637" /> <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="3662" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3665" /> <source>Push Bookmark</source> <translation type="unfinished">Inserisce Segnalibro</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3663" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3666" /> <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="3678" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3681" /> <source>Pushing bookmark to a remote Mercurial repository</source> <translation type="unfinished">Inserisce segnalibro in un repository Mercurial remoto</translation> </message> @@ -38262,7 +38262,7 @@ <translation type="unfinished">Visualizza</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3049" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3063" /> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="298" /> <source>Select Branches</source> <translation type="unfinished" /> @@ -38303,7 +38303,7 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2218" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2227" /> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="343" /> <source>Copy Changesets</source> <translation type="unfinished" /> @@ -38360,8 +38360,8 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2312" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2295" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2321" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2304" /> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="387" /> <source>Switch</source> <translation type="unfinished" /> @@ -38392,263 +38392,270 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2430" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1622" /> <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 Selected Changes</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="419" /> + <source>Pull selected changes from a remote repository</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="423" /> + <source>Pull All Changes</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="427" /> + <source>Pull all changes from a remote repository</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="430" /> <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>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> + <source>Pull large files for selected revisions</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="438" /> + <source>Push Selected 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> + <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="449" /> + <source>Push All Changes</source> <translation type="unfinished" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="452" /> + <source>Push all changes to a remote repository</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="458" /> + <source>Create Changegroup</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="462" /> <source>Create a changegroup file containing the selected changesets</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="455" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="465" /> <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="2569" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="468" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2583" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="478" /> <source>Apply Changegroup</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="472" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="482" /> <source>Apply the currently viewed changegroup file</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="479" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="489" /> <source>Sign Revisions</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="483" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="493" /> <source>Add a signature for the selected revisions</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="487" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="497" /> <source>Verify Signatures</source> <translation type="unfinished" /> </message> <message> - <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="2476" /> - <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="501" /> + <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="2490" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="508" /> + <source>Strip Changesets</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="511" /> <source>Strip changesets from a repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="506" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="516" /> <source>Select All Entries</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="509" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="519" /> <source>Deselect All Entries</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="958" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="934" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="911" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="885" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="968" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="944" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="921" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="895" /> <source>Mercurial Error</source> <translation>Mercurial Error</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1266" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1276" /> <source>{0} (large file)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1532" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1542" /> <source>Side-by-Side Diff to Parent {0}</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1543" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1553" /> <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="1701" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1620" /> - <source>Pull Selected Changes</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2570" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2477" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2431" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2313" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2219" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2584" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2491" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2445" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2322" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2228" /> <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="2296" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2305" /> <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="2341" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2350" /> <source>Define Bookmark</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2342" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2351" /> <source>Enter bookmark name for changeset "{0}":</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2371" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2380" /> <source>Move Bookmark</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2372" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2381" /> <source>Select the bookmark to be moved to changeset '{0}':</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2713" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2444" /> + <source>Pull Changes</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2727" /> <source>Find Commit</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2714" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2728" /> <source>'{0}' was not found.</source> <translation type="unfinished">'{0}' non è stato trovato.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2774" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2788" /> <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="2775" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2789" /> <source>Differences</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2794" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2808" /> <source>No differences available. Get some more log entries.</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2796" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2810" /> <source>No differences available.</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2807" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2821" /> <source>Differences to Parent {0}</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2823" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2837" /> <source>Diff to Parent {0}{1}</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2846" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2860" /> <source>There is no difference.</source> <translation type="unfinished">Non ci sono differenze.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2999" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2983" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2965" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3013" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2997" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2979" /> <source>Save Diff</source> <translation type="unfinished">Salva Diff</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2967" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2981" /> <source>Patch Files (*.diff)</source> <translation type="unfinished">File Patch (*.diff)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2984" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2998" /> <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="3000" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3014" /> <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="3031" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3045" /> <source>closed</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3032" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3046" /> <source>inactive</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3041" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3055" /> <source>{0} ({1})</source> <translation type="unfinished">{0} ({1})</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3050" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3064" /> <source>Select the branches to be shown (none for 'All'):</source> <translation type="unfinished" /> </message> @@ -38797,6 +38804,10 @@ <source><b>Mercurial log errors</b><p>This shows possible error messages of the hg log command.</p></source> <translation><b>Log errori Mercurial</b><p>Mostra gli eventuali messaggi di errore del comando hg log.</p></translation> </message> + <message> + <source>Pull changes from a remote repository</source> + <translation type="vanished">Pull changes da un repository remoto</translation> + </message> </context> <context> <name>HgMergeDialog</name> @@ -106087,19 +106098,19 @@ <tr><td><b>Changeset</b></td><td>{1}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1961" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1964" /> <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1397" /> <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="1967" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1970" /> <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1403" /> <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="1974" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1977" /> <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1410" /> <source><tr><td><b>Branches</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Branches</b></td><td>{0}</td></tr></translation> @@ -106131,36 +106142,36 @@ </translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1935" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1938" /> <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="1942" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1945" /> <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="1949" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1952" /> <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="1954" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1957" /> <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="1981" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1984" /> <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="1987" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1990" /> <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 Thu Dec 19 16:06:08 2024 +0100 +++ b/src/eric7/i18n/eric7_pt.ts Thu Dec 19 19:32:37 2024 +0100 @@ -35602,317 +35602,317 @@ <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="2463" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2452" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2442" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1841" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2466" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2455" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2445" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1844" /> <source>Apply changegroups</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1844" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1847" /> <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="1890" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1893" /> <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="2033" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2036" /> <source>Marking as 'unresolved'</source> <translation>A marcar como 'sem resolver'</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2035" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2038" /> <source>Marking as 'resolved'</source> <translation>A marcar como 'resolvido'</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2057" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2060" /> <source>Aborting uncommitted merge</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2081" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2084" /> <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="2092" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2095" /> <source>Created new branch <{0}>.</source> <translation>Criado o novo ramo <{0}>.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2101" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2104" /> <source>Showing current branch</source> <translation>A mostrar o ramo atual</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2190" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2193" /> <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="2206" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2209" /> <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="2221" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2224" /> <source>Showing aliases for remote repositories</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2236" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2239" /> <source>Recovering from interrupted transaction</source> <translation>A recuperar duma transação interrompida</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2251" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2254" /> <source>Identifying project directory</source> <translation>A identificar o diretorio do projeto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2297" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2300" /> <source>Create .hgignore file</source> <translation>Criar ficheiro .hgignore</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2298" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2301" /> <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="2401" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2375" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2357" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2404" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2378" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2360" /> <source>Create changegroup</source> <translation>Criar conjunto de alterações</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2359" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2362" /> <source>Mercurial Changegroup Files (*.hg)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2376" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2379" /> <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="2415" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2418" /> <source>Preview changegroup</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2444" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2417" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2447" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2420" /> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2453" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2456" /> <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="2485" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2488" /> <source>Bisect subcommand ({0}) invalid.</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2507" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2510" /> <source>Mercurial Bisect ({0})</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2533" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2536" /> <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="2582" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2563" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2585" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2566" /> <source>Backing out changeset</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2564" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2567" /> <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="2599" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2593" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2602" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2596" /> <source>Rollback last transaction</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2594" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2597" /> <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="2663" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2666" /> <source>Import Patch</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2713" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2716" /> <source>Export Patches</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2755" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2758" /> <source>Change Phase</source> <translation>Mudar Fase</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2810" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2813" /> <source>Copy Changesets</source> <translation type="unfinished">Copiar Conjuntos de Alterações</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2849" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2852" /> <source>Copy Changesets (Continue)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2859" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2862" /> <source>Copy Changesets (Stop)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2869" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2872" /> <source>Copy Changesets (Abort)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2893" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2896" /> <source>Create Unversioned Archive</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2908" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2911" /> <source>Delete All Backups</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2909" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2912" /> <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="3000" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2980" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2969" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3003" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2983" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2972" /> <source>Add Sub-repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3039" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2970" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3042" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2973" /> <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="2981" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2984" /> <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="3057" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3001" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3060" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3004" /> <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="3056" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3038" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3024" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3059" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3041" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3027" /> <source>Remove Sub-repositories</source> <translation>Retirar Sub Repositórios</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3025" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3028" /> <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="3317" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3144" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3320" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3147" /> <source>Mercurial Command Server</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3145" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3148" /> <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="3318" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3321" /> <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="3441" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3444" /> <source>Mercurial Bookmark</source> <translation>Marcador de Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3458" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3461" /> <source>Delete Bookmark</source> <translation>Apagar Marcador</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3459" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3462" /> <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="3470" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3473" /> <source>Delete Mercurial Bookmark</source> <translation>Apagar o Marcador de Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3497" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3500" /> <source>Rename Mercurial Bookmark</source> <translation>Renomear o Marcador de Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3539" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3542" /> <source>Move Mercurial Bookmark</source> <translation>Mover o Marcador de Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3621" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3624" /> <source>Pull Bookmark</source> <translation>Puxar Marcador</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3622" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3625" /> <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="3634" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3637" /> <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="3662" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3665" /> <source>Push Bookmark</source> <translation>Empurrar Marcador</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3663" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3666" /> <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="3678" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3681" /> <source>Pushing bookmark to a remote Mercurial repository</source> <translation>A empurrar marcador a um repositório remoto de Mercurial</translation> </message> @@ -38267,7 +38267,7 @@ <translation type="unfinished">Vista</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3049" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3063" /> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="298" /> <source>Select Branches</source> <translation type="unfinished" /> @@ -38308,7 +38308,7 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2218" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2227" /> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="343" /> <source>Copy Changesets</source> <translation type="unfinished">Copiar Conjuntos de Alterações</translation> @@ -38366,8 +38366,8 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2312" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2295" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2321" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2304" /> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="387" /> <source>Switch</source> <translation type="unfinished">Mudar</translation> @@ -38398,263 +38398,270 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2430" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1622" /> <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 Selected Changes</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="419" /> + <source>Pull selected changes from a remote repository</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="423" /> + <source>Pull All Changes</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="427" /> + <source>Pull all changes from a remote repository</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="430" /> <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>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> + <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="438" /> + <source>Push Selected 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> + <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="449" /> + <source>Push All Changes</source> <translation type="unfinished" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="452" /> + <source>Push all changes to a remote repository</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="458" /> + <source>Create Changegroup</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="462" /> <source>Create a changegroup file containing the selected changesets</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="455" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="465" /> <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="2569" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="468" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2583" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="478" /> <source>Apply Changegroup</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="472" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="482" /> <source>Apply the currently viewed changegroup file</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="479" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="489" /> <source>Sign Revisions</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="483" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="493" /> <source>Add a signature for the selected revisions</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="487" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="497" /> <source>Verify Signatures</source> <translation type="unfinished">Verificar Assinaturas</translation> </message> <message> - <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="2476" /> - <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="501" /> + <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="2490" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="508" /> + <source>Strip Changesets</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="511" /> <source>Strip changesets from a repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="506" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="516" /> <source>Select All Entries</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="509" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="519" /> <source>Deselect All Entries</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="958" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="934" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="911" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="885" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="968" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="944" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="921" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="895" /> <source>Mercurial Error</source> <translation>Erro de Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1266" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1276" /> <source>{0} (large file)</source> <translation>{0} (ficheiro grande)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1532" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1542" /> <source>Side-by-Side Diff to Parent {0}</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1543" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1553" /> <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="1701" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1620" /> - <source>Pull Selected Changes</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2570" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2477" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2431" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2313" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2219" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2584" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2491" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2445" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2322" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2228" /> <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="2296" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2305" /> <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="2341" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2350" /> <source>Define Bookmark</source> <translation type="unfinished">Definir Marcador</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2342" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2351" /> <source>Enter bookmark name for changeset "{0}":</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2371" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2380" /> <source>Move Bookmark</source> <translation type="unfinished">Mover marcador</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2372" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2381" /> <source>Select the bookmark to be moved to changeset '{0}':</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2713" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2444" /> + <source>Pull Changes</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2727" /> <source>Find Commit</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2714" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2728" /> <source>'{0}' was not found.</source> <translation>'{0}' não foi encontrado.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2774" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2788" /> <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="2775" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2789" /> <source>Differences</source> <translation type="unfinished">Diferenças</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2794" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2808" /> <source>No differences available. Get some more log entries.</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2796" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2810" /> <source>No differences available.</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2807" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2821" /> <source>Differences to Parent {0}</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2823" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2837" /> <source>Diff to Parent {0}{1}</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2846" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2860" /> <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="2999" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2983" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2965" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3013" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2997" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2979" /> <source>Save Diff</source> <translation type="unfinished">Gravar Diff</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2967" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2981" /> <source>Patch Files (*.diff)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2984" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2998" /> <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="3000" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3014" /> <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="3031" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3045" /> <source>closed</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3032" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3046" /> <source>inactive</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3041" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3055" /> <source>{0} ({1})</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3050" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3064" /> <source>Select the branches to be shown (none for 'All'):</source> <translation type="unfinished" /> </message> @@ -38803,6 +38810,10 @@ <source><b>Mercurial log errors</b><p>This shows possible error messages of the hg log command.</p></source> <translation><b>Registo de erros de Mercurial</b><p>Mostra as mensagens possiveis do comando hg log.</p></translation> </message> + <message> + <source>Pull changes from a remote repository</source> + <translation type="vanished">Puxar alterações do repositorio remoto</translation> + </message> </context> <context> <name>HgMergeDialog</name> @@ -105906,19 +105917,19 @@ <tr><td><b>Conjunto de Alterações</b></td><td>{1}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1961" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1964" /> <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1397" /> <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="1967" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1970" /> <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1403" /> <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="1974" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1977" /> <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1410" /> <source><tr><td><b>Branches</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Ramos</b></td><td>{0}</td></tr></translation> @@ -105950,36 +105961,36 @@ </translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1935" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1938" /> <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="1942" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1945" /> <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="1949" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1952" /> <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="1954" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1957" /> <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="1981" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1984" /> <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="1987" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1990" /> <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 Thu Dec 19 16:06:08 2024 +0100 +++ b/src/eric7/i18n/eric7_ru.ts Thu Dec 19 19:32:37 2024 +0100 @@ -35665,317 +35665,317 @@ <translation><p>Невозможно прочитать файл <b>{0}</b>.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2463" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2452" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2442" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1841" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2466" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2455" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2445" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1844" /> <source>Apply changegroups</source> <translation>Применить группу изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1844" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1847" /> <source>Pulling from a remote Mercurial repository</source> <translation>Затягивание изменений из удалённого Mercurial репозитория</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1890" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1893" /> <source>Pushing to a remote Mercurial repository</source> <translation>Mercurial: Проталкивание изменений в удалённый репозиторий</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2033" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2036" /> <source>Marking as 'unresolved'</source> <translation>Помеченные как 'unresolved'</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2035" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2038" /> <source>Marking as 'resolved'</source> <translation>Помеченные как 'resolved'</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2057" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2060" /> <source>Aborting uncommitted merge</source> <translation>Отмена незавершенного слияния</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2081" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2084" /> <source>Creating branch in the Mercurial repository</source> <translation>Создание ветки в Mercurial репозитории</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2092" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2095" /> <source>Created new branch <{0}>.</source> <translation>Создана новая ветка <{0}>.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2101" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2104" /> <source>Showing current branch</source> <translation>Отображение текущей ветки</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2190" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2193" /> <source>Verifying the integrity of the Mercurial repository</source> <translation>Mercurial: Проверка целостности репозитория</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2206" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2209" /> <source>Showing the combined configuration settings</source> <translation>Отображение обобщенных параметров конфигурации</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2221" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2224" /> <source>Showing aliases for remote repositories</source> <translation>Отображение алиасов удалённых репозиториев</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2236" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2239" /> <source>Recovering from interrupted transaction</source> <translation>Восстановление после прерванной транзакции</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2251" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2254" /> <source>Identifying project directory</source> <translation>Идентификация директории проекта</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2297" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2300" /> <source>Create .hgignore file</source> <translation>Создать файл .hgignore</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2298" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2301" /> <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="2401" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2375" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2357" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2404" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2378" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2360" /> <source>Create changegroup</source> <translation>Создать группу изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2359" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2362" /> <source>Mercurial Changegroup Files (*.hg)</source> <translation>Файлы группы изменений Mercurial (*.hg)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2376" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2379" /> <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="2415" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2418" /> <source>Preview changegroup</source> <translation>Просмотр группы изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2444" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2417" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2447" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2420" /> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation>Файлы группы изменений Mercurial (*.hg);;Все файлы (*)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2453" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2456" /> <source>Shall the working directory be updated?</source> <translation>Обновить рабочую директорию?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2485" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2488" /> <source>Bisect subcommand ({0}) invalid.</source> <translation>Bisect: Недействительная подкоманда ({0}).</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2507" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2510" /> <source>Mercurial Bisect ({0})</source> <translation>Mercurial: Bisect ({0})</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2533" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2536" /> <source>Removing files from the Mercurial repository only</source> <translation>Mercurial: Удаление файлов только из репозитория</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2582" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2563" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2585" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2566" /> <source>Backing out changeset</source> <translation>Отмена набора изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2564" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2567" /> <source>No revision given. Aborting...</source> <translation>Не задана ревизия. Отмена...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2599" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2593" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2602" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2596" /> <source>Rollback last transaction</source> <translation>Откатить последнюю транзакцию</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2594" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2597" /> <source>Are you sure you want to rollback the last transaction?</source> <translation>Вы действительно хотите откатить последнюю транзакцию?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2663" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2666" /> <source>Import Patch</source> <translation>Импорт патча</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2713" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2716" /> <source>Export Patches</source> <translation>Экспорт патчей</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2755" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2758" /> <source>Change Phase</source> <translation>Изменить фазу</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2810" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2813" /> <source>Copy Changesets</source> <translation>Копировать наборы изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2849" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2852" /> <source>Copy Changesets (Continue)</source> <translation>Копировать наборы изменений (продолжение)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2859" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2862" /> <source>Copy Changesets (Stop)</source> <translation>Копировать наборы изменений (Stop)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2869" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2872" /> <source>Copy Changesets (Abort)</source> <translation>Копировать наборы изменений (Abort)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2893" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2896" /> <source>Create Unversioned Archive</source> <translation>Создать неверсированный архив</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2908" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2911" /> <source>Delete All Backups</source> <translation>Удалить все резервные копии</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2909" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2912" /> <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="3000" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2980" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2969" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3003" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2983" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2972" /> <source>Add Sub-repository</source> <translation>Добавить субрепозиторий</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3039" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2970" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3042" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2973" /> <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="2981" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2984" /> <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="3057" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3001" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3060" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3004" /> <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="3056" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3038" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3024" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3059" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3041" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3027" /> <source>Remove Sub-repositories</source> <translation>Удалить субрепозитории</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3025" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3028" /> <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="3317" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3144" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3320" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3147" /> <source>Mercurial Command Server</source> <translation>Mercurial: Сервер команд</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3145" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3148" /> <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="3318" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3321" /> <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="3441" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3444" /> <source>Mercurial Bookmark</source> <translation>Mercurial: Закладка</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3458" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3461" /> <source>Delete Bookmark</source> <translation>Удалить закладку</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3459" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3462" /> <source>Select the bookmark to be deleted:</source> <translation>Выберите закладку для удаления:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3470" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3473" /> <source>Delete Mercurial Bookmark</source> <translation>Mercurial: Удалить закладку</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3497" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3500" /> <source>Rename Mercurial Bookmark</source> <translation>Mercurial: Переименовать закладку</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3539" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3542" /> <source>Move Mercurial Bookmark</source> <translation>Mercurial: Переместить закладку</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3621" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3624" /> <source>Pull Bookmark</source> <translation>Затянуть закладку</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3622" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3625" /> <source>Select the bookmark to be pulled:</source> <translation>Выберите закладку для затягивания:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3634" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3637" /> <source>Pulling bookmark from a remote Mercurial repository</source> <translation>Затянуть закладку из удалённого Mercurial репозитория</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3662" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3665" /> <source>Push Bookmark</source> <translation>Протолкнуть закладку</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3663" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3666" /> <source>Select the bookmark to be push:</source> <translation>Выберите закладку для проталкивания:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3678" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3681" /> <source>Pushing bookmark to a remote Mercurial repository</source> <translation>Mercurial: Проталкивание закладки в удалённый репозиторий</translation> </message> @@ -38343,7 +38343,7 @@ <translation>Отображение</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3049" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3063" /> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="298" /> <source>Select Branches</source> <translation>Выбрать ветки</translation> @@ -38384,7 +38384,7 @@ <translation>Выберите для отображения ветки из списка закрытых веток и обновите отображение</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2218" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2227" /> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="343" /> <source>Copy Changesets</source> <translation>Копировать наборы изменений</translation> @@ -38442,8 +38442,8 @@ <translation>Закрыть выбранные головные ревизии</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2312" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2295" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2321" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2304" /> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="387" /> <source>Switch</source> <translation>Переключиться</translation> @@ -38474,264 +38474,271 @@ <translation>Переместить закладку в выбранную ревизию</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2430" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1622" /> <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 Selected Changes</source> + <translation>Затянуть помеченные изменения</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="419" /> + <source>Pull selected changes from a remote repository</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="423" /> + <source>Pull All Changes</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="427" /> + <source>Pull all changes from a remote repository</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="430" /> <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> + <source>Pull large files for selected revisions</source> + <translation>Загрузить (затянуть) большие файлы для выбранных ревизий</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="438" /> + <source>Push Selected 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> + <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="449" /> + <source>Push All Changes</source> + <translation>Протолкнуть все изменения</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="452" /> + <source>Push all changes to a remote repository</source> + <translation>Протолкнуть все изменения в удаленный репозиторий</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="458" /> + <source>Create Changegroup</source> + <translation>Создать группу изменений</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="462" /> <source>Create a changegroup file containing the selected changesets</source> <translation>Создать файл группы изменений, содержащий выбранные наборы изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="455" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="465" /> <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="2569" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="468" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2583" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="478" /> <source>Apply Changegroup</source> <translation>Применить группу изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="472" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="482" /> <source>Apply the currently viewed changegroup file</source> <translation>Применить просматриваемый в настоящее время файл группы изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="479" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="489" /> <source>Sign Revisions</source> <translation>Подписать ревизию</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="483" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="493" /> <source>Add a signature for the selected revisions</source> <translation>Добавить подпись для выбранной ревизии</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="487" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="497" /> <source>Verify Signatures</source> <translation>Проверить подписи</translation> </message> <message> - <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="2476" /> - <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="501" /> + <source>Verify all signatures there may be for the selected revision</source> + <translation>Проверить все подписи, которые могут быть для отмеченных ревизий</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2490" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="508" /> + <source>Strip Changesets</source> + <translation>Срезать наборы изменений (strip)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="511" /> <source>Strip changesets from a repository</source> <translation>Срезать наборы изменений из репозитория</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="506" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="516" /> <source>Select All Entries</source> <translation>Выбрать все записи</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="509" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="519" /> <source>Deselect All Entries</source> <translation>Снять выделение всех записей</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="958" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="934" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="911" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="885" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="968" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="944" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="921" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="895" /> <source>Mercurial Error</source> <translation>Mercurial: Ошибка</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1266" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1276" /> <source>{0} (large file)</source> <translation>{0} большой файл</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1532" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1542" /> <source>Side-by-Side Diff to Parent {0}</source> <translation>Построчные различия с предком {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1543" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1553" /> <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="1701" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1620" /> - <source>Pull Selected Changes</source> - <translation>Затянуть помеченные изменения</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2570" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2477" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2431" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2313" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2219" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2584" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2491" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2445" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2322" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2228" /> <source>The project should be reread. Do this now?</source> <translation>Проект должен быть перепрочитан. Сделать это сейчас?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2296" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2305" /> <source>Select bookmark to switch to (leave empty to use revision):</source> <translation>Выберите закладку для переключения (оставьте поле пустым для использования ревизии):</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2341" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2350" /> <source>Define Bookmark</source> <translation>Определить закладку</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2342" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2351" /> <source>Enter bookmark name for changeset "{0}":</source> <translation>Введите имя закладки для набора изменений "{0}":</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2371" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2380" /> <source>Move Bookmark</source> <translation>Переместить закладку</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2372" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2381" /> <source>Select the bookmark to be moved to changeset '{0}':</source> <translation>Выберите закладку для перемещения в набор изменений '{0}':</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2713" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2444" /> + <source>Pull Changes</source> + <translation>Затянуть изменения</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2727" /> <source>Find Commit</source> <translation>Поиск фиксации</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2714" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2728" /> <source>'{0}' was not found.</source> <translation>'{0}' не найден.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2774" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2788" /> <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="2775" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2789" /> <source>Differences</source> <translation>Различия</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2794" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2808" /> <source>No differences available. Get some more log entries.</source> <translation>Различия недоступны. Получите еще несколько записей из журнала.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2796" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2810" /> <source>No differences available.</source> <translation>Различия недоступны.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2807" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2821" /> <source>Differences to Parent {0}</source> <translation>Различия с предком {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2823" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2837" /> <source>Diff to Parent {0}{1}</source> <translation>Различия с предком {0}{1}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2846" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2860" /> <source>There is no difference.</source> <translation>Различий нет.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2999" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2983" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2965" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3013" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2997" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2979" /> <source>Save Diff</source> <translation>Сохранить различия</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2967" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2981" /> <source>Patch Files (*.diff)</source> <translation>Файлы патчей (*.diff)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2984" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2998" /> <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="3000" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3014" /> <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="3031" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3045" /> <source>closed</source> <translation>закрыта</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3032" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3046" /> <source>inactive</source> <translation>неактивна</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3041" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3055" /> <source>{0} ({1})</source> <translation>{0} ({1})</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3050" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3064" /> <source>Select the branches to be shown (none for 'All'):</source> <translation>Выберите ветки для отображения (не для варианта 'Все'):</translation> </message> @@ -38880,6 +38887,10 @@ <source><b>Mercurial log errors</b><p>This shows possible error messages of the hg log command.</p></source> <translation><b>Mercurial: Журнал ошибок</b><p>Отображение возможных ошибок команды hg log.</p></translation> </message> + <message> + <source>Pull changes from a remote repository</source> + <translation type="vanished">Затянуть изменения из удалённого репозитория</translation> + </message> </context> <context> <name>HgMergeDialog</name> @@ -106445,19 +106456,19 @@ <tr><td><b>Набор изменений</b></td><td>{1}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1961" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1964" /> <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1397" /> <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="1967" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1970" /> <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1403" /> <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="1974" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1977" /> <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1410" /> <source><tr><td><b>Branches</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Ветви</b></td><td>{0}</td></tr></translation> @@ -106490,38 +106501,38 @@ </translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1935" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1938" /> <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="1942" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1945" /> <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="1949" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1952" /> <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="1954" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1957" /> <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="1981" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1984" /> <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="1987" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1990" /> <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 Thu Dec 19 16:06:08 2024 +0100 +++ b/src/eric7/i18n/eric7_tr.ts Thu Dec 19 19:32:37 2024 +0100 @@ -35563,317 +35563,317 @@ <translation type="unfinished"><p>Dosya <b>{0}</b> okunamıyor.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2463" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2452" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2442" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1841" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2466" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2455" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2445" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1844" /> <source>Apply changegroups</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1844" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1847" /> <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="1890" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1893" /> <source>Pushing to a remote Mercurial repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2033" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2036" /> <source>Marking as 'unresolved'</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2035" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2038" /> <source>Marking as 'resolved'</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2057" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2060" /> <source>Aborting uncommitted merge</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2081" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2084" /> <source>Creating branch in the Mercurial repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2092" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2095" /> <source>Created new branch <{0}>.</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2101" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2104" /> <source>Showing current branch</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2190" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2193" /> <source>Verifying the integrity of the Mercurial repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2206" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2209" /> <source>Showing the combined configuration settings</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2221" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2224" /> <source>Showing aliases for remote repositories</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2236" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2239" /> <source>Recovering from interrupted transaction</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2251" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2254" /> <source>Identifying project directory</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2297" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2300" /> <source>Create .hgignore file</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2298" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2301" /> <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="2401" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2375" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2357" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2404" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2378" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2360" /> <source>Create changegroup</source> <translation>Değişimgrubu oluştur</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2359" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2362" /> <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="2376" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2379" /> <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="2415" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2418" /> <source>Preview changegroup</source> <translation>Değişimgrubu öngörünümü</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2444" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2417" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2447" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2420" /> <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="2453" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2456" /> <source>Shall the working directory be updated?</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2485" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2488" /> <source>Bisect subcommand ({0}) invalid.</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2507" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2510" /> <source>Mercurial Bisect ({0})</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2533" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2536" /> <source>Removing files from the Mercurial repository only</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2582" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2563" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2585" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2566" /> <source>Backing out changeset</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2564" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2567" /> <source>No revision given. Aborting...</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2599" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2593" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2602" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2596" /> <source>Rollback last transaction</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2594" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2597" /> <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="2663" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2666" /> <source>Import Patch</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2713" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2716" /> <source>Export Patches</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2755" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2758" /> <source>Change Phase</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2810" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2813" /> <source>Copy Changesets</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2849" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2852" /> <source>Copy Changesets (Continue)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2859" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2862" /> <source>Copy Changesets (Stop)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2869" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2872" /> <source>Copy Changesets (Abort)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2893" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2896" /> <source>Create Unversioned Archive</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2908" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2911" /> <source>Delete All Backups</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2909" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2912" /> <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="3000" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2980" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2969" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3003" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2983" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2972" /> <source>Add Sub-repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3039" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2970" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3042" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2973" /> <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="2981" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2984" /> <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="3057" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3001" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3060" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3004" /> <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="3056" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3038" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3024" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3059" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3041" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3027" /> <source>Remove Sub-repositories</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3025" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3028" /> <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="3317" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3144" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3320" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3147" /> <source>Mercurial Command Server</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3145" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3148" /> <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="3318" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3321" /> <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="3441" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3444" /> <source>Mercurial Bookmark</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3458" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3461" /> <source>Delete Bookmark</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3459" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3462" /> <source>Select the bookmark to be deleted:</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3470" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3473" /> <source>Delete Mercurial Bookmark</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3497" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3500" /> <source>Rename Mercurial Bookmark</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3539" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3542" /> <source>Move Mercurial Bookmark</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3621" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3624" /> <source>Pull Bookmark</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3622" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3625" /> <source>Select the bookmark to be pulled:</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3634" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3637" /> <source>Pulling bookmark from a remote Mercurial repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3662" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3665" /> <source>Push Bookmark</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3663" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3666" /> <source>Select the bookmark to be push:</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3678" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3681" /> <source>Pushing bookmark to a remote Mercurial repository</source> <translation type="unfinished" /> </message> @@ -38220,7 +38220,7 @@ <translation type="unfinished">Görünüm</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3049" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3063" /> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="298" /> <source>Select Branches</source> <translation type="unfinished" /> @@ -38261,7 +38261,7 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2218" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2227" /> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="343" /> <source>Copy Changesets</source> <translation type="unfinished" /> @@ -38318,8 +38318,8 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2312" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2295" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2321" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2304" /> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="387" /> <source>Switch</source> <translation type="unfinished">Değiştirmek</translation> @@ -38350,263 +38350,270 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2430" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1622" /> <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 Selected Changes</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="419" /> + <source>Pull selected changes from a remote repository</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="423" /> + <source>Pull All Changes</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="427" /> + <source>Pull all changes from a remote repository</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="430" /> <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>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> + <source>Pull large files for selected revisions</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="438" /> + <source>Push Selected 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> + <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="449" /> + <source>Push All Changes</source> <translation type="unfinished" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="452" /> + <source>Push all changes to a remote repository</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="458" /> + <source>Create Changegroup</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="462" /> <source>Create a changegroup file containing the selected changesets</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="455" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="465" /> <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="2569" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="468" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2583" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="478" /> <source>Apply Changegroup</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="472" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="482" /> <source>Apply the currently viewed changegroup file</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="479" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="489" /> <source>Sign Revisions</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="483" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="493" /> <source>Add a signature for the selected revisions</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="487" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="497" /> <source>Verify Signatures</source> <translation type="unfinished" /> </message> <message> - <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="2476" /> - <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="501" /> + <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="2490" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="508" /> + <source>Strip Changesets</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="511" /> <source>Strip changesets from a repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="506" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="516" /> <source>Select All Entries</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="509" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="519" /> <source>Deselect All Entries</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="958" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="934" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="911" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="885" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="968" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="944" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="921" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="895" /> <source>Mercurial Error</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1266" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1276" /> <source>{0} (large file)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1532" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1542" /> <source>Side-by-Side Diff to Parent {0}</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1543" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1553" /> <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="1701" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1620" /> - <source>Pull Selected Changes</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2570" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2477" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2431" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2313" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2219" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2584" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2491" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2445" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2322" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2228" /> <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="2296" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2305" /> <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="2341" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2350" /> <source>Define Bookmark</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2342" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2351" /> <source>Enter bookmark name for changeset "{0}":</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2371" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2380" /> <source>Move Bookmark</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2372" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2381" /> <source>Select the bookmark to be moved to changeset '{0}':</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2713" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2444" /> + <source>Pull Changes</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2727" /> <source>Find Commit</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2714" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2728" /> <source>'{0}' was not found.</source> <translation type="unfinished">'{0}' bulunamadı.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2774" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2788" /> <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="2775" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2789" /> <source>Differences</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2794" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2808" /> <source>No differences available. Get some more log entries.</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2796" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2810" /> <source>No differences available.</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2807" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2821" /> <source>Differences to Parent {0}</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2823" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2837" /> <source>Diff to Parent {0}{1}</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2846" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2860" /> <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="2999" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2983" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2965" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3013" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2997" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2979" /> <source>Save Diff</source> <translation type="unfinished">Farklılıkları Kaydet</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2967" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2981" /> <source>Patch Files (*.diff)</source> <translation type="unfinished">Patch Dosyaları (*.diff)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2984" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2998" /> <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="3000" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3014" /> <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="3031" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3045" /> <source>closed</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3032" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3046" /> <source>inactive</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3041" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3055" /> <source>{0} ({1})</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3050" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3064" /> <source>Select the branches to be shown (none for 'All'):</source> <translation type="unfinished" /> </message> @@ -38755,6 +38762,10 @@ <source><b>Mercurial log errors</b><p>This shows possible error messages of the hg log command.</p></source> <translation type="unfinished" /> </message> + <message> + <source>Pull changes from a remote repository</source> + <translation type="vanished">Değişiklileri uzak kaynak havuzundan çek</translation> + </message> </context> <context> <name>HgMergeDialog</name> @@ -105829,19 +105840,19 @@ <tr><td><b>Değişiklik seti</b></td><td>{1}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1961" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1964" /> <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1397" /> <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="1967" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1970" /> <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1403" /> <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="1974" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1977" /> <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1410" /> <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> @@ -105867,35 +105878,35 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1935" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1938" /> <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="1942" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1945" /> <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="1949" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1952" /> <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="1954" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1957" /> <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="1981" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1984" /> <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="1987" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1990" /> <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 Thu Dec 19 16:06:08 2024 +0100 +++ b/src/eric7/i18n/eric7_zh_CN.ts Thu Dec 19 19:32:37 2024 +0100 @@ -35573,317 +35573,317 @@ <translation><p>文件 <b>{0}</b> 无法读取。</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2463" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2452" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2442" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1841" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2466" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2455" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2445" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1844" /> <source>Apply changegroups</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1844" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1847" /> <source>Pulling from a remote Mercurial repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1890" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1893" /> <source>Pushing to a remote Mercurial repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2033" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2036" /> <source>Marking as 'unresolved'</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2035" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2038" /> <source>Marking as 'resolved'</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2057" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2060" /> <source>Aborting uncommitted merge</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2081" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2084" /> <source>Creating branch in the Mercurial repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2092" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2095" /> <source>Created new branch <{0}>.</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2101" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2104" /> <source>Showing current branch</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2190" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2193" /> <source>Verifying the integrity of the Mercurial repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2206" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2209" /> <source>Showing the combined configuration settings</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2221" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2224" /> <source>Showing aliases for remote repositories</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2236" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2239" /> <source>Recovering from interrupted transaction</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2251" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2254" /> <source>Identifying project directory</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2297" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2300" /> <source>Create .hgignore file</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2298" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2301" /> <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="2401" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2375" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2357" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2404" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2378" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2360" /> <source>Create changegroup</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2359" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2362" /> <source>Mercurial Changegroup Files (*.hg)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2376" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2379" /> <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="2415" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2418" /> <source>Preview changegroup</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2444" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2417" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2447" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2420" /> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2453" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2456" /> <source>Shall the working directory be updated?</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2485" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2488" /> <source>Bisect subcommand ({0}) invalid.</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2507" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2510" /> <source>Mercurial Bisect ({0})</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2533" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2536" /> <source>Removing files from the Mercurial repository only</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2582" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2563" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2585" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2566" /> <source>Backing out changeset</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2564" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2567" /> <source>No revision given. Aborting...</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2599" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2593" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2602" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2596" /> <source>Rollback last transaction</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2594" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2597" /> <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="2663" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2666" /> <source>Import Patch</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2713" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2716" /> <source>Export Patches</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2755" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2758" /> <source>Change Phase</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2810" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2813" /> <source>Copy Changesets</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2849" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2852" /> <source>Copy Changesets (Continue)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2859" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2862" /> <source>Copy Changesets (Stop)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2869" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2872" /> <source>Copy Changesets (Abort)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2893" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2896" /> <source>Create Unversioned Archive</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2908" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2911" /> <source>Delete All Backups</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2909" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2912" /> <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="3000" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2980" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2969" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3003" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2983" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2972" /> <source>Add Sub-repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3039" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2970" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3042" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2973" /> <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="2981" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2984" /> <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="3057" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3001" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3060" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3004" /> <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="3056" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3038" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3024" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3059" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3041" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3027" /> <source>Remove Sub-repositories</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3025" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3028" /> <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="3317" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3144" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3320" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3147" /> <source>Mercurial Command Server</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3145" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3148" /> <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="3318" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3321" /> <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="3441" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3444" /> <source>Mercurial Bookmark</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3458" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3461" /> <source>Delete Bookmark</source> <translation type="unfinished">删除书签</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3459" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3462" /> <source>Select the bookmark to be deleted:</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3470" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3473" /> <source>Delete Mercurial Bookmark</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3497" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3500" /> <source>Rename Mercurial Bookmark</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3539" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3542" /> <source>Move Mercurial Bookmark</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3621" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3624" /> <source>Pull Bookmark</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3622" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3625" /> <source>Select the bookmark to be pulled:</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3634" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3637" /> <source>Pulling bookmark from a remote Mercurial repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3662" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3665" /> <source>Push Bookmark</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3663" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3666" /> <source>Select the bookmark to be push:</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3678" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3681" /> <source>Pushing bookmark to a remote Mercurial repository</source> <translation type="unfinished" /> </message> @@ -38230,7 +38230,7 @@ <translation type="unfinished">视图</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3049" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3063" /> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="298" /> <source>Select Branches</source> <translation type="unfinished" /> @@ -38271,7 +38271,7 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2218" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2227" /> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="343" /> <source>Copy Changesets</source> <translation type="unfinished" /> @@ -38328,8 +38328,8 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2312" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2295" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2321" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2304" /> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="387" /> <source>Switch</source> <translation type="unfinished">转换</translation> @@ -38360,263 +38360,270 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2430" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1622" /> <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 Selected Changes</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="419" /> + <source>Pull selected changes from a remote repository</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="423" /> + <source>Pull All Changes</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="427" /> + <source>Pull all changes from a remote repository</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="430" /> <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>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> + <source>Pull large files for selected revisions</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="438" /> + <source>Push Selected 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> + <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="449" /> + <source>Push All Changes</source> <translation type="unfinished" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="452" /> + <source>Push all changes to a remote repository</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="458" /> + <source>Create Changegroup</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="462" /> <source>Create a changegroup file containing the selected changesets</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="455" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="465" /> <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="2569" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="468" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2583" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="478" /> <source>Apply Changegroup</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="472" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="482" /> <source>Apply the currently viewed changegroup file</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="479" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="489" /> <source>Sign Revisions</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="483" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="493" /> <source>Add a signature for the selected revisions</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="487" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="497" /> <source>Verify Signatures</source> <translation type="unfinished" /> </message> <message> - <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="2476" /> - <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="501" /> + <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="2490" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="508" /> + <source>Strip Changesets</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="511" /> <source>Strip changesets from a repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="506" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="516" /> <source>Select All Entries</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="509" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="519" /> <source>Deselect All Entries</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="958" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="934" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="911" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="885" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="968" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="944" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="921" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="895" /> <source>Mercurial Error</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1266" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1276" /> <source>{0} (large file)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1532" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1542" /> <source>Side-by-Side Diff to Parent {0}</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1543" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1553" /> <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="1701" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1620" /> - <source>Pull Selected Changes</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2570" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2477" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2431" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2313" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2219" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2584" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2491" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2445" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2322" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2228" /> <source>The project should be reread. Do this now?</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2296" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2305" /> <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="2341" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2350" /> <source>Define Bookmark</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2342" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2351" /> <source>Enter bookmark name for changeset "{0}":</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2371" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2380" /> <source>Move Bookmark</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2372" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2381" /> <source>Select the bookmark to be moved to changeset '{0}':</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2713" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2444" /> + <source>Pull Changes</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2727" /> <source>Find Commit</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2714" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2728" /> <source>'{0}' was not found.</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2774" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2788" /> <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="2775" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2789" /> <source>Differences</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2794" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2808" /> <source>No differences available. Get some more log entries.</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2796" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2810" /> <source>No differences available.</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2807" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2821" /> <source>Differences to Parent {0}</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2823" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2837" /> <source>Diff to Parent {0}{1}</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2846" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2860" /> <source>There is no difference.</source> <translation type="unfinished">没有差异。</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2999" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2983" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2965" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3013" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2997" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2979" /> <source>Save Diff</source> <translation type="unfinished">保存差异</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2967" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2981" /> <source>Patch Files (*.diff)</source> <translation type="unfinished">补丁文件 (*.diff)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2984" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2998" /> <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="3000" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3014" /> <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="3031" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3045" /> <source>closed</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3032" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3046" /> <source>inactive</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3041" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3055" /> <source>{0} ({1})</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3050" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3064" /> <source>Select the branches to be shown (none for 'All'):</source> <translation type="unfinished" /> </message> @@ -106058,19 +106065,19 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1961" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1964" /> <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1397" /> <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="1967" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1970" /> <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1403" /> <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="1974" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1977" /> <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1410" /> <source><tr><td><b>Branches</b></td><td>{0}</td></tr></source> <translation type="unfinished" /> @@ -106094,35 +106101,35 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1935" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1938" /> <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="1942" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1945" /> <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="1949" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1952" /> <source><tr><td><b>Tip</b></td><td></td></tr> </source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1954" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1957" /> <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="1981" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1984" /> <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="1987" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1990" /> <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>
