Mercurial Repositories > eric / changeset
changeset
Merged again with default.
Sat, 31 Aug 2019 12:29:57 +0200
- author
- Detlev Offenbach <detlev@die-offenbachs.de>
- date
- Sat, 31 Aug 2019 12:29:57 +0200
- branch
- without_py2_and_pyqt4
- changeset 7191
- 960850ec284c
- parent 7190
- 550136399241 (current diff)
- parent 7189
- 4d22e3cb9827 (diff)
- child 7192
- a22eee00b052
Merged again with default.
--- a/eric6/Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py Sat Aug 31 12:28:43 2019 +0200 +++ b/eric6/Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py Sat Aug 31 12:29:57 2019 +0200 @@ -407,8 +407,6 @@ self.buttonBox.button(QDialogButtonBox.Cancel).setDefault(True) self.refreshButton.setEnabled(False) - - self.statusList.setEnabled(not self.vcs.canCommitMerge(self.dname)) def __finish(self): """ @@ -575,8 +573,6 @@ """ Private slot to refresh the status display. """ - self.statusList.setEnabled(not self.vcs.canCommitMerge(self.dname)) - selectedItems = self.statusList.selectedItems() if len(selectedItems) == 1: self.__selectedName = selectedItems[0].text(self.__pathColumn) @@ -935,7 +931,7 @@ """ Private slot to handle the Commit Merge context menu entry. """ - self.vcs.vcsCommit(self.dname, 'Merge', merge=True) + self.vcs.vcsCommit(self.dname, self.tr('Merge'), merge=True) self.__committed() def __abortMerge(self):
--- a/eric6/Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py Sat Aug 31 12:28:43 2019 +0200 +++ b/eric6/Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py Sat Aug 31 12:29:57 2019 +0200 @@ -1728,7 +1728,7 @@ """ Private slot used to commit a merge. """ - self.vcs.vcsCommit(self.project.ppath, 'Merge', merge=True) + self.vcs.vcsCommit(self.project.ppath, self.tr('Merge'), merge=True) def __hgAbortMerge(self): """
--- a/eric6/i18n/eric6_cs.ts Sat Aug 31 12:28:43 2019 +0200 +++ b/eric6/i18n/eric6_cs.ts Sat Aug 31 12:29:57 2019 +0200 @@ -34174,27 +34174,27 @@ <translation>Změněno</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1199"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1201"/> <source>Process Generation Error</source> <translation>Chyba v procesu generování</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1199"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1201"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>Proces {0} nelze spustit. Ověřte, že je umístěn v požadované cestě.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="960"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="962"/> <source>The hg process did not finish within 30s.</source> <translation>Hg proces neskončil do 30s.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="963"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="965"/> <source>Could not start the hg executable.</source> <translation>Nelze spustit hg program.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="966"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="968"/> <source>Mercurial Error</source> <translation>Mercurial chyba</translation> </message> @@ -34265,12 +34265,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2232"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2234"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2573"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2575"/> <source>The project should be reread. Do this now?</source> <translation type="unfinished">Projekt bude znovu načten. Má se provést?</translation> </message> @@ -34295,7 +34295,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2304"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2306"/> <source>Switch</source> <translation type="unfinished">Přepnout</translation> </message> @@ -34315,7 +34315,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1302"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1304"/> <source>{0} (large file)</source> <translation type="unfinished"></translation> </message> @@ -34360,12 +34360,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2715"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2717"/> <source>Find Commit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2715"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2717"/> <source>'{0}' was not found.</source> <translation type="unfinished">'{0}' nebyl nalezen.</translation> </message> @@ -34390,7 +34390,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2435"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2437"/> <source>Pull Changes</source> <translation type="unfinished"></translation> </message> @@ -34420,12 +34420,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2400"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2402"/> <source>Fetch Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2481"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2483"/> <source>Strip Changesets</source> <translation type="unfinished"></translation> </message> @@ -34460,27 +34460,27 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2326"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2328"/> <source>Define Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2326"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2328"/> <source>Enter bookmark name for changeset "{0}":</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2349"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2351"/> <source>Move Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2349"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2351"/> <source>Select the bookmark to be moved to changeset "{0}":</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2290"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2292"/> <source>Select bookmark to switch to (leave empty to use revision):</source> <translation type="unfinished"></translation> </message> @@ -34541,7 +34541,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2573"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2575"/> <source>Apply Changegroup</source> <translation type="unfinished"></translation> </message> @@ -34581,62 +34581,62 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1556"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1558"/> <source>Side-by-Side Diff to Parent {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1567"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1569"/> <source><a href="sbsdiff:{0}_{1}">Side-by-Side Compare</a></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1706"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1708"/> <source>Pull Selected Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1707"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1709"/> <source>Fetch Selected Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2759"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2761"/> <source>Differences</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2769"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2771"/> <source>Differences to Parent {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2785"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2787"/> <source>Diff to Parent {0}{1}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2810"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2812"/> <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="2953"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2955"/> <source>Save Diff</source> <translation type="unfinished">Uložit Diff</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2920"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2922"/> <source>Patch Files (*.diff)</source> <translation type="unfinished">Patch soubory (*.diff)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2937"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2939"/> <source><p>The patch file <b>{0}</b> already exists. Overwrite it?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2953"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2955"/> <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> @@ -34646,7 +34646,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2758"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2760"/> <source>Generating differences ...</source> <translation type="unfinished"></translation> </message> @@ -35393,7 +35393,7 @@ <translation><b>Vrátit změny</b><p>Vrátí se všechny změny, které byly provedeny v lokálním projektu.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="406"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1731"/> <source>Merge</source> <translation>Sloučit</translation> </message> @@ -38111,37 +38111,37 @@ <translation>Proces {0} nelze spustit. Ověřte, že je umístěn v požadované cestě.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="673"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="669"/> <source>Commit</source> <translation>Zapsat měny</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="839"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="835"/> <source>There are no uncommitted changes available/selected.</source> <translation>Nezapsné změny nejsou dostupné/vybrané.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="737"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="733"/> <source>Add</source> <translation>Přidat</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="737"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="733"/> <source>There are no unversioned entries available/selected.</source> <translation>Položky mimo verzi nejsou dostupné/vybrány.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="801"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="797"/> <source>Revert</source> <translation>Vrátit</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="760"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="756"/> <source>Remove</source> <translation>Odebrat</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="801"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="797"/> <source>There are no missing entries available/selected.</source> <translation>Chybějící záznamy nejsou dostupné/vybrány.</translation> </message> @@ -38161,17 +38161,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="595"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="591"/> <source>all</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="819"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="815"/> <source>Differences</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="673"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="669"/> <source>There are no entries selected to be committed.</source> <translation type="unfinished"></translation> </message> @@ -38186,12 +38186,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="846"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="842"/> <source>Side-by-Side Diff</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="846"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="842"/> <source>Only one file with uncommitted changes must be selected.</source> <translation type="unfinished"></translation> </message> @@ -38290,6 +38290,11 @@ <source>Abort an uncommitted merge and lose all changes</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="934"/> + <source>Merge</source> + <translation type="unfinished">Sloučit</translation> + </message> </context> <context> <name>HgStatusMonitorThread</name>
--- a/eric6/i18n/eric6_de.ts Sat Aug 31 12:28:43 2019 +0200 +++ b/eric6/i18n/eric6_de.ts Sat Aug 31 12:29:57 2019 +0200 @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> -<!DOCTYPE TS><TS version="2.0" language="de" sourcelanguage=""> +<!DOCTYPE TS> +<TS version="2.1" language="de"> <context> <name>AboutDialog</name> <message> @@ -1972,8 +1973,8 @@ </message> <message> <location filename="../WebBrowser/Bookmarks/BookmarksMenu.py" line="170"/> - <source>Open in New Tab<byte value="x9"/>Ctrl+LMB</source> - <translation>In neuem Register öffnen<byte value="x9"/>Strg+LMK</translation> + <source>Open in New Tab Ctrl+LMB</source> + <translation>In neuem Register öffnen Strg+LMK</translation> </message> <message> <location filename="../WebBrowser/Bookmarks/BookmarksMenu.py" line="174"/> @@ -2051,8 +2052,8 @@ </message> <message> <location filename="../WebBrowser/Bookmarks/BookmarksToolBar.py" line="91"/> - <source>Open in New Tab<byte value="x9"/>Ctrl+LMB</source> - <translation>In neuem Register öffnen<byte value="x9"/>Strg+LMK</translation> + <source>Open in New Tab Ctrl+LMB</source> + <translation>In neuem Register öffnen Strg+LMK</translation> </message> <message> <location filename="../WebBrowser/Bookmarks/BookmarksToolBar.py" line="95"/> @@ -26593,8 +26594,8 @@ </message> <message> <location filename="../Helpviewer/HelpBrowserWV.py" line="1217"/> - <source>Open Link in New Tab<byte value="x9"/>Ctrl+LMB</source> - <translation>Link in neuem Fenster öffnen<byte value="x9"/>Strg+LMK</translation> + <source>Open Link in New Tab Ctrl+LMB</source> + <translation>Link in neuem Fenster öffnen Strg+LMK</translation> </message> <message> <location filename="../Helpviewer/HelpBrowserWV.py" line="1308"/> @@ -34210,27 +34211,27 @@ <translation>Modifiziert</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1199"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1201"/> <source>Process Generation Error</source> <translation>Fehler beim Prozessstart</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1199"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1201"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>Der Prozess {0} konnte nicht gestartet werden. Stellen Sie sicher, dass er sich im Suchpfad befindet.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="960"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="962"/> <source>The hg process did not finish within 30s.</source> <translation>Der hg-Prozess endete nicht innerhalb von 30s.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="963"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="965"/> <source>Could not start the hg executable.</source> <translation>Das hg Programm konnte nicht gestartet werden.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="966"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="968"/> <source>Mercurial Error</source> <translation>Mercurial-Fehler</translation> </message> @@ -34301,12 +34302,12 @@ <translation>Phase ändern</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2232"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2234"/> <source>Copy Changesets</source> <translation>Änderungssätze kopieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2573"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2575"/> <source>The project should be reread. Do this now?</source> <translation>Das Projekt sollte neu gelesen werde. Jetzt durchführen?</translation> </message> @@ -34331,7 +34332,7 @@ <translation>Ausgewählte Revision mit einer Marke versehen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2304"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2306"/> <source>Switch</source> <translation>Umschalten</translation> </message> @@ -34351,7 +34352,7 @@ <translation>Binärriesen der ausgewählten Revisionen herunterladen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1302"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1304"/> <source>{0} (large file)</source> <translation>{0} (Binärriese)</translation> </message> @@ -34396,12 +34397,12 @@ <translation><tr><td><b>Lesezeichen</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2715"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2717"/> <source>Find Commit</source> <translation>Revision finden</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2715"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2717"/> <source>'{0}' was not found.</source> <translation>„{0}“ wurde nicht gefunden.</translation> </message> @@ -34426,7 +34427,7 @@ <translation>Geheim</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2435"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2437"/> <source>Pull Changes</source> <translation>Änderungen herunterladen</translation> </message> @@ -34456,12 +34457,12 @@ <translation>Alle Änderungen an ein entferntes Repository hochladen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2400"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2402"/> <source>Fetch Changes</source> <translation>Änderungen abholen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2481"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2483"/> <source>Strip Changesets</source> <translation>Änderungssätze löschen</translation> </message> @@ -34496,27 +34497,27 @@ <translation>Verschiebe ein Lesezeichen zur ausgewählten Revision</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2326"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2328"/> <source>Define Bookmark</source> <translation>Lesezeichen hinzufügen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2326"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2328"/> <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="2349"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2351"/> <source>Move Bookmark</source> <translation>Lesezeichen verschieben</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2349"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2351"/> <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="2290"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2292"/> <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> @@ -34578,7 +34579,7 @@ <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="2573"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2575"/> <source>Apply Changegroup</source> <translation>Änderungsgruppe anwenden</translation> </message> @@ -34618,62 +34619,62 @@ <translation>Alle Einträge abwählen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1556"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1558"/> <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="1567"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1569"/> <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="1706"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1708"/> <source>Pull Selected Changes</source> <translation>Ausgewählte Änderungen herunterladen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1707"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1709"/> <source>Fetch Selected Changes</source> <translation>Ausgewählte Änderungen herunterladen und zusammenführen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2759"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2761"/> <source>Differences</source> <translation>Unterschiede</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2769"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2771"/> <source>Differences to Parent {0}</source> <translation>Unterschiede zu Vorgänger {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2785"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2787"/> <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="2810"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2812"/> <source>There is no difference.</source> <translation>Es gibt keinen Unterschied.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2953"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2955"/> <source>Save Diff</source> <translation>Diff speichern</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2920"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2922"/> <source>Patch Files (*.diff)</source> <translation>Patchdateien (*.diff)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2937"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2939"/> <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="2953"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2955"/> <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> @@ -34683,7 +34684,7 @@ <translation><a href="save:me">Speichern</a></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2758"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2760"/> <source>Generating differences ...</source> <translation>Erzeuge Unterschiede ...</translation> </message> @@ -35436,7 +35437,7 @@ <translation><b>Änderungen rückgängig</b><p>Dies macht alle Änderungen am lokalen Projekt werden rückgängig.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="406"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1731"/> <source>Merge</source> <translation>Änderungen zusammenführen</translation> </message> @@ -38154,37 +38155,37 @@ <translation>Der Prozess {0} konnte nicht gestartet werden. Stellen Sie sicher, dass er sich im Suchpfad befindet.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="673"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="669"/> <source>Commit</source> <translation>Einpflegen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="839"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="835"/> <source>There are no uncommitted changes available/selected.</source> <translation>Es sind keine nicht eingepflegten Änderungen vorhanden/ausgewählt.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="737"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="733"/> <source>Add</source> <translation>Hinzufügen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="737"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="733"/> <source>There are no unversioned entries available/selected.</source> <translation>Es sind keine unversionierten Einträge vorhanden/ausgewählt.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="801"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="797"/> <source>Revert</source> <translation>Rückgängig machen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="760"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="756"/> <source>Remove</source> <translation>Entfernen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="801"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="797"/> <source>There are no missing entries available/selected.</source> <translation>Es sind keine fehlenden Einträge vorhanden/ausgewählt.</translation> </message> @@ -38204,17 +38205,17 @@ <translation>Fehlende wiederherstellen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="595"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="591"/> <source>all</source> <translation>alle</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="819"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="815"/> <source>Differences</source> <translation>Unterschiede</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="673"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="669"/> <source>There are no entries selected to be committed.</source> <translation>Es sind keine Einträge zum Einpflegen ausgewählt.</translation> </message> @@ -38229,12 +38230,12 @@ <translation>Mercurial Status des Queue-Repositories</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="846"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="842"/> <source>Side-by-Side Diff</source> <translation>Unterschiede nebeneinander</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="846"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="842"/> <source>Only one file with uncommitted changes must be selected.</source> <translation>Es darf nur eine Datei ausgewählt werden.</translation> </message> @@ -38333,6 +38334,11 @@ <source>Abort an uncommitted merge and lose all changes</source> <translation>Bricht eine nicht eingepflegte Zusammenführung unter Verlust aller Änderungen ab</translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="934"/> + <source>Merge</source> + <translation>Zusammenführen</translation> + </message> </context> <context> <name>HgStatusMonitorThread</name> @@ -47988,12 +47994,12 @@ </message> <message> <location filename="../MicroPython/MicroPythonWidget.py" line="979"/> - <source>µPy Chart</source> + <source>µPy Chart</source> <translation>µPy Chart</translation> </message> <message> <location filename="../MicroPython/MicroPythonWidget.py" line="1059"/> - <source>µPy Files</source> + <source>µPy Files</source> <translation>µPy Dateien</translation> </message> <message> @@ -87703,8 +87709,8 @@ </message> <message> <location filename="../WebBrowser/WebBrowserView.py" line="649"/> - <source>Open Link in New Tab<byte value="x9"/>Ctrl+LMB</source> - <translation>Link in neuem Fenster öffnen<byte value="x9"/>Strg+LMK</translation> + <source>Open Link in New Tab Ctrl+LMB</source> + <translation>Link in neuem Fenster öffnen Strg+LMK</translation> </message> <message> <location filename="../WebBrowser/WebBrowserView.py" line="655"/>
--- a/eric6/i18n/eric6_empty.ts Sat Aug 31 12:28:43 2019 +0200 +++ b/eric6/i18n/eric6_empty.ts Sat Aug 31 12:29:57 2019 +0200 @@ -34119,7 +34119,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2232"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2234"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> @@ -34155,7 +34155,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2304"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2306"/> <source>Switch</source> <translation type="unfinished"></translation> </message> @@ -34165,7 +34165,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2435"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2437"/> <source>Pull Changes</source> <translation type="unfinished"></translation> </message> @@ -34205,57 +34205,57 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="960"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="962"/> <source>The hg process did not finish within 30s.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="963"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="965"/> <source>Could not start the hg executable.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="966"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="968"/> <source>Mercurial Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1199"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1201"/> <source>Process Generation Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1199"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1201"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1302"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1304"/> <source>{0} (large file)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2573"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2575"/> <source>The project should be reread. Do this now?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2715"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2717"/> <source>Find Commit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2715"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2717"/> <source>'{0}' was not found.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2400"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2402"/> <source>Fetch Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2481"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2483"/> <source>Strip Changesets</source> <translation type="unfinished"></translation> </message> @@ -34290,27 +34290,27 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2326"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2328"/> <source>Define Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2326"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2328"/> <source>Enter bookmark name for changeset "{0}":</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2349"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2351"/> <source>Move Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2349"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2351"/> <source>Select the bookmark to be moved to changeset "{0}":</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2290"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2292"/> <source>Select bookmark to switch to (leave empty to use revision):</source> <translation type="unfinished"></translation> </message> @@ -34371,7 +34371,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2573"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2575"/> <source>Apply Changegroup</source> <translation type="unfinished"></translation> </message> @@ -34411,62 +34411,62 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1556"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1558"/> <source>Side-by-Side Diff to Parent {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1567"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1569"/> <source><a href="sbsdiff:{0}_{1}">Side-by-Side Compare</a></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1706"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1708"/> <source>Pull Selected Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1707"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1709"/> <source>Fetch Selected Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2759"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2761"/> <source>Differences</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2769"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2771"/> <source>Differences to Parent {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2785"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2787"/> <source>Diff to Parent {0}{1}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2810"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2812"/> <source>There is no difference.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2953"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2955"/> <source>Save Diff</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2920"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2922"/> <source>Patch Files (*.diff)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2937"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2939"/> <source><p>The patch file <b>{0}</b> already exists. Overwrite it?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2953"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2955"/> <source><p>The patch file <b>{0}</b> could not be saved.<br>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> @@ -34476,7 +34476,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2758"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2760"/> <source>Generating differences ...</source> <translation type="unfinished"></translation> </message> @@ -35283,7 +35283,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="406"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1731"/> <source>Merge</source> <translation type="unfinished"></translation> </message> @@ -37825,7 +37825,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="673"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="669"/> <source>Commit</source> <translation type="unfinished"></translation> </message> @@ -37845,7 +37845,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="819"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="815"/> <source>Differences</source> <translation type="unfinished"></translation> </message> @@ -37935,7 +37935,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="737"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="733"/> <source>Add</source> <translation type="unfinished"></translation> </message> @@ -37990,47 +37990,47 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="595"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="591"/> <source>all</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="673"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="669"/> <source>There are no entries selected to be committed.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="737"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="733"/> <source>There are no unversioned entries available/selected.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="760"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="756"/> <source>Remove</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="801"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="797"/> <source>There are no missing entries available/selected.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="801"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="797"/> <source>Revert</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="839"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="835"/> <source>There are no uncommitted changes available/selected.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="846"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="842"/> <source>Side-by-Side Diff</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="846"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="842"/> <source>Only one file with uncommitted changes must be selected.</source> <translation type="unfinished"></translation> </message> @@ -38114,6 +38114,11 @@ <source>Abort an uncommitted merge and lose all changes</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="934"/> + <source>Merge</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgStatusMonitorThread</name>
--- a/eric6/i18n/eric6_en.ts Sat Aug 31 12:28:43 2019 +0200 +++ b/eric6/i18n/eric6_en.ts Sat Aug 31 12:29:57 2019 +0200 @@ -34051,27 +34051,27 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="960"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="962"/> <source>The hg process did not finish within 30s.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="963"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="965"/> <source>Could not start the hg executable.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="966"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="968"/> <source>Mercurial Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1199"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1201"/> <source>Process Generation Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1199"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1201"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished"></translation> </message> @@ -34122,12 +34122,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2232"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2234"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2573"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2575"/> <source>The project should be reread. Do this now?</source> <translation type="unfinished"></translation> </message> @@ -34152,7 +34152,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2304"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2306"/> <source>Switch</source> <translation type="unfinished"></translation> </message> @@ -34172,7 +34172,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1302"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1304"/> <source>{0} (large file)</source> <translation type="unfinished"></translation> </message> @@ -34217,12 +34217,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2715"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2717"/> <source>Find Commit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2715"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2717"/> <source>'{0}' was not found.</source> <translation type="unfinished"></translation> </message> @@ -34247,7 +34247,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2435"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2437"/> <source>Pull Changes</source> <translation type="unfinished"></translation> </message> @@ -34277,12 +34277,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2400"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2402"/> <source>Fetch Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2481"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2483"/> <source>Strip Changesets</source> <translation type="unfinished"></translation> </message> @@ -34317,27 +34317,27 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2326"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2328"/> <source>Define Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2326"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2328"/> <source>Enter bookmark name for changeset "{0}":</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2349"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2351"/> <source>Move Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2349"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2351"/> <source>Select the bookmark to be moved to changeset "{0}":</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2290"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2292"/> <source>Select bookmark to switch to (leave empty to use revision):</source> <translation type="unfinished"></translation> </message> @@ -34398,7 +34398,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2573"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2575"/> <source>Apply Changegroup</source> <translation type="unfinished"></translation> </message> @@ -34438,62 +34438,62 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1556"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1558"/> <source>Side-by-Side Diff to Parent {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1567"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1569"/> <source><a href="sbsdiff:{0}_{1}">Side-by-Side Compare</a></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1706"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1708"/> <source>Pull Selected Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1707"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1709"/> <source>Fetch Selected Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2759"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2761"/> <source>Differences</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2769"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2771"/> <source>Differences to Parent {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2785"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2787"/> <source>Diff to Parent {0}{1}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2810"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2812"/> <source>There is no difference.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2953"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2955"/> <source>Save Diff</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2920"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2922"/> <source>Patch Files (*.diff)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2937"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2939"/> <source><p>The patch file <b>{0}</b> already exists. Overwrite it?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2953"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2955"/> <source><p>The patch file <b>{0}</b> could not be saved.<br>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> @@ -34503,7 +34503,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2758"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2760"/> <source>Generating differences ...</source> <translation type="unfinished"></translation> </message> @@ -35265,7 +35265,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="406"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1731"/> <source>Merge</source> <translation type="unfinished"></translation> </message> @@ -37965,37 +37965,37 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="673"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="669"/> <source>Commit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="839"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="835"/> <source>There are no uncommitted changes available/selected.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="737"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="733"/> <source>Add</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="737"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="733"/> <source>There are no unversioned entries available/selected.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="760"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="756"/> <source>Remove</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="801"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="797"/> <source>There are no missing entries available/selected.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="801"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="797"/> <source>Revert</source> <translation type="unfinished"></translation> </message> @@ -38015,17 +38015,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="595"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="591"/> <source>all</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="819"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="815"/> <source>Differences</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="673"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="669"/> <source>There are no entries selected to be committed.</source> <translation type="unfinished"></translation> </message> @@ -38040,12 +38040,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="846"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="842"/> <source>Side-by-Side Diff</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="846"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="842"/> <source>Only one file with uncommitted changes must be selected.</source> <translation type="unfinished"></translation> </message> @@ -38144,6 +38144,11 @@ <source>Abort an uncommitted merge and lose all changes</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="934"/> + <source>Merge</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgStatusMonitorThread</name>
--- a/eric6/i18n/eric6_es.ts Sat Aug 31 12:28:43 2019 +0200 +++ b/eric6/i18n/eric6_es.ts Sat Aug 31 12:29:57 2019 +0200 @@ -34202,12 +34202,12 @@ <translation>Modificado</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1199"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1201"/> <source>Process Generation Error</source> <translation>Error de Generación de Proceso</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1199"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1201"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>El proceso {0} no se ha podido ejecutar. Verifique que está en la ruta de búsqueda (search path).</translation> </message> @@ -34222,17 +34222,17 @@ <translation>Tags</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="960"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="962"/> <source>The hg process did not finish within 30s.</source> <translation>El proceso hg no terminó en un plazo de 30s.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="963"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="965"/> <source>Could not start the hg executable.</source> <translation>No se ha podido iniciar el ejecutable de hg.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="966"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="968"/> <source>Mercurial Error</source> <translation>Error de Mercurial</translation> </message> @@ -34304,12 +34304,12 @@ <translation>Cambiar Fase</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2232"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2234"/> <source>Copy Changesets</source> <translation>Copiar Changesets</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2573"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2575"/> <source>The project should be reread. Do this now?</source> <translation>El proyecto debería ser cargado de nuevo. ¿Desea hacerlo ahora?</translation> </message> @@ -34334,7 +34334,7 @@ <translation>Aplicar Tag a la revisión seleccionada</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2304"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2306"/> <source>Switch</source> <translation>Hacer switch</translation> </message> @@ -34354,7 +34354,7 @@ <translation>Hacer pull de archivos grandes para revisiones seleccionadas</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1302"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1304"/> <source>{0} (large file)</source> <translation>{0} (archivo grande)</translation> </message> @@ -34399,12 +34399,12 @@ <translation><tr><td><b>Marcadores</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2715"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2717"/> <source>Find Commit</source> <translation>Buscar Commit</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2715"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2717"/> <source>'{0}' was not found.</source> <translation>'{0}' no se ha encontrado.</translation> </message> @@ -34429,7 +34429,7 @@ <translation>Secreto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2435"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2437"/> <source>Pull Changes</source> <translation>Hacer Pull de Cambios</translation> </message> @@ -34459,12 +34459,12 @@ <translation>Hacer push de todos los cambios a un repositorio remoto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2400"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2402"/> <source>Fetch Changes</source> <translation>Fetch (recuperación) de cambios</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2481"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2483"/> <source>Strip Changesets</source> <translation>Hacer strip de Changesets</translation> </message> @@ -34499,27 +34499,27 @@ <translation>Mover marcador a la revisión seleccionada</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2326"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2328"/> <source>Define Bookmark</source> <translation>Definir Marcador</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2326"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2328"/> <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="2349"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2351"/> <source>Move Bookmark</source> <translation>Mover Marcador</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2349"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2351"/> <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="2290"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2292"/> <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> @@ -34581,7 +34581,7 @@ <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="2573"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2575"/> <source>Apply Changegroup</source> <translation>Aplicar Changegroup</translation> </message> @@ -34621,62 +34621,62 @@ <translation>Quitar Selección de Todas las Entradas</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1556"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1558"/> <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="1567"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1569"/> <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="1706"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1708"/> <source>Pull Selected Changes</source> <translation>Hacer Pull de Cambios Seleccionados</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1707"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1709"/> <source>Fetch Selected Changes</source> <translation>Hacer Fetch de Cambios Seleccionados</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2759"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2761"/> <source>Differences</source> <translation>Diferencias</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2769"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2771"/> <source>Differences to Parent {0}</source> <translation>Diferencias con el Parent {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2785"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2787"/> <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="2810"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2812"/> <source>There is no difference.</source> <translation>No hay ninguna diferencia.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2953"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2955"/> <source>Save Diff</source> <translation>Guardar Diff</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2920"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2922"/> <source>Patch Files (*.diff)</source> <translation>Archivos de Parche (*.diff)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2937"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2939"/> <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="2953"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2955"/> <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> @@ -34686,7 +34686,7 @@ <translation><a href="save:me">Guardar</a></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2758"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2760"/> <source>Generating differences ...</source> <translation>Generando diferencias ...</translation> </message> @@ -35404,7 +35404,7 @@ <translation><b>Mostrar tip</b><p>Muestra el tip del repositorio.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="406"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1731"/> <source>Merge</source> <translation>Hacer merge</translation> </message> @@ -38162,37 +38162,37 @@ <translation>El proceso {0} no se ha podido ejecutar. Verifique que está en la ruta de búsqueda (search path).</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="673"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="669"/> <source>Commit</source> <translation>Commit</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="839"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="835"/> <source>There are no uncommitted changes available/selected.</source> <translation>No hay cambios pendientes de commit disponibles/seleccionados.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="737"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="733"/> <source>Add</source> <translation>Añadir</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="737"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="733"/> <source>There are no unversioned entries available/selected.</source> <translation>No hay entradas sin versionar disponibles/seleccionadas.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="801"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="797"/> <source>Revert</source> <translation>Revertir</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="760"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="756"/> <source>Remove</source> <translation>Eliminar</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="801"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="797"/> <source>There are no missing entries available/selected.</source> <translation>No hay entradas perdidas disponibles/seleccionadas.</translation> </message> @@ -38212,17 +38212,17 @@ <translation>Restore sobre elementos perdidos</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="595"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="591"/> <source>all</source> <translation>todo</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="819"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="815"/> <source>Differences</source> <translation>Diferencias</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="673"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="669"/> <source>There are no entries selected to be committed.</source> <translation>No hay entradas seleccionadas sobre las que aplicar commit.</translation> </message> @@ -38237,12 +38237,12 @@ <translation>Estado de Cola Repositorio Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="846"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="842"/> <source>Side-by-Side Diff</source> <translation>Lado a Lado Diff</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="846"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="842"/> <source>Only one file with uncommitted changes must be selected.</source> <translation>Se debe seleccionar solamente un archivo con cambios sin commit.</translation> </message> @@ -38341,6 +38341,11 @@ <source>Abort an uncommitted merge and lose all changes</source> <translation type="unfinished">Abortar un merge sin commit y perder todos los cambios</translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="934"/> + <source>Merge</source> + <translation type="unfinished">Hacer merge</translation> + </message> </context> <context> <name>HgStatusMonitorThread</name>
--- a/eric6/i18n/eric6_fr.ts Sat Aug 31 12:28:43 2019 +0200 +++ b/eric6/i18n/eric6_fr.ts Sat Aug 31 12:29:57 2019 +0200 @@ -34180,27 +34180,27 @@ <translation type="unfinished">Modifié</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1199"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1201"/> <source>Process Generation Error</source> <translation type="unfinished">Erreur du processus</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1199"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1201"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished">Impossible de lancer le processus {0}. Assurez-vous qu'il est bien dans le chemin de recherche.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="960"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="962"/> <source>The hg process did not finish within 30s.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="963"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="965"/> <source>Could not start the hg executable.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="966"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="968"/> <source>Mercurial Error</source> <translation type="unfinished"></translation> </message> @@ -34271,12 +34271,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2232"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2234"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2573"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2575"/> <source>The project should be reread. Do this now?</source> <translation type="unfinished"></translation> </message> @@ -34301,7 +34301,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2304"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2306"/> <source>Switch</source> <translation type="unfinished">Basculer de version</translation> </message> @@ -34321,7 +34321,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1302"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1304"/> <source>{0} (large file)</source> <translation type="unfinished"></translation> </message> @@ -34366,12 +34366,12 @@ <translation type="unfinished"><tr><td><b>Signets</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2715"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2717"/> <source>Find Commit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2715"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2717"/> <source>'{0}' was not found.</source> <translation type="unfinished"></translation> </message> @@ -34396,7 +34396,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2435"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2437"/> <source>Pull Changes</source> <translation type="unfinished"></translation> </message> @@ -34426,12 +34426,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2400"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2402"/> <source>Fetch Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2481"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2483"/> <source>Strip Changesets</source> <translation type="unfinished"></translation> </message> @@ -34466,27 +34466,27 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2326"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2328"/> <source>Define Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2326"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2328"/> <source>Enter bookmark name for changeset "{0}":</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2349"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2351"/> <source>Move Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2349"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2351"/> <source>Select the bookmark to be moved to changeset "{0}":</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2290"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2292"/> <source>Select bookmark to switch to (leave empty to use revision):</source> <translation type="unfinished"></translation> </message> @@ -34547,7 +34547,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2573"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2575"/> <source>Apply Changegroup</source> <translation type="unfinished"></translation> </message> @@ -34587,62 +34587,62 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1556"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1558"/> <source>Side-by-Side Diff to Parent {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1567"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1569"/> <source><a href="sbsdiff:{0}_{1}">Side-by-Side Compare</a></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1706"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1708"/> <source>Pull Selected Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1707"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1709"/> <source>Fetch Selected Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2759"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2761"/> <source>Differences</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2769"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2771"/> <source>Differences to Parent {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2785"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2787"/> <source>Diff to Parent {0}{1}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2810"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2812"/> <source>There is no difference.</source> <translation type="unfinished">Aucune différence.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2953"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2955"/> <source>Save Diff</source> <translation type="unfinished">Enregistrer Diff</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2920"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2922"/> <source>Patch Files (*.diff)</source> <translation type="unfinished">Fichiers Patch (*.diff)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2937"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2939"/> <source><p>The patch file <b>{0}</b> already exists. Overwrite it?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2953"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2955"/> <source><p>The patch file <b>{0}</b> could not be saved.<br>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> @@ -34652,7 +34652,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2758"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2760"/> <source>Generating differences ...</source> <translation type="unfinished"></translation> </message> @@ -35403,7 +35403,7 @@ <translation type="unfinished"><b>Recharger le projet</b><p>Recharge le projet et écrase toutes les modifications effectuées localement.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="406"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1731"/> <source>Merge</source> <translation type="unfinished">Fusionner</translation> </message> @@ -38118,37 +38118,37 @@ <translation type="unfinished">Impossible de lancer le processus {0}. Assurez-vous qu'il est bien dans le chemin de recherche.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="673"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="669"/> <source>Commit</source> <translation type="unfinished">Commit</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="839"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="835"/> <source>There are no uncommitted changes available/selected.</source> <translation type="unfinished">Il n'y a pas de modification non commitée disponible/sélectionnée.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="737"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="733"/> <source>Add</source> <translation type="unfinished">Ajouter</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="737"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="733"/> <source>There are no unversioned entries available/selected.</source> <translation type="unfinished">Aucune entrée "non-versionnée" disponible/sélectionnée.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="801"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="797"/> <source>Revert</source> <translation type="unfinished">Recouvrir</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="760"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="756"/> <source>Remove</source> <translation type="unfinished">Supprimer</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="801"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="797"/> <source>There are no missing entries available/selected.</source> <translation type="unfinished"></translation> </message> @@ -38168,17 +38168,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="595"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="591"/> <source>all</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="819"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="815"/> <source>Differences</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="673"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="669"/> <source>There are no entries selected to be committed.</source> <translation type="unfinished"></translation> </message> @@ -38193,12 +38193,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="846"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="842"/> <source>Side-by-Side Diff</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="846"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="842"/> <source>Only one file with uncommitted changes must be selected.</source> <translation type="unfinished"></translation> </message> @@ -38297,6 +38297,11 @@ <source>Abort an uncommitted merge and lose all changes</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="934"/> + <source>Merge</source> + <translation type="unfinished">Fusionner</translation> + </message> </context> <context> <name>HgStatusMonitorThread</name>
--- a/eric6/i18n/eric6_it.ts Sat Aug 31 12:28:43 2019 +0200 +++ b/eric6/i18n/eric6_it.ts Sat Aug 31 12:29:57 2019 +0200 @@ -34234,27 +34234,27 @@ <translation>Modificato</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1199"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1201"/> <source>Process Generation Error</source> <translation>Errore Generazione Processo</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1199"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1201"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>Il processo {0} non può essere avviato. Assicurarsi che sia nel path.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="960"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="962"/> <source>The hg process did not finish within 30s.</source> <translation>Il processo hg non è finito entro i 30s.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="963"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="965"/> <source>Could not start the hg executable.</source> <translation>Non posso avviare l'eseguibile hg.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="966"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="968"/> <source>Mercurial Error</source> <translation>Mercurial Error</translation> </message> @@ -34325,12 +34325,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2232"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2234"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2573"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2575"/> <source>The project should be reread. Do this now?</source> <translation type="unfinished">Il progetto deve essere riletto. Farlo ora ?</translation> </message> @@ -34355,7 +34355,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2304"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2306"/> <source>Switch</source> <translation type="unfinished"></translation> </message> @@ -34375,7 +34375,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1302"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1304"/> <source>{0} (large file)</source> <translation type="unfinished"></translation> </message> @@ -34420,12 +34420,12 @@ <translation type="unfinished"><tr><td><b>Segnalibri</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2715"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2717"/> <source>Find Commit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2715"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2717"/> <source>'{0}' was not found.</source> <translation type="unfinished">'{0}' non è stato trovato.</translation> </message> @@ -34450,7 +34450,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2435"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2437"/> <source>Pull Changes</source> <translation type="unfinished"></translation> </message> @@ -34480,12 +34480,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2400"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2402"/> <source>Fetch Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2481"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2483"/> <source>Strip Changesets</source> <translation type="unfinished"></translation> </message> @@ -34520,27 +34520,27 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2326"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2328"/> <source>Define Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2326"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2328"/> <source>Enter bookmark name for changeset "{0}":</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2349"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2351"/> <source>Move Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2349"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2351"/> <source>Select the bookmark to be moved to changeset "{0}":</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2290"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2292"/> <source>Select bookmark to switch to (leave empty to use revision):</source> <translation type="unfinished"></translation> </message> @@ -34601,7 +34601,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2573"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2575"/> <source>Apply Changegroup</source> <translation type="unfinished"></translation> </message> @@ -34641,62 +34641,62 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1556"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1558"/> <source>Side-by-Side Diff to Parent {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1567"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1569"/> <source><a href="sbsdiff:{0}_{1}">Side-by-Side Compare</a></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1706"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1708"/> <source>Pull Selected Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1707"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1709"/> <source>Fetch Selected Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2759"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2761"/> <source>Differences</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2769"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2771"/> <source>Differences to Parent {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2785"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2787"/> <source>Diff to Parent {0}{1}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2810"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2812"/> <source>There is no difference.</source> <translation type="unfinished">Non ci sono differenze.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2953"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2955"/> <source>Save Diff</source> <translation type="unfinished">Salva Diff</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2920"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2922"/> <source>Patch Files (*.diff)</source> <translation type="unfinished">File Patch (*.diff)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2937"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2939"/> <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="2953"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2955"/> <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> @@ -34706,7 +34706,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2758"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2760"/> <source>Generating differences ...</source> <translation type="unfinished"></translation> </message> @@ -35458,7 +35458,7 @@ <translation><b>Inverti modifiche</b><p>Inverte tutte le modifiche fatte al progetto locale.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="406"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1731"/> <source>Merge</source> <translation>Fondi</translation> </message> @@ -38174,37 +38174,37 @@ <translation>Il processo {0} non può essere avviato. Assicurarsi che sia nel path.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="673"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="669"/> <source>Commit</source> <translation>Commit</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="839"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="835"/> <source>There are no uncommitted changes available/selected.</source> <translation>Non ci sono modifiche disponibili/selezionate da committare.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="737"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="733"/> <source>Add</source> <translation>Aggiungi</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="737"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="733"/> <source>There are no unversioned entries available/selected.</source> <translation>Non ci sono elementi non sotto controllo disponibili/selezionati.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="801"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="797"/> <source>Revert</source> <translation>Inverti</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="760"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="756"/> <source>Remove</source> <translation>Rimuovi</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="801"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="797"/> <source>There are no missing entries available/selected.</source> <translation>Non ci sono elementi mancati disponibili/selezionati.</translation> </message> @@ -38224,17 +38224,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="595"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="591"/> <source>all</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="673"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="669"/> <source>There are no entries selected to be committed.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="819"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="815"/> <source>Differences</source> <translation type="unfinished"></translation> </message> @@ -38249,12 +38249,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="846"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="842"/> <source>Side-by-Side Diff</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="846"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="842"/> <source>Only one file with uncommitted changes must be selected.</source> <translation type="unfinished"></translation> </message> @@ -38353,6 +38353,11 @@ <source>Abort an uncommitted merge and lose all changes</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="934"/> + <source>Merge</source> + <translation type="unfinished">Fondi</translation> + </message> </context> <context> <name>HgStatusMonitorThread</name>
--- a/eric6/i18n/eric6_pt.ts Sat Aug 31 12:28:43 2019 +0200 +++ b/eric6/i18n/eric6_pt.ts Sat Aug 31 12:29:57 2019 +0200 @@ -34251,27 +34251,27 @@ <translation>Tudo</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="960"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="962"/> <source>The hg process did not finish within 30s.</source> <translation>O processo hg não acabou em 30s.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="963"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="965"/> <source>Could not start the hg executable.</source> <translation>Não se pôde iniciar o executável hg.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="966"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="968"/> <source>Mercurial Error</source> <translation>Erro de Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1199"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1201"/> <source>Process Generation Error</source> <translation>Erro na Criação de Processo</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1199"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1201"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>Não pôde iniciar {0}.<br>Certifique-se de que está na rota de pesquisa.</translation> </message> @@ -34323,12 +34323,12 @@ <translation>Mudar Fase</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2232"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2234"/> <source>Copy Changesets</source> <translation type="unfinished">Copiar Conjuntos de Alterações</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2573"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2575"/> <source>The project should be reread. Do this now?</source> <translation>O projecto deve ser recarregado. Fazer-lo agora?</translation> </message> @@ -34353,7 +34353,7 @@ <translation>Etiqueta a revisão selecionada</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2304"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2306"/> <source>Switch</source> <translation type="unfinished">Mudar</translation> </message> @@ -34373,7 +34373,7 @@ <translation>Puxar os ficheiros grandes das revisões selecionadas</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1302"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1304"/> <source>{0} (large file)</source> <translation>{0} (ficheiro grande)</translation> </message> @@ -34423,12 +34423,12 @@ <translation><tr><td><b>Marcadores</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2715"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2717"/> <source>Find Commit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2715"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2717"/> <source>'{0}' was not found.</source> <translation>'{0}' não foi encontrado.</translation> </message> @@ -34448,7 +34448,7 @@ <translation type="unfinished">Secreto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2435"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2437"/> <source>Pull Changes</source> <translation type="unfinished"></translation> </message> @@ -34478,12 +34478,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2400"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2402"/> <source>Fetch Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2481"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2483"/> <source>Strip Changesets</source> <translation type="unfinished"></translation> </message> @@ -34518,27 +34518,27 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2326"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2328"/> <source>Define Bookmark</source> <translation type="unfinished">Definir Marcador</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2326"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2328"/> <source>Enter bookmark name for changeset "{0}":</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2349"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2351"/> <source>Move Bookmark</source> <translation type="unfinished">Mover marcador</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2349"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2351"/> <source>Select the bookmark to be moved to changeset "{0}":</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2290"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2292"/> <source>Select bookmark to switch to (leave empty to use revision):</source> <translation type="unfinished"></translation> </message> @@ -34599,7 +34599,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2573"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2575"/> <source>Apply Changegroup</source> <translation type="unfinished"></translation> </message> @@ -34639,62 +34639,62 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1556"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1558"/> <source>Side-by-Side Diff to Parent {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1567"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1569"/> <source><a href="sbsdiff:{0}_{1}">Side-by-Side Compare</a></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1706"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1708"/> <source>Pull Selected Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1707"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1709"/> <source>Fetch Selected Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2759"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2761"/> <source>Differences</source> <translation type="unfinished">Diferenças</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2769"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2771"/> <source>Differences to Parent {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2785"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2787"/> <source>Diff to Parent {0}{1}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2810"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2812"/> <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="2953"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2955"/> <source>Save Diff</source> <translation type="unfinished">Gravar Diff</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2920"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2922"/> <source>Patch Files (*.diff)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2937"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2939"/> <source><p>The patch file <b>{0}</b> already exists. Overwrite it?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2953"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2955"/> <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> @@ -34704,7 +34704,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2758"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2760"/> <source>Generating differences ...</source> <translation type="unfinished"></translation> </message> @@ -35469,7 +35469,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="406"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1731"/> <source>Merge</source> <translation>Mesclar</translation> </message> @@ -38170,37 +38170,37 @@ <translation>Não pôde iniciar {0}.<br>Certifique-se de que está na rota de pesquisa.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="673"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="669"/> <source>Commit</source> <translation>Cometido</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="839"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="835"/> <source>There are no uncommitted changes available/selected.</source> <translation>Não há aterações por cometer disponíveis/selecionadas.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="737"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="733"/> <source>Add</source> <translation>Adicionar</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="737"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="733"/> <source>There are no unversioned entries available/selected.</source> <translation>Não existem entradas sem versão disponíveis/selecionadas.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="760"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="756"/> <source>Remove</source> <translation>Retirar</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="801"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="797"/> <source>There are no missing entries available/selected.</source> <translation>Não existem entradas desaparecidas disponíveis/selcionadas.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="801"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="797"/> <source>Revert</source> <translation>Anular</translation> </message> @@ -38220,17 +38220,17 @@ <translation>Restaurar desaparecidos</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="595"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="591"/> <source>all</source> <translation>tudo</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="819"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="815"/> <source>Differences</source> <translation>Diferenças</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="673"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="669"/> <source>There are no entries selected to be committed.</source> <translation>Não há entradas selecionadas a cometer.</translation> </message> @@ -38245,12 +38245,12 @@ <translation>Estado de Fila do Repositório Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="846"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="842"/> <source>Side-by-Side Diff</source> <translation>Diff Lado a lado</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="846"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="842"/> <source>Only one file with uncommitted changes must be selected.</source> <translation>Apenas um ficheiro com alterações por cometer deve ser selecionado.</translation> </message> @@ -38349,6 +38349,11 @@ <source>Abort an uncommitted merge and lose all changes</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="934"/> + <source>Merge</source> + <translation type="unfinished">Mesclar</translation> + </message> </context> <context> <name>HgStatusMonitorThread</name>
--- a/eric6/i18n/eric6_ru.ts Sat Aug 31 12:28:43 2019 +0200 +++ b/eric6/i18n/eric6_ru.ts Sat Aug 31 12:29:57 2019 +0200 @@ -34288,27 +34288,27 @@ <translation>Все</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="960"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="962"/> <source>The hg process did not finish within 30s.</source> <translation>Процесс hg не завершился в течение 30 секунд.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="963"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="965"/> <source>Could not start the hg executable.</source> <translation>Невозможно запустить исполняемый файл hg.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="966"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="968"/> <source>Mercurial Error</source> <translation>Mercurial: Ошибка</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1199"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1201"/> <source>Process Generation Error</source> <translation>Ошибка при запуске процесса</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1199"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1201"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>Невозможно запустить процесс {0}. Убедитесь, что он находится в путях поиска.</translation> </message> @@ -34360,12 +34360,12 @@ <translation>Изменить фазу</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2232"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2234"/> <source>Copy Changesets</source> <translation>Копировать набор изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2573"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2575"/> <source>The project should be reread. Do this now?</source> <translation>Проект должен быть перепрочитан. Сделать это сейчас?</translation> </message> @@ -34390,7 +34390,7 @@ <translation>Тег выбранной ревизии</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2304"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2306"/> <source>Switch</source> <translation>Переключиться</translation> </message> @@ -34410,7 +34410,7 @@ <translation>Загрузить (затянуть) большие файлы для выбранных ревизий</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1302"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1304"/> <source>{0} (large file)</source> <translation>{0} большой файл</translation> </message> @@ -34455,12 +34455,12 @@ <translation><tr><td><b>Закладки</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2715"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2717"/> <source>Find Commit</source> <translation>Поиск фиксации</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2715"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2717"/> <source>'{0}' was not found.</source> <translation>'{0}' не найдено.</translation> </message> @@ -34485,7 +34485,7 @@ <translation>Secret</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2435"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2437"/> <source>Pull Changes</source> <translation>Затянуть изменения</translation> </message> @@ -34515,12 +34515,12 @@ <translation>Протолкнуть все изменения в удаленный репозиторий</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2400"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2402"/> <source>Fetch Changes</source> <translation>Получить изменения (fetch)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2481"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2483"/> <source>Strip Changesets</source> <translation>Срезать наборы изменений (strip)</translation> </message> @@ -34555,27 +34555,27 @@ <translation>Переместить закладку в выбранную ревизию</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2326"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2328"/> <source>Define Bookmark</source> <translation>Определить закладку</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2326"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2328"/> <source>Enter bookmark name for changeset "{0}":</source> <translation>Введите имя закладки для набора изменений "{0}":</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2349"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2351"/> <source>Move Bookmark</source> <translation>Переместить закладку</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2349"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2351"/> <source>Select the bookmark to be moved to changeset "{0}":</source> <translation>Выберите закладку для перемещения в набор изменений "{0}":</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2290"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2292"/> <source>Select bookmark to switch to (leave empty to use revision):</source> <translation>Выберите закладку для переключения (оставьте поле пустым для использования ревизии):</translation> </message> @@ -34637,7 +34637,7 @@ <p>Создание файла группы изменений, содержащего выбранные ревизии. Если не выбрано ни одного изменения, все наборы изменений будут поставляться пакетом. Если выбрана одна ревизия, то она будет интерпретирована как базовая ревизия. В противном случае самая младшая ревизия будет использована как базовая ревизия а все остальные изменения будут поставляться пакетом. Если диалог отображает исходящие наборы изменений, все помеченные наборы изменений будут поставляться пакетом.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2573"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2575"/> <source>Apply Changegroup</source> <translation>Применить группу изменений</translation> </message> @@ -34677,62 +34677,62 @@ <translation>Снять выделение всех записей</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1556"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1558"/> <source>Side-by-Side Diff to Parent {0}</source> <translation>Построчные различия с предком {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1567"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1569"/> <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="1706"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1708"/> <source>Pull Selected Changes</source> <translation>Затянуть помеченные изменения</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1707"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1709"/> <source>Fetch Selected Changes</source> <translation>Получить помеченные изменения</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2759"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2761"/> <source>Differences</source> <translation>Различия</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2769"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2771"/> <source>Differences to Parent {0}</source> <translation>Различия с предком {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2785"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2787"/> <source>Diff to Parent {0}{1}</source> <translation>Различия с предком {0}{1}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2810"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2812"/> <source>There is no difference.</source> <translation>Различий нет.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2953"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2955"/> <source>Save Diff</source> <translation>Сохранить различия</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2920"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2922"/> <source>Patch Files (*.diff)</source> <translation>Файлы патчей (*.diff)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2937"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2939"/> <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="2953"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2955"/> <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> @@ -34742,7 +34742,7 @@ <translation><a href="save:me">Сохранить</a></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2758"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2760"/> <source>Generating differences ...</source> <translation>Генерация различий...</translation> </message> @@ -35509,7 +35509,7 @@ <translation><b>Вернуть изменения</b><p>Все изменения в локальном проекте будут отменены.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="406"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1731"/> <source>Merge</source> <translation>Слить</translation> </message> @@ -38215,37 +38215,37 @@ <translation>Невозможно запустить процесс {0}. Убедитесь, что он находится в путях поиска.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="673"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="669"/> <source>Commit</source> <translation>Фиксация</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="839"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="835"/> <source>There are no uncommitted changes available/selected.</source> <translation>Нет доступных/выбранных нефиксированных изменений.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="737"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="733"/> <source>Add</source> <translation>Добавить</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="737"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="733"/> <source>There are no unversioned entries available/selected.</source> <translation>Нет доступных/выбранных неверсированных элементов.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="760"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="756"/> <source>Remove</source> <translation>Удалить</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="801"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="797"/> <source>There are no missing entries available/selected.</source> <translation>Нет доступных/выбраных недостающих записей.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="801"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="797"/> <source>Revert</source> <translation>Вернуть</translation> </message> @@ -38270,17 +38270,17 @@ <translation>Восстановить отсутствующие</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="595"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="591"/> <source>all</source> <translation>все</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="819"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="815"/> <source>Differences</source> <translation>Различия</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="673"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="669"/> <source>There are no entries selected to be committed.</source> <translation>Нет выбранных записей для фиксации.</translation> </message> @@ -38295,12 +38295,12 @@ <translation>Mercurial: Статус репозитория очереди</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="846"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="842"/> <source>Side-by-Side Diff</source> <translation>Построчные различия</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="846"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="842"/> <source>Only one file with uncommitted changes must be selected.</source> <translation>Должен быть выбран только один файл незафиксированных изменений.</translation> </message> @@ -38399,6 +38399,11 @@ <source>Abort an uncommitted merge and lose all changes</source> <translation type="unfinished">Отмена незавершенного слияния и потеря всех изменений</translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="934"/> + <source>Merge</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgStatusMonitorThread</name>
--- a/eric6/i18n/eric6_tr.ts Sat Aug 31 12:28:43 2019 +0200 +++ b/eric6/i18n/eric6_tr.ts Sat Aug 31 12:29:57 2019 +0200 @@ -34151,27 +34151,27 @@ <translation>Değiştirildi</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="960"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="962"/> <source>The hg process did not finish within 30s.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="963"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="965"/> <source>Could not start the hg executable.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="966"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="968"/> <source>Mercurial Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1199"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1201"/> <source>Process Generation Error</source> <translation>İşlem Üretecinde Hata</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1199"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1201"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>Süreç {0} başlatılamadı. Bunun arama yolunda olduğundan emin olun.</translation> </message> @@ -34237,12 +34237,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2232"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2234"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2573"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2575"/> <source>The project should be reread. Do this now?</source> <translation type="unfinished">Projenin yeniden okunması gerekiyor. Şimdi yapılsın mı?</translation> </message> @@ -34267,7 +34267,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2304"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2306"/> <source>Switch</source> <translation type="unfinished">Değiştirmek</translation> </message> @@ -34287,7 +34287,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1302"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1304"/> <source>{0} (large file)</source> <translation type="unfinished"></translation> </message> @@ -34332,12 +34332,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2715"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2717"/> <source>Find Commit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2715"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2717"/> <source>'{0}' was not found.</source> <translation type="unfinished">'{0}' bulunamadı.</translation> </message> @@ -34362,7 +34362,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2435"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2437"/> <source>Pull Changes</source> <translation type="unfinished"></translation> </message> @@ -34392,12 +34392,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2400"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2402"/> <source>Fetch Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2481"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2483"/> <source>Strip Changesets</source> <translation type="unfinished"></translation> </message> @@ -34432,27 +34432,27 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2326"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2328"/> <source>Define Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2326"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2328"/> <source>Enter bookmark name for changeset "{0}":</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2349"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2351"/> <source>Move Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2349"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2351"/> <source>Select the bookmark to be moved to changeset "{0}":</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2290"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2292"/> <source>Select bookmark to switch to (leave empty to use revision):</source> <translation type="unfinished"></translation> </message> @@ -34513,7 +34513,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2573"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2575"/> <source>Apply Changegroup</source> <translation type="unfinished"></translation> </message> @@ -34553,62 +34553,62 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1556"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1558"/> <source>Side-by-Side Diff to Parent {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1567"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1569"/> <source><a href="sbsdiff:{0}_{1}">Side-by-Side Compare</a></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1706"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1708"/> <source>Pull Selected Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1707"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1709"/> <source>Fetch Selected Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2759"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2761"/> <source>Differences</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2769"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2771"/> <source>Differences to Parent {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2785"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2787"/> <source>Diff to Parent {0}{1}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2810"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2812"/> <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="2953"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2955"/> <source>Save Diff</source> <translation type="unfinished">Farklılıkları Kaydet</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2920"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2922"/> <source>Patch Files (*.diff)</source> <translation type="unfinished">Patch Dosyaları (*.diff)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2937"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2939"/> <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="2953"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2955"/> <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> @@ -34618,7 +34618,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2758"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2760"/> <source>Generating differences ...</source> <translation type="unfinished"></translation> </message> @@ -35366,7 +35366,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="406"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1731"/> <source>Merge</source> <translation>Birleştir</translation> </message> @@ -38082,37 +38082,37 @@ <translation>Süreç {0} başlatılamadı. Bunun arama yolunda olduğundan emin olun.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="673"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="669"/> <source>Commit</source> <translation>Teslimat</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="839"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="835"/> <source>There are no uncommitted changes available/selected.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="737"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="733"/> <source>Add</source> <translation>Ekle</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="737"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="733"/> <source>There are no unversioned entries available/selected.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="760"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="756"/> <source>Remove</source> <translation>Kaldır</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="801"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="797"/> <source>There are no missing entries available/selected.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="801"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="797"/> <source>Revert</source> <translation>Başa Dönme</translation> </message> @@ -38132,17 +38132,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="595"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="591"/> <source>all</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="819"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="815"/> <source>Differences</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="673"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="669"/> <source>There are no entries selected to be committed.</source> <translation type="unfinished"></translation> </message> @@ -38157,12 +38157,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="846"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="842"/> <source>Side-by-Side Diff</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="846"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="842"/> <source>Only one file with uncommitted changes must be selected.</source> <translation type="unfinished"></translation> </message> @@ -38261,6 +38261,11 @@ <source>Abort an uncommitted merge and lose all changes</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="934"/> + <source>Merge</source> + <translation type="unfinished">Birleştir</translation> + </message> </context> <context> <name>HgStatusMonitorThread</name>
--- a/eric6/i18n/eric6_zh_CN.ts Sat Aug 31 12:28:43 2019 +0200 +++ b/eric6/i18n/eric6_zh_CN.ts Sat Aug 31 12:29:57 2019 +0200 @@ -34160,27 +34160,27 @@ <translation type="unfinished">已修改</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1199"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1201"/> <source>Process Generation Error</source> <translation type="unfinished">进程生成错误</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1199"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1201"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished">进程 {0} 无法启动。请保证它处在搜索路径中。</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="960"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="962"/> <source>The hg process did not finish within 30s.</source> <translation type="unfinished">hg 进程没有在 30 秒内结束。</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="963"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="965"/> <source>Could not start the hg executable.</source> <translation type="unfinished">无法启动 hg 可执行程序。</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="966"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="968"/> <source>Mercurial Error</source> <translation type="unfinished"></translation> </message> @@ -34251,12 +34251,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2232"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2234"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2573"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2575"/> <source>The project should be reread. Do this now?</source> <translation type="unfinished"></translation> </message> @@ -34281,7 +34281,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2304"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2306"/> <source>Switch</source> <translation type="unfinished">转换</translation> </message> @@ -34301,7 +34301,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1302"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1304"/> <source>{0} (large file)</source> <translation type="unfinished"></translation> </message> @@ -34346,12 +34346,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2715"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2717"/> <source>Find Commit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2715"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2717"/> <source>'{0}' was not found.</source> <translation type="unfinished"></translation> </message> @@ -34376,7 +34376,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2435"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2437"/> <source>Pull Changes</source> <translation type="unfinished"></translation> </message> @@ -34406,12 +34406,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2400"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2402"/> <source>Fetch Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2481"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2483"/> <source>Strip Changesets</source> <translation type="unfinished"></translation> </message> @@ -34446,27 +34446,27 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2326"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2328"/> <source>Define Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2326"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2328"/> <source>Enter bookmark name for changeset "{0}":</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2349"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2351"/> <source>Move Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2349"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2351"/> <source>Select the bookmark to be moved to changeset "{0}":</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2290"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2292"/> <source>Select bookmark to switch to (leave empty to use revision):</source> <translation type="unfinished"></translation> </message> @@ -34527,7 +34527,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2573"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2575"/> <source>Apply Changegroup</source> <translation type="unfinished"></translation> </message> @@ -34567,62 +34567,62 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1556"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1558"/> <source>Side-by-Side Diff to Parent {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1567"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1569"/> <source><a href="sbsdiff:{0}_{1}">Side-by-Side Compare</a></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1706"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1708"/> <source>Pull Selected Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1707"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1709"/> <source>Fetch Selected Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2759"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2761"/> <source>Differences</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2769"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2771"/> <source>Differences to Parent {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2785"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2787"/> <source>Diff to Parent {0}{1}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2810"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2812"/> <source>There is no difference.</source> <translation type="unfinished">没有差异。</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2953"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2955"/> <source>Save Diff</source> <translation type="unfinished">保存差异</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2920"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2922"/> <source>Patch Files (*.diff)</source> <translation type="unfinished">补丁文件 (*.diff)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2937"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2939"/> <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="2953"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2955"/> <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> @@ -34632,7 +34632,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2758"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2760"/> <source>Generating differences ...</source> <translation type="unfinished"></translation> </message> @@ -35384,7 +35384,7 @@ <translation type="unfinished"><b>还原改变</b><p>还原所有改变到本地项目中。</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="406"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1731"/> <source>Merge</source> <translation type="unfinished">合并</translation> </message> @@ -38096,37 +38096,37 @@ <translation type="unfinished">进程 {0} 无法启动。请保证它处在搜索路径中。</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="673"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="669"/> <source>Commit</source> <translation type="unfinished">提交</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="839"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="835"/> <source>There are no uncommitted changes available/selected.</source> <translation type="unfinished">没有未提交的更改可用或被选择。</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="737"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="733"/> <source>Add</source> <translation type="unfinished">添加</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="737"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="733"/> <source>There are no unversioned entries available/selected.</source> <translation type="unfinished">没有未版本化的条目可用或被选择。</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="801"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="797"/> <source>Revert</source> <translation type="unfinished">还原</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="760"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="756"/> <source>Remove</source> <translation type="unfinished">移除</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="801"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="797"/> <source>There are no missing entries available/selected.</source> <translation type="unfinished"></translation> </message> @@ -38146,17 +38146,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="595"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="591"/> <source>all</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="819"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="815"/> <source>Differences</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="673"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="669"/> <source>There are no entries selected to be committed.</source> <translation type="unfinished"></translation> </message> @@ -38171,12 +38171,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="846"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="842"/> <source>Side-by-Side Diff</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="846"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="842"/> <source>Only one file with uncommitted changes must be selected.</source> <translation type="unfinished"></translation> </message> @@ -38275,6 +38275,11 @@ <source>Abort an uncommitted merge and lose all changes</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="934"/> + <source>Merge</source> + <translation type="unfinished">合并</translation> + </message> </context> <context> <name>HgStatusMonitorThread</name>
